diff --git a/docs/generator/types/DocumentedMember.js b/docs/generator/types/DocumentedMember.js index 3eaddc24e..632bf382f 100644 --- a/docs/generator/types/DocumentedMember.js +++ b/docs/generator/types/DocumentedMember.js @@ -40,6 +40,7 @@ class DocumentedMember extends DocumentedItem { serialize() { super.serialize(); + console.log('serializing', this); const { id, name, description, memberof, type, access, meta, properties } = this.directData; return { id, diff --git a/src/client/voice/VoiceConnection.js b/src/client/voice/VoiceConnection.js index dbe54dfaf..9f8c38d89 100644 --- a/src/client/voice/VoiceConnection.js +++ b/src/client/voice/VoiceConnection.js @@ -1,6 +1,5 @@ const VoiceWebSocket = require('./VoiceWebSocket'); const VoiceUDP = require('./VoiceUDPClient'); -const VoiceReceiver = require('./receiver/VoiceReceiver'); const Constants = require('../../util/Constants'); const AudioPlayer = require('./player/AudioPlayer'); const EventEmitter = require('events').EventEmitter; @@ -40,6 +39,10 @@ class VoiceConnection extends EventEmitter { this.player = new AudioPlayer(this); + this.player.on('debug', m => { + this.emit('debug', `audio player - ${m}`); + }); + this.player.on('error', e => { this.emit('warn', e); this.player.cleanup(); diff --git a/src/client/voice/VoiceUDPClient.js b/src/client/voice/VoiceUDPClient.js index ef6b4936f..3a13b675a 100644 --- a/src/client/voice/VoiceUDPClient.js +++ b/src/client/voice/VoiceUDPClient.js @@ -63,6 +63,7 @@ class VoiceConnectionUDPClient extends EventEmitter { } /** * The port of the discord voice server + * @type {number} * @readonly */ get discordPort() { diff --git a/src/client/voice/VoiceWebSocket.js b/src/client/voice/VoiceWebSocket.js index 30c3d98c1..290dbf8ea 100644 --- a/src/client/voice/VoiceWebSocket.js +++ b/src/client/voice/VoiceWebSocket.js @@ -97,7 +97,7 @@ class VoiceWebSocket extends EventEmitter { } }); } else { - reject(new Error('websocket not open for ' + data)); + reject(new Error(`voice websocket not open to send ${data}`)); } }); } @@ -148,9 +148,8 @@ class VoiceWebSocket extends EventEmitter { /** * Called whenever the connection to the WebSocket Server is lost - * @param {CloseEvent} event the close event */ - onClose(event) { + onClose() { // #todo see if the connection is open before reconnecting if (!this.dead) this.client.setTimeout(this.connect.bind(this), this.attempts * 1000); } diff --git a/src/client/voice/dispatcher/StreamDispatcher.js b/src/client/voice/dispatcher/StreamDispatcher.js index c49a146cc..961ad97f4 100644 --- a/src/client/voice/dispatcher/StreamDispatcher.js +++ b/src/client/voice/dispatcher/StreamDispatcher.js @@ -255,7 +255,6 @@ class StreamDispatcher extends EventEmitter { _triggerTerminalState(state, err) { if (this._triggered) return; - console.log(state, err); /** * Emitted when the stream wants to give debug information. * @event StreamDispatcher#debug diff --git a/src/client/voice/player/AudioPlayer.js b/src/client/voice/player/AudioPlayer.js index 9b6735271..fe8ca5b68 100644 --- a/src/client/voice/player/AudioPlayer.js +++ b/src/client/voice/player/AudioPlayer.js @@ -59,6 +59,7 @@ class AudioPlayer extends EventEmitter { dispatcher.on('end', () => this.cleanup(dispatcher.stream, 'disp ended')); dispatcher.on('speaking', value => this.voiceConnection.setSpeaking(value)); this.currentDispatcher = dispatcher; + dispatcher.on('debug', m => this.emit('debug', `stream dispatch - ${m}`)); return dispatcher; }