Prevent heartbeat during identify (#1290)

abalabahaha · Nov 10, 2021 · 5db41aa · 5db41aa
1 parent e8dfcbb
commit 5db41aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -2952,7 +2952,7 @@ declare namespace Eris {
     requestMembersPromise: { [s: string]: RequestMembersPromise };
     seq: number;
     sessionID: string | null;
-    status: "disconnected" | "connecting" | "handshaking" | "ready" | "resuming";
+    status: "connecting" | "disconnected" | "handshaking" | "identifying" | "ready" | "resuming";
     unsyncedGuilds: number;
     ws: WebSocket | BrowserWebSocket | null;
     constructor(id: number, client: Client);

diff --git a/lib/gateway/Shard.js b/lib/gateway/Shard.js
@@ -49,7 +49,7 @@ try {
 * @prop {Number} lastHeartbeatSent Last time shard sent a heartbeat, null if shard has not sent heartbeat yet
 * @prop {Number} latency The current latency between the shard and Discord, in milliseconds
 * @prop {Boolean} ready Whether the shard is ready
-* @prop {String} status The status of the shard. "disconnected"/"connecting"/"handshaking"/"ready"
+* @prop {String} status The status of the shard. "disconnected"/"connecting"/"handshaking"/"ready"/"identifying"/"resuming"
 */
 class Shard extends EventEmitter {
     constructor(id, client) {
@@ -287,8 +287,8 @@ class Shard extends EventEmitter {
     }
 
     heartbeat(normal) {
-        // Can only heartbeat after resume succeeds, discord/discord-api-docs#1619
-        if(this.status === "resuming") {
+        // Can only heartbeat after identify/resume succeeds, session will be killed otherwise, discord/discord-api-docs#1619
+        if(this.status === "resuming" || this.status === "identifying") {
             return;
         }
         if(normal) {
@@ -321,6 +321,7 @@ class Shard extends EventEmitter {
             this.emit("error", new Error("pako/zlib-sync not found, cannot decompress data"));
             return;
         }
+        this.status = "identifying";
         const identify = {
             token: this._token,
             v: GATEWAY_VERSION,