Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 04:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(WebSocketShard): cancel initial heartbeat in destroy (#9244)

Browse Source 
* fix(WebSocketShard): cancel initial heartbeat in destroy

* refactor: use try/catch/finally

* chore: add debug log
This commit is contained in:
DD
2023-03-18 21:32:50 +02:00
committed by GitHub
parent 51edba78bc
commit 98420826bc
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/ws/src/ws/WebSocketShard.ts
View File

@@ -95,6 +95,8 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
private sendRateLimitState: SendRateLimitState = getInitialSendRateLimitState(); private sendRateLimitState: SendRateLimitState = getInitialSendRateLimitState();
private initialHeartbeatTimeoutController: AbortController | null = null;
private heartbeatInterval: NodeJS.Timer | null = null; private heartbeatInterval: NodeJS.Timer | null = null;
private lastHeartbeatAt = -1; private lastHeartbeatAt = -1;
@@ -203,6 +205,11 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
clearInterval(this.heartbeatInterval); clearInterval(this.heartbeatInterval);
} }
if (this.initialHeartbeatTimeoutController) {
this.initialHeartbeatTimeoutController.abort();
this.initialHeartbeatTimeoutController = null;
}
this.lastHeartbeatAt = -1; this.lastHeartbeatAt = -1;
// Clear session state if applicable // Clear session state if applicable
@@ -568,7 +575,17 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
const firstWait = Math.floor(payload.d.heartbeat_interval * jitter); const firstWait = Math.floor(payload.d.heartbeat_interval * jitter);
this.debug([`Preparing first heartbeat of the connection with a jitter of ${jitter}; waiting ${firstWait}ms`]); this.debug([`Preparing first heartbeat of the connection with a jitter of ${jitter}; waiting ${firstWait}ms`]);
await sleep(firstWait); try {
const controller = new AbortController();
this.initialHeartbeatTimeoutController = controller;
await sleep(firstWait, undefined, { signal: controller.signal });
} catch {
this.debug(['Cancelled initial heartbeat due to #destroy being called']);
return;
} finally {
this.initialHeartbeatTimeoutController = null;
}
await this.heartbeat(); await this.heartbeat();
this.debug([`First heartbeat sent, starting to beat every ${payload.d.heartbeat_interval}ms`]); this.debug([`First heartbeat sent, starting to beat every ${payload.d.heartbeat_interval}ms`]);