dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-05-25 13:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle unexpected disconnects via packets (#1521)

Browse source
This commit is contained in:
aemino 2017-07-26 01:10:21 -07:00 committed by Crawl
parent 4342ed29a8
commit e29a3ec08b
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/voice/ClientVoiceManager.js
View file

@ -1,4 +1,5 @@
const Collection = require('../../util/Collection');
const Constants = require('../../util/Constants');
const VoiceConnection = require('./VoiceConnection');
const { Error } = require('../../errors');
@ -31,10 +32,13 @@ class ClientVoiceManager {
onVoiceStateUpdate({ guild_id, session_id, channel_id }) {
const connection = this.connections.get(guild_id);
if (connection) {
connection.channel = this.client.channels.get(channel_id);
connection.setSessionID(session_id);
if (!connection) return;
if (!channel_id && connection.status !== Constants.VoiceStatus.DISCONNECTED) {
connection._disconnect();
return;
}
connection.channel = this.client.channels.get(channel_id);
connection.setSessionID(session_id);
}
/**

12
src/client/voice/VoiceConnection.js
View file

@ -307,7 +307,14 @@ class VoiceConnection extends EventEmitter {
this.sendVoiceStateUpdate({
channel_id: null,
});
this.player.destroy();
this._disconnect();
}
/**
* Internally disconnects (doesn't send disconnect packet.)
* @private
*/
_disconnect() {
this.cleanup();
this.status = Constants.VoiceStatus.DISCONNECTED;
/**
@ -317,11 +324,14 @@ class VoiceConnection extends EventEmitter {
this.emit('disconnect');
}
/**
* Cleans up after disconnect.
* @private
*/
cleanup() {
this.player.destroy();
const { ws, udp } = this.sockets;
if (ws) {