Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ringing): Auto-Cancel outgoing calls #1217

Merged
merged 1 commit into from
Dec 11, 2023
Merged

fix(ringing): Auto-Cancel outgoing calls #1217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 25 additions & 41 deletions packages/client/src/Call.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ import {
debounce,
filter,
map,
pairwise,
Subject,
takeWhile,
tap,
timer,
} from 'rxjs';
import { TrackSubscriptionDetails } from './gen/video/sfu/signal_rpc/signal';
Expand Down Expand Up @@ -1345,9 +1343,10 @@ export class Call {
};

/**
* Updates the list of video layers to publish.
*
* @internal
* @param enabledRids
* @returns
* @param enabledLayers the list of layers to enable.
*/
updatePublishQuality = async (enabledLayers: VideoLayerSetting[]) => {
return this.publisher?.updateVideoPublishQuality(enabledLayers);
Expand Down Expand Up @@ -1718,45 +1717,30 @@ export class Call {
>(`${this.streamClientBasePath}/members`, data);
};

/**
* Schedules an auto-drop timeout based on the call settings.
* Applicable only for ringing calls.
*/
private scheduleAutoDrop = () => {
if (this.dropTimeout) clearTimeout(this.dropTimeout);
const subscription = this.state.settings$
.pipe(
pairwise(),
tap(([prevSettings, currentSettings]) => {
if (!currentSettings || !this.clientStore.connectedUser) return;

const isOutgoingCall =
this.currentUserId === this.state.createdBy?.id;

const [prevTimeoutMs, timeoutMs] = isOutgoingCall
? [
prevSettings?.ring.auto_cancel_timeout_ms,
currentSettings.ring.auto_cancel_timeout_ms,
]
: [
prevSettings?.ring.incoming_call_timeout_ms,
currentSettings.ring.incoming_call_timeout_ms,
];
if (
typeof timeoutMs === 'undefined' ||
timeoutMs === prevTimeoutMs ||
timeoutMs === 0
)
return;

if (this.dropTimeout) clearTimeout(this.dropTimeout);
this.dropTimeout = setTimeout(() => this.leave(), timeoutMs);
}),
takeWhile(
() => !!this.clientStore.calls.find((call) => call.cid === this.cid),
),
)
.subscribe();
clearTimeout(this.dropTimeout);
this.leaveCallHooks.add(
createSubscription(this.state.settings$, (settings) => {
if (!settings) return;
// ignore if the call is not ringing
if (this.state.callingState !== CallingState.RINGING) return;

this.leaveCallHooks.add(() => {
!subscription.closed && subscription.unsubscribe();
});
const timeoutInMs = settings.ring.auto_cancel_timeout_ms;
// 0 means no auto-drop
if (timeoutInMs <= 0) return;

clearTimeout(this.dropTimeout);
this.dropTimeout = setTimeout(() => {
this.leave().catch((err) => {
this.logger('error', 'Failed to drop call', err);
});
}, timeoutInMs);
}),
);
};

/**
Expand Down
Loading