Skip to content

Commit 9dcf18a

Browse files
zaide-chrismcollina
authored andcommitted
stream: Fixes missing 'unpipe' event
Currently when the destination emits an 'error', 'finish' or 'close' event the pipe calls unpipe to emit 'unpipe' and trigger the clean up of all it's listeners. When the source emits an 'end' event without {end: false} it calls end() on the destination leading it to emit a 'close', this will again lead to the pipe calling unpipe. However the source emitting an 'end' event along side {end: false} is the only time the cleanup gets ran directly without unpipe being called. This fixes that so the 'unpipe' event does get emitted and cleanup in turn gets ran by that event. Fixes: nodejs#11837 PR-URL: nodejs#11876 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent fbe946b commit 9dcf18a

File tree

2 files changed

+87
-2
lines changed

2 files changed

+87
-2
lines changed

lib/_stream_readable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
511511
dest !== process.stdout &&
512512
dest !== process.stderr;
513513

514-
var endFn = doEnd ? onend : cleanup;
514+
var endFn = doEnd ? onend : unpipe;
515515
if (state.endEmitted)
516516
process.nextTick(endFn);
517517
else
@@ -547,7 +547,7 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
547547
dest.removeListener('error', onerror);
548548
dest.removeListener('unpipe', onunpipe);
549549
src.removeListener('end', onend);
550-
src.removeListener('end', cleanup);
550+
src.removeListener('end', unpipe);
551551
src.removeListener('data', ondata);
552552

553553
cleanedUp = true;
+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const {Writable, Readable} = require('stream');
5+
class NullWriteable extends Writable {
6+
_write(chunk, encoding, callback) {
7+
return callback();
8+
}
9+
}
10+
class QuickEndReadable extends Readable {
11+
_read() {
12+
this.push(null);
13+
}
14+
}
15+
class NeverEndReadable extends Readable {
16+
_read() {}
17+
}
18+
19+
{
20+
const dest = new NullWriteable();
21+
const src = new QuickEndReadable();
22+
dest.on('pipe', common.mustCall());
23+
dest.on('unpipe', common.mustCall());
24+
src.pipe(dest);
25+
setImmediate(() => {
26+
assert.strictEqual(src._readableState.pipesCount, 0);
27+
});
28+
}
29+
30+
{
31+
const dest = new NullWriteable();
32+
const src = new NeverEndReadable();
33+
dest.on('pipe', common.mustCall());
34+
dest.on('unpipe', common.mustNotCall('unpipe should not have been emitted'));
35+
src.pipe(dest);
36+
setImmediate(() => {
37+
assert.strictEqual(src._readableState.pipesCount, 1);
38+
});
39+
}
40+
41+
{
42+
const dest = new NullWriteable();
43+
const src = new NeverEndReadable();
44+
dest.on('pipe', common.mustCall());
45+
dest.on('unpipe', common.mustCall());
46+
src.pipe(dest);
47+
src.unpipe(dest);
48+
setImmediate(() => {
49+
assert.strictEqual(src._readableState.pipesCount, 0);
50+
});
51+
}
52+
53+
{
54+
const dest = new NullWriteable();
55+
const src = new QuickEndReadable();
56+
dest.on('pipe', common.mustCall());
57+
dest.on('unpipe', common.mustCall());
58+
src.pipe(dest, {end: false});
59+
setImmediate(() => {
60+
assert.strictEqual(src._readableState.pipesCount, 0);
61+
});
62+
}
63+
64+
{
65+
const dest = new NullWriteable();
66+
const src = new NeverEndReadable();
67+
dest.on('pipe', common.mustCall());
68+
dest.on('unpipe', common.mustNotCall('unpipe should not have been emitted'));
69+
src.pipe(dest, {end: false});
70+
setImmediate(() => {
71+
assert.strictEqual(src._readableState.pipesCount, 1);
72+
});
73+
}
74+
75+
{
76+
const dest = new NullWriteable();
77+
const src = new NeverEndReadable();
78+
dest.on('pipe', common.mustCall());
79+
dest.on('unpipe', common.mustCall());
80+
src.pipe(dest, {end: false});
81+
src.unpipe(dest);
82+
setImmediate(() => {
83+
assert.strictEqual(src._readableState.pipesCount, 0);
84+
});
85+
}

0 commit comments

Comments
 (0)