1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stream: Clean up more effectively in pipe()

Browse Source
This commit is contained in:
isaacs 2013-01-07 06:10:35 -08:00
parent a5d4e74891
commit 3e6f737eaf
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/_stream_readable.js
View File

@ -305,12 +305,14 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
dest !== process.stdout && dest !== process.stdout &&
dest !== process.stderr) { dest !== process.stderr) {
src.once('end', onend); src.once('end', onend);
dest.on('unpipe', function unpipe(readable) { } else {
if (readable === src) { src.once('end', cleanup);
src.removeListener('end', onend);
dest.removeListener('unpipe', unpipe);
} }
});
dest.on('unpipe', onunpipe);
function onunpipe(readable) {
if (readable !== src) return;
cleanup();
} }
if (pipeOpts && pipeOpts.chunkSize) if (pipeOpts && pipeOpts.chunkSize)
@ -326,9 +328,16 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
// too slow. // too slow.
var ondrain = pipeOnDrain(src); var ondrain = pipeOnDrain(src);
dest.on('drain', ondrain); dest.on('drain', ondrain);
dest.on('unpipe', function cleanup(readable) {
if (readable === src) { function cleanup() {
dest.removeListener('unpipe', cleanup); // cleanup event handlers once the pipe is broken
dest.removeListener('close', unpipe);
dest.removeListener('finish', onfinish);
dest.removeListener('drain', ondrain);
dest.removeListener('error', onerror);
dest.removeListener('unpipe', onunpipe);
src.removeListener('end', onend);
src.removeListener('end', cleanup);
// if the reader is waiting for a drain event from this // if the reader is waiting for a drain event from this
// specific writer, then it would cause it to never start // specific writer, then it would cause it to never start
@ -338,7 +347,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
if (!dest._writableState || dest._writableState.needDrain) if (!dest._writableState || dest._writableState.needDrain)
ondrain(); ondrain();
} }
});
// if the dest has an error, then stop piping into it. // if the dest has an error, then stop piping into it.
// however, don't suppress the throwing behavior for this. // however, don't suppress the throwing behavior for this.
@ -361,17 +369,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
src.unpipe(dest); src.unpipe(dest);
} }
// cleanup event handlers once the pipe is broken
dest.once('unpipe', function cleanup(readable) {
if (readable !== src) return;
dest.removeListener('close', unpipe);
dest.removeListener('finish', onfinish);
dest.removeListener('drain', ondrain);
dest.removeListener('error', onerror);
dest.removeListener('unpipe', cleanup);
});
// tell the dest that it's being piped to // tell the dest that it's being piped to
dest.emit('pipe', src); dest.emit('pipe', src);