From 468d46a97c813a8b916118f8be9f44ff15a41466 Mon Sep 17 00:00:00 2001 From: Dylan Depass Date: Wed, 5 Feb 2025 15:17:46 -0500 Subject: [PATCH] fix: pass abort controller instead --- packages/helix-shared-process-queue/src/process-queue.d.ts | 4 ++-- packages/helix-shared-process-queue/src/process-queue.js | 4 ++-- .../helix-shared-process-queue/test/process-queue.test.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/helix-shared-process-queue/src/process-queue.d.ts b/packages/helix-shared-process-queue/src/process-queue.d.ts index 2068847e..b44bbef5 100644 --- a/packages/helix-shared-process-queue/src/process-queue.d.ts +++ b/packages/helix-shared-process-queue/src/process-queue.d.ts @@ -75,11 +75,11 @@ export default function processQueue< * @property {number} maxConcurrent Maximum number of items processed concurrently * @property {number} limit Maximum number of items processed within the interval * @property {number} interval Time window in milliseconds - * @property {AbortSignal} abortSignal Optional abort signal + * @property {AbortController} abortController Optional abort controller */ export declare type RateLimitOptions = { maxConcurrent: number; limit: number; interval: number; - abortSignal?: AbortSignal; + abortController?: AbortController; }; diff --git a/packages/helix-shared-process-queue/src/process-queue.js b/packages/helix-shared-process-queue/src/process-queue.js index c13f3e25..93867457 100644 --- a/packages/helix-shared-process-queue/src/process-queue.js +++ b/packages/helix-shared-process-queue/src/process-queue.js @@ -98,7 +98,7 @@ export default async function processQueue( limit, interval, maxConcurrent = 8, - abortSignal, + abortController, } = typeof rateLimitOptions === 'object' ? rateLimitOptions : { maxConcurrent: rateLimitOptions || 8 }; @@ -139,7 +139,7 @@ export default async function processQueue( for await (const value of iter) { await waitForToken(); - if (abortSignal?.aborted) { + if (abortController?.signal?.aborted) { return results; } diff --git a/packages/helix-shared-process-queue/test/process-queue.test.js b/packages/helix-shared-process-queue/test/process-queue.test.js index c0a2a0bb..f545e3a9 100644 --- a/packages/helix-shared-process-queue/test/process-queue.test.js +++ b/packages/helix-shared-process-queue/test/process-queue.test.js @@ -254,7 +254,7 @@ describe('Process Queue', () => { maxConcurrent: 2, limit: 20, interval: 30000, - abortSignal: abortController.signal, + abortController, }); // Increase time enough so that all tasks can complete