Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-14 18:43:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(voice): use voice gateway v8 (#10918)

Browse Source 
* feat(voice): use voice gateway v8

* docs: small typo

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Snazzah
2025-06-02 12:38:50 -05:00
committed by GitHub
parent e094faf225
commit d40ceedad4
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/voice/src/networking/Networking.ts
View File

@@ -298,9 +298,14 @@ export class Networking extends EventEmitter {
* Creates a new WebSocket to a Discord Voice gateway. * Creates a new WebSocket to a Discord Voice gateway.
* *
* @param endpoint - The endpoint to connect to * @param endpoint - The endpoint to connect to
* @param lastSequence - The last sequence to set for this WebSocket
*/ */
private createWebSocket(endpoint: string) { private createWebSocket(endpoint: string, lastSequence?: number) {
const ws = new VoiceWebSocket(`wss://${endpoint}?v=4`, Boolean(this.debug)); const ws = new VoiceWebSocket(`wss://${endpoint}?v=8`, Boolean(this.debug));
if (lastSequence !== undefined) {
ws.sequence = lastSequence;
}
ws.on('error', this.onChildError); ws.on('error', this.onChildError);
ws.once('open', this.onWsOpen); ws.once('open', this.onWsOpen);
@@ -347,6 +352,7 @@ export class Networking extends EventEmitter {
server_id: this.state.connectionOptions.serverId, server_id: this.state.connectionOptions.serverId,
session_id: this.state.connectionOptions.sessionId, session_id: this.state.connectionOptions.sessionId,
token: this.state.connectionOptions.token, token: this.state.connectionOptions.token,
seq_ack: this.state.ws.sequence,
}, },
}; };
this.state.ws.sendPacket(packet); this.state.ws.sendPacket(packet);
@@ -363,10 +369,11 @@ export class Networking extends EventEmitter {
private onWsClose({ code }: CloseEvent) { private onWsClose({ code }: CloseEvent) {
const canResume = code === 4_015 || code < 4_000; const canResume = code === 4_015 || code < 4_000;
if (canResume && this.state.code === NetworkingStatusCode.Ready) { if (canResume && this.state.code === NetworkingStatusCode.Ready) {
const lastSequence = this.state.ws.sequence;
this.state = { this.state = {
...this.state, ...this.state,
code: NetworkingStatusCode.Resuming, code: NetworkingStatusCode.Resuming,
ws: this.createWebSocket(this.state.connectionOptions.endpoint), ws: this.createWebSocket(this.state.connectionOptions.endpoint, lastSequence),
}; };
} else if (this.state.code !== NetworkingStatusCode.Closed) { } else if (this.state.code !== NetworkingStatusCode.Closed) {
this.destroy(); this.destroy();
@@ -379,10 +386,11 @@ export class Networking extends EventEmitter {
*/ */
private onUdpClose() { private onUdpClose() {
if (this.state.code === NetworkingStatusCode.Ready) { if (this.state.code === NetworkingStatusCode.Ready) {
const lastSequence = this.state.ws.sequence;
this.state = { this.state = {
...this.state, ...this.state,
code: NetworkingStatusCode.Resuming, code: NetworkingStatusCode.Resuming,
ws: this.createWebSocket(this.state.connectionOptions.endpoint), ws: this.createWebSocket(this.state.connectionOptions.endpoint, lastSequence),
}; };
} }
} }

15
packages/voice/src/networking/VoiceWebSocket.ts
View File

@@ -52,6 +52,11 @@ export class VoiceWebSocket extends EventEmitter {
*/ */
public ping?: number; public ping?: number;
/**
* The last sequence number acknowledged from Discord. Will be `-1` if no sequence numbered messages have been received.
*/
public sequence = -1;
/** /**
* The debug logger function, if debugging is enabled. * The debug logger function, if debugging is enabled.
*/ */
@@ -115,6 +120,10 @@ export class VoiceWebSocket extends EventEmitter {
return; return;
} }
if (packet.seq) {
this.sequence = packet.seq;
}
if (packet.op === VoiceOpcodes.HeartbeatAck) { if (packet.op === VoiceOpcodes.HeartbeatAck) {
this.lastHeartbeatAck = Date.now(); this.lastHeartbeatAck = Date.now();
this.missedHeartbeats = 0; this.missedHeartbeats = 0;
@@ -150,7 +159,11 @@ export class VoiceWebSocket extends EventEmitter {
this.sendPacket({ this.sendPacket({
op: VoiceOpcodes.Heartbeat, op: VoiceOpcodes.Heartbeat,
// eslint-disable-next-line id-length // eslint-disable-next-line id-length
d: nonce, d: {
// eslint-disable-next-line id-length
t: nonce,
seq_ack: this.sequence,
},
}); });
} }