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

Fixed memory leaks

Browse Source
This commit is contained in:
hydrabolt
2015-11-08 10:09:49 +00:00
parent 99a63db142
commit 04c3dbedac
7 changed files with 121 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Client/InternalClient.js
View File

@@ -44,26 +44,21 @@ var InternalClient = (function () {
this.channels = new Cache();
this.servers = new Cache();
this.private_channels = new Cache();
this.voiceConnections = new Cache();
this.voiceConnection = null;
this.resolver = new Resolver(this);
}
//def leaveVoiceChannel
InternalClient.prototype.leaveVoiceChannel = function leaveVoiceChannel(chann) {
InternalClient.prototype.leaveVoiceChannel = function leaveVoiceChannel() {
var self = this;
return new Promise(function (resolve, reject) {
var channel = self.resolver.resolveVoiceChannel(chann);
if (channel) {
if (self.voiceConnections[channel]) {
var chan = self.voiceConnections[channel];
chan.stopPlaying();
self.voiceConnections.remove(chan);
resolve();
}
if (self.voiceConnection) {
self.voiceConnection.destroy();
self.voiceConnection = null;
resolve();
} else {
reject(new Error("voice channel does not exist"));
resolve();
}
});
};
@@ -77,8 +72,7 @@ var InternalClient = (function () {
var channel = self.resolver.resolveVoiceChannel(chann);
if (channel) {
if (!self.voiceConnections.get("id", channel.id)) {
var next = function next() {
var session,
token,
server = channel.server,
@@ -90,16 +84,18 @@ var InternalClient = (function () {
if (data.t === "VOICE_STATE_UPDATE") {
session = data.d.session_id;
fired++;
} else if (data.t === "VOICE_SERVER_UPDATE") {
token = data.d.token;
endpoint = data.d.endpoint;
var chan = self.voiceConnections.add(new VoiceConnection(channel, self.client, session, token, server, endpoint));
fired++;
var chan = self.voiceConnection = new VoiceConnection(channel, self.client, session, token, server, endpoint);
chan.on("ready", resolve);
chan.on("error", reject);
}
if (fired >= 2) {
self.client.emit("debug", "removed temporary voice websocket listeners");
self.websocket.removeListener('message', check);
}
};
@@ -114,9 +110,9 @@ var InternalClient = (function () {
"self_deaf": false
}
});
} else {
reject(new Error("voice channel connection exists"));
}
};
self.leaveVoiceChannel().then(next);
} else {
reject(new Error("voice channel does not exist"));
}