voice: clean up packet handling

src/client/voice/VoiceConnection.js

@@ -396,29 +396,25 @@ class VoiceConnection extends EventEmitter {
    * @param {Object} data The received data
    * @private
    */
-  onReady({ port, ssrc, ip, modes }) {
+  onReady(data) {
-    this.authentication.port = port;
+    this.authentication = data;
-    this.authentication.ssrc = ssrc;
+    for (let mode of data.modes) {
-    for (let mode of modes) {
       if (SUPPORTED_MODES.includes(mode)) {
-        this.authentication.encryptionMode = mode;
+        this.authentication.mode = mode;
         this.emit('debug', `Selecting the ${mode} mode`);
         break;
       }
     }
-    this.sockets.udp.createUDPSocket(ip);
+    this.sockets.udp.createUDPSocket(data.ip);
   }
 
   /**
    * Invoked when a session description is received.
-   * @param {string} mode The encryption mode
+   * @param {Object} data The received data
-   * @param {string} secret The secret key
    * @private
    */
-  onSessionDescription(mode, secret) {
+  onSessionDescription(data) {
-    this.authentication.encryptionMode = mode;
+    Object.assign(this.authentication, data);
-    this.authentication.secretKey = secret;
-
     this.status = VoiceStatus.CONNECTED;
     clearTimeout(this.connectTimeout);
     /**

src/client/voice/dispatcher/StreamDispatcher.js

@@ -242,26 +242,26 @@ class StreamDispatcher extends Writable {
   }
 
   _playChunk(chunk) {
-    if (this.player.dispatcher !== this || !this.player.voiceConnection.authentication.secretKey) return;
+    if (this.player.dispatcher !== this || !this.player.voiceConnection.authentication.secret_key) return;
     this._setSpeaking(true);
     this._sendPacket(this._createPacket(this._sdata.sequence, this._sdata.timestamp, chunk));
   }
 
   _encrypt(buffer) {
-    const { secretKey, encryptionMode } = this.player.voiceConnection.authentication;
+    const { secret_key, mode } = this.player.voiceConnection.authentication;
-    if (encryptionMode === 'xsalsa20_poly1305_lite') {
+    if (mode === 'xsalsa20_poly1305_lite') {
       this._nonce++;
       if (this._nonce > MAX_NONCE_SIZE) this._nonce = 0;
       this._nonceBuffer.writeUInt32BE(this._nonce, 0);
       return [
-        secretbox.methods.close(buffer, this._nonceBuffer, secretKey),
+        secretbox.methods.close(buffer, this._nonceBuffer, secret_key),
         this._nonceBuffer.slice(0, 4),
       ];
-    } else if (encryptionMode === 'xsalsa20_poly1305_suffix') {
+    } else if (mode === 'xsalsa20_poly1305_suffix') {
       const random = secretbox.methods.random(24);
-      return [secretbox.methods.close(buffer, random, secretKey), random];
+      return [secretbox.methods.close(buffer, random, secret_key), random];
     } else {
-      return [secretbox.methods.close(buffer, nonce, secretKey)];
+      return [secretbox.methods.close(buffer, nonce, secret_key)];
     }
   }
 

src/client/voice/networking/VoiceUDPClient.js

@@ -104,7 +104,7 @@ class VoiceConnectionUDPClient extends EventEmitter {
           data: {
             address: packet.address,
             port: packet.port,
-            mode: this.voiceConnection.authentication.encryptionMode,
+            mode: this.voiceConnection.authentication.mode,
           },
         },
       });

src/client/voice/networking/VoiceWebSocket.js

@@ -168,15 +168,13 @@ class VoiceWebSocket extends EventEmitter {
         break;
       /* eslint-disable no-case-declarations */
       case VoiceOPCodes.SESSION_DESCRIPTION:
-        const key = new Uint8Array(new ArrayBuffer(packet.d.secret_key.length));
+        packet.d.secret_key = new Uint8Array(packet.d.secret_key);
-        for (const i in packet.d.secret_key) key[i] = packet.d.secret_key[i];
         /**
          * Emitted once the Voice Websocket receives a description of this voice session.
-         * @param {string} encryptionMode The type of encryption being used
+         * @param {Object} packet The received packet
-         * @param {Uint8Array} secretKey The secret key used for encryption
          * @event VoiceWebSocket#sessionDescription
          */
-        this.emit('sessionDescription', packet.d.mode, key);
+        this.emit('sessionDescription', packet.d);
         break;
       case VoiceOPCodes.CLIENT_CONNECT:
         this.connection.ssrcMap.set(+packet.d.audio_ssrc, packet.d.user_id);

src/client/voice/receiver/PacketHandler.js

@@ -32,14 +32,14 @@ class PacketHandler extends EventEmitter {
   }
 
   parseBuffer(buffer) {
-    const { secretKey, encryptionMode } = this.receiver.connection.authentication;
+    const { secret_key, mode } = this.receiver.connection.authentication;
 
     // Choose correct nonce depending on encryption
     let end;
-    if (encryptionMode === 'xsalsa20_poly1305_lite') {
+    if (mode === 'xsalsa20_poly1305_lite') {
       buffer.copy(this.nonce, 0, buffer.length - 4);
       end = buffer.length - 4;
-    } else if (encryptionMode === 'xsalsa20_poly1305_suffix') {
+    } else if (mode === 'xsalsa20_poly1305_suffix') {
       buffer.copy(this.nonce, 0, buffer.length - 24);
       end = buffer.length - 24;
     } else {
@@ -47,7 +47,7 @@ class PacketHandler extends EventEmitter {
     }
 
     // Open packet
-    let packet = secretbox.methods.open(buffer.slice(12, end), this.nonce, secretKey);
+    let packet = secretbox.methods.open(buffer.slice(12, end), this.nonce, secret_key);
     if (!packet) return new Error('Failed to decrypt voice packet');
     packet = Buffer.from(packet);