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

fix(WebSocketShard): #send race condition due to ready state (#9226)

Browse Source 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
DD
2023-03-12 21:28:10 +02:00
committed by GitHub
parent 6ecff26ec6
commit a99fc64e3f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,14 +383,9 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
d, d,
}); });
const { ok } = await this.bubbleWaitForEventError( await this.bubbleWaitForEventError(
this.waitForEvent(WebSocketShardEvents.Ready, this.strategy.options.readyTimeout), this.waitForEvent(WebSocketShardEvents.Ready, this.strategy.options.readyTimeout),
); );
if (!ok) {
return;
}
this.#status = WebSocketShardStatus.Ready;
} }
private async resume(session: SessionInfo) { private async resume(session: SessionInfo) {
@@ -499,7 +494,7 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
// eslint-disable-next-line sonarjs/no-nested-switch // eslint-disable-next-line sonarjs/no-nested-switch
switch (payload.t) { switch (payload.t) {
case GatewayDispatchEvents.Ready: { case GatewayDispatchEvents.Ready: {
this.emit(WebSocketShardEvents.Ready, { data: payload.d }); this.#status = WebSocketShardStatus.Ready;
this.session ??= { this.session ??= {
sequence: payload.s, sequence: payload.s,
@@ -510,6 +505,8 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
}; };
await this.strategy.updateSessionInfo(this.id, this.session); await this.strategy.updateSessionInfo(this.id, this.session);
this.emit(WebSocketShardEvents.Ready, { data: payload.d });
break; break;
} }