Skip to content

Regression: Change logic to check if connection is online on unstable networks #25618

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

Merged
amolghode1981 merged 3 commits into from
May 27, 2022
Merged

Regression: Change logic to check if connection is online on unstable networks #25618

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c236748
Change .race for .allsettled so rejections are handled better
KevLehman May 23, 2022
d6fce39
improve to unstable check logic
KevLehman May 23, 2022
a12ad83
CR suggestions
KevLehman May 24, 2022
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
30 changes: 12 additions & 18 deletions apps/meteor/client/lib/voip/VoIPUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ export class VoIPUser extends Emitter<VoipEvents> {

private optionsKeepAliveDebounceTimeInSec = 5;

private optionsKeepAliveDebounceCount = 3;

private attemptRegistration = false;

constructor(private readonly config: VoIPUserConfiguration, mediaRenderer?: IMediaStreamRenderer) {
Expand All @@ -97,6 +95,7 @@ export class VoIPUser extends Emitter<VoipEvents> {
this.networkEmitter = new Emitter<SignalingSocketEvents>();
this.connectionRetryCount = this.config.connectionRetryCount;
this.stop = false;

this.onlineNetworkHandler = this.onNetworkRestored.bind(this);
this.offlineNetworkHandler = this.onNetworkLost.bind(this);
}
Expand Down Expand Up @@ -912,24 +911,19 @@ export class VoIPUser extends Emitter<VoipEvents> {
return;
}
if (this._connectionState !== 'SERVER_RECONNECTING') {
const keepAliveResponse = await this.sendKeepAliveAndWaitForResponse();
if (!keepAliveResponse) {
const connectivityArray = new Array(this.optionsKeepAliveDebounceCount).fill(this.sendKeepAliveAndWaitForResponse(true));
await Promise.race(connectivityArray).then((response): void => {
if (!response) {
this.networkEmitter.emit('disconnected');
}
});
}
/**
* Either we got connected and managed to send keep-alive
* or while attempting keepAlive with debounce, we got connected at moment,
* |keepAliveResponse| will be turned on.
*/
if (keepAliveResponse) {
this.networkEmitter.emit('connected');
let isConnected = false;
try {
await this.sendKeepAliveAndWaitForResponse();
isConnected = true;
} catch (e) {
console.error(`[${e}] Failed to do options ping.`);
} finally {
// Send event only if it's a "change" on the status (avoid unnecessary event flooding)
!isConnected && this.networkEmitter.emit('disconnected');
isConnected && this.networkEmitter.emit('connected');
}
}
// Each seconds check if the network can reach asterisk. If not, try to reconnect
this.startOptionsPingForUnstableNetworks();
}, this.optionsKeepaliveInterval * 1000);
}
Expand Down