@sonata-sdk/voice 0.1.1 → 0.1.3

package/dist/connection.js

@@ -19,6 +19,7 @@ export class VoiceConnection extends EventEmitter {
     #token = '';
     #endpoint = '';
     #destroyed = false;
+    #daveReady = false;
     constructor(opts) {
         super();
         this.guildId = opts.guildId;
@@ -26,6 +27,7 @@ export class VoiceConnection extends EventEmitter {
         this.channelId = opts.channelId;
         this.encryption = opts.encryption ?? null;
         this.#gateway = new VoiceGateway(opts.guildId, opts.userId);
+        this.#gateway.setDaveSession(opts.channelId);
         this.#udp = new UdpSocket();
         this.#setupListeners();
     }
@@ -36,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');
@@ -58,6 +61,60 @@ export class VoiceConnection extends EventEmitter {
                 this.ping = Date.now() - d.t;
         });
         this.#udp.on('error', (err) => this.emit('error', err));
+        // DAVE handshake handlers
+        this.#gateway.on('dave_external_sender', (data) => {
+            const session = this.#gateway.daveSession;
+            if (!session)
+                return this.emit('error', new Error('No DAVE session'));
+            try {
+                session.setExternalSender(data);
+                const keyPackage = session.getSerializedKeyPackage();
+                this.#gateway.sendDaveOp(26, keyPackage); // dave_mls_key_package
+            }
+            catch (e) {
+                this.emit('error', new Error(`DAVE external sender: ${e.message}`));
+            }
+        });
+        this.#gateway.on('dave_proposals', (d) => {
+            const session = this.#gateway.daveSession;
+            if (!session)
+                return this.emit('error', new Error('No DAVE session'));
+            try {
+                const { operationType, proposals } = d;
+                const result = session.processProposals(operationType, Buffer.from(proposals));
+                if (result.commit && result.welcome) {
+                    this.#gateway.sendDaveOp(28, Buffer.concat([result.commit, result.welcome]));
+                }
+                else if (result.commit) {
+                    this.#gateway.sendDaveOp(28, result.commit);
+                }
+            }
+            catch (e) {
+                this.emit('error', new Error(`DAVE proposals: ${e.message}`));
+            }
+        });
+        this.#gateway.on('dave_commit', (data) => {
+            const session = this.#gateway.daveSession;
+            if (!session)
+                return this.emit('error', new Error('No DAVE session'));
+            try {
+                session.processCommit(data);
+            }
+            catch (e) {
+                this.emit('error', new Error(`DAVE commit: ${e.message}`));
+            }
+        });
+        this.#gateway.on('dave_welcome', (data) => {
+            const session = this.#gateway.daveSession;
+            if (!session)
+                return this.emit('error', new Error('No DAVE session'));
+            try {
+                session.processWelcome(data);
+            }
+            catch (e) {
+                this.emit('error', new Error(`DAVE welcome: ${e.message}`));
+            }
+        });
     }
     voiceStateUpdate(obj) {
         this.#sessionId = obj.sessionId ?? obj.session_id ?? this.#sessionId;

package/dist/gateway.d.ts

@@ -26,11 +26,13 @@ export declare class VoiceGateway extends EventEmitter {
     get secretKey(): Buffer<ArrayBufferLike> | null;
     get daveProtocolVersion(): number;
     constructor(guildId: string, userId: string);
+    setDaveSession(channelId: string): void;
     voiceStateUpdate(sessionId: string): void;
     voiceServerUpdate(token: string, endpoint: string, channelId?: string): void;
     connect(): void;
     sendBinary(data: Buffer): void;
     sendSelectProtocol(address: string, port: number, mode: string): void;
+    sendDaveOp(op: number, data: Buffer): void;
     setSpeaking(value: number, delay?: number): void;
     close(): void;
 }

package/dist/gateway.js

@@ -1,5 +1,6 @@
 import WebSocket from 'ws';
 import { EventEmitter } from 'node:events';
+import { DAVESession, DAVE_PROTOCOL_VERSION, generateP256Keypair } from '@snazzah/davey';
 const DISCORD_VOICE_VERSION = 8;
 const DISCORD_VOICE_URL_TEMPLATE = 'wss://{endpoint}/?v={v}';
 export class VoiceGateway extends EventEmitter {
@@ -19,6 +20,9 @@ export class VoiceGateway extends EventEmitter {
     #secretKey = null;
     #connected = false;
     #daveProtocolVersion = 0;
+    #daveSession = null;
+    #daveKeypair = null;
+    #pendingBinary = [];
     get connected() { return this.#connected; }
     get ssrc() { return this.#ssrc; }
     get ip() { return this.#ip; }
@@ -31,14 +35,27 @@ export class VoiceGateway extends EventEmitter {
         this.#guildId = guildId;
         this.#userId = userId;
     }
+    setDaveSession(channelId) {
+        try {
+            this.#daveKeypair = generateP256Keypair();
+            this.#channelId = channelId;
+            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}`));
+        }
+    }
     voiceStateUpdate(sessionId) {
         this.#sessionId = sessionId;
     }
     voiceServerUpdate(token, endpoint, channelId) {
         this.#token = token;
         this.#endpoint = endpoint.replace(/^wss:\/\//, '').replace(/\/\?v=\d+$/, '');
-        if (channelId)
+        if (channelId) {
             this.#channelId = channelId;
+            if (!this.#daveSession)
+                this.setDaveSession(channelId);
+        }
     }
     connect() {
         const url = DISCORD_VOICE_URL_TEMPLATE
@@ -51,12 +68,15 @@ export class VoiceGateway extends EventEmitter {
         this.#ws.on('error', (err) => this.emit('error', err));
     }
     #onOpen() {
-        this.#sendOp(0, {
+        const identify = {
             server_id: this.#guildId,
             user_id: this.#userId,
             session_id: this.#sessionId,
             token: this.#token,
-        });
+            max_dave_protocol_version: Number(DAVE_PROTOCOL_VERSION),
+            supported_dave_versions: [Number(DAVE_PROTOCOL_VERSION)],
+        };
+        this.#sendOp(0, identify);
     }
     #onMessage(data) {
         try {
@@ -64,12 +84,22 @@ export class VoiceGateway extends EventEmitter {
             this.#handleOp(json.op, json.d);
         }
         catch {
-            // binary op (DAVE)
+            // binary op (DAVE protocol)
             if (data.length > 0) {
-                this.emit('binary', data);
+                this.#handleDaveBinary(data);
             }
         }
     }
+    #handleDaveBinary(data) {
+        if (!this.#daveSession) {
+            this.#pendingBinary.push(data);
+            return;
+        }
+        // Try to parse DAVE binary protocol messages
+        // First byte after the opcode determines the message type
+        // DAVE messages from Discord: external sender package, proposals, commit, welcome
+        this.emit('binary', data);
+    }
     #handleOp(op, d) {
         switch (op) {
             case 2: { // Ready
@@ -106,6 +136,22 @@ export class VoiceGateway extends EventEmitter {
                 this.emit('resumed');
                 break;
             }
+            case 25: { // DAVE MLS External Sender Package
+                this.emit('dave_external_sender', Buffer.from(d));
+                break;
+            }
+            case 27: { // DAVE MLS Proposals
+                this.emit('dave_proposals', d);
+                break;
+            }
+            case 29: { // DAVE MLS Announce Commit Transition
+                this.emit('dave_commit', Buffer.from(d));
+                break;
+            }
+            case 30: { // DAVE MLS Welcome
+                this.emit('dave_welcome', Buffer.from(d));
+                break;
+            }
         }
     }
     #onClose(code, reason) {
@@ -139,6 +185,9 @@ export class VoiceGateway extends EventEmitter {
             data: { address, port, mode },
         });
     }
+    sendDaveOp(op, data) {
+        this.#sendOp(op, [...data]);
+    }
     setSpeaking(value, delay = 0) {
         this.#sendOp(5, { speaking: value, delay, ssrc: this.#ssrc });
     }

package/package.json

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