Skip to content

stream: normalize Broadcast.from() byte inputs #64082

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
+34 −7
Open

stream: normalize Broadcast.from() byte inputs #64082

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
13 changes: 8 additions & 5 deletions lib/internal/streams/iter/broadcast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const {
} = require('internal/streams/iter/types');

const {
from,
isAsyncIterable,
isSyncIterable,
} = require('internal/streams/iter/from');
Expand Down Expand Up @@ -799,7 +800,9 @@ const Broadcast = {
return { __proto__: null, writer: { __proto__: null }, broadcast: bc };
}

if (!isAsyncIterable(input) && !isSyncIterable(input)) {
const source = from(input);

if (!isAsyncIterable(source) && !isSyncIterable(source)) {
throw new ERR_INVALID_ARG_TYPE(
'input', ['Broadcastable', 'AsyncIterable', 'Iterable'], input);
}
Expand All @@ -810,8 +813,8 @@ const Broadcast = {
const pump = async () => {
const w = result.writer;
try {
if (isAsyncIterable(input)) {
for await (const chunks of input) {
if (isAsyncIterable(source)) {
for await (const chunks of source) {
signal?.throwIfAborted();
if (ArrayIsArray(chunks)) {
if (!w.writevSync(chunks)) {
Expand All @@ -821,8 +824,8 @@ const Broadcast = {
await w.write(chunks, signal ? { signal } : undefined);
}
}
} else if (isSyncIterable(input)) {
for (const chunks of input) {
} else if (isSyncIterable(source)) {
for (const chunks of source) {
signal?.throwIfAborted();
if (ArrayIsArray(chunks)) {
if (!w.writevSync(chunks)) {
Expand Down
25 changes: 25 additions & 0 deletions test/parallel/test-stream-iter-broadcast-from.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,28 @@ async function testBroadcastFromStringChunks() {
assert.strictEqual(data, 'foobar');
}

async function testBroadcastFromStringInput() {
const { broadcast: bc } = Broadcast.from('abc');
const consumer = bc.push();
const data = await text(consumer);
assert.strictEqual(data, 'abc');
}

async function testBroadcastFromUint8ArrayInput() {
const { broadcast: bc } = Broadcast.from(new Uint8Array([97]));
const consumer = bc.push();
const data = await text(consumer);
assert.strictEqual(data, 'a');
}

async function testBroadcastFromDataViewInput() {
const view = new DataView(new Uint8Array([104, 105]).buffer);
const { broadcast: bc } = Broadcast.from(view);
const consumer = bc.push();
const data = await text(consumer);
assert.strictEqual(data, 'hi');
}

async function testBroadcastFromMultipleConsumers() {
const source = from('shared-data');
const { broadcast: bc } = Broadcast.from(source);
Expand Down Expand Up @@ -180,6 +202,9 @@ Promise.all([
testBroadcastFromAsyncIterable(),
testBroadcastFromNonArrayChunks(),
testBroadcastFromStringChunks(),
testBroadcastFromStringInput(),
testBroadcastFromUint8ArrayInput(),
testBroadcastFromDataViewInput(),
testBroadcastFromMultipleConsumers(),
testAbortSignal(),
testAlreadyAbortedSignal(),
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-stream-iter-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,8 @@ assert.throws(() => broadcast({ backpressure: 'bad' }), { code: 'ERR_INVALID_ARG
writer.endSync();
}

// Broadcast.from rejects non-iterable input
// Broadcast.from rejects non-streamable input
assert.throws(() => Broadcast.from(42), { code: 'ERR_INVALID_ARG_TYPE' });
assert.throws(() => Broadcast.from('bad'), { code: 'ERR_INVALID_ARG_TYPE' });

// =============================================================================
// share() / shareSync() validation
Expand Down
Loading