From 1f7c1ddaa21c6e58055b79f0a91a23aa136cd0fb Mon Sep 17 00:00:00 2001 From: Amish Shah Date: Fri, 22 Jun 2018 17:42:04 +0100 Subject: [PATCH] voice: start update to v4, fix heartbeats --- src/client/voice/networking/VoiceWebSocket.js | 7 ++++--- src/util/Constants.js | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/client/voice/networking/VoiceWebSocket.js b/src/client/voice/networking/VoiceWebSocket.js index 4241aed21..08ee114a9 100644 --- a/src/client/voice/networking/VoiceWebSocket.js +++ b/src/client/voice/networking/VoiceWebSocket.js @@ -68,7 +68,7 @@ class VoiceWebSocket extends EventEmitter { * The actual WebSocket used to connect to the Voice WebSocket Server. * @type {WebSocket} */ - this.ws = WebSocket.create(`wss://${this.voiceConnection.authentication.endpoint}/`, { v: 3 }); + this.ws = WebSocket.create(`wss://${this.voiceConnection.authentication.endpoint}/`, { v: 4 }); this.ws.onopen = this.onOpen.bind(this); this.ws.onmessage = this.onMessage.bind(this); this.ws.onclose = this.onClose.bind(this); @@ -154,9 +154,10 @@ class VoiceWebSocket extends EventEmitter { */ onPacket(packet) { switch (packet.op) { + case VoiceOPCodes.HELLO: + this.setHeartbeat(packet.d.heartbeat_interval); + break; case VoiceOPCodes.READY: - // *.75 to correct for discord devs taking longer to fix things than i do to release versions - this.setHeartbeat(packet.d.heartbeat_interval * 0.75); /** * Emitted once the voice WebSocket receives the ready packet. * @param {Object} packet The received packet diff --git a/src/util/Constants.js b/src/util/Constants.js index 729448d7a..7a3c2bcca 100644 --- a/src/util/Constants.js +++ b/src/util/Constants.js @@ -197,6 +197,7 @@ exports.VoiceOPCodes = { HEARTBEAT: 3, SESSION_DESCRIPTION: 4, SPEAKING: 5, + HELLO: 8, }; exports.Events = {