Skip to content

stream: always invoke callback before emitting error #29293

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 6 commits into from
Closed

stream: always invoke callback before emitting error #29293

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f4a28f
stream: always invoke callback before emitting error
ronag Aug 24, 2019
1cd617b
fixup: no finish or prefinish on errored
ronag Sep 20, 2019
5da8563
fixup: simplify
ronag Sep 20, 2019
14428f3
fixup: no finish after destroy error
ronag Sep 20, 2019
eb9099b
fixup: remove unused errorMaybe
ronag Sep 20, 2019
60dac52
fixup: remove no longer necessary test change
ronag Sep 28, 2019
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
Prev Previous commit
Next Next commit
fixup: simplify
  • Loading branch information
@ronag
ronag committed Sep 20, 2019
commit 5da8563bae3eaa3bdced04fac1a2182da878aac2
23 changes: 5 additions & 18 deletions lib/_stream_writable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,20 +437,12 @@ function doWrite(stream, state, writev, len, chunk, encoding, cb) {
state.sync = false;
}

function onwriteError(stream, state, sync, er, cb) {
if (sync) {
process.nextTick(onwriteErrorNT, stream, state, er, cb);
} else {
onwriteErrorNT(stream, state, er, cb);
}
}

function onwriteErrorNT(stream, state, er, cb) {
function onwriteError(stream, state, er, cb) {
--state.pendingcb;

cb(er);
// This can emit error, but error must always follow cb.
errorMaybe(stream, er);
errorOrDestroy(stream, er);
}

function onwrite(stream, er) {
Expand All @@ -468,15 +460,10 @@ function onwrite(stream, er) {

if (er) {
state.errored = true;
Copy link
Copy Markdown
Member Author

@ronag ronag Aug 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use errorEmitted since it must be set after cb and cb must be invoked asynchronously. Thus without this we have no way to synchronously tell if a stream has errored.

Copy link
Copy Markdown
Member Author

@ronag ronag Aug 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use destroyed since it will not be set on !autoDestroy.

if (state.autoDestroy) {
stream.destroy(er, (err) => {
// TODO(ronag): Minor optimization opportunities:
// - We might no longer be sync here.
// - Closure allocation can probably be optimized away.
onwriteError(stream, state, sync, err, cb);
});
if (sync) {
process.nextTick(onwriteError, stream, state, er, cb);
} else {
onwriteError(stream, state, sync, er, cb);
onwriteError(stream, state, er, cb);
}
} else {
// Check if we're actually ready to finish, but don't emit yet
Expand Down