discordjs/discord.js
2
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2024-08-21 06:54:44 +12:00
Code Issues Projects Releases Packages Wiki Activity

fix(websocketshard): backport zombie connection fix (#9003)

Browse source
This commit is contained in:
Voxelli 2023-01-02 20:28:08 +05:30 committed by GitHub
parent 649058055a
commit 56e67185fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/client/websocket/WebSocketShard.js
View file

@ -578,14 +578,10 @@ class WebSocketShard extends EventEmitter {
} }
this.wsCloseTimeout = setTimeout(() => { this.wsCloseTimeout = setTimeout(() => {
this.setWsCloseTimeout(-1); this.setWsCloseTimeout(-1);
this.debug(`[WebSocket] Close Emitted: ${this.closeEmitted}`);
// Check if close event was emitted. // Check if close event was emitted.
if (this.closeEmitted) { if (this.closeEmitted) {
this.debug( this.debug(`[WebSocket] close was already emitted, assuming the connection was closed properly.`);
`[WebSocket] was closed. | WS State: ${
CONNECTION_STATE[this.connection?.readyState ?? WebSocket.CLOSED]
} | Close Emitted: ${this.closeEmitted}`,
);
// Setting the variable false to check for zombie connections. // Setting the variable false to check for zombie connections.
this.closeEmitted = false; this.closeEmitted = false;
return; return;
@ -593,13 +589,17 @@ class WebSocketShard extends EventEmitter {
this.debug( this.debug(
// eslint-disable-next-line max-len // eslint-disable-next-line max-len
`[WebSocket] did not close properly, assuming a zombie connection.\nEmitting close and reconnecting again.`, `[WebSocket] Close Emitted: ${this.closeEmitted} | did not close properly, assuming a zombie connection.\nEmitting close and reconnecting again.`,
); );
this.emitClose(); if (this.connection) this._cleanupConnection();
// Setting the variable false to check for zombie connections.
this.closeEmitted = false; this.emitClose({
}, time).unref(); code: 4009,
reason: 'Session time out.',
wasClean: false,
});
}, time);
} }
/** /**
@ -824,14 +824,11 @@ class WebSocketShard extends EventEmitter {
this._emitDestroyed(); this._emitDestroyed();
} }
if (this.connection?.readyState === WebSocket.CLOSING || this.connection?.readyState === WebSocket.CLOSED) { this.debug(
this.closeEmitted = false; `[WebSocket] Adding a WebSocket close timeout to ensure a correct WS reconnect.
this.debug(
`[WebSocket] Adding a WebSocket close timeout to ensure a correct WS reconnect.
Timeout: ${this.manager.client.options.closeTimeout}ms`, Timeout: ${this.manager.client.options.closeTimeout}ms`,
); );
this.setWsCloseTimeout(this.manager.client.options.closeTimeout); this.setWsCloseTimeout(this.manager.client.options.closeTimeout);
}
// Step 2: Null the connection object // Step 2: Null the connection object
this.connection = null; this.connection = null;

2
test/shard.js
View file

@ -26,7 +26,7 @@ process.send(123);
client.on('ready', () => { client.on('ready', () => {
console.log('Ready', client.options.shards); console.log('Ready', client.options.shards);
if (client.options.shards === 0) { if (client.options.shards[0] === 0) {
setTimeout(() => { setTimeout(() => {
console.log('kek dying'); console.log('kek dying');
client.destroy(); client.destroy();