fix some stuff

This commit is contained in:
Amish Shah
2016-10-24 20:13:44 +01:00
parent 5749eb6bb0
commit 1a5ce878a1
6 changed files with 34 additions and 11 deletions

View File

@@ -41,6 +41,7 @@ class VoiceConnection extends EventEmitter {
this.player.on('error', e => {
this.emit('warn', e);
console.log('so yeah uh'+e);
this.player.cleanup();
});

View File

@@ -77,7 +77,6 @@ class VoiceWebSocket extends EventEmitter {
send(data) {
return new Promise((resolve, reject) => {
if (this.ws.readyState === WebSocket.OPEN) {
console.log('sending', data);
this.ws.send(data, null, error => {
if (error) {
reject(error);

View File

@@ -132,7 +132,7 @@ class StreamDispatcher extends EventEmitter {
_sendBuffer(buffer, sequence, timestamp) {
let repeats = this.passes;
const packet = this._createPacket(sequence, timestamp, this.player.opusEncoder.encode(buffer));
while (repeats--) this.player.voiceConnection.sockets.udp.send(packet);
while (repeats--) this.player.voiceConnection.sockets.udp.send(packet).catch(e => console.log('so uhhh', e));
}
_createPacket(sequence, timestamp, buffer) {

View File

@@ -7,9 +7,36 @@ class PCMConversionProcess extends EventEmitter {
constructor(process) {
super();
this.process = process;
this.input = null;
this.process.on('error', e => this.emit('error', e));
}
setInput(stream) {
this.input = stream;
stream.pipe(this.process.stdin, { end: false });
this.input.on('error', e => this.emit('error', e));
}
destroy() {
this.emit('debug', 'destroying a ffmpeg process:');
if (this.input && this.input.unpipe && this.process.stdin) {
this.input.unpipe(this.process.stdin);
this.emit('unpiped the user input stream from the process input stream');
}
if (this.process.stdin) {
this.process.stdin.end();
this.emit('ended the process stdin');
}
if (this.process.stdin.destroy) {
this.process.stdin.destroy();
this.emit('destroyed the process stdin');
}
if (this.process.kill) {
this.process.kill();
this.emit('killed the process');
}
}
}
class FfmpegConverterEngine extends ConverterEngine {

View File

@@ -26,9 +26,10 @@ class AudioPlayer extends EventEmitter {
stream.on('end', () => {
console.log(Date.now(), 'real input stream ended');
})
});
stream.on('error', e => this.emit('error', e));
const conversionProcess = this.audioToPCM.createConvertStream(0);
stream.pipe(conversionProcess.process.stdin, { end: false });
conversionProcess.setInput(stream);
return this.playPCMStream(conversionProcess.process.stdout, conversionProcess);
}
@@ -37,12 +38,7 @@ class AudioPlayer extends EventEmitter {
console.log(Date.now(), 'clean up triggered due to', reason);
const filter = checkStream && this.currentDispatcher && this.currentDispatcher.stream === checkStream;
if (this.currentConverter && (checkStream ? filter : true)) {
if (this.currentConverter.process.stdin.destroy) {
this.currentConverter.process.stdin.destroy();
}
if (this.currentConverter.process.kill) {
this.currentConverter.process.kill();
}
this.currentConverter.destroy();
this.currentConverter = null;
}
}
@@ -65,6 +61,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;
return dispatcher;
}
}

View File

@@ -26,7 +26,6 @@ client.on('channelCreate', channel => {
console.log(`made ${channel.name}`);
});
client.on('debug', m => console.log('debug', m));
client.on('error', m => console.log('debug', m));
client.on('reconnecting', m => console.log('debug', m));