Skip to content

stream: wait for push writer end fallback to drain #63503

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

Open
trivikr wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −7
Open

stream: wait for push writer end fallback to drain #63503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions lib/internal/streams/iter/duplex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ function duplex(options = { __proto__: null }) {
if (aClosed) return;
aClosed = true;
// End the writer (signals end-of-stream to B's readable)
if (aWriter.endSync() < 0) {
await aWriter.end();
}
aWriter.endSync();
// Stop iteration of this channel's readable
if (aReadableIterator?.return) {
await aReadableIterator.return();
Expand Down Expand Up @@ -104,9 +102,7 @@ function duplex(options = { __proto__: null }) {
async close() {
if (bClosed) return;
bClosed = true;
if (bWriter.endSync() < 0) {
await bWriter.end();
}
bWriter.endSync();
if (bReadableIterator?.return) {
await bReadableIterator.return();
bReadableIterator = null;
Expand Down
9 changes: 8 additions & 1 deletion lib/internal/streams/iter/push.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,10 @@ class PushQueue {
if (this.#writerState === 'errored') {
return -2; // Signal to reject with stored error
}
if (this.#writerState === 'closing' || this.#writerState === 'closed') {
if (this.#writerState === 'closing') {
return -3; // Signal to PushWriter: wait for drain to complete
}
if (this.#writerState === 'closed') {
return this.#bytesWritten; // Idempotent
}

Expand Down Expand Up @@ -636,6 +639,10 @@ class PushWriter {
if (result === -3) {
// Closing: buffer has data, create deferred promise that resolves
// when consumer drains past the end sentinel
const pendingEndPromise = this.#queue.pendingEndPromise;
if (pendingEndPromise !== null) {
return pendingEndPromise;
}
const { promise, resolve, reject } = PromiseWithResolvers();
this.#queue.setPendingEnd({ __proto__: null, promise, resolve, reject });
return promise;
Expand Down
20 changes: 20 additions & 0 deletions test/parallel/test-stream-iter-push-writer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,25 @@ async function testEndAsyncReturnValue() {
await consume;
}

async function testEndAfterEndSyncWaitsForDrain() {
const { writer, readable } = push();
writer.writeSync('hello');
assert.strictEqual(writer.endSync(), -1);

let ended = false;
const end = writer.end().then((n) => {
ended = true;
return n;
});

await Promise.resolve();
assert.strictEqual(ended, false);

// eslint-disable-next-line no-unused-vars
for await (const _ of readable) { /* drain */ }
assert.strictEqual(await end, 5);
}

async function testWriteUint8Array() {
const { writer, readable } = push();
writer.write(new Uint8Array([72, 73])); // 'HI'
Expand Down Expand Up @@ -413,6 +432,7 @@ Promise.all([
testOndrainProtocolErrorPropagates(),
testFail(),
testEndAsyncReturnValue(),
testEndAfterEndSyncWaitsForDrain(),
testWriteUint8Array(),
testOndrainWaitsForDrain(),
testConsumerThrowRejectsWrites(),
Expand Down
Loading