Skip to content
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

stream: improve readable webstream pipeTo #49690

Merged
merged 3 commits into from
Sep 19, 2023
Merged

stream: improve readable webstream pipeTo #49690

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfe2058
stream: improve readable webstream `pipeTo`
rluvaton Sep 17, 2023
3734af5
stream: fix lint
rluvaton Sep 17, 2023
fac8ca6
stream: inline var
rluvaton Sep 17, 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
51 changes: 34 additions & 17 deletions lib/internal/webstreams/readablestream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const {
ObjectCreate,
ObjectDefineProperties,
ObjectSetPrototypeOf,
Promise,
PromisePrototypeThen,
PromiseResolve,
PromiseReject,
Expand Down Expand Up @@ -1336,7 +1335,9 @@ function readableStreamPipeTo(

const promise = createDeferredPromise();

let currentWrite = PromiseResolve();
const state = {
currentWrite: PromiseResolve(),
};

// The error here can be undefined. The rejected arg
// tells us that the promise must be rejected even
Expand All @@ -1353,9 +1354,9 @@ function readableStreamPipeTo(
}

async function waitForCurrentWrite() {
const write = currentWrite;
const write = state.currentWrite;
await write;
if (write !== currentWrite)
if (write !== state.currentWrite)
await waitForCurrentWrite();
}

Expand Down Expand Up @@ -1446,20 +1447,14 @@ function readableStreamPipeTo(
async function step() {
if (shuttingDown)
return true;

await writer[kState].ready.promise;
return new Promise((resolve, reject) => {
readableStreamDefaultReaderRead(
reader,
{
[kChunk](chunk) {
currentWrite = writableStreamDefaultWriterWrite(writer, chunk);
setPromiseHandled(currentWrite);
resolve(false);
},
[kClose]: () => resolve(true),
[kError]: reject,
});
});

const promise = createDeferredPromise();
// eslint-disable-next-line no-use-before-define
readableStreamDefaultReaderRead(reader, new PipeToReadableStreamReadRequest(writer, state, promise));

return promise.promise;
}

async function run() {
Expand Down Expand Up @@ -1521,6 +1516,28 @@ function readableStreamPipeTo(
return promise.promise;
}

class PipeToReadableStreamReadRequest {
constructor(writer, state, promise) {
this.writer = writer;
this.state = state;
this.promise = promise;
}

[kChunk](chunk) {
this.state.currentWrite = writableStreamDefaultWriterWrite(this.writer, chunk);
setPromiseHandled(this.state.currentWrite);
this.promise.resolve(false);
}

[kClose]() {
this.promise.resolve(true);
}

[kError](error) {
this.promise.reject(error);
}
}

function readableStreamTee(stream, cloneForBranch2) {
if (isReadableByteStreamController(stream[kState].controller)) {
return readableByteStreamTee(stream);
Expand Down