stream: fix readable behavior for highWaterMark === 0

Avoid trying to emit 'readable' due to the fact that
state.length is always >= state.highWaterMark if highWaterMark is 0.
Therefore upon .read(0) call (through .on('readable')) stream assumed
that it has enough data to emit 'readable' even though
state.length === 0 instead of issuing _read(). Which led to the TTY
not recognizing that someone is waiting for the input.

Fixes: https://github.com/nodejs/node/issues/20503
Refs: https://github.com/nodejs/node/pull/18372

PR-URL: https://github.com/nodejs/node/pull/21690
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Denys Otrishko 2018-07-06 02:19:15 +03:00 committed by Matteo Collina
parent b85460498f
commit fe47b8b6a5
5 changed files with 80 additions and 1 deletions

View File

@ -383,7 +383,10 @@ Readable.prototype.read = function(n) {
// the 'readable' event and move on. // the 'readable' event and move on.
if (n === 0 && if (n === 0 &&
state.needReadable && state.needReadable &&
(state.length >= state.highWaterMark || state.ended)) { ((state.highWaterMark !== 0 ?
state.length >= state.highWaterMark :
state.length > 0) ||
state.ended)) {
debug('read: emitReadable', state.length, state.ended); debug('read: emitReadable', state.length, state.ended);
if (state.length === 0 && state.ended) if (state.length === 0 && state.ended)
endReadable(this); endReadable(this);
@ -808,6 +811,7 @@ Readable.prototype.on = function(ev, fn) {
if (!state.endEmitted && !state.readableListening) { if (!state.endEmitted && !state.readableListening) {
state.readableListening = state.needReadable = true; state.readableListening = state.needReadable = true;
state.emittedReadable = false; state.emittedReadable = false;
debug('on readable', state.length, state.reading);
if (state.length) { if (state.length) {
emitReadable(this); emitReadable(this);
} else if (!state.reading) { } else if (!state.reading) {

View File

@ -0,0 +1,16 @@
'use strict';
const common = require('../common');
const { Readable } = require('stream');
// This test ensures that there will not be an additional empty 'readable'
// event when stream has ended (only 1 event signalling about end)
const r = new Readable({
read: () => {},
});
r.push(null);
r.on('readable', common.mustCall());
r.on('end', common.mustCall());

View File

@ -0,0 +1,30 @@
'use strict';
const common = require('../common');
// This test ensures that Readable stream will call _read() for streams
// with highWaterMark === 0 upon .read(0) instead of just trying to
// emit 'readable' event.
const assert = require('assert');
const { Readable } = require('stream');
const r = new Readable({
// must be called only once upon setting 'readable' listener
read: common.mustCall(),
highWaterMark: 0,
});
let pushedNull = false;
// this will trigger read(0) but must only be called after push(null)
// because the we haven't pushed any data
r.on('readable', common.mustCall(() => {
assert.strictEqual(r.read(), null);
assert.strictEqual(pushedNull, true);
}));
r.on('end', common.mustCall());
process.nextTick(() => {
assert.strictEqual(r.read(), null);
pushedNull = true;
r.push(null);
});

View File

@ -0,0 +1,29 @@
'use strict';
const common = require('../common');
const assert = require('assert');
// This test ensures that Node.js will not ignore tty 'readable' subscribers
// when it's the only tty subscriber and the only thing keeping event loop alive
// https://github.com/nodejs/node/issues/20503
process.stdin.setEncoding('utf8');
const expectedInput = ['foo', 'bar', null];
process.stdin.on('readable', common.mustCall(function() {
const data = process.stdin.read();
assert.strictEqual(data, expectedInput.shift());
}, 3)); // first 2 data, then end
process.stdin.on('end', common.mustCall());
setTimeout(() => {
process.stdin.push('foo');
process.nextTick(() => {
process.stdin.push('bar');
process.nextTick(() => {
process.stdin.push(null);
});
});
}, 1);