Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions lib/internal/streams/operators.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ function map(fn, options) {
pump();

try {
if (signal.aborted) {
throw new AbortError();
}

while (true) {
while (queue.length > 0) {
const val = await queue[0];
Expand Down Expand Up @@ -293,6 +297,13 @@ async function toArray(options) {
validateAbortSignal(options.signal, 'options.signal');
}

if (options?.signal?.aborted) {
const err = new AbortError(undefined, { cause: options.signal.reason });
this.once('error', () => {}); // The error is already propagated
await finished(this.destroy(err));
throw err;
}

const result = [];
for await (const val of this) {
if (options?.signal?.aborted) {
Expand Down
10 changes: 10 additions & 0 deletions test/parallel/test-stream-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,13 @@ const { setTimeout } = require('timers/promises');
// Check that map isn't getting called.
stream.filter(() => true);
}

{
// Already aborted AbortSignal on an empty stream
const stream = Readable.from([]).filter(common.mustNotCall(), {
signal: AbortSignal.abort(),
});
assert.rejects(stream.toArray(), {
name: 'AbortError',
}).then(common.mustCall());
}
10 changes: 10 additions & 0 deletions test/parallel/test-stream-flatMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,13 @@ function oneTo5() {
// Check that map isn't getting called.
stream.flatMap(() => true);
}

{
// Already aborted AbortSignal on an empty stream
const stream = Readable.from([]).flatMap(common.mustNotCall(), {
signal: AbortSignal.abort(),
});
assert.rejects(stream.toArray(), {
name: 'AbortError',
}).then(common.mustCall());
}
9 changes: 9 additions & 0 deletions test/parallel/test-stream-forEach.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,12 @@ const { once } = require('events');
// Check that map isn't getting called.
stream.forEach(() => true);
}

{
// Already aborted AbortSignal on an empty stream
assert.rejects(Readable.from([]).forEach(common.mustNotCall(), {
signal: AbortSignal.abort(),
}), {
name: 'AbortError',
}).then(common.mustCall());
}
10 changes: 10 additions & 0 deletions test/parallel/test-stream-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,3 +358,13 @@ function createDependentPromises(n) {
const stream = Readable.from([1, 2, 3, 4, 5]).map((x) => x);
assert.strictEqual(stream.readable, true);
}

{
// Already aborted AbortSignal on an empty stream
const stream = Readable.from([]).map(common.mustNotCall(), {
signal: AbortSignal.abort(),
});
assert.rejects(stream.toArray(), {
name: 'AbortError',
}).then(common.mustCall());
}
9 changes: 9 additions & 0 deletions test/parallel/test-stream-some-find-every.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,15 @@ function oneTo5Async() {
name: 'AbortError',
}, `${op} should abort with pre-aborted abort controller`).then(common.mustCall());
}
{
// Support for pre-aborted AbortSignal on an empty stream
assert.rejects(Readable.from([])[op](
common.mustNotCall(),
{ signal: AbortSignal.abort() }
), {
name: 'AbortError',
}, `${op} should abort with pre-aborted signal on empty stream`).then(common.mustCall());
}
}
}
{
Expand Down
12 changes: 12 additions & 0 deletions test/parallel/test-stream-toArray.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,15 @@ const assert = require('assert');
});
}, /ERR_INVALID_ARG_TYPE/).then(common.mustCall());
}

{
// Already aborted AbortSignal on an empty stream
const reason = new Error('aborted');
const stream = Readable.from([]);
assert.rejects(stream.toArray({ signal: AbortSignal.abort(reason) }), {
name: 'AbortError',
cause: reason,
}).then(common.mustCall(() => {
assert.strictEqual(stream.destroyed, true);
}));
}
Loading