Skip to content

stream: complete pipeline with stdio #32373

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

stream: complete pipeline with stdio #32373

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
571e867
stream: complete pipeline with stdio
ronag Mar 19, 2020
ab76605
fixup: isStdio helper
ronag Mar 19, 2020
84cf2aa
fixup: test
ronag Mar 19, 2020
b2925d8
fixup: typo
ronag Mar 19, 2020
bb882a2
fixup: test
ronag Mar 19, 2020
1d0a7a5
fixup: unhandledRejection
ronag Mar 19, 2020
3444617
fixup: faster version
ronag Mar 19, 2020
e9e4444
fixup: unify
ronag Mar 19, 2020
d9d992a
fixup: end stdio
ronag Mar 20, 2020
1498bb3
fixup
ronag Apr 6, 2020
2feb611
fixup
ronag Apr 6, 2020
e2ef9c9
fixup
ronag Apr 6, 2020
51d45eb
fixup
ronag Apr 6, 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: complete pipeline with stdio 
stdio (stderr & stdout) should for compatibility
reasons not be closed/end():ed. However, this
causes pipeline with a stdio destination to
never finish. This commit fixes this issue at
a performance cost.

Refs: #7606

Fixes: #32363
  • Loading branch information
@ronag
ronag committed Mar 19, 2020
commit 571e86741690caa217124f993052bfa1fe1bd30f
32 changes: 24 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 @@ -6,7 +6,8 @@
const {
ArrayIsArray,
SymbolAsyncIterator,
SymbolIterator
SymbolIterator,
Promise
} = primordials;

let eos;
Expand Down Expand Up @@ -147,13 +148,23 @@ async function pump(iterable, writable, finish) {
}
let error;
try {
for await (const chunk of iterable) {
if (!writable.write(chunk)) {
if (writable.destroyed) return;
await EE.once(writable, 'drain');
if (writable !== process.stdout && writable !== process.stderr) {
for await (const chunk of iterable) {
if (!writable.write(chunk)) {
if (writable.destroyed) return;
await EE.once(writable, 'drain');
}
}
writable.end();
} else {
for await (const chunk of iterable) {
await new Promise((resolve, reject) => {
writable.write(chunk, null, (err) => {
err ? reject(err) : resolve();
});
});
}
}
writable.end();
} catch (err) {
error = err;
} finally {
Expand Down Expand Up @@ -202,7 +213,9 @@ function pipeline(...streams) {
const reading = i < streams.length - 1;
const writing = i > 0;

if (isStream(stream)) {
if (stream === process.stdout || stream === process.stderr) {
// `pipe()` doesn't .end() stdout and stderr.
} else if (isStream(stream)) {
finishCount++;
destroys.push(destroyer(stream, reading, writing, !reading, finish));
}
Expand Down Expand Up @@ -263,7 +276,10 @@ function pipeline(...streams) {
destroys.push(destroyer(ret, false, true, true, finish));
}
} else if (isStream(stream)) {
if (isReadable(ret)) {
if (isReadable(ret) &&
stream !== process.stdout &&
stream !== process.stderr
) {
ret.pipe(stream);
} else {
ret = makeAsyncIterable(ret);
Expand Down