feat(voice): Support resuming voice connection (#1448)

Co-authored-by: bsian03 <[email protected]>
abalabahaha · Jul 9, 2024 · 552dbb0 · 552dbb0
1 parent 55a8a69
commit 552dbb0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -4234,6 +4234,7 @@ declare namespace Eris {
     receiveStreamOpus?: VoiceDataStream | null;
     receiveStreamPCM?: VoiceDataStream | null;
     reconnecting: boolean;
+    resuming: boolean;
     samplingRate: number;
     secret: Buffer;
     sendBuffer: Buffer;

diff --git a/lib/voice/VoiceConnection.js b/lib/voice/VoiceConnection.js
@@ -74,6 +74,7 @@ converterCommand.pickCommand = function pickCommand() {
  * @prop {Boolean} paused Whether the voice connection is paused
  * @prop {Boolean} playing Whether the voice connection is playing something
  * @prop {Boolean} ready Whether the voice connection is ready
+ * @prop {Boolean} resuming Whether the voice connection is waiting for resuming
  * @prop {Number} volume The current volume level of the connection
  */
 class VoiceConnection extends EventEmitter {
@@ -120,6 +121,7 @@ class VoiceConnection extends EventEmitter {
         this.connectionTimeout = null;
         this.connecting = false;
         this.reconnecting = false;
+        this.resuming = false;
         this.ready = false;
 
         this.sendBuffer = Buffer.allocUnsafe(16 + 32 + MAX_FRAME_SIZE);
@@ -199,12 +201,20 @@ class VoiceConnection extends EventEmitter {
                 clearTimeout(this.connectionTimeout);
                 this.connectionTimeout = null;
             }
-            this.sendWS(VoiceOPCodes.IDENTIFY, {
-                server_id: this.id === "call" ? data.channel_id : this.id,
-                user_id: data.user_id,
-                session_id: data.session_id,
-                token: data.token
-            });
+            if(this.resuming) {
+                this.sendWS(VoiceOPCodes.RESUME, {
+                    server_id: this.id === "call" ? data.channel_id : this.id,
+                    session_id: data.session_id,
+                    token: data.token
+                });
+            } else {
+                this.sendWS(VoiceOPCodes.IDENTIFY, {
+                    server_id: this.id === "call" ? data.channel_id : this.id,
+                    user_id: data.user_id,
+                    session_id: data.session_id,
+                    token: data.token
+                });
+            }
         });
         this.ws.on("message", (m) => {
             const packet = JSON.parse(m);
@@ -269,6 +279,11 @@ class VoiceConnection extends EventEmitter {
                     this.sendUDPPacket(udpMessage);
                     break;
                 }
+                case VoiceOPCodes.RESUMED: {
+                    this.connecting = false;
+                    this.resuming = false;
+                    break;
+                }
                 case VoiceOPCodes.SESSION_DESCRIPTION: {
                     this.mode = packet.d.mode;
                     this.secret = Buffer.from(packet.d.secret_key);
@@ -355,6 +370,13 @@ class VoiceConnection extends EventEmitter {
             this.emit("warn", `Voice WS close ${code}: ${reason}`);
             if(this.connecting || this.ready) {
                 let reconnecting = true;
+                if(code < 4000 || code === 4015) {
+                    this.resuming = true;
+                    setTimeout(() => {
+                        this.connect(data);
+                    }, 500).unref();
+                    return;
+                }
                 if(code === 4006) {
                     reconnecting = false;
                 } else if(code === 4014) {
@@ -383,6 +405,7 @@ class VoiceConnection extends EventEmitter {
     disconnect(error, reconnecting) {
         this.connecting = false;
         this.reconnecting = reconnecting;
+        this.resuming = false;
         this.ready = false;
         this.speaking = false;
         this.timestamp = 0;