Skip to content

stream: do not swallow errors with async iterators and pipeline #32051

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
mcollina wants to merge 2 commits into from
Closed

stream: do not swallow errors with async iterators and pipeline #32051

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4c3f55
stream: do not swallow errors with async iterators and pipeline
mcollina Mar 2, 2020
828abfb
handle final
mcollina Mar 10, 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
Prev Previous commit
handle final
  • Loading branch information
@mcollina
mcollina committed Mar 10, 2020
commit 828abfb3e3da4af6720e7f3f00358e93089e4f72
8 changes: 4 additions & 4 deletions lib/internal/streams/pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ let EE;
let PassThrough;
let createReadableStreamAsyncIterator;

function destroyer(stream, reading, writing, callback) {
function destroyer(stream, reading, writing, final, callback) {
const _destroy = once((err) => {
const readable = stream.readable || isRequest(stream);
if (err || !readable) {
if (err || !final || !readable) {
destroyImpl.destroyer(stream, err);
}
callback(err);
Expand Down Expand Up @@ -182,7 +182,7 @@ function pipeline(...streams) {

if (isStream(stream)) {
finishCount++;
destroys.push(destroyer(stream, reading, writing, finish));
destroys.push(destroyer(stream, reading, writing, !reading, finish));
}

if (i === 0) {
Expand Down Expand Up @@ -238,7 +238,7 @@ function pipeline(...streams) {
ret = pt;

finishCount++;
destroys.push(destroyer(ret, false, true, finish));
destroys.push(destroyer(ret, false, true, true, finish));
}
} else if (isStream(stream)) {
if (isReadable(ret)) {
Expand Down