@c9up/bay 0.1.13 → 0.2.1

package/dist/QueueManager.d.ts

@@ -1,3 +1,4 @@
+import { type JobClass, type JobOptions } from "./Job.js";
 /**
  * QueueManager — dispatch and process background jobs.
  *
@@ -6,7 +7,7 @@
  *   await queue.dispatch('send-email', { to: 'user@example.com' })
  *   queue.work()
  */
-export interface Job {
+export interface JobRecord {
     id: string;
     name: string;
     payload: unknown;
@@ -16,17 +17,84 @@ export interface Job {
     error?: string;
     createdAt: number;
     processedAt?: number;
+    /**
+     * How many times this job has been recovered from a stalled worker.
+     *
+     * Separate from `attempts`, which counts times a handler RAN. A worker that
+     * dies mid-job never reaches the failure path, so `attempts` cannot see it —
+     * upstream carries the same two counters side by side for the same reason
+     * (`JobData.stalledCount` in `@boringnode/queue`).
+     */
+    stalledCount?: number;
+    /**
+     * Named queue this job waits in. A worker is told which queues to serve, so
+     * a slow queue cannot starve a fast one sharing the same process.
+     *
+     * Optional on the wire: a job written by a version that had no queues
+     * parses without it and reads as `default`.
+     */
+    queue?: string;
+    /** Epoch ms before which no worker may take the job (`delay`). */
+    runAt?: number;
+    /** Milliseconds the handler gets before the attempt counts as failed. */
+    timeout?: number;
 }
+/** The queue a record belongs to, for a record written before named queues. */
+export declare function queueOf(job: JobRecord): string;
 export interface JobHandler {
     handle(payload: unknown): Promise<void>;
 }
+/**
+ * What a worker is told before it starts, by upstream's names for it
+ * (`WorkerConfig.idleDelay`, `WorkerConfig.stalledInterval`).
+ */
+export interface WorkerOptions {
+    /** Milliseconds to wait after finding nothing to do. Default `2000`. */
+    idleDelay?: number;
+    /** Milliseconds between stalled-job sweeps. Default `30_000`. */
+    stalledInterval?: number;
+    /**
+     * How many jobs this worker runs at once. Default `1`.
+     *
+     * One job at a time is the safe default and a poor one for anything that
+     * waits on the network: a worker sending mail spends nearly all of its time
+     * idle with a queue behind it.
+     */
+    concurrency?: number;
+    /**
+     * Which named queues to serve, in order. Default: the `default` queue.
+     *
+     * Naming them is how a slow queue is kept from starving a fast one — run
+     * one worker for `emails` and another for `default`, rather than one worker
+     * taking whatever comes.
+     */
+    queues?: readonly string[];
+}
+/**
+ * What a single `dispatch` may override.
+ *
+ * Everything a job class declares, plus `maxAttempts` — the name this method
+ * took before job classes existed, kept because it is what every existing call
+ * site passes. `maxRetries` is the class's name for the same number.
+ */
+export interface DispatchOptions extends JobOptions {
+    /** The older spelling of `maxRetries`. Wins when both are given. */
+    maxAttempts?: number;
+}
 export interface QueueDriver {
-    push(job: Job): Promise<void>;
-    pop(): Promise<Job | null>;
-    fail(job: Job, error: string): Promise<void>;
-    complete(job: Job): Promise<void>;
-    retry(job: Job): Promise<void>;
-    failed(): Promise<Job[]>;
+    push(job: JobRecord): Promise<void>;
+    /**
+     * Take the next job from one of `queues`, or from the default queue when
+     * the caller names none.
+     *
+     * A driver written before named queues takes no argument and keeps working:
+     * it serves the one queue it has, which is the default one.
+     */
+    pop(queues?: readonly string[]): Promise<JobRecord | null>;
+    fail(job: JobRecord, error: string): Promise<void>;
+    complete(job: JobRecord): Promise<void>;
+    retry(job: JobRecord): Promise<void>;
+    failed(): Promise<JobRecord[]>;
     size(): Promise<number>;
     /**
      * Optional crash recovery: move jobs orphaned in the driver's 'processing'
@@ -34,25 +102,76 @@ export interface QueueDriver {
      * recovered. In-memory drivers omit this — their jobs don't survive a crash.
      */
     recoverStale?(): Promise<number>;
+    /**
+     * Optional lease renewal: tell the driver this job is still being worked on,
+     * answering `false` when the claim is gone (already recovered, or now held
+     * by another worker). Drivers with no lease omit it.
+     */
+    renew?(job: JobRecord): Promise<boolean>;
+    /**
+     * How often the worker should call `renew` while a handler runs. The driver
+     * sets the cadence because the driver owns the deadline. Absent means no
+     * renewal.
+     */
+    readonly renewIntervalMs?: number;
 }
 export declare class QueueManager {
     #private;
-    constructor(driver: QueueDriver);
-    /** Register a job handler. */
+    constructor(driver: QueueDriver, workerDefaults?: WorkerOptions);
+    /** Register a job handler under a name. */
     register(name: string, handler: JobHandler | (new () => JobHandler)): void;
-    /** Dispatch a job to the queue. */
-    dispatch(name: string, payload: unknown, options?: {
-        maxAttempts?: number;
-    }): Promise<string>;
-    /** Process the next job in the queue. */
-    processOne(): Promise<boolean>;
+    /**
+     * Register a job class under its own name, so a worker in another process
+     * can find it from what the record carries.
+     *
+     * `dispatch(SomeJob, …)` does this on its own; call it directly when the
+     * worker never dispatches — which is the ordinary case, since a worker
+     * process runs jobs and an HTTP process queues them.
+     */
+    registerJob(job: JobClass): void;
+    /** Every job class this manager knows, by name. */
+    registeredJobs(): ReadonlyMap<string, JobClass>;
+    /**
+     * Queue a job.
+     *
+     * Takes a job class — the payload is then typed by the class's own
+     * parameter, so a field the handler reads cannot be one the dispatcher
+     * never sent:
+     *
+     *     await queue.dispatch(SendEmail, { to: 'user@example.com' })
+     *
+     * A registered name still works, and is what a job whose name is computed
+     * at runtime needs:
+     *
+     *     await queue.dispatch('send-email', { to: '…' })
+     */
+    dispatch<Payload>(job: JobClass<Payload>, payload: Payload, options?: DispatchOptions): Promise<string>;
+    dispatch(name: string, payload: unknown, options?: DispatchOptions): Promise<string>;
+    /**
+     * Process the next job, from `queues` when the caller names any.
+     *
+     * Returns whether there was one — the loop uses that to decide between
+     * asking again and sleeping.
+     */
+    processOne(queues?: readonly string[]): Promise<boolean>;
     /**
      * Start processing jobs continuously. Reclaims crash-orphaned jobs at
-     * startup and every `recoverStaleMs` thereafter (no-op for in-memory drivers
-     * without recoverStale) — otherwise a job left in 'processing' by a crashed
-     * worker would sit there forever.
+     * startup and every `stalledInterval` thereafter (no-op for in-memory
+     * drivers without recoverStale) — otherwise a job left in 'processing' by a
+     * crashed worker would sit there forever.
+     *
+     * The options are upstream's `worker` block, by the names it gives them:
+     *
+     *   queue.work({ idleDelay: 2000, stalledInterval: 30_000 })
+     *
+     * `idleDelay` defaults to 2 s, which is upstream's default too — a worker
+     * that finds nothing waits before asking again, and asking every second was
+     * bay's own number rather than the framework's.
+     *
+     * The positional form is the one this method had before it took the
+     * framework's names, and still works: `work(idleDelay, stalledInterval)`.
      */
-    work(pollIntervalMs?: number, recoverStaleMs?: number): Promise<void>;
+    work(options?: WorkerOptions | number, stalledIntervalArg?: number): Promise<void>;
     /**
      * Reclaim jobs orphaned by a crashed worker — moves entries stuck in the
      * driver's 'processing' state (expired lease) back to pending and returns
@@ -60,7 +179,7 @@ export declare class QueueManager {
      * Called automatically by work(); also safe to schedule manually.
      */
     recoverStale(): Promise<number>;
-    /** Await the currently in-flight processOne, if any. */
+    /** Await every in-flight attempt, if any. */
     drain(): Promise<void>;
     /**
      * Stop the worker and wait for it to actually be gone.
@@ -71,7 +190,7 @@ export declare class QueueManager {
      */
     stop(): Promise<void>;
     /** Get failed jobs. */
-    failedJobs(): Promise<Job[]>;
+    failedJobs(): Promise<JobRecord[]>;
     /** Get queue size. */
     size(): Promise<number>;
 }

package/dist/QueueManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueueManager.d.ts","sourceRoot":"","sources":["../src/QueueManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IAC1B,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,WAAW;IAC3B,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,IAAI,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IAC3B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACzB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,qBAAa,YAAY;;gBAUZ,MAAM,EAAE,WAAW;IAI/B,8BAA8B;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,CAAC,UAAU,UAAU,CAAC,GAAG,IAAI;IAI1E,mCAAmC;IAC7B,QAAQ,CACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAChC,OAAO,CAAC,MAAM,CAAC;IAkBlB,yCAAyC;IACnC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IA2CpC;;;;;OAKG;IACG,IAAI,CAAC,cAAc,SAAO,EAAE,cAAc,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6EzE;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,wDAAwD;IAClD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,uBAAuB;IACjB,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAIlC,sBAAsB;IAChB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CAG7B"}
+{"version":3,"file":"QueueManager.d.ts","sourceRoot":"","sources":["../src/QueueManager.ts"],"names":[],"mappings":"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"}

package/dist/QueueManager.js

@@ -1,69 +1,146 @@
+import { DEFAULT_QUEUE, isJobClass, toMilliseconds, } from "./Job.js";
+/** The queue a record belongs to, for a record written before named queues. */
+export function queueOf(job) {
+    return job.queue ?? DEFAULT_QUEUE;
+}
 /**
- * QueueManager — dispatch and process background jobs.
+ * Reject once `ms` has passed, without touching the work.
  *
- * Usage:
- *   queue.register('send-email', new SendEmailHandler())
- *   await queue.dispatch('send-email', { to: 'user@example.com' })
- *   queue.work()
+ * Nothing in Node can interrupt a running promise, so a job that ignores its
+ * timeout goes on burning CPU. What this buys is that the WORKER stops waiting
+ * for it — otherwise one stuck job costs the whole worker, which never picks
+ * anything up again.
  */
+function withTimeout(work, ms, name) {
+    const settled = Promise.resolve(work);
+    if (ms === undefined || ms <= 0)
+        return settled;
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            reject(new Error(`Job '${name}' exceeded its ${ms}ms timeout`));
+        }, ms);
+        // Unreffed: a pending timeout must not be the reason the process stays up.
+        timer.unref();
+        settled.then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        }, (err) => {
+            clearTimeout(timer);
+            reject(err);
+        });
+    });
+}
 export class QueueManager {
     #driver;
     #handlers = new Map();
+    #jobs = new Map();
     #running = false;
     /** The running loop, so `stop()` can wait for it to finish. */
     #loopPromise;
     /** Cuts the sleep between polls short. */
     #wake;
-    #inflightPromise = null;
-    constructor(driver) {
+    /** Every attempt currently in flight, so `drain()` can wait for all of them. */
+    #inflight = new Set();
+    /** Defaults for `work()`, from the config's `worker` block. */
+    #workerDefaults;
+    constructor(driver, workerDefaults) {
         this.#driver = driver;
+        this.#workerDefaults = workerDefaults ?? {};
     }
-    /** Register a job handler. */
+    /** Register a job handler under a name. */
     register(name, handler) {
         this.#handlers.set(name, handler);
     }
-    /** Dispatch a job to the queue. */
-    async dispatch(name, payload, options) {
-        if (options?.maxAttempts !== undefined && options.maxAttempts < 1) {
+    /**
+     * Register a job class under its own name, so a worker in another process
+     * can find it from what the record carries.
+     *
+     * `dispatch(SomeJob, …)` does this on its own; call it directly when the
+     * worker never dispatches — which is the ordinary case, since a worker
+     * process runs jobs and an HTTP process queues them.
+     */
+    registerJob(job) {
+        this.#jobs.set(job.name, job);
+    }
+    /** Every job class this manager knows, by name. */
+    registeredJobs() {
+        return this.#jobs;
+    }
+    async dispatch(job, payload, options = {}) {
+        let name;
+        let declared = {};
+        if (isJobClass(job)) {
+            name = job.name;
+            declared = job.options ?? {};
+            // So a worker that never dispatches still resolves it by name.
+            this.#jobs.set(name, job);
+        }
+        else {
+            name = job;
+        }
+        // The call site wins over the class, and the class over the defaults —
+        // the same order `work()` reads its own options in.
+        const maxAttempts = options.maxAttempts ?? options.maxRetries ?? declared.maxRetries ?? 3;
+        if (maxAttempts < 1) {
             throw new Error("maxAttempts must be >= 1");
         }
+        const delay = options.delay ?? declared.delay;
+        const delayMs = delay === undefined ? 0 : toMilliseconds(delay, "delay");
+        const timeout = options.timeout ?? declared.timeout;
         const id = `job_${crypto.randomUUID()}`;
-        const job = {
+        const record = {
             id,
             name,
             payload,
             attempts: 0,
-            maxAttempts: options?.maxAttempts ?? 3,
+            maxAttempts,
             status: "pending",
             createdAt: Date.now(),
+            queue: options.queue ?? declared.queue ?? DEFAULT_QUEUE,
         };
-        await this.#driver.push(job);
+        if (delayMs > 0)
+            record.runAt = Date.now() + delayMs;
+        if (timeout !== undefined) {
+            record.timeout = toMilliseconds(timeout, "timeout");
+        }
+        await this.#driver.push(record);
         return id;
     }
-    /** Process the next job in the queue. */
-    async processOne() {
-        const job = await this.#driver.pop();
+    /**
+     * Process the next job, from `queues` when the caller names any.
+     *
+     * Returns whether there was one — the loop uses that to decide between
+     * asking again and sleeping.
+     */
+    async processOne(queues) {
+        const job = await this.#driver.pop(queues);
         if (!job)
             return false;
-        const handlerOrClass = this.#handlers.get(job.name);
-        if (!handlerOrClass) {
+        const run = this.#resolveRunner(job.name);
+        if (!run) {
             process.stderr.write(`QueueManager: no handler registered for job '${job.name}'\n`);
             await this.#driver.fail(job, `No handler registered for job: ${job.name}`);
             return true;
         }
-        const handler = typeof handlerOrClass === "function"
-            ? new handlerOrClass()
-            : handlerOrClass;
+        const handler = run;
         job.attempts++;
         job.status = "processing";
         job.processedAt = Date.now();
+        // The lease a driver takes at pop() has a deadline, and a handler slower
+        // than that deadline was being recovered and re-delivered WHILE IT WAS
+        // STILL RUNNING — a second worker picked the job up, and the first one's
+        // completion then removed an entry the second one owned. Upstream calls
+        // the same mechanism a heartbeat (`Adapter.renewJobs`); a driver without
+        // a lease supplies no cadence and nothing is scheduled.
+        const stopRenewing = this.#startRenewing(job);
+        let handled = false;
         try {
-            await handler.handle(job.payload);
-            job.status = "completed";
-            await this.#driver.complete(job);
+            await withTimeout(handler.run(job.payload), job.timeout, job.name);
+            handled = true;
         }
         catch (err) {
-            const errorMsg = err instanceof Error ? err.message : String(err);
+            const error = err instanceof Error ? err : new Error(String(err));
+            const errorMsg = error.message;
             if (job.attempts < job.maxAttempts) {
                 job.status = "pending";
                 await this.#driver.retry(job);
@@ -72,28 +149,135 @@ export class QueueManager {
                 job.status = "failed";
                 job.error = errorMsg;
                 await this.#driver.fail(job, errorMsg);
+                // After the last attempt, not after each one. A throw here is
+                // reported and swallowed: the job has already failed, and
+                // failing to say so must not be read as a second failure.
+                try {
+                    await handler.onFailed?.(error);
+                }
+                catch (hookErr) {
+                    process.stderr.write(`QueueManager: failed() hook of '${job.name}' threw: ${hookErr instanceof Error ? hookErr.message : String(hookErr)}\n`);
+                }
             }
         }
+        finally {
+            stopRenewing();
+        }
+        // Outside the catch, and deliberately. Marking the job done is a write to
+        // the driver, and a write can fail on its own — a Redis blip, a closed
+        // connection. Inside, that failure was read as the HANDLER having failed:
+        // the job went round again and the handler ran a second time, and once
+        // `attempts` ran out the job was filed as failed with the driver's error
+        // on it. A job that succeeded, in the failed list. The completion is
+        // allowed to throw now; the job keeps its lease, and the ordinary stall
+        // recovery is what re-delivers it.
+        if (handled) {
+            job.status = "completed";
+            await this.#driver.complete(job);
+        }
         return true;
     }
+    /**
+     * The runner for `name`: a registered handler, or a job class.
+     *
+     * A handler registered under the name wins — an application that registers
+     * one deliberately is overriding whatever else answers to it.
+     */
+    #resolveRunner(name) {
+        const handlerOrClass = this.#handlers.get(name);
+        if (handlerOrClass !== undefined) {
+            const handler = typeof handlerOrClass === "function"
+                ? new handlerOrClass()
+                : handlerOrClass;
+            return { run: (payload) => handler.handle(payload) };
+        }
+        const JobConstructor = this.#jobs.get(name);
+        if (JobConstructor === undefined)
+            return undefined;
+        const instance = new JobConstructor();
+        return {
+            run: (payload) => {
+                // `payload` is declared readonly on the class so a handler cannot
+                // rewrite what it was sent; it is assigned once, here.
+                Object.defineProperty(instance, "payload", {
+                    value: payload,
+                    configurable: true,
+                    enumerable: true,
+                });
+                return instance.execute();
+            },
+            onFailed: instance.failed?.bind(instance),
+        };
+    }
+    /**
+     * Keep the driver's claim on `job` alive for as long as the handler runs.
+     * Returns the function that stops it — always called, including when the
+     * handler throws, so a finished job never keeps extending a lease.
+     */
+    #startRenewing(job) {
+        const driver = this.#driver;
+        const every = driver.renewIntervalMs;
+        if (!driver.renew || every === undefined || every <= 0) {
+            return () => { };
+        }
+        const timer = setInterval(() => {
+            // A renewal that fails is not a reason to interrupt the handler: the
+            // job may already have been recovered, and the handler finishing is
+            // still the best outcome available.
+            void driver.renew?.(job).catch(() => { });
+        }, every);
+        // Unreffed: the handler's own promise is what holds the process open.
+        timer.unref();
+        return () => {
+            clearInterval(timer);
+        };
+    }
     /**
      * Start processing jobs continuously. Reclaims crash-orphaned jobs at
-     * startup and every `recoverStaleMs` thereafter (no-op for in-memory drivers
-     * without recoverStale) — otherwise a job left in 'processing' by a crashed
-     * worker would sit there forever.
+     * startup and every `stalledInterval` thereafter (no-op for in-memory
+     * drivers without recoverStale) — otherwise a job left in 'processing' by a
+     * crashed worker would sit there forever.
+     *
+     * The options are upstream's `worker` block, by the names it gives them:
+     *
+     *   queue.work({ idleDelay: 2000, stalledInterval: 30_000 })
+     *
+     * `idleDelay` defaults to 2 s, which is upstream's default too — a worker
+     * that finds nothing waits before asking again, and asking every second was
+     * bay's own number rather than the framework's.
+     *
+     * The positional form is the one this method had before it took the
+     * framework's names, and still works: `work(idleDelay, stalledInterval)`.
      */
-    async work(pollIntervalMs = 1000, recoverStaleMs = 30_000) {
-        if (pollIntervalMs <= 0) {
-            throw new Error("pollIntervalMs must be positive");
+    async work(options, stalledIntervalArg = 30_000) {
+        const asOptions = typeof options === "number" ? undefined : options;
+        // An argument beats the config's `worker` block, which beats the
+        // framework's own defaults.
+        const defaults = this.#workerDefaults;
+        const idleDelay = typeof options === "number"
+            ? options
+            : (options?.idleDelay ?? defaults.idleDelay ?? 2000);
+        const stalledInterval = typeof options === "number"
+            ? stalledIntervalArg
+            : (options?.stalledInterval ??
+                defaults.stalledInterval ??
+                stalledIntervalArg);
+        if (idleDelay <= 0) {
+            throw new Error("idleDelay must be positive");
+        }
+        if (stalledInterval <= 0) {
+            throw new Error("stalledInterval must be positive");
         }
-        if (recoverStaleMs <= 0) {
-            throw new Error("recoverStaleMs must be positive");
+        const concurrency = asOptions?.concurrency ?? this.#workerDefaults.concurrency ?? 1;
+        if (!Number.isInteger(concurrency) || concurrency < 1) {
+            throw new Error("concurrency must be a whole number >= 1");
         }
+        const queues = asOptions?.queues ?? this.#workerDefaults.queues;
         if (this.#running) {
             throw new Error("QueueManager is already running");
         }
         this.#running = true;
-        const loop = this.#loop(pollIntervalMs, recoverStaleMs);
+        const loop = this.#loop(idleDelay, stalledInterval, concurrency, queues);
         this.#loopPromise = loop;
         try {
             await loop;
@@ -110,24 +294,34 @@ export class QueueManager {
      * while the loop was still pending — up to a full poll interval of a worker
      * that was supposed to be gone, and a timer holding the process open.
      */
-    async #loop(pollIntervalMs, recoverStaleMs) {
+    async #loop(idleDelay, stalledInterval, concurrency, queues) {
         await this.#tryRecoverStale();
         let lastRecover = Date.now();
         while (this.#running) {
-            try {
-                this.#inflightPromise = this.processOne();
-                const processed = await this.#inflightPromise;
-                if (!processed)
-                    await this.#sleep(pollIntervalMs);
-            }
-            catch (err) {
-                process.stderr.write(`QueueManager processOne error: ${err instanceof Error ? err.message : String(err)}\n`);
-                await this.#sleep(pollIntervalMs);
+            // One round of up to `concurrency` jobs. `allSettled`, not `all`: a
+            // driver that throws for one job must not abandon the others
+            // mid-flight, and each attempt already reports its own failure.
+            const round = Array.from({ length: concurrency }, () => this.processOne(queues));
+            for (const attempt of round)
+                this.#inflight.add(attempt);
+            const outcomes = await Promise.allSettled(round);
+            for (const attempt of round)
+                this.#inflight.delete(attempt);
+            let processed = false;
+            for (const outcome of outcomes) {
+                if (outcome.status === "fulfilled") {
+                    processed = processed || outcome.value;
+                }
+                else {
+                    const err = outcome.reason;
+                    process.stderr.write(`QueueManager processOne error: ${err instanceof Error ? err.message : String(err)}\n`);
+                }
             }
-            finally {
-                this.#inflightPromise = null;
-            }
-            if (this.#running && Date.now() - lastRecover >= recoverStaleMs) {
+            // Nothing anywhere means the queues are empty; anything at all means
+            // there may be more behind it, so ask again without waiting.
+            if (!processed)
+                await this.#sleep(idleDelay);
+            if (this.#running && Date.now() - lastRecover >= stalledInterval) {
                 await this.#tryRecoverStale();
                 lastRecover = Date.now();
             }
@@ -165,11 +359,11 @@ export class QueueManager {
     async recoverStale() {
         return (await this.#driver.recoverStale?.()) ?? 0;
     }
-    /** Await the currently in-flight processOne, if any. */
+    /** Await every in-flight attempt, if any. */
     async drain() {
-        if (this.#inflightPromise) {
-            await this.#inflightPromise.catch(() => { });
-        }
+        if (this.#inflight.size === 0)
+            return;
+        await Promise.allSettled([...this.#inflight]);
     }
     /**
      * Stop the worker and wait for it to actually be gone.

package/dist/QueueManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../src/QueueManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueueManager.js","sourceRoot":"","sources":["../src/QueueManager.ts"],"names":[],"mappings":"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"}