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

Fix ECONNRESET (again)

Browse Source
This commit is contained in:
Amish Shah
2017-10-31 18:12:49 +00:00
parent 2e1a28a6ee
commit fa7f391b3a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/voice/dispatcher/StreamDispatcher.js
View File

@@ -59,9 +59,7 @@ class StreamDispatcher extends Writable {
this._pausedTime = 0; this._pausedTime = 0;
this.count = 0; this.count = 0;
this.on('error', err => this.destroy(err));
this.on('finish', () => { this.on('finish', () => {
this.end.bind(this);
// Still emitting end for backwards compatibility, probably remove it in the future! // Still emitting end for backwards compatibility, probably remove it in the future!
this.emit('end'); this.emit('end');
}); });
@@ -73,9 +71,11 @@ class StreamDispatcher extends Writable {
const streamError = err => { const streamError = err => {
this.emit('warn', err); this.emit('warn', err);
this.destroy(err); this.destroy();
}; };
this.on('error', streamError);
if (this.streams.input) this.streams.input.on('error', streamError);
if (this.streams.ffmpeg) this.streams.ffmpeg.on('error', streamError); if (this.streams.ffmpeg) this.streams.ffmpeg.on('error', streamError);
if (this.streams.opus) this.streams.opus.on('error', streamError); if (this.streams.opus) this.streams.opus.on('error', streamError);
if (this.streams.volume) this.streams.volume.on('error', streamError); if (this.streams.volume) this.streams.volume.on('error', streamError);

9
src/client/voice/player/BasePlayer.js
View File

@@ -46,9 +46,12 @@ class BasePlayer extends EventEmitter {
const isStream = input instanceof ReadableStream; const isStream = input instanceof ReadableStream;
const args = isStream ? FFMPEG_ARGUMENTS : ['-i', input, ...FFMPEG_ARGUMENTS]; const args = isStream ? FFMPEG_ARGUMENTS : ['-i', input, ...FFMPEG_ARGUMENTS];
const ffmpeg = new prism.FFmpeg({ args }); const ffmpeg = new prism.FFmpeg({ args });
if (isStream) input.pipe(ffmpeg); const streams = { ffmpeg };
if (isStream) {
return this.playPCMStream(ffmpeg, options, { ffmpeg }); streams.input = input;
input.pipe(ffmpeg);
}
return this.playPCMStream(ffmpeg, options, streams);
} }
playPCMStream(stream, options, streams = {}) { playPCMStream(stream, options, streams = {}) {