Mirrors/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-12-28 07:50:41 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

stream: do not emit 'end' after 'error'

Browse Source 
Refs: https://github.com/nodejs/node/issues/6083

PR-URL: https://github.com/nodejs/node/pull/31182
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Robert Nagy 2020-01-03 21:41:44 +01:00 committed by Rich Trott
parent 57a1ca99ab
commit 66f4e4edcb
7 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/_stream_readable.js
View File

@ -1215,7 +1215,7 @@ function endReadableNT(state, stream) {
debug('endReadableNT', state.endEmitted, state.length);
// Check that we didn't get one last unshift.
if (!state.endEmitted && state.length === 0) {
if (!state.errorEmitted && !state.endEmitted && state.length === 0) {
state.endEmitted = true;
stream.readable = false;
stream.emit('end');

4
lib/internal/streams/destroy.js
View File

@ -7,6 +7,8 @@ function destroy(err, cb) {
const r = this._readableState;
const w = this._writableState;
// TODO(ronag): readable & writable = false?
if (err) {
if (w) {
w.errored = true;
@ -129,6 +131,8 @@ function errorOrDestroy(stream, err, sync) {
const r = stream._readableState;
const w = stream._writableState;
// TODO(ronag): readable & writable = false?
if ((r && r.autoDestroy) || (w && w.autoDestroy))
stream.destroy(err);
else if (err) {

2
test/parallel/test-http2-client-destroy.js
View File

@ -95,7 +95,7 @@ const Countdown = require('../common/countdown');
});
req.resume();
req.on('end', common.mustCall());
req.on('end', common.mustNotCall());
req.on('close', common.mustCall(() => server.close()));
}));
}

2
test/parallel/test-http2-client-stream-destroy-before-connect.js
View File

@ -50,5 +50,5 @@ server.listen(0, common.mustCall(() => {
req.on('response', common.mustNotCall());
req.resume();
req.on('end', common.mustCall());
req.on('end', common.mustNotCall());
}));

8
test/parallel/test-http2-head-request.js
View File

@ -10,7 +10,7 @@ const errCheck = common.expectsError({
name: 'Error',
code: 'ERR_STREAM_WRITE_AFTER_END',
message: 'write after end'
}, 2);
}, 1);
const {
HTTP2_HEADER_PATH,
@ -41,12 +41,6 @@ server.listen(0, () => {
[HTTP2_HEADER_PATH]: '/'
});
// Because it is a HEAD request, the payload is meaningless. The
// option.endStream flag is set automatically making the stream
// non-writable.
req.on('error', errCheck);
req.write('data');
req.on('response', common.mustCall((headers, flags) => {
assert.strictEqual(headers[HTTP2_HEADER_STATUS], 200);
assert.strictEqual(flags, 5); // The end of stream flag is set

15
test/parallel/test-stream-readable-error-end.js Normal file
View File

@ -0,0 +1,15 @@
'use strict';
const common = require('../common');
const { Readable } = require('stream');
{
const r = new Readable({ read() {} });
r.on('end', common.mustNotCall());
r.on('data', common.mustCall());
r.on('error', common.mustCall());
r.push('asd');
r.push(null);
r.destroy(new Error('kaboom'));
}

8
test/parallel/test-stream-unshift-read-race.js
View File

@ -68,6 +68,9 @@ r._read = function(n) {
};
function pushError() {
r.unshift(Buffer.allocUnsafe(1));
w.end();
assert.throws(() => {
r.push(Buffer.allocUnsafe(1));
}, {
@ -85,10 +88,7 @@ w._write = function(chunk, encoding, cb) {
cb();
};
r.on('end', common.mustCall(function() {
r.unshift(Buffer.allocUnsafe(1));
w.end();
}));
r.on('end', common.mustNotCall());
r.on('readable', function() {
let chunk;