@sonata-sdk/voice 0.1.2 → 0.1.4

package/dist/connection.js

@@ -38,14 +38,15 @@ export class VoiceConnection extends EventEmitter {
             }).catch((err) => this.emit('error', err));
         });
         this.#gateway.on('sessionDescription', (payload) => {
-            this.#udp.setSecretKey(payload.secret_key);
+            const secretKey = Buffer.from(payload.secret_key);
+            this.#udp.setSecretKey(secretKey);
             this.udpInfo = {
                 ssrc: this.#gateway.ssrc,
                 ip: this.#gateway.ip,
                 port: this.#gateway.port,
-                secretKey: payload.secret_key,
+                secretKey,
             };
-            this.#encryption = new AudioEncryption(payload.mode, payload.secret_key, this.#gateway.ssrc);
+            this.#encryption = new AudioEncryption(payload.mode, secretKey, this.#gateway.ssrc);
             this.state = { status: 'connected', reason: null, code: null };
             this.emit('stateChange', { status: 'connecting' }, this.state);
             this.emit('ready');
@@ -81,6 +82,8 @@ export class VoiceConnection extends EventEmitter {
             try {
                 const { operationType, proposals } = d;
                 const result = session.processProposals(operationType, Buffer.from(proposals));
+                if (session.ready)
+                    this.#daveReady = true;
                 if (result.commit && result.welcome) {
                     this.#gateway.sendDaveOp(28, Buffer.concat([result.commit, result.welcome]));
                 }
@@ -98,6 +101,8 @@ export class VoiceConnection extends EventEmitter {
                 return this.emit('error', new Error('No DAVE session'));
             try {
                 session.processCommit(data);
+                if (session.ready)
+                    this.#daveReady = true;
             }
             catch (e) {
                 this.emit('error', new Error(`DAVE commit: ${e.message}`));
@@ -109,6 +114,8 @@ export class VoiceConnection extends EventEmitter {
                 return this.emit('error', new Error('No DAVE session'));
             try {
                 session.processWelcome(data);
+                if (session.ready)
+                    this.#daveReady = true;
             }
             catch (e) {
                 this.emit('error', new Error(`DAVE welcome: ${e.message}`));
@@ -130,14 +137,19 @@ export class VoiceConnection extends EventEmitter {
     sendAudioFrame(frame) {
         if (this.#destroyed)
             return;
+        let payload = frame;
+        const daveSession = this.#gateway.daveSession;
+        if (this.#daveReady && daveSession?.ready) {
+            payload = daveSession.encryptOpus(frame);
+        }
         if (this.#encryption) {
-            const encrypted = this.#encryption.encrypt(frame);
+            const encrypted = this.#encryption.encrypt(payload);
             if (!encrypted)
                 return; // silence frame
             this.#udp.send(encrypted);
         }
         else {
-            this.#udp.send(frame);
+            this.#udp.send(payload);
         }
         this.statistics.packetsSent++;
         this.statistics.packetsExpected++;

package/dist/gateway.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'node:events';
+import { DAVESession } from '@snazzah/davey';
 export interface VoiceServerPayload {
     token: string;
     endpoint: string;
@@ -18,6 +19,7 @@ export interface SessionDescriptionPayload {
 }
 export declare class VoiceGateway extends EventEmitter {
     #private;
+    daveSession: DAVESession | null;
     get connected(): boolean;
     get ssrc(): number;
     get ip(): string;

package/dist/gateway.js

@@ -20,7 +20,7 @@ export class VoiceGateway extends EventEmitter {
     #secretKey = null;
     #connected = false;
     #daveProtocolVersion = 0;
-    #daveSession = null;
+    daveSession = null;
     #daveKeypair = null;
     #pendingBinary = [];
     get connected() { return this.#connected; }
@@ -39,7 +39,7 @@ export class VoiceGateway extends EventEmitter {
         try {
             this.#daveKeypair = generateP256Keypair();
             this.#channelId = channelId;
-            this.#daveSession = new DAVESession(Number(DAVE_PROTOCOL_VERSION), this.#userId, channelId, this.#daveKeypair);
+            this.daveSession = new DAVESession(Number(DAVE_PROTOCOL_VERSION), this.#userId, channelId, this.#daveKeypair);
         }
         catch (e) {
             this.emit('error', new Error(`DAVE init failed: ${e.message}`));
@@ -53,7 +53,7 @@ export class VoiceGateway extends EventEmitter {
         this.#endpoint = endpoint.replace(/^wss:\/\//, '').replace(/\/\?v=\d+$/, '');
         if (channelId) {
             this.#channelId = channelId;
-            if (!this.#daveSession)
+            if (!this.daveSession)
                 this.setDaveSession(channelId);
         }
     }
@@ -91,7 +91,7 @@ export class VoiceGateway extends EventEmitter {
         }
     }
     #handleDaveBinary(data) {
-        if (!this.#daveSession) {
+        if (!this.daveSession) {
             this.#pendingBinary.push(data);
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonata-sdk/voice",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Discord voice connection library — WebSocket gateway, UDP, RTP, encryption, DAVE/MLS",
   "license": "MIT",
   "type": "module",