-
Notifications
You must be signed in to change notification settings - Fork 666
feat(async/unstable): add support for AbortSignal in pooledMap
#7014
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.
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
tomas-zijdemans
wants to merge
6
commits into
denoland:main
Choose a base branch
from
tomas-zijdemans:pool-signal
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+474
−0
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8e7169b
feat(async/unstable): add support for AbortSignal in
tomas-zijdemans bd465c1
fmt
tomas-zijdemans 8e7ed40
add input validation
tomas-zijdemans b25ff6a
merge
tomas-zijdemans 7a505e4
Merge remote-tracking branch 'upstream/main' into pool-signal
tomas-zijdemans ac26cdd
use overload
tomas-zijdemans File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,238 @@ | ||
| // Copyright 2018-2026 the Deno authors. MIT license. | ||
| // This module is browser compatible. | ||
|
|
||
| /** Error message emitted from the thrown error while mapping. */ | ||
| const ERROR_WHILE_MAPPING_MESSAGE = | ||
| "Cannot complete the mapping as an error was thrown from an item"; | ||
|
|
||
| /** Options for {@linkcode pooledMap}. */ | ||
| export interface PooledMapOptions { | ||
| /** | ||
| * The maximum count of items being processed concurrently. | ||
| * Must be a positive integer. | ||
| */ | ||
| poolLimit: number; | ||
| /** | ||
| * An AbortSignal to cancel the pooled mapping operation. | ||
| * | ||
| * If the signal is aborted, no new items will begin processing. All currently | ||
| * executing items are allowed to finish. The iterator then rejects with the | ||
| * signal's reason. | ||
| * | ||
| * @default {undefined} | ||
| */ | ||
| signal?: AbortSignal; | ||
| } | ||
|
|
||
| /** | ||
| * Transforms values from an (async) iterable into another async iterable. | ||
| * The transforms are done concurrently, with a max concurrency defined by | ||
| * `poolLimit`. | ||
| * | ||
| * @experimental **UNSTABLE**: New API, yet to be vetted. | ||
| * | ||
| * If an error is thrown from `iteratorFn`, no new transformations will begin. | ||
| * All currently executing transformations are allowed to finish and still | ||
| * yielded on success. After that, the rejections among them are gathered and | ||
| * thrown by the iterator in an `AggregateError`. | ||
| * | ||
| * @example Usage | ||
| * ```ts | ||
| * import { pooledMap } from "@std/async/unstable-pool"; | ||
| * import { assertEquals } from "@std/assert"; | ||
| * | ||
| * const results = pooledMap( | ||
| * 2, | ||
| * [1, 2, 3], | ||
| * (i) => new Promise((r) => setTimeout(() => r(i), 1000)), | ||
| * ); | ||
| * | ||
| * assertEquals(await Array.fromAsync(results), [1, 2, 3]); | ||
| * ``` | ||
| * | ||
| * @typeParam T the input type. | ||
| * @typeParam R the output type. | ||
| * @param poolLimit The maximum count of items being processed concurrently. | ||
| * @param array The input array for mapping. | ||
| * @param iteratorFn The function to call for every item of the array. | ||
| * @returns The async iterator with the transformed values. | ||
| * @throws {RangeError} If `poolLimit` is not a positive integer. | ||
| */ | ||
| export function pooledMap<T, R>( | ||
| poolLimit: number, | ||
| array: Iterable<T> | AsyncIterable<T>, | ||
| iteratorFn: (data: T) => Promise<R>, | ||
| ): AsyncIterableIterator<R>; | ||
|
|
||
| /** | ||
| * Transforms values from an (async) iterable into another async iterable. | ||
| * The transforms are done concurrently, with a max concurrency defined by | ||
| * {@linkcode PooledMapOptions.poolLimit}. | ||
| * | ||
| * @experimental **UNSTABLE**: New API, yet to be vetted. | ||
| * | ||
| * If an error is thrown from `iteratorFn`, no new transformations will begin. | ||
| * All currently executing transformations are allowed to finish and still | ||
| * yielded on success. After that, the rejections among them are gathered and | ||
| * thrown by the iterator in an `AggregateError`. | ||
| * | ||
| * @example Usage with options | ||
| * ```ts | ||
| * import { pooledMap } from "@std/async/unstable-pool"; | ||
| * import { assertEquals } from "@std/assert"; | ||
| * | ||
| * const results = pooledMap( | ||
| * { poolLimit: 2 }, | ||
| * [1, 2, 3], | ||
| * (i) => new Promise((r) => setTimeout(() => r(i), 1000)), | ||
| * ); | ||
| * | ||
| * assertEquals(await Array.fromAsync(results), [1, 2, 3]); | ||
| * ``` | ||
| * | ||
| * @example Cancellation with AbortSignal | ||
| * ```ts | ||
| * import { pooledMap } from "@std/async/unstable-pool"; | ||
| * import { assertRejects } from "@std/assert"; | ||
| * | ||
| * const controller = new AbortController(); | ||
| * const results = pooledMap( | ||
| * { poolLimit: 2, signal: controller.signal }, | ||
| * [1, 2, 3, 4, 5], | ||
| * (i) => new Promise((r) => setTimeout(() => r(i), 1000)), | ||
| * ); | ||
| * | ||
| * controller.abort(new Error("cancelled")); | ||
| * | ||
| * await assertRejects( | ||
| * () => Array.fromAsync(results), | ||
| * Error, | ||
| * "cancelled", | ||
| * ); | ||
| * ``` | ||
| * | ||
| * @typeParam T the input type. | ||
| * @typeParam R the output type. | ||
| * @param options Options including pool limit and abort signal. | ||
| * @param array The input array for mapping. | ||
| * @param iteratorFn The function to call for every item of the array. | ||
| * @returns The async iterator with the transformed values. | ||
| * @throws {RangeError} If `poolLimit` is not a positive integer. | ||
| */ | ||
| export function pooledMap<T, R>( | ||
| options: PooledMapOptions, | ||
| array: Iterable<T> | AsyncIterable<T>, | ||
| iteratorFn: (data: T) => Promise<R>, | ||
| ): AsyncIterableIterator<R>; | ||
|
|
||
| export function pooledMap<T, R>( | ||
| poolLimitOrOptions: number | PooledMapOptions, | ||
| array: Iterable<T> | AsyncIterable<T>, | ||
| iteratorFn: (data: T) => Promise<R>, | ||
| ): AsyncIterableIterator<R> { | ||
| let poolLimit: number; | ||
| let signal: AbortSignal | undefined; | ||
|
|
||
| if (typeof poolLimitOrOptions === "number") { | ||
| poolLimit = poolLimitOrOptions; | ||
| } else { | ||
| poolLimit = poolLimitOrOptions.poolLimit; | ||
| signal = poolLimitOrOptions.signal; | ||
| } | ||
|
|
||
| if (!Number.isInteger(poolLimit) || poolLimit < 1) { | ||
| throw new RangeError("'poolLimit' must be a positive integer"); | ||
| } | ||
|
|
||
| const res = new TransformStream<Promise<R>, R>({ | ||
| async transform( | ||
| p: Promise<R>, | ||
| controller: TransformStreamDefaultController<R>, | ||
| ) { | ||
| try { | ||
| const s = await p; | ||
| controller.enqueue(s); | ||
| } catch (e) { | ||
| if (signal?.aborted) { | ||
| controller.error(signal.reason); | ||
| } else if ( | ||
| e instanceof AggregateError && | ||
| e.message === ERROR_WHILE_MAPPING_MESSAGE | ||
| ) { | ||
| controller.error(e as unknown); | ||
| } | ||
| } | ||
| }, | ||
| }); | ||
|
|
||
| (async () => { | ||
| const writer = res.writable.getWriter(); | ||
| const executing: Array<Promise<unknown>> = []; | ||
|
|
||
| function raceWithSignal( | ||
| promises: Array<Promise<unknown>>, | ||
| ): Promise<unknown> { | ||
| if (!signal) return Promise.race(promises); | ||
| const { promise, resolve, reject } = Promise.withResolvers<never>(); | ||
| const onAbort = () => reject(signal!.reason); | ||
| signal.addEventListener("abort", onAbort, { once: true }); | ||
| return Promise.race([...promises, promise]).finally(() => { | ||
| signal!.removeEventListener("abort", onAbort); | ||
| resolve(undefined as never); | ||
| }); | ||
| } | ||
|
|
||
| try { | ||
| signal?.throwIfAborted(); | ||
|
|
||
| for await (const item of array) { | ||
| signal?.throwIfAborted(); | ||
|
|
||
| const p = Promise.resolve().then(() => iteratorFn(item)); | ||
| // Only write on success. If we `writer.write()` a rejected promise, | ||
| // that will end the iteration. We don't want that yet. Instead let it | ||
| // fail the race, taking us to the catch block where all currently | ||
| // executing jobs are allowed to finish and all rejections among them | ||
| // can be reported together. | ||
| writer.write(p); | ||
| const e: Promise<unknown> = p.then(() => | ||
| executing.splice(executing.indexOf(e), 1) | ||
| ); | ||
| executing.push(e); | ||
| if (executing.length >= poolLimit) { | ||
| await raceWithSignal(executing); | ||
| } | ||
| } | ||
| await Promise.all(executing); | ||
| writer.close(); | ||
| } catch { | ||
| const errors = []; | ||
| for (const result of await Promise.allSettled(executing)) { | ||
| if (result.status === "rejected") { | ||
| errors.push(result.reason); | ||
| } | ||
| } | ||
| if (signal?.aborted) { | ||
| writer.write(Promise.reject(signal.reason)).catch(() => {}); | ||
| } else { | ||
| writer.write(Promise.reject( | ||
| new AggregateError(errors, ERROR_WHILE_MAPPING_MESSAGE), | ||
| )).catch(() => {}); | ||
| } | ||
| } | ||
| })(); | ||
|
|
||
| // Feature test until browser coverage is adequate | ||
| return Symbol.asyncIterator in res.readable && | ||
| typeof res.readable[Symbol.asyncIterator] === "function" | ||
| ? (res.readable[Symbol.asyncIterator] as () => AsyncIterableIterator<R>)() | ||
| : (async function* () { | ||
| const reader = res.readable.getReader(); | ||
| while (true) { | ||
| const { done, value } = await reader.read(); | ||
| if (done) break; | ||
| yield value; | ||
| } | ||
| reader.releaseLock(); | ||
| })(); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm this function signature is incompatible with the existing one. we can't stabilize this version as is. can we somehow invent something else which isn't a breaking change? (maybe we have to use overload?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Goog point! I pushed a new commit using overloads