Skip to content

stream: enable usage of webstreams on compose() #46675

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

Merged
nodejs-github-bot merged 12 commits into from
Feb 27, 2023
Merged

stream: enable usage of webstreams on compose() #46675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
505d884
stream: enable usage of webstreams on compose()
debadree25 Feb 15, 2023
a1cca78
fixup! destroyer
debadree25 Feb 16, 2023
bcd122a
fixup! add tests
debadree25 Feb 16, 2023
62f5372
fixup! update doc
debadree25 Feb 16, 2023
20fd566
fixup! pipeline finishcount
debadree25 Feb 16, 2023
4e1d499
fixup! add rejection handle to writer close
debadree25 Feb 16, 2023
f3c6214
fixup! tests some issue
debadree25 Feb 16, 2023
8ce94be
fixup! fix unhandled reject, add more tests
debadree25 Feb 17, 2023
838f5ef
fixup! simplify
debadree25 Feb 17, 2023
183f475
fixup! unify conditions
debadree25 Feb 17, 2023
233115d
fixup! add update to doc
debadree25 Feb 17, 2023
002eed4
fixup! update code flow while reading
debadree25 Feb 19, 2023
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! add tests
  • Loading branch information
@debadree25
debadree25 committed Feb 16, 2023
commit bcd122a620e8a8f658e2e96b5bce3324f841bc27
32 changes: 27 additions & 5 deletions lib/internal/streams/compose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,32 @@ module.exports = function compose(...streams) {
}

for (let n = 0; n < streams.length; ++n) {
if (!isNodeStream(streams[n])) {
if (!isNodeStream(streams[n]) && !isWebStream(streams[n])) {
// TODO(ronag): Add checks for non streams.
continue;
}
if (n < streams.length - 1 && !isReadable(streams[n])) {
if (
n < streams.length - 1 &&
!(
isReadable(streams[n]) ||
isReadableStream(streams[n]) ||
isTransformStream(streams[n])
)
) {
throw new ERR_INVALID_ARG_VALUE(
`streams[${n}]`,
orgStreams[n],
'must be readable'
);
}
if (n > 0 && !isWritable(streams[n])) {
if (
n > 0 &&
!(
isWritable(streams[n]) ||
isWritableStream(streams[n]) ||
isTransformStream(streams[n])
)
) {
throw new ERR_INVALID_ARG_VALUE(
`streams[${n}]`,
orgStreams[n],
Expand Down Expand Up @@ -83,8 +97,16 @@ module.exports = function compose(...streams) {
const head = streams[0];
const tail = pipeline(streams, onfinished);

const writable = !!(isWritable(head) || isWritableStream(head) || isTransformStream(head));
const readable = !!(isReadable(tail) || isReadableStream(tail) || isTransformStream(tail));
const writable = !!(
isWritable(head) ||
isWritableStream(head) ||
isTransformStream(head)
);
const readable = !!(
isReadable(tail) ||
isReadableStream(tail) ||
isTransformStream(tail)
);

// TODO(ronag): Avoid double buffering.
// Implement Writable/Readable/Duplex traits.
Expand Down
Loading