Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-12 01:23:31 +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

86
src/Client/InternalClient.js
View File

@@ -40,25 +40,20 @@ class InternalClient {
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
leaveVoiceChannel(chann){
leaveVoiceChannel(){
var self = this;
return new Promise((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();
}
});
}
@@ -71,45 +66,46 @@ class InternalClient {
var channel = self.resolver.resolveVoiceChannel(chann);
if(channel){
if(!self.voiceConnections.get("id", channel.id)){
var session, token, server = channel.server, endpoint, fired = 0;
self.leaveVoiceChannel().then(next);
var check = (m) => {
var data = JSON.parse(m);
function next(){
var session, token, server = channel.server, endpoint, fired = 0;
if(data.t === "VOICE_STATE_UPDATE"){
session = data.d.session_id;
}else if(data.t === "VOICE_SERVER_UPDATE"){
token = data.d.token;
endpoint = data.d.endpoint;
var check = (m) => {
var data = JSON.parse(m);
var chan = self.voiceConnections.add(new VoiceConnection(channel, self.client, session, token, server, endpoint));
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;
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);
}
chan.on("ready", resolve);
chan.on("error", reject);
}
if(fired >= 2){
self.websocket.removeListener('message', check);
}
};
};
self.websocket.on("message", check);
self.sendWS({
op : 4,
d : {
"guild_id" : server.id,
"channel_id" : channel.id,
"self_mute" : false,
"self_deaf" : false
}
});
}else{
reject(new Error("voice channel connection exists"));
}
self.websocket.on("message", check);
self.sendWS({
op : 4,
d : {
"guild_id" : server.id,
"channel_id" : channel.id,
"self_mute" : false,
"self_deaf" : false
}
});
}
}else{
reject(new Error("voice channel does not exist"));
}

2
src/Voice/AudioEncoder.js
View File

@@ -27,7 +27,7 @@ class AudioEncoder{
"pipe:1"
]);
enc.stdout.on("readable", function() {
enc.stdout.once("readable", function() {
callback(null, {
proc : enc,
stream : enc.stdout

54
src/Voice/VoiceConnection.js
View File

@@ -18,10 +18,10 @@ var VoicePacket = require("./VoicePacket.js");
var StreamIntent = require("./StreamIntent.js");
var EventEmitter = require("events");
class VoiceConnection extends EventEmitter{
class VoiceConnection extends EventEmitter {
constructor(channel, client, session, token, server, endpoint) {
super();
if(!Opus){
if (!Opus) {
console.log("HEY! WATCH OUT\n\n discord.js needs node-opus, you don't have it installed.");
}
this.id = channel.id;
@@ -41,13 +41,22 @@ class VoiceConnection extends EventEmitter{
this.playing = false;
this.streamTime = 0;
this.streamProc = null;
this.KAI = null;
this.init();
}
destroy() {
this.stopPlaying();
if(this.KAI)
clearInterval(this.KAI);
this.vWS.close();
this.udp.close();
}
stopPlaying() {
this.playing=false;
this.playing = false;
this.playingIntent = null;
if(this.streamProc)
if (this.streamProc)
this.streamProc.kill();
}
@@ -78,12 +87,12 @@ class VoiceConnection extends EventEmitter{
}
try {
var buffer = stream.read(1920);
if (!buffer) {
setTimeout(send, length * 10); // give chance for some data in 200ms to appear
return;
}
if (buffer.length !== 1920) {
if (onWarning) {
retStream.emit("end");
@@ -126,21 +135,22 @@ class VoiceConnection extends EventEmitter{
setSpeaking(value) {
this.playing = value;
this.vWS.send(JSON.stringify({
op: 5,
d: {
speaking: value,
delay: 0
}
}));
if (this.vWS.readyState === WebSocket.OPEN)
this.vWS.send(JSON.stringify({
op: 5,
d: {
speaking: value,
delay: 0
}
}));
}
sendPacket(packet, callback = function (err) { }) {
var self = this;
self.playing = true;
try {
self.udp.send(packet, 0, packet.length, self.vWSData.port, self.endpoint, callback);
if (self.vWS.readyState === WebSocket.OPEN)
self.udp.send(packet, 0, packet.length, self.vWSData.port, self.endpoint, callback);
} catch (e) {
self.playing = false;
callback(e);
@@ -180,7 +190,7 @@ class VoiceConnection extends EventEmitter{
.encodeFile(stream)
.catch(error)
.then(data => {
self.streamProc = data.proc;
var intent = self.playRawStream(data.stream);
resolve(intent);
@@ -251,16 +261,18 @@ class VoiceConnection extends EventEmitter{
self.vWSData = data.d;
KAI = setInterval(() => {
vWS.send(JSON.stringify({
op: 3,
d: null
}));
if (vWS.readyState === WebSocket.OPEN)
vWS.send(JSON.stringify({
op: 3,
d: null
}));
}, data.d.heartbeat_interval);
self.KAI = KAI;
var udpPacket = new Buffer(70);
udpPacket.writeUIntBE(data.d.ssrc, 0, 4);
udpClient.send(udpPacket, 0, udpPacket.length, data.d.port, self.endpoint, err => {
if(err)
if (err)
self.emit("error", err)
});
break;