adaptive-concurrency 0.3.2 → 0.3.3

package/dist/limiter/allocation-unavailable-strategies/BlockingBacklogRejection.d.ts

@@ -0,0 +1,51 @@
+import type { LimitAllotment } from "../../LimitAllotment.js";
+import type { AcquireResult, AllotmentUnavailableStrategy } from "../../Limiter.js";
+type Waiter<ContextT> = {
+    context: ContextT;
+    retry: (context: ContextT) => AcquireResult;
+    handle: WaiterHandle;
+    resolve: (allotment: LimitAllotment | undefined) => void;
+};
+export declare const MAX_TIMEOUT: number;
+export type BlockingBacklogRejectionOptions<ContextT> = {
+    backlogSize: number;
+    backlogTimeout: number | ((context: ContextT) => number);
+    queue: WaiterQueue<Waiter<ContextT>>;
+};
+export type WaiterQueue<WaiterT extends Waiter<any>> = {
+    enqueue: (waiter: Omit<WaiterT, "handle">) => WaiterT;
+    peekHead: () => WaiterT | undefined;
+    removeByHandle: (handle: WaiterHandle) => boolean;
+    size: () => number;
+};
+export type WaiterHandle = {
+    key: symbol;
+};
+export declare class BlockingBacklogRejection<ContextT> implements AllotmentUnavailableStrategy<ContextT> {
+    private readonly backlogSize;
+    private readonly getBacklogTimeout;
+    private readonly queue;
+    private drainInProgress;
+    constructor(options: BlockingBacklogRejectionOptions<ContextT>);
+    onAllotmentUnavailable(context: ContextT, retry: (context: ContextT) => AcquireResult, signal?: AbortSignal): Promise<LimitAllotment | undefined>;
+    onAllotmentReleased(): Promise<void>;
+    onLimitChanged(oldLimit: number, newLimit: number): void;
+    private waitInBacklog;
+    private assertTimeoutWithinBounds;
+}
+export declare class ArrayWaiterQueue<WaiterT extends Waiter<any>> implements WaiterQueue<WaiterT> {
+    private head;
+    private tail;
+    private readonly nodes;
+    private readonly enqueueDirection;
+    private length;
+    constructor(enqueueDirection: "front" | "back");
+    enqueue(waiterWithoutHandle: Omit<WaiterT, "handle">): WaiterT;
+    peekHead(): WaiterT | undefined;
+    removeByHandle(handle: WaiterHandle): boolean;
+    size(): number;
+    private pushFront;
+    private pushBack;
+}
+export {};
+//# sourceMappingURL=BlockingBacklogRejection.d.ts.map

package/dist/limiter/allocation-unavailable-strategies/BlockingBacklogRejection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BlockingBacklogRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/BlockingBacklogRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,aAAa,EACb,4BAA4B,EAC7B,MAAM,kBAAkB,CAAC;AAE1B,KAAK,MAAM,CAAC,QAAQ,IAAI;IACtB,OAAO,EAAE,QAAQ,CAAC;IAClB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,CAAC;IAC5C,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,CAAC,SAAS,EAAE,cAAc,GAAG,SAAS,KAAK,IAAI,CAAC;CAC1D,CAAC;AAEF,eAAO,MAAM,WAAW,QAAiB,CAAC;AAE1C,MAAM,MAAM,+BAA+B,CAAC,QAAQ,IAAI;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,CAAC;IACzD,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,GAAG,CAAC,IAAI;IACrD,OAAO,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,OAAO,CAAC;IACtD,QAAQ,EAAE,MAAM,OAAO,GAAG,SAAS,CAAC;IACpC,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC;IAClD,IAAI,EAAE,MAAM,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,qBAAa,wBAAwB,CACnC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAgC;IAClE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,eAAe,CAAS;gBAEpB,OAAO,EAAE,+BAA+B,CAAC,QAAQ,CAAC;IAmB9D,sBAAsB,CACpB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAYhC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC1C,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQxD,OAAO,CAAC,aAAa;IAmCrB,OAAO,CAAC,yBAAyB;CAKlC;AAED,qBAAa,gBAAgB,CAC3B,OAAO,SAAS,MAAM,CAAC,GAAG,CAAC,CAC3B,YAAW,WAAW,CAAC,OAAO,CAAC;IAC/B,OAAO,CAAC,IAAI,CAAkC;IAC9C,OAAO,CAAC,IAAI,CAAkC;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0C;IAChE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,MAAM,CAAK;gBAEP,gBAAgB,EAAE,OAAO,GAAG,MAAM;IAI9C,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,OAAO;IAuB9D,QAAQ,IAAI,OAAO,GAAG,SAAS;IAI/B,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO;IAuB7C,IAAI,IAAI,MAAM;IAId,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,QAAQ;CAWjB"}

package/dist/limiter/allocation-unavailable-strategies/BlockingBacklogRejection.js

@@ -0,0 +1,176 @@
+export const MAX_TIMEOUT = 60 * 60 * 1000; // 1 hour
+export class BlockingBacklogRejection {
+    backlogSize;
+    getBacklogTimeout;
+    queue;
+    drainInProgress = false;
+    constructor(options) {
+        this.backlogSize = options.backlogSize;
+        this.queue = options.queue;
+        const backlogTimeout = options.backlogTimeout;
+        if (typeof backlogTimeout === "number") {
+            this.assertTimeoutWithinBounds(backlogTimeout);
+            this.getBacklogTimeout = () => backlogTimeout;
+            return;
+        }
+        this.getBacklogTimeout = (context) => {
+            const contextTimeout = backlogTimeout(context);
+            this.assertTimeoutWithinBounds(contextTimeout);
+            return contextTimeout;
+        };
+    }
+    onAllotmentUnavailable(context, retry, signal) {
+        if (signal?.aborted) {
+            return Promise.resolve(undefined);
+        }
+        if (this.queue.size() >= this.backlogSize) {
+            return Promise.resolve(undefined);
+        }
+        return this.waitInBacklog(context, retry, signal);
+    }
+    async onAllotmentReleased() {
+        if (this.drainInProgress || this.queue.size() === 0) {
+            return;
+        }
+        this.drainInProgress = true;
+        try {
+            while (this.queue.size() > 0) {
+                const waiter = this.queue.peekHead();
+                if (!waiter) {
+                    return;
+                }
+                const allotment = await waiter.retry(waiter.context);
+                if (!allotment) {
+                    return;
+                }
+                if (!this.queue.removeByHandle(waiter.handle)) {
+                    // Waiter expired while retry was in-flight. Release the acquired slot
+                    // so future retries can serve active queued waiters.
+                    await allotment.releaseAndIgnore();
+                    continue;
+                }
+                waiter.resolve(allotment);
+            }
+        }
+        finally {
+            this.drainInProgress = false;
+        }
+    }
+    onLimitChanged(oldLimit, newLimit) {
+        if (newLimit > oldLimit) {
+            queueMicrotask(() => {
+                void this.onAllotmentReleased();
+            });
+        }
+    }
+    waitInBacklog(context, retry, signal) {
+        return new Promise((resolve) => {
+            let settled = false;
+            const settle = (allotment) => {
+                if (settled)
+                    return;
+                settled = true;
+                cleanup();
+                resolve(allotment);
+            };
+            const waiter = this.queue.enqueue({
+                context,
+                retry,
+                resolve: (allotment) => settle(allotment),
+            });
+            const timer = setTimeout(() => settle(undefined), this.getBacklogTimeout(context));
+            const onAbort = () => settle(undefined);
+            const cleanup = () => {
+                clearTimeout(timer);
+                signal?.removeEventListener("abort", onAbort);
+                this.queue.removeByHandle(waiter.handle);
+            };
+            signal?.addEventListener("abort", onAbort, { once: true });
+        });
+    }
+    assertTimeoutWithinBounds(timeout) {
+        if (timeout > MAX_TIMEOUT) {
+            throw new Error(`Timeout cannot be greater than ${MAX_TIMEOUT} ms`);
+        }
+    }
+}
+export class ArrayWaiterQueue {
+    head;
+    tail;
+    nodes = new Map();
+    enqueueDirection;
+    length = 0;
+    constructor(enqueueDirection) {
+        this.enqueueDirection = enqueueDirection;
+    }
+    enqueue(waiterWithoutHandle) {
+        const handle = { key: Symbol("waiter-node") };
+        const waiter = {
+            ...waiterWithoutHandle,
+            handle,
+        };
+        const node = {
+            handle,
+            value: waiter,
+            prev: undefined,
+            next: undefined,
+        };
+        this.nodes.set(handle.key, node);
+        if (this.enqueueDirection === "front") {
+            this.pushFront(node);
+        }
+        else {
+            this.pushBack(node);
+        }
+        this.length += 1;
+        return waiter;
+    }
+    peekHead() {
+        return this.head?.value;
+    }
+    removeByHandle(handle) {
+        const node = this.nodes.get(handle.key);
+        if (!node)
+            return false;
+        this.nodes.delete(handle.key);
+        if (node.prev) {
+            node.prev.next = node.next;
+        }
+        else {
+            this.head = node.next;
+        }
+        if (node.next) {
+            node.next.prev = node.prev;
+        }
+        else {
+            this.tail = node.prev;
+        }
+        node.prev = undefined;
+        node.next = undefined;
+        this.length -= 1;
+        return true;
+    }
+    size() {
+        return this.length;
+    }
+    pushFront(node) {
+        if (!this.head) {
+            this.head = node;
+            this.tail = node;
+            return;
+        }
+        node.next = this.head;
+        this.head.prev = node;
+        this.head = node;
+    }
+    pushBack(node) {
+        if (!this.tail) {
+            this.head = node;
+            this.tail = node;
+            return;
+        }
+        node.prev = this.tail;
+        this.tail.next = node;
+        this.tail = node;
+    }
+}

package/dist/limiter/allocation-unavailable-strategies/DelayedThenBlockingRejection.d.ts

@@ -1,5 +1,5 @@
 import type { LimitAllotment } from "../../LimitAllotment.js";
-import type { AllotmentUnavailableStrategy, AcquireResult } from "../../Limiter.js";
+import type { AcquireResult, AllotmentUnavailableStrategy } from "../../Limiter.js";
 import type { DelayedRejectStrategy } from "./DelayedRejectStrategy.js";
 /**
  * Composes "delay then reject" backoff with blocking behavior. On rejection:

package/dist/limiter/allocation-unavailable-strategies/DelayedThenBlockingRejection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DelayedThenBlockingRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/DelayedThenBlockingRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,4BAA4B,EAC5B,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE;;;;GAIG;AACH,qBAAa,4BAA4B,CACvC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyC;gBAE9D,OAAO,EAAE;QACnB,aAAa,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/C,gBAAgB,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC;KAC1D;IAKK,sBAAsB,CAC1B,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAYhC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAI3C"}
+{"version":3,"file":"DelayedThenBlockingRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/DelayedThenBlockingRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,aAAa,EACb,4BAA4B,EAC7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE;;;;GAIG;AACH,qBAAa,4BAA4B,CACvC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAChE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyC;gBAE9D,OAAO,EAAE;QACnB,aAAa,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/C,gBAAgB,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC;KAC1D;IAKK,sBAAsB,CAC1B,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBhC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAI3C"}

package/dist/limiter/allocation-unavailable-strategies/DelayedThenBlockingRejection.js

@@ -16,6 +16,12 @@ export class DelayedThenBlockingRejection {
             return undefined;
         }
         const allotment = await retry(context);
+        if (allotment) {
+            return allotment;
+        }
+        if (signal?.aborted) {
+            return undefined;
+        }
         return (allotment ??
             this.blockingStrategy.onAllotmentUnavailable(context, retry, signal));
     }

package/dist/limiter/allocation-unavailable-strategies/FifoBlockingRejection.d.ts

@@ -1,5 +1,17 @@
-import type { LimitAllotment } from "../../LimitAllotment.js";
-import type { AllotmentUnavailableStrategy, AcquireResult } from "../../Limiter.js";
+import type { AcquireResult, AllotmentUnavailableStrategy } from "../../Limiter.js";
+export type FifoBlockingRejectionOptions<ContextT> = {
+    /**
+     * Maximum number of blocked callers in the backlog.
+     * Default: unbounded
+     */
+    backlogSize?: number | undefined;
+    /**
+     * Maximum timeout for callers blocked on the limiter, in milliseconds.
+     * Can be a fixed number or a function that derives the timeout from the
+     * request context (e.g. from a deadline). Default: 3_600_000 (1 hour).
+     */
+    backlogTimeout?: number | ((context: ContextT) => number) | undefined;
+};
 /**
  * Rejection strategy that blocks the caller in a FIFO queue when the limit
  * has been reached, waiting for a slot to open up. This strategy favors
@@ -9,18 +21,10 @@ import type { AllotmentUnavailableStrategy, AcquireResult } from "../../Limiter.
  * that resolves when a token becomes available.
  */
 export declare class FifoBlockingRejection<ContextT> implements AllotmentUnavailableStrategy<ContextT> {
-    private readonly timeout;
-    private readonly waiters;
-    constructor(options?: {
-        /**
-         * Maximum time in milliseconds to wait for a slot to become available.
-         * Default: 3_600_000 (1 hour).
-         */
-        timeout?: number | undefined;
-    });
-    onAllotmentUnavailable(_context: ContextT, retry: (context: ContextT) => AcquireResult, signal?: AbortSignal): Promise<LimitAllotment | undefined>;
-    onAllotmentReleased(): void;
-    private acquireAsync;
-    private waitForRelease;
+    private readonly delegate;
+    constructor(options?: FifoBlockingRejectionOptions<ContextT>);
+    onAllotmentUnavailable(context: ContextT, retry: (context: ContextT) => AcquireResult, signal?: AbortSignal): Promise<import("../../LimitAllotment.js").LimitAllotment | undefined>;
+    onAllotmentReleased(): Promise<void>;
+    onLimitChanged(oldLimit: number, newLimit: number): void;
 }
 //# sourceMappingURL=FifoBlockingRejection.d.ts.map

package/dist/limiter/allocation-unavailable-strategies/FifoBlockingRejection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FifoBlockingRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/FifoBlockingRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,4BAA4B,EAC5B,aAAa,EACd,MAAM,kBAAkB,CAAC;AAM1B;;;;;;;GAOG;AACH,qBAAa,qBAAqB,CAChC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;gBAG3C,OAAO,GAAE;QACP;;;WAGG;QACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB;IASR,sBAAsB,CACpB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAItC,mBAAmB,IAAI,IAAI;YAOb,YAAY;IA6B1B,OAAO,CAAC,cAAc;CAoCvB"}
+{"version":3,"file":"FifoBlockingRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/FifoBlockingRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,4BAA4B,EAC7B,MAAM,kBAAkB,CAAC;AAO1B,MAAM,MAAM,4BAA4B,CAAC,QAAQ,IAAI;IACnD;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;CACvE,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,qBAAqB,CAChC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;gBAElD,OAAO,GAAE,4BAA4B,CAAC,QAAQ,CAAM;IAQhE,sBAAsB,CACpB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW;IAKtB,mBAAmB;IAInB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAGzD"}

package/dist/limiter/allocation-unavailable-strategies/FifoBlockingRejection.js

@@ -1,4 +1,4 @@
-const MAX_TIMEOUT = 60 * 60 * 1000; // 1 hour
+import { ArrayWaiterQueue, BlockingBacklogRejection, MAX_TIMEOUT, } from "./BlockingBacklogRejection.js";
 /**
  * Rejection strategy that blocks the caller in a FIFO queue when the limit
  * has been reached, waiting for a slot to open up. This strategy favors
@@ -8,70 +8,21 @@ const MAX_TIMEOUT = 60 * 60 * 1000; // 1 hour
  * that resolves when a token becomes available.
  */
 export class FifoBlockingRejection {
-    timeout;
-    waiters = [];
+    delegate;
     constructor(options = {}) {
-        const t = options.timeout ?? MAX_TIMEOUT;
-        if (t > MAX_TIMEOUT) {
-            throw new Error(`Timeout cannot be greater than ${MAX_TIMEOUT} ms`);
-        }
-        this.timeout = t;
+        this.delegate = new BlockingBacklogRejection({
+            backlogSize: options.backlogSize ?? Number.POSITIVE_INFINITY,
+            backlogTimeout: options.backlogTimeout ?? MAX_TIMEOUT,
+            queue: new ArrayWaiterQueue("back"),
+        });
     }
-    onAllotmentUnavailable(_context, retry, signal) {
-        return this.acquireAsync(_context, retry, signal);
+    onAllotmentUnavailable(context, retry, signal) {
+        return this.delegate.onAllotmentUnavailable(context, retry, signal);
     }
     onAllotmentReleased() {
-        const waiters = this.waiters.splice(0);
-        for (const waiter of waiters) {
-            waiter();
-        }
-    }
-    async acquireAsync(context, retry, signal) {
-        const deadline = performance.now() + this.timeout;
-        while (true) {
-            const remaining = deadline - performance.now();
-            if (remaining <= 0) {
-                return undefined;
-            }
-            if (signal?.aborted) {
-                return undefined;
-            }
-            const allotment = await retry(context);
-            if (allotment) {
-                return allotment;
-            }
-            const acquired = await this.waitForRelease(remaining, signal);
-            if (!acquired) {
-                return undefined;
-            }
-        }
+        return this.delegate.onAllotmentReleased();
     }
-    waitForRelease(timeoutMs, signal) {
-        if (signal?.aborted) {
-            return Promise.resolve(false);
-        }
-        return new Promise((resolve) => {
-            let settled = false;
-            const settle = (acquired) => {
-                if (settled)
-                    return;
-                settled = true;
-                cleanup();
-                resolve(acquired);
-            };
-            const waiter = () => settle(true);
-            this.waiters.push(waiter);
-            const timer = setTimeout(() => settle(false), timeoutMs);
-            const onAbort = () => settle(false);
-            const cleanup = () => {
-                clearTimeout(timer);
-                signal?.removeEventListener("abort", onAbort);
-                const idx = this.waiters.indexOf(waiter);
-                if (idx !== -1) {
-                    this.waiters.splice(idx, 1);
-                }
-            };
-            signal?.addEventListener("abort", onAbort, { once: true });
-        });
+    onLimitChanged(oldLimit, newLimit) {
+        this.delegate.onLimitChanged(oldLimit, newLimit);
     }
 }

package/dist/limiter/allocation-unavailable-strategies/LifoBlockingRejection.d.ts

@@ -1,5 +1,4 @@
-import type { LimitAllotment } from "../../LimitAllotment.js";
-import type { AllotmentUnavailableStrategy, AcquireResult } from "../../Limiter.js";
+import type { AcquireResult, AllotmentUnavailableStrategy } from "../../Limiter.js";
 export interface LifoBlockingRejectionOptions<ContextT> {
     /**
      * Maximum number of blocked callers in the backlog. Default: 100
@@ -19,13 +18,10 @@ export interface LifoBlockingRejectionOptions<ContextT> {
  * latencies low and minimizing timeouts.
  */
 export declare class LifoBlockingRejection<ContextT> implements AllotmentUnavailableStrategy<ContextT> {
-    private readonly backlogSize;
-    private readonly getBacklogTimeout;
-    private readonly backlog;
-    private retry;
+    private readonly delegate;
     constructor(options?: LifoBlockingRejectionOptions<ContextT>);
-    onAllotmentUnavailable(context: ContextT, retry: (context: ContextT) => AcquireResult, signal?: AbortSignal): Promise<LimitAllotment | undefined>;
+    onAllotmentUnavailable(context: ContextT, retry: (context: ContextT) => AcquireResult, signal?: AbortSignal): Promise<import("../../LimitAllotment.js").LimitAllotment | undefined>;
     onAllotmentReleased(): Promise<void>;
-    private waitForBacklog;
+    onLimitChanged(oldLimit: number, newLimit: number): void;
 }
 //# sourceMappingURL=LifoBlockingRejection.d.ts.map

package/dist/limiter/allocation-unavailable-strategies/LifoBlockingRejection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LifoBlockingRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/LifoBlockingRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,4BAA4B,EAC5B,aAAa,EACd,MAAM,kBAAkB,CAAC;AAO1B,MAAM,WAAW,4BAA4B,CAAC,QAAQ;IACpD;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;CACvE;AAED;;;;;GAKG;AACH,qBAAa,qBAAqB,CAChC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAgC;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IAEvD,OAAO,CAAC,KAAK,CAAqD;gBAEtD,OAAO,GAAE,4BAA4B,CAAC,QAAQ,CAAM;IAQhE,sBAAsB,CACpB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAUhC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C,OAAO,CAAC,cAAc;CAsCvB"}
+{"version":3,"file":"LifoBlockingRejection.d.ts","sourceRoot":"","sources":["../../../src/limiter/allocation-unavailable-strategies/LifoBlockingRejection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,4BAA4B,EAC7B,MAAM,kBAAkB,CAAC;AAM1B,MAAM,WAAW,4BAA4B,CAAC,QAAQ;IACpD;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;CACvE;AAED;;;;;GAKG;AACH,qBAAa,qBAAqB,CAChC,QAAQ,CACR,YAAW,4BAA4B,CAAC,QAAQ,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;gBAElD,OAAO,GAAE,4BAA4B,CAAC,QAAQ,CAAM;IAQhE,sBAAsB,CACpB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,EAC3C,MAAM,CAAC,EAAE,WAAW;IAKtB,mBAAmB;IAInB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAGzD"}

package/dist/limiter/allocation-unavailable-strategies/LifoBlockingRejection.js

@@ -1,3 +1,4 @@
+import { ArrayWaiterQueue, BlockingBacklogRejection, } from "./BlockingBacklogRejection.js";
 /**
  * Rejection strategy that blocks the caller in a LIFO queue when the limit
  * has been reached. This strategy favors availability over latency by
@@ -5,59 +6,21 @@
  * latencies low and minimizing timeouts.
  */
 export class LifoBlockingRejection {
-    backlogSize;
-    getBacklogTimeout;
-    backlog = [];
-    retry;
+    delegate;
     constructor(options = {}) {
-        this.backlogSize = options.backlogSize ?? 100;
-        const timeout = options.backlogTimeout ?? 1_000;
-        this.getBacklogTimeout =
-            typeof timeout === "number" ? () => timeout : timeout;
+        this.delegate = new BlockingBacklogRejection({
+            backlogSize: options.backlogSize ?? 100,
+            backlogTimeout: options.backlogTimeout ?? 1_000,
+            queue: new ArrayWaiterQueue("front"),
+        });
     }
     onAllotmentUnavailable(context, retry, signal) {
-        this.retry = retry;
-        if (this.backlog.length >= this.backlogSize) {
-            return Promise.resolve(undefined);
-        }
-        return this.waitForBacklog(context, signal);
+        return this.delegate.onAllotmentUnavailable(context, retry, signal);
     }
-    async onAllotmentReleased() {
-        if (this.backlog.length === 0 || !this.retry)
-            return;
-        const waiter = this.backlog[0];
-        const allotment = await this.retry(waiter.context);
-        if (allotment) {
-            this.backlog.shift();
-            waiter.resolve(allotment);
-        }
+    onAllotmentReleased() {
+        return this.delegate.onAllotmentReleased();
     }
-    waitForBacklog(context, signal) {
-        return new Promise((resolve) => {
-            let settled = false;
-            const settle = (allotment) => {
-                if (settled)
-                    return;
-                settled = true;
-                cleanup();
-                resolve(allotment);
-            };
-            const waiter = {
-                context,
-                resolve: (allotment) => settle(allotment),
-            };
-            this.backlog.unshift(waiter);
-            const timer = setTimeout(() => settle(undefined), this.getBacklogTimeout(context));
-            const onAbort = () => settle(undefined);
-            const cleanup = () => {
-                clearTimeout(timer);
-                signal?.removeEventListener("abort", onAbort);
-                const idx = this.backlog.indexOf(waiter);
-                if (idx !== -1) {
-                    this.backlog.splice(idx, 1);
-                }
-            };
-            signal?.addEventListener("abort", onAbort, { once: true });
-        });
+    onLimitChanged(oldLimit, newLimit) {
+        this.delegate.onLimitChanged(oldLimit, newLimit);
     }
 }

package/dist/limiter/factories/makeBlockingLimiter.d.ts

@@ -1,6 +1,8 @@
 import { Limiter, type LimiterOptions } from "../../Limiter.js";
+import { type FifoBlockingRejectionOptions } from "../allocation-unavailable-strategies/FifoBlockingRejection.js";
 export declare function makeBlockingLimiter<ContextT = void>(options?: {
-    timeout?: number;
+    backlogSize?: number;
+    backlogTimeout?: FifoBlockingRejectionOptions<ContextT>["backlogTimeout"];
     limiter?: Omit<LimiterOptions<ContextT>, "allotmentUnavailableStrategy">;
 }): Limiter<ContextT>;
 //# sourceMappingURL=makeBlockingLimiter.d.ts.map

package/dist/limiter/factories/makeBlockingLimiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeBlockingLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makeBlockingLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAG1B,wBAAgB,mBAAmB,CAAC,QAAQ,GAAG,IAAI,EACjD,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,8BAA8B,CAAC,CAAC;CACrE,GACL,OAAO,CAAC,QAAQ,CAAC,CAOnB"}
+{"version":3,"file":"makeBlockingLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makeBlockingLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,+DAA+D,CAAC;AAEvE,wBAAgB,mBAAmB,CAAC,QAAQ,GAAG,IAAI,EACjD,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,8BAA8B,CAAC,CAAC;CACrE,GACL,OAAO,CAAC,QAAQ,CAAC,CAQnB"}

package/dist/limiter/factories/makeBlockingLimiter.js

@@ -1,10 +1,11 @@
 import { Limiter, } from "../../Limiter.js";
-import { FifoBlockingRejection } from "../allocation-unavailable-strategies/FifoBlockingRejection.js";
+import { FifoBlockingRejection, } from "../allocation-unavailable-strategies/FifoBlockingRejection.js";
 export function makeBlockingLimiter(options = {}) {
     return new Limiter({
         ...options.limiter,
         allotmentUnavailableStrategy: new FifoBlockingRejection({
-            timeout: options.timeout,
+            backlogSize: options.backlogSize,
+            backlogTimeout: options.backlogTimeout,
         }),
     });
 }

package/dist/limiter/factories/makeLifoBlockingLimiter.d.ts

@@ -1,7 +1,7 @@
 import { Limiter, type LimiterOptions } from "../../Limiter.js";
 import { type LifoBlockingRejectionOptions } from "../allocation-unavailable-strategies/LifoBlockingRejection.js";
 export declare function makeLifoBlockingLimiter<ContextT = void>(options?: {
-    backlogSize?: number;
+    backlogSize?: LifoBlockingRejectionOptions<ContextT>["backlogSize"];
     backlogTimeout?: LifoBlockingRejectionOptions<ContextT>["backlogTimeout"];
     limiter?: Omit<LimiterOptions<ContextT>, "allotmentUnavailableStrategy">;
 }): Limiter<ContextT>;

package/dist/limiter/factories/makeLifoBlockingLimiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeLifoBlockingLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makeLifoBlockingLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,+DAA+D,CAAC;AAEvE,wBAAgB,uBAAuB,CAAC,QAAQ,GAAG,IAAI,EACrD,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,8BAA8B,CAAC,CAAC;CACrE,GACL,OAAO,CAAC,QAAQ,CAAC,CAQnB"}
+{"version":3,"file":"makeLifoBlockingLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makeLifoBlockingLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,+DAA+D,CAAC;AAEvE,wBAAgB,uBAAuB,CAAC,QAAQ,GAAG,IAAI,EACrD,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC;IACpE,cAAc,CAAC,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,8BAA8B,CAAC,CAAC;CACrE,GACL,OAAO,CAAC,QAAQ,CAAC,CAQnB"}

package/dist/limiter/factories/makeLifoBlockingLimiter.js

@@ -1,4 +1,4 @@
-import { Limiter, } from "../../Limiter.js";
+import { Limiter } from "../../Limiter.js";
 import { LifoBlockingRejection, } from "../allocation-unavailable-strategies/LifoBlockingRejection.js";
 export function makeLifoBlockingLimiter(options = {}) {
     return new Limiter({

package/dist/limiter/factories/makePartitionedBlockingLimiter.d.ts

@@ -1,5 +1,6 @@
 import { Limiter, type LimiterOptions } from "../../Limiter.js";
 import { type PartitionConfig } from "../acquire-strategies/PartitionedStrategy.js";
+import { type FifoBlockingRejectionOptions } from "../allocation-unavailable-strategies/FifoBlockingRejection.js";
 export declare function makePartitionedBlockingLimiter<ContextT, PartitionName extends string = string>(options: {
     partitionResolver: (context: ContextT) => PartitionName | undefined;
     partitions: Record<PartitionName, PartitionConfig & {
@@ -7,6 +8,7 @@ export declare function makePartitionedBlockingLimiter<ContextT, PartitionName e
     }>;
     limiter?: Omit<LimiterOptions<ContextT>, "acquireStrategy">;
     maxConcurrentDelays?: number;
-    timeout?: number;
+    backlogSize?: FifoBlockingRejectionOptions<ContextT>["backlogSize"];
+    backlogTimeout?: FifoBlockingRejectionOptions<ContextT>["backlogTimeout"];
 }): Limiter<ContextT>;
 //# sourceMappingURL=makePartitionedBlockingLimiter.d.ts.map

package/dist/limiter/factories/makePartitionedBlockingLimiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makePartitionedBlockingLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makePartitionedBlockingLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,8CAA8C,CAAC;AAEtD,wBAAgB,8BAA8B,CAC5C,QAAQ,EACR,aAAa,SAAS,MAAM,GAAG,MAAM,EACrC,OAAO,EAAE;IACT,iBAAiB,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,GAAG,SAAS,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAgCpB"}
+{"version":3,"file":"makePartitionedBlockingLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makePartitionedBlockingLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,8CAA8C,CAAC;AAGtD,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,+DAA+D,CAAC;AAEvE,wBAAgB,8BAA8B,CAC5C,QAAQ,EACR,aAAa,SAAS,MAAM,GAAG,MAAM,EACrC,OAAO,EAAE;IACT,iBAAiB,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,aAAa,GAAG,SAAS,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC5D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC;IACpE,cAAc,CAAC,EAAE,4BAA4B,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC;CAC3E,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiCpB"}

package/dist/limiter/factories/makePartitionedBlockingLimiter.js

@@ -1,8 +1,8 @@
-import { Limiter, } from "../../Limiter.js";
+import { Limiter } from "../../Limiter.js";
+import { PartitionedStrategy, } from "../acquire-strategies/PartitionedStrategy.js";
 import { DelayedRejectStrategy } from "../allocation-unavailable-strategies/DelayedRejectStrategy.js";
 import { DelayedThenBlockingRejection } from "../allocation-unavailable-strategies/DelayedThenBlockingRejection.js";
-import { FifoBlockingRejection } from "../allocation-unavailable-strategies/FifoBlockingRejection.js";
-import { PartitionedStrategy, } from "../acquire-strategies/PartitionedStrategy.js";
+import { FifoBlockingRejection, } from "../allocation-unavailable-strategies/FifoBlockingRejection.js";
 export function makePartitionedBlockingLimiter(options) {
     const limit = options.limiter?.limit ?? Limiter.makeDefaultLimit();
     const delayByPartition = new Map(Object.entries(options.partitions).map(([name, cfg]) => [
@@ -29,7 +29,8 @@ export function makePartitionedBlockingLimiter(options) {
                 maxConcurrentDelays: options.maxConcurrentDelays,
             }),
             blockingStrategy: new FifoBlockingRejection({
-                timeout: options.timeout,
+                backlogSize: options.backlogSize,
+                backlogTimeout: options.backlogTimeout,
             }),
         }),
     });

package/dist/limiter/factories/makeSimpleLimiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeSimpleLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makeSimpleLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAE1B,wBAAgB,iBAAiB,CAAC,QAAQ,GAAG,IAAI,EAC/C,OAAO,GAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAM,GAC9D,OAAO,CAAC,QAAQ,CAAC,CAOnB"}
+{"version":3,"file":"makeSimpleLimiter.d.ts","sourceRoot":"","sources":["../../../src/limiter/factories/makeSimpleLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGhE,wBAAgB,iBAAiB,CAAC,QAAQ,GAAG,IAAI,EAC/C,OAAO,GAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAM,GAC9D,OAAO,CAAC,QAAQ,CAAC,CAOnB"}

package/dist/limiter/factories/makeSimpleLimiter.js

@@ -1,4 +1,5 @@
-import { Limiter, SemaphoreStrategy, } from "../../Limiter.js";
+import { Limiter } from "../../Limiter.js";
+import { SemaphoreStrategy } from "../acquire-strategies/SemaphoreStrategy.js";
 export function makeSimpleLimiter(options = {}) {
     const limit = options.limit ?? Limiter.makeDefaultLimit();
     return new Limiter({