Skip to content

stream: fix finished w/ 'close' before 'finish' #31534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronag wants to merge 2 commits into from
Closed

stream: fix finished w/ 'close' before 'finish' #31534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9ab30
stream: fix finished w/ 'close' before 'finish'
ronag Jan 27, 2020
6282580
fixup: simplify
ronag Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
stream: fix finished w/ 'close' before 'finish' 
Emitting 'close' before 'finish' on a Writable should
result in a premature close error.
  • Loading branch information
@ronag
ronag committed Jan 29, 2020
commit 1e9ab300b300098237a0d2a29ac5d52d0d3b590d
18 changes: 14 additions & 4 deletions lib/internal/streams/end-of-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ function isWritable(stream) {
!!stream._writableState;
}

function isWritableFinished(stream) {
if (stream.writableFinished) return true;
const wState = stream._writableState;
if (wState && wState.finished) return true;
if (wState && wState.ended && wState.length === 0 &&
!wState.errored) return true;
return false;
Comment thread
ronag marked this conversation as resolved.
Outdated
}

function eos(stream, opts, callback) {
if (arguments.length === 2) {
callback = opts;
Expand All @@ -49,10 +58,11 @@ function eos(stream, opts, callback) {
if (!stream.writable) onfinish();
};

let writableEnded = stream._writableState && stream._writableState.finished;
let writableFinished = stream.writableFinished ||
(stream._writableState && stream._writableState.finished);
const onfinish = () => {
writable = false;
writableEnded = true;
writableFinished = true;
if (!readable) callback.call(stream);
};

Expand All @@ -75,8 +85,8 @@ function eos(stream, opts, callback) {
err = new ERR_STREAM_PREMATURE_CLOSE();
return callback.call(stream, err);
}
if (writable && !writableEnded) {
if (!stream._writableState || !stream._writableState.ended)
if (writable && !writableFinished) {
if (!isWritableFinished(stream))
err = new ERR_STREAM_PREMATURE_CLOSE();
return callback.call(stream, err);
}
Expand Down
13 changes: 13 additions & 0 deletions test/parallel/test-stream-finished.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,16 @@ const { promisify } = require('util');
assert.strictEqual(err.code, 'ERR_STREAM_PREMATURE_CLOSE');
}));
}

{
const w = new Writable({
write(chunk, encoding, callback) {
setImmediate(callback);
}
});
finished(w, common.mustCall((err) => {
assert.strictEqual(err.code, 'ERR_STREAM_PREMATURE_CLOSE');
}));
w.end('asd');
w.destroy();
}