From a705edfd0df4de0a7e6df59cf709132d7e0e8da2 Mon Sep 17 00:00:00 2001 From: Amish Shah Date: Mon, 11 Feb 2019 17:22:17 +0000 Subject: [PATCH] voice: more debug information --- src/client/actions/VoiceStateUpdate.js | 1 + src/client/voice/ClientVoiceManager.js | 4 ++-- src/client/voice/VoiceConnection.js | 5 +++-- src/client/websocket/handlers/VOICE_SERVER_UPDATE.js | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/client/actions/VoiceStateUpdate.js b/src/client/actions/VoiceStateUpdate.js index e4efa1292..7e4d35149 100644 --- a/src/client/actions/VoiceStateUpdate.js +++ b/src/client/actions/VoiceStateUpdate.js @@ -26,6 +26,7 @@ class VoiceStateUpdate extends Action { // Emit event if (member && member.user.id === client.user.id && data.channel_id) { + client.emit('debug', `[VOICE] received voice state update: ${JSON.stringify(data)}`); client.emit('self.voiceStateUpdate', data); } diff --git a/src/client/voice/ClientVoiceManager.js b/src/client/voice/ClientVoiceManager.js index fce2d3b6e..ef3bb132d 100644 --- a/src/client/voice/ClientVoiceManager.js +++ b/src/client/voice/ClientVoiceManager.js @@ -64,6 +64,8 @@ class ClientVoiceManager { return; } else { connection = new VoiceConnection(this, channel); + connection.on('debug', msg => this.client.emit('debug', `[VOICE (${channel.guild.id})]: ${msg}`)); + connection.authenticate(); this.connections.set(channel.guild.id, connection); } @@ -72,8 +74,6 @@ class ClientVoiceManager { reject(reason); }); - connection.on('debug', msg => this.client.emit('debug', `[VOICE (${channel.guild.id})]: ${msg}`)); - connection.once('authenticated', () => { connection.once('ready', () => { resolve(connection); diff --git a/src/client/voice/VoiceConnection.js b/src/client/voice/VoiceConnection.js index 4d5c23a86..da3f8f162 100644 --- a/src/client/voice/VoiceConnection.js +++ b/src/client/voice/VoiceConnection.js @@ -125,8 +125,6 @@ class VoiceConnection extends EventEmitter { * @type {VoiceReceiver} */ this.receiver = new VoiceReceiver(this); - - this.authenticate(); } /** @@ -180,6 +178,9 @@ class VoiceConnection extends EventEmitter { self_deaf: false, }, options); + const queueLength = this.channel.guild.shard.ratelimit.queue.length; + this.emit('debug', `Sending voice state update (queue length is ${queueLength}): ${JSON.stringify(options)}`); + this.channel.guild.shard.send({ op: OPCodes.VOICE_STATE_UPDATE, d: options, diff --git a/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js b/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js index 2663d99aa..563db1ead 100644 --- a/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js +++ b/src/client/websocket/handlers/VOICE_SERVER_UPDATE.js @@ -1,5 +1,6 @@ 'use strict'; module.exports = (client, packet) => { + client.emit('debug', `[VOICE] received voice server: ${JSON.stringify(packet)}`); client.emit('self.voiceServer', packet.d); };