hippoz/bridgecord
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hopefully improve discordclient reconnecting

Browse source
This commit is contained in:
hippoz 2022-02-14 22:18:33 +02:00
parent 742a46c708
commit 5ce0b81864
No known key found for this signature in database
GPG key ID: 7C52899193467641
1 changed files with 30 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
DiscordClient.js
View file

@ -7,18 +7,17 @@ const opcodes = {
EVENT: 0, EVENT: 0,
CLIENT_HEARTBEAT: 1, CLIENT_HEARTBEAT: 1,
IDENTIFY: 2, IDENTIFY: 2,
RESUME: 6,
INVALID_SESSION: 9, INVALID_SESSION: 9,
HELLO: 10, HELLO: 10,
HEARTBEAT_ACK: 11, HEARTBEAT_ACK: 11,
}; };
const reconnectOnCloseCodes = [ const skipReconnectFor = [
1000, 1001, 4000, 4001, 4002, 4003, 4005, 4007, 4008, 4009 4004, 4010, 4011, 4012, 4013, 4014
]; ];
class DiscordClient extends EventEmitter { class DiscordClient extends EventEmitter {
constructor(token, { intents, baseDomain="discord.com", gatewayUrl="wss://gateway.discord.gg/?v=9&encoding=json&compress=zlib-stream", apiBase="https://discord.com/api/v9" } = {}) { constructor(token, { intents, gatewayUrl="wss://gateway.discord.gg/?v=9&encoding=json&compress=zlib-stream", apiBase="https://discord.com/api/v9" } = {}) {
super(); super();
this.token = token; this.token = token;
@ -79,19 +78,11 @@ class DiscordClient extends EventEmitter {
}; };
} }
_getResumePayload() {
return {
token: this.token,
session_id: this.sessionId,
seq: this.seq
};
}
_handleGatewayMessage(ws, message) { _handleGatewayMessage(ws, message) {
try { try {
message = JSON.parse(message); message = JSON.parse(message);
} catch(e) { } catch(e) {
console.error("error: DiscordClient: on `message`: failed to parse incoming message as JSON", e); console.error("error: DiscordClient: on 'message': failed to parse incoming message as JSON", e);
return; return;
} }
@ -103,28 +94,20 @@ class DiscordClient extends EventEmitter {
switch (message.op) { switch (message.op) {
case opcodes.HELLO: { case opcodes.HELLO: {
console.log(`DiscordClient: HELLO; heartbeat_interval=${payload.heartbeat_interval}`);
this._setHeartbeat(payload.heartbeat_interval); this._setHeartbeat(payload.heartbeat_interval);
if (this.resuming) { ws.send(JSON.stringify({
console.warn("DiscordClient: resuming..."); op: opcodes.IDENTIFY,
this.resuming = false; d: this._getIdentifyPayload()
ws.send(JSON.stringify({ }));
op: opcodes.RESUME,
d: this._getResumePayload()
}));
} else {
ws.send(JSON.stringify({
op: opcodes.IDENTIFY,
d: this._getIdentifyPayload()
}));
}
break; break;
} }
case opcodes.EVENT: { case opcodes.EVENT: {
switch (message.t) { switch (message.t) {
case "READY": { case "READY": {
console.log("DiscordClient: ready"); console.log("DiscordClient: READY");
this.user = payload.user; this.user = payload.user;
this.sessionId = payload.session_id; this.sessionId = payload.session_id;
this.guilds = payload.guilds; this.guilds = payload.guilds;
@ -211,19 +194,8 @@ class DiscordClient extends EventEmitter {
} }
case opcodes.INVALID_SESSION: { case opcodes.INVALID_SESSION: {
if (message.d) { console.error("DiscordClient: INVALID_SESSION - please check your authentication token");
// connection is resumable, we are going to resume the connection console.error("DiscordClient: INVALID_SESSION: will not reconnect");
this.resuming = true;
this.connect();
} else {
// connection is not resumable, wait some time and then send a new IDENTIFY payload
setTimeout(() => {
ws.send(JSON.stringify({
op: opcodes.IDENTIFY,
d: this._getIdentifyPayload()
}));
}, 3500);
}
break; break;
} }
@ -235,7 +207,9 @@ class DiscordClient extends EventEmitter {
} }
connect() { connect() {
console.log("DiscordClient: connecting...");
if (this.ws) { if (this.ws) {
console.log("DiscordClient: a websocket connection already exists, killing...");
this.ws.removeAllListeners(); this.ws.removeAllListeners();
this.ws.close(); this.ws.close();
this.ws = null; this.ws = null;
@ -249,30 +223,37 @@ class DiscordClient extends EventEmitter {
}); });
// we decompressed the data, send it to the handler now // we decompressed the data, send it to the handler now
this.inflate.on("data", (message) => this._handleGatewayMessage(ws, message)); this.inflate.on("data", (message) =>
this._handleGatewayMessage(ws, message)
);
ws.on("message", (data, isBinary) => { ws.on("message", (data, isBinary) => {
// pass the data to the decompressor // pass the data to the decompressor
this.inflate.write(data); this.inflate.write(data);
}); });
ws.on("open", () => {
console.log("DiscordClient: WebSocket 'open'")
});
ws.on("close", (code, reason) => { ws.on("close", (code, reason) => {
reason = reason.toString(); reason = reason.toString();
console.error(`DiscordClient: on \`close\`: disconnected from gateway: code \`${code}\`, reason \`${reason}\``); console.error(`DiscordClient: on 'close': disconnected from gateway: code '${code}', reason '${reason}'`);
this.emit("close", code, reason); this.emit("close", code, reason);
this._setHeartbeat(-1); this._setHeartbeat(-1);
if (reconnectOnCloseCodes.includes(code)) { if (skipReconnectFor.includes(code)) {
this.resuming = true; console.error("DiscordClient: on 'close': the exit code above is in skipReconnectFor, and thus the server will not reconnect.");
} else {
console.log("DiscordClient: on 'close': the client will now attempt to reconnect...");
this.connect(); this.connect();
} }
}); });
ws.on("error", (e) => { ws.on("error", (e) => {
console.error("DiscordClient: websocket error:", e); console.error("DiscordClient: on 'error': websocket error:", e);
console.log("DiscordClient: reconnecting?"); console.log("DiscordClient: on 'error': reconnecting due to previous websocket error...");
this._setHeartbeat(-1); this._setHeartbeat(-1);
this.resuming = true;
this.connect(); this.connect();
}); });
} }
@ -301,4 +282,4 @@ class DiscordClient extends EventEmitter {
} }
} }
export default DiscordClient; export default DiscordClient;