From 025318f4b491e4ebf2ab5b3eaa33bc5bb4351128 Mon Sep 17 00:00:00 2001 From: vedchaudhari Date: Fri, 20 Nov 2026 10:43:32 +0530 Subject: [PATCH] stream: reject operators on empty streams with aborted signal Stream operators given an already-aborted signal resolved instead of rejecting when the stream was empty, because the signal was only checked once a chunk arrived. Check it up front in map() and toArray(), which the other operators are built on. Signed-off-by: vedchaudhari --- lib/internal/streams/operators.js | 11 +++++++++++ test/parallel/test-stream-filter.js | 10 ++++++++++ test/parallel/test-stream-flatMap.js | 10 ++++++++++ test/parallel/test-stream-forEach.js | 9 +++++++++ test/parallel/test-stream-map.js | 10 ++++++++++ test/parallel/test-stream-some-find-every.mjs | 9 +++++++++ test/parallel/test-stream-toArray.js | 12 ++++++++++++ 7 files changed, 71 insertions(+) diff --git a/lib/internal/streams/operators.js b/lib/internal/streams/operators.js index 87b82b65b56b..1cd4d7aa8951 100644 --- a/lib/internal/streams/operators.js +++ b/lib/internal/streams/operators.js @@ -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]; @@ -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) { diff --git a/test/parallel/test-stream-filter.js b/test/parallel/test-stream-filter.js index 0b70c391c88f..53171dce78ef 100644 --- a/test/parallel/test-stream-filter.js +++ b/test/parallel/test-stream-filter.js @@ -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()); +} diff --git a/test/parallel/test-stream-flatMap.js b/test/parallel/test-stream-flatMap.js index a75672e73c8d..c5ef6a571628 100644 --- a/test/parallel/test-stream-flatMap.js +++ b/test/parallel/test-stream-flatMap.js @@ -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()); +} diff --git a/test/parallel/test-stream-forEach.js b/test/parallel/test-stream-forEach.js index cccd263adf4c..a5f754312f80 100644 --- a/test/parallel/test-stream-forEach.js +++ b/test/parallel/test-stream-forEach.js @@ -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()); +} diff --git a/test/parallel/test-stream-map.js b/test/parallel/test-stream-map.js index 212658313885..be2628c41825 100644 --- a/test/parallel/test-stream-map.js +++ b/test/parallel/test-stream-map.js @@ -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()); +} diff --git a/test/parallel/test-stream-some-find-every.mjs b/test/parallel/test-stream-some-find-every.mjs index c18e418ddce5..a583350eb954 100644 --- a/test/parallel/test-stream-some-find-every.mjs +++ b/test/parallel/test-stream-some-find-every.mjs @@ -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()); + } } } { diff --git a/test/parallel/test-stream-toArray.js b/test/parallel/test-stream-toArray.js index 438e21724e40..e713b00826fe 100644 --- a/test/parallel/test-stream-toArray.js +++ b/test/parallel/test-stream-toArray.js @@ -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); + })); +}