Skip to content

[v13.x backport] stream: support passing generator functions into pipeline() #31975

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

[v13.x backport] stream: support passing generator functions into pipeline() #31975

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8af1387
stream: support passing generator functions into pipeline()
ronag Jan 6, 2020
21a0dd0
stream: fix broken pipeline error propagation
ronag Feb 21, 2020
23011b9
stream: ensure pipeline always destroys streams
ronag Feb 24, 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
Next Next commit
stream: fix broken pipeline error propagation 
If the destination was an async function any
error thrown from that function would be swallowed.

Backport-PR-URL: #31975
PR-URL: #31835
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
  • Loading branch information
@ronag
ronag committed Feb 27, 2020
commit 21a0dd0b31164ff3d6ccd9d1e13a1af14d1a307a
16 changes: 8 additions & 8 deletions lib/internal/streams/pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,10 @@ function pipeline(...streams) {
}

let error;
let value;
const destroys = [];

function finish(err, val, final) {
function finish(err, final) {
if (!error && err) {
error = err;
}
Expand All @@ -177,13 +178,13 @@ function pipeline(...streams) {
}

if (final) {
callback(error, val);
callback(error, value);
}
}

function wrap(stream, reading, writing, final) {
destroys.push(destroyer(stream, reading, writing, (err) => {
finish(err, null, final);
finish(err, final);
}));
}

Expand Down Expand Up @@ -229,11 +230,10 @@ function pipeline(...streams) {
if (isPromise(ret)) {
ret
.then((val) => {
value = val;
pt.end(val);
finish(null, val, true);
})
.catch((err) => {
finish(err, null, true);
}, (err) => {
pt.destroy(err);
});
} else if (isIterable(ret, true)) {
pump(ret, pt, finish);
Expand All @@ -243,7 +243,7 @@ function pipeline(...streams) {
}

ret = pt;
wrap(ret, true, false, true);
wrap(ret, false, true, true);
}
} else if (isStream(stream)) {
if (isReadable(ret)) {
Expand Down
25 changes: 25 additions & 0 deletions test/parallel/test-stream-pipeline-uncaught.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use strict';

const common = require('../common');
const {
pipeline,
PassThrough
} = require('stream');
const assert = require('assert');

process.on('uncaughtException', common.mustCall((err) => {
assert.strictEqual(err.message, 'error');
}));

// Ensure that pipeline that ends with Promise
// still propagates error to uncaughtException.
const s = new PassThrough();
s.end('data');
pipeline(s, async function(source) {
for await (const chunk of source) {
chunk;
}
}, common.mustCall((err) => {
assert.ifError(err);
throw new Error('error');
}));
6 changes: 1 addition & 5 deletions test/parallel/test-stream-pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,11 +613,9 @@ const { promisify } = require('util');
yield 'hello';
yield 'world';
}, async function*(source) {
const ret = [];
for await (const chunk of source) {
ret.push(chunk.toUpperCase());
yield chunk.toUpperCase();
}
yield ret;
}, async function(source) {
let ret = '';
for await (const chunk of source) {
Expand Down Expand Up @@ -754,7 +752,6 @@ const { promisify } = require('util');
}, common.mustCall((err) => {
assert.strictEqual(err, undefined);
assert.strictEqual(ret, 'asd');
assert.strictEqual(s.destroyed, true);
}));
}

Expand All @@ -775,7 +772,6 @@ const { promisify } = require('util');
}, common.mustCall((err) => {
assert.strictEqual(err, undefined);
assert.strictEqual(ret, 'asd');
assert.strictEqual(s.destroyed, true);
}));
}

Expand Down