@c9up/bay 0.1.13 → 0.2.1

package/dist/console/queueWork.js

@@ -0,0 +1,58 @@
+/**
+ * `queue:work` — run the worker that takes jobs off the queue.
+ *
+ * The command a deployment runs as its own process, beside the HTTP one:
+ *
+ *     ream queue:work
+ *     ream queue:work --queue=emails,notifications
+ *     ream queue:work --concurrency=10
+ *
+ * It stays alive on purpose — `staysAlive` — and the loop it starts is the
+ * application's, so a SIGTERM reaches `BayProvider.shutdown()`, which stops the
+ * worker and lets the job in flight finish rather than dropping it.
+ */
+import { getQueue } from "../services/main.js";
+import { flag } from "./contract.js";
+/** Split `--queue=a,b` into names, dropping the empties a trailing comma makes. */
+export function parseQueues(value) {
+    if (value === undefined)
+        return undefined;
+    const names = value
+        .split(",")
+        .map((name) => name.trim())
+        .filter((name) => name.length > 0);
+    return names.length > 0 ? names : undefined;
+}
+export function queueWorkCommand() {
+    return class QueueWork {
+        static commandName = "queue:work";
+        static description = "Process queued jobs until the process is stopped";
+        // The worker needs the container: the queue it drains is the one the
+        // provider booted, with the driver the config named.
+        static options = { startApp: true, staysAlive: true };
+        static flags = [
+            flag("queue", "string", {
+                description: "Comma-separated queues to serve, in order (default: the default queue)",
+            }),
+            flag("concurrency", "number", {
+                description: "How many jobs to run at once (default: 1)",
+            }),
+        ];
+        async run() {
+            const manager = getQueue();
+            if (!manager) {
+                // Naming the wiring beats a stack trace out of the service proxy:
+                // the usual cause is a project that never added the provider.
+                throw new Error("[bay] queue:work found no queue. Add `() => import('@c9up/bay/provider')` " +
+                    "to the providers in reamrc.ts, or call setQueue(myQueue) at boot.");
+            }
+            const queues = parseQueues(this.queue);
+            process.stdout.write(`[bay] worker started — queues: ${(queues ?? ["default"]).join(", ")}, concurrency: ${this.concurrency ?? 1}\n`);
+            await manager.work({
+                queues,
+                concurrency: this.concurrency,
+            });
+        }
+    };
+}
+//# sourceMappingURL=queueWork.js.map

package/dist/console/queueWork.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queueWork.js","sourceRoot":"","sources":["../../src/console/queueWork.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAwB,IAAI,EAAE,MAAM,eAAe,CAAC;AAE3D,mFAAmF;AACnF,MAAM,UAAU,WAAW,CAAC,KAAyB;IACpD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,KAAK,GAAG,KAAK;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACpC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC/B,OAAO,MAAM,SAAS;QACrB,MAAM,CAAC,WAAW,GAAG,YAAY,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,kDAAkD,CAAC;QACxE,qEAAqE;QACrE,qDAAqD;QACrD,MAAM,CAAC,OAAO,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACtD,MAAM,CAAC,KAAK,GAAG;YACd,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE;gBACvB,WAAW,EACV,wEAAwE;aACzE,CAAC;YACF,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE;gBAC7B,WAAW,EAAE,2CAA2C;aACxD,CAAC;SACF,CAAC;QAKF,KAAK,CAAC,GAAG;YACR,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,kEAAkE;gBAClE,8DAA8D;gBAC9D,MAAM,IAAI,KAAK,CACd,4EAA4E;oBAC3E,mEAAmE,CACpE,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CACnB,kCAAkC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAC/G,CAAC;YAEF,MAAM,OAAO,CAAC,IAAI,CAAC;gBAClB,MAAM;gBACN,WAAW,EAAE,IAAI,CAAC,WAAW;aAC7B,CAAC,CAAC;QACJ,CAAC;KACD,CAAC;AACH,CAAC"}

package/dist/drivers/MemoryDriver.d.ts

@@ -1,18 +1,24 @@
 /**
- * Memory queue driver — in-process queue for development.
+ * Memory queue driver — in-process queue for development and tests.
  */
-import type { Job, QueueDriver } from "../QueueManager.js";
+import { type JobRecord, type QueueDriver } from "../QueueManager.js";
 export declare class MemoryDriver implements QueueDriver {
     #private;
     constructor(options?: {
         maxFailedJobs?: number;
     });
-    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>;
+    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[]>;
+    /**
+     * Everything waiting, across every queue — a delayed job included.
+     *
+     * It is queued; it is simply not due. Leaving it out would report an empty
+     * queue to anything draining one before shutdown.
+     */
     size(): Promise<number>;
 }
 //# sourceMappingURL=MemoryDriver.d.ts.map

package/dist/drivers/MemoryDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/MemoryDriver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE3D,qBAAa,YAAa,YAAW,WAAW;;gBAKnC,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE;IAI1C,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7B,GAAG,IAAI,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAI1B,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5C,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9B,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAIxB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CAG7B"}
+{"version":3,"file":"MemoryDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/MemoryDriver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAW,MAAM,oBAAoB,CAAC;AAE/E,qBAAa,YAAa,YAAW,WAAW;;gBAcnC,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE;IAwB1C,IAAI,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,GAAG,CACR,MAAM,GAAE,SAAS,MAAM,EAAoB,GACzC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAWtB,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASlD,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpC,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAIpC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CAK7B"}

package/dist/drivers/MemoryDriver.js

@@ -1,18 +1,63 @@
 /**
- * Memory queue driver — in-process queue for development.
+ * Memory queue driver — in-process queue for development and tests.
  */
+import { DEFAULT_QUEUE } from "../Job.js";
+import { queueOf } from "../QueueManager.js";
 export class MemoryDriver {
-    #pending = [];
+    /** One list per named queue, created on first use. */
+    #pending = new Map();
+    /**
+     * Jobs whose `runAt` has not arrived, oldest deadline first.
+     *
+     * Kept apart from the queues rather than filtered on the way out: a delayed
+     * job at the head of a list would otherwise be skipped over on every poll,
+     * and a queue whose head is not due would look empty while it is not.
+     */
+    #delayed = [];
     #failedJobs = [];
     #maxFailedJobs;
     constructor(options) {
         this.#maxFailedJobs = options?.maxFailedJobs ?? 1000;
     }
+    #queue(name) {
+        const existing = this.#pending.get(name);
+        if (existing !== undefined)
+            return existing;
+        const created = [];
+        this.#pending.set(name, created);
+        return created;
+    }
+    /** Move everything whose delay has elapsed into its queue. */
+    #promoteDue(now = Date.now()) {
+        if (this.#delayed.length === 0)
+            return;
+        const due = this.#delayed.filter((job) => (job.runAt ?? 0) <= now);
+        if (due.length === 0)
+            return;
+        this.#delayed = this.#delayed.filter((job) => (job.runAt ?? 0) > now);
+        for (const job of due) {
+            job.runAt = undefined;
+            this.#queue(queueOf(job)).push(job);
+        }
+    }
     async push(job) {
-        this.#pending.push(job);
+        if (job.runAt !== undefined && job.runAt > Date.now()) {
+            this.#delayed.push(job);
+            this.#delayed.sort((a, b) => (a.runAt ?? 0) - (b.runAt ?? 0));
+            return;
+        }
+        this.#queue(queueOf(job)).push(job);
     }
-    async pop() {
-        return this.#pending.shift() ?? null;
+    async pop(queues = [DEFAULT_QUEUE]) {
+        this.#promoteDue();
+        // In the order given: naming `['critical', 'default']` is how a worker
+        // says which queue it would rather drain first.
+        for (const name of queues) {
+            const next = this.#pending.get(name)?.shift();
+            if (next !== undefined)
+                return next;
+        }
+        return null;
     }
     async fail(job, error) {
         job.error = error;
@@ -27,13 +72,22 @@ export class MemoryDriver {
     }
     async retry(job) {
         job.status = "pending";
-        this.#pending.push(job);
+        this.#queue(queueOf(job)).push(job);
     }
     async failed() {
         return [...this.#failedJobs];
     }
+    /**
+     * Everything waiting, across every queue — a delayed job included.
+     *
+     * It is queued; it is simply not due. Leaving it out would report an empty
+     * queue to anything draining one before shutdown.
+     */
     async size() {
-        return this.#pending.length;
+        let total = this.#delayed.length;
+        for (const jobs of this.#pending.values())
+            total += jobs.length;
+        return total;
     }
 }
 //# sourceMappingURL=MemoryDriver.js.map

package/dist/drivers/MemoryDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryDriver.js","sourceRoot":"","sources":["../../src/drivers/MemoryDriver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,MAAM,OAAO,YAAY;IACxB,QAAQ,GAAU,EAAE,CAAC;IACrB,WAAW,GAAU,EAAE,CAAC;IACxB,cAAc,CAAS;IAEvB,YAAY,OAAoC;QAC/C,IAAI,CAAC,cAAc,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAQ;QAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAQ,EAAE,KAAa;QACjC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC;QAClB,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACnD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3E,CAAC;IACF,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAS;QACvB,kCAAkC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAQ;QACnB,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM;QACX,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC7B,CAAC;CACD"}
+{"version":3,"file":"MemoryDriver.js","sourceRoot":"","sources":["../../src/drivers/MemoryDriver.ts"],"names":[],"mappings":"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"}

package/dist/drivers/RedisDriver.d.ts

@@ -17,17 +17,32 @@
  * { PX: ms }) does NOT satisfy this interface and would drop the lease TTL — it
  * needs a thin adapter.
  */
-import type { Job, QueueDriver } from "../QueueManager.js";
+import { type JobRecord, type QueueDriver } from "../QueueManager.js";
 export interface RedisClient {
     rpush(key: string, ...values: string[]): Promise<number>;
     lpop(key: string): Promise<string | null>;
     lmove?(source: string, destination: string, from: "LEFT" | "RIGHT", to: "LEFT" | "RIGHT"): Promise<string | null>;
     lrem(key: string, count: number, element: string): Promise<number>;
+    /**
+     * Optional, like `lmove`. Present on ioredis; without it the failed list
+     * simply keeps its entries, which is what this driver did before.
+     */
+    ltrim?(key: string, start: number, stop: number): Promise<string>;
     llen(key: string): Promise<number>;
     lrange(key: string, start: number, stop: number): Promise<string[]>;
     del(key: string): Promise<number>;
     set(key: string, value: string, ...args: string[]): Promise<string | null>;
     get(key: string): Promise<string | null>;
+    /**
+     * Sorted-set commands, for delayed jobs. Optional like `lmove`: a client
+     * without them can still run a queue, and `push` refuses a job carrying a
+     * `delay` rather than running it early — which is the one thing a delay
+     * must not do.
+     */
+    zadd?(key: string, score: number, member: string): Promise<number | string>;
+    zrangebyscore?(key: string, min: number | string, max: number | string, ...args: string[]): Promise<string[]>;
+    zrem?(key: string, ...members: string[]): Promise<number>;
+    zcard?(key: string): Promise<number>;
 }
 /**
  * Where the client comes from. A resolver is what lets a queue name its
@@ -47,14 +62,51 @@ export declare class RedisDriver implements QueueDriver {
          * deployment makes, not one a version check makes for it.
          */
         allowNonAtomicPop?: boolean;
+        /**
+         * How many times a job may be reclaimed from a stalled worker before
+         * it is filed as failed instead of pushed round again. Default `1`,
+         * upstream's default for the same setting.
+         *
+         * Unbounded recovery is a job that kills its worker taking the whole
+         * queue down with it, forever: the crash never reaches the failure
+         * path, so `attempts` never moves and `maxAttempts` never applies.
+         */
+        maxStalledCount?: number;
+        /**
+         * How many failed jobs to keep. Default `1000` — the ceiling the
+         * memory driver already had. `0` keeps every one of them.
+         *
+         * Only enforced when the client answers `ltrim`.
+         */
+        maxFailedJobs?: number;
     });
-    push(job: Job): Promise<void>;
-    pop(): Promise<Job | null>;
-    complete(job: Job): Promise<void>;
-    fail(job: Job, error: string): Promise<void>;
-    retry(job: Job): Promise<void>;
+    /**
+     * Renew a lease at half its length: two chances to be heard before the
+     * deadline, so one slow round-trip does not hand a running job to somebody
+     * else. Read by `QueueManager` while a handler runs.
+     */
+    get renewIntervalMs(): number;
+    push(job: JobRecord): Promise<void>;
+    pop(queues?: readonly string[]): Promise<JobRecord | null>;
+    /**
+     * Say the job is still being worked on, and push its deadline back.
+     *
+     * Answers `false` when there is nothing left to renew — the lease expired
+     * and the job was recovered, or it was recovered and re-popped by another
+     * worker, whose claim this one must not extend.
+     */
+    renew(job: JobRecord): Promise<boolean>;
+    complete(job: JobRecord): Promise<void>;
+    fail(job: JobRecord, error: string): Promise<void>;
+    retry(job: JobRecord): Promise<void>;
     recoverStale(): Promise<number>;
-    failed(): Promise<Job[]>;
-    size(): Promise<number>;
+    failed(): Promise<JobRecord[]>;
+    /**
+     * How many jobs are waiting on `queue` — its list plus its delayed set.
+     *
+     * A delayed job is queued; it is simply not due. Counting only the list
+     * reported an empty queue to anything draining one before shutdown.
+     */
+    size(queue?: string): Promise<number>;
 }
 //# sourceMappingURL=RedisDriver.d.ts.map

package/dist/drivers/RedisDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC3B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,KAAK,CAAC,CACL,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GAAG,OAAO,EACtB,EAAE,EAAE,MAAM,GAAG,OAAO,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3E,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACzC;AAcD;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAC1B,WAAW,GACX,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAmD9C,qBAAa,WAAY,YAAW,WAAW;;gBAsC7C,MAAM,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B;;;;WAIG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC5B;IAkCI,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7B,GAAG,IAAI,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAkD1B,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5C,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IA8D/B,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAexB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CAI7B"}
+{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAW,MAAM,oBAAoB,CAAC;AAG/E,MAAM,WAAW,WAAW;IAC3B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,KAAK,CAAC,CACL,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GAAG,OAAO,EACtB,EAAE,EAAE,MAAM,GAAG,OAAO,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE;;;OAGG;IACH,KAAK,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3E,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACzC;;;;;OAKG;IACH,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAC5E,aAAa,CAAC,CACb,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,GAAG,IAAI,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrB,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,KAAK,CAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACrC;AAiDD;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAC1B,WAAW,GACX,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;AAuD9C,qBAAa,WAAY,YAAW,WAAW;;gBAsC7C,MAAM,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B;;;;WAIG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B;;;;;;;;WAQG;QACH,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB;;;;;WAKG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KACvB;IA4CF;;;;OAIG;IACH,IAAI,eAAe,IAAI,MAAM,CAE5B;IA2BK,IAAI,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnC,GAAG,CACR,MAAM,GAAE,SAAS,MAAM,EAAoB,GACzC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA6C5B;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAavC,QAAQ,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASlD,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IA6G/B,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAepC;;;;;OAKG;IACG,IAAI,CAAC,KAAK,GAAE,MAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;CAwD1D"}

package/dist/drivers/RedisDriver.js

@@ -17,16 +17,39 @@
  * { PX: ms }) does NOT satisfy this interface and would drop the lease TTL — it
  * needs a thin adapter.
  */
-import { inProduction } from "../nodeEnv.js";
+import { DEFAULT_QUEUE } from "../Job.js";
+import { queueOf } from "../QueueManager.js";
+import { inProduction } from "../vendor/nodeEnv.js";
 function isValidJob(obj) {
     if (typeof obj !== "object" || obj === null)
         return false;
-    const j = obj;
-    return (typeof j.id === "string" &&
-        typeof j.name === "string" &&
-        typeof j.attempts === "number" &&
-        typeof j.maxAttempts === "number" &&
-        typeof j.status === "string");
+    return (typeof Reflect.get(obj, "id") === "string" &&
+        typeof Reflect.get(obj, "name") === "string" &&
+        typeof Reflect.get(obj, "attempts") === "number" &&
+        typeof Reflect.get(obj, "maxAttempts") === "number" &&
+        typeof Reflect.get(obj, "status") === "string");
+}
+/**
+ * Read a lease back. A value written by an older version of this driver is the
+ * raw job string on its own, with no owner — still usable for the one thing
+ * `#removeFromProcessing` needs it for.
+ */
+function readLease(stored) {
+    let parsed;
+    try {
+        parsed = JSON.parse(stored);
+    }
+    catch {
+        return { raw: stored };
+    }
+    if (typeof parsed !== "object" || parsed === null)
+        return { raw: stored };
+    const raw = Reflect.get(parsed, "raw");
+    const owner = Reflect.get(parsed, "owner");
+    if (typeof raw !== "string" || typeof owner !== "string") {
+        return { raw: stored };
+    }
+    return { owner, raw };
 }
 /**
  * LMOVE (Redis 6.2+) is what makes pop() atomic. Warned once, when the client
@@ -42,6 +65,10 @@ function checkLmove(client, allowNonAtomicPop) {
     // job from pending before it reaches processing: nothing recovers it,
     // because nothing knows it existed. That is a different product, and in
     // production it must be asked for rather than fallen into.
+    // Read through `inProduction()` rather than `NODE_ENV === "production"`:
+    // `NODE_ENV=prod` is ordinary in a Dockerfile, and taken verbatim it answers
+    // "not production" — so this queue would silently accept a delivery
+    // guarantee weaker than the one it advertises.
     if (inProduction() && !allowNonAtomicPop) {
         throw new Error("[bay] this Redis client has no LMOVE (Redis < 6.2), so pop() would be a non-atomic lpop+rpush — " +
             "a crash between the two loses the in-flight job, turning at-least-once delivery into at-most-once.\n" +
@@ -131,26 +158,71 @@ export class RedisDriver {
             throw new Error(`[bay] RedisDriver visibilityTimeoutMs must be a positive integer (ms), got ${visibilityTimeout}`);
         }
         this.#visibilityTimeout = visibilityTimeout;
+        const maxStalled = options?.maxStalledCount ?? 1;
+        if (!Number.isInteger(maxStalled) || maxStalled < 0) {
+            throw new Error(`[bay] RedisDriver maxStalledCount must be a non-negative integer, got ${maxStalled}`);
+        }
+        this.#maxStalledCount = maxStalled;
+        const maxFailed = options?.maxFailedJobs ?? 1000;
+        if (!Number.isInteger(maxFailed) || maxFailed < 0) {
+            throw new Error(`[bay] RedisDriver maxFailedJobs must be a non-negative integer, got ${maxFailed}`);
+        }
+        this.#maxFailedJobs = maxFailed;
+    }
+    /**
+     * Renew a lease at half its length: two chances to be heard before the
+     * deadline, so one slow round-trip does not hand a running job to somebody
+     * else. Read by `QueueManager` while a handler runs.
+     */
+    get renewIntervalMs() {
+        return Math.max(1, Math.floor(this.#visibilityTimeout / 2));
     }
-    #pendingKey = () => `${this.#prefix}pending`;
+    /**
+     * Where one queue's jobs wait.
+     *
+     * The default queue keeps the key it always had. Naming it
+     * `queue:default:pending` would have been tidier and would have orphaned
+     * every job already sitting in `queue:pending` at the moment of the upgrade
+     * — a silent loss, since nothing reads the old key afterwards.
+     */
+    #pendingKey = (queue = DEFAULT_QUEUE) => queue === DEFAULT_QUEUE
+        ? `${this.#prefix}pending`
+        : `${this.#prefix}q:${queue}:pending`;
+    #delayedKey = (queue = DEFAULT_QUEUE) => queue === DEFAULT_QUEUE
+        ? `${this.#prefix}delayed`
+        : `${this.#prefix}q:${queue}:delayed`;
     #processingKey = () => `${this.#prefix}processing`;
     #allowNonAtomicPop = false;
+    #maxStalledCount = 1;
+    #maxFailedJobs = 1000;
+    /** This driver instance, as a lease owner. */
+    #workerId = crypto.randomUUID();
     #failedKey = () => `${this.#prefix}failed`;
     #leaseKey = (jobId) => `${this.#prefix}lease:${jobId}`;
     async push(job) {
         const client = await this.#client();
-        await client.rpush(this.#pendingKey(), JSON.stringify(job));
+        const queue = queueOf(job);
+        if (job.runAt !== undefined && job.runAt > Date.now()) {
+            if (!client.zadd) {
+                // Pushing it to the list instead would run it now, which is the
+                // one thing a delay exists to prevent.
+                throw new Error("This Redis client cannot hold a delayed job: it has no ZADD. " +
+                    "Use a client with sorted-set commands (ioredis has them), or dispatch without `delay`.");
+            }
+            await client.zadd(this.#delayedKey(queue), job.runAt, JSON.stringify(job));
+            return;
+        }
+        await client.rpush(this.#pendingKey(queue), JSON.stringify(job));
     }
-    async pop() {
+    async pop(queues = [DEFAULT_QUEUE]) {
         const client = await this.#client();
         let raw = null;
-        if (client.lmove) {
-            raw = await client.lmove(this.#pendingKey(), this.#processingKey(), "LEFT", "RIGHT");
-        }
-        else {
-            raw = await client.lpop(this.#pendingKey());
-            if (raw)
-                await client.rpush(this.#processingKey(), raw);
+        // In the order given, so a worker can say which queue it drains first.
+        for (const queue of queues) {
+            await this.#promoteDue(client, queue);
+            raw = await this.#take(client, queue);
+            if (raw !== null)
+                break;
         }
         if (!raw)
             return null;
@@ -177,9 +249,29 @@ export class RedisDriver {
         // bad job. The error propagates and the job STAYS in processing with
         // no lease, which is precisely the state recoverStale() puts back in
         // pending — so the delivery guarantee survives the blip.
-        await client.set(this.#leaseKey(parsed.id), raw, "PX", String(this.#visibilityTimeout));
+        await client.set(this.#leaseKey(parsed.id), JSON.stringify({ owner: this.#workerId, raw }), "PX", String(this.#visibilityTimeout));
         return parsed;
     }
+    /**
+     * Say the job is still being worked on, and push its deadline back.
+     *
+     * Answers `false` when there is nothing left to renew — the lease expired
+     * and the job was recovered, or it was recovered and re-popped by another
+     * worker, whose claim this one must not extend.
+     */
+    async renew(job) {
+        const client = await this.#client();
+        const key = this.#leaseKey(job.id);
+        const stored = await client.get(key);
+        if (stored === null)
+            return false;
+        const lease = readLease(stored);
+        if (lease.owner !== undefined && lease.owner !== this.#workerId) {
+            return false;
+        }
+        await client.set(key, stored, "PX", String(this.#visibilityTimeout));
+        return true;
+    }
     async complete(job) {
         const client = await this.#client();
         await this.#removeFromProcessing(job);
@@ -191,14 +283,14 @@ export class RedisDriver {
         await client.del(this.#leaseKey(job.id));
         job.error = error;
         job.status = "failed";
-        await client.rpush(this.#failedKey(), JSON.stringify(job));
+        await this.#pushFailed(client, job);
     }
     async retry(job) {
         const client = await this.#client();
         await this.#removeFromProcessing(job);
         await client.del(this.#leaseKey(job.id));
         job.status = "pending";
-        await client.rpush(this.#pendingKey(), JSON.stringify(job));
+        await client.rpush(this.#pendingKey(queueOf(job)), JSON.stringify(job));
     }
     async recoverStale() {
         const client = await this.#client();
@@ -220,29 +312,72 @@ export class RedisDriver {
                 continue;
             }
             const lease = await client.get(this.#leaseKey(parsed.id));
-            if (lease === null) {
-                await client.lrem(this.#processingKey(), 1, raw);
-                parsed.status = "pending";
-                await client.rpush(this.#pendingKey(), JSON.stringify(parsed));
-                recovered++;
+            if (lease !== null)
+                continue;
+            // The LREM is the claim, and its RESULT decides who acts. Two
+            // recovery passes overlapping — two workers, or one worker whose
+            // pass ran long — both read the same expired entry, and both used to
+            // push it back to pending: one job, delivered twice, from the
+            // mechanism that exists to make delivery reliable. Exactly one LREM
+            // can remove a given element, so exactly one pass continues past
+            // here. (A crash between this and the RPUSH below still loses the
+            // entry; closing that needs the whole pass in one server-side script,
+            // which is how upstream does it.)
+            const claimed = await client.lrem(this.#processingKey(), 1, raw);
+            if (claimed === 0)
+                continue;
+            // A stall is not an attempt: the worker died before the handler
+            // could fail, so `attempts` never moved and `maxAttempts` never
+            // applied. A job that kills whatever picks it up was therefore
+            // recovered forever, taking the queue with it. Counted separately,
+            // and bounded — upstream bounds the same thing with the same
+            // default, failing the job once it is exceeded.
+            const stalled = (parsed.stalledCount ?? 0) + 1;
+            if (stalled > this.#maxStalledCount) {
+                parsed.stalledCount = stalled;
+                parsed.status = "failed";
+                parsed.error = `Stalled ${stalled} time(s) without completing (maxStalledCount ${this.#maxStalledCount})`;
+                await this.#pushFailed(client, parsed);
+                continue;
             }
+            parsed.stalledCount = stalled;
+            parsed.status = "pending";
+            // Back to the queue it came from, not to the default one: a recovered
+            // job whose queue nobody serves would never run again.
+            await client.rpush(this.#pendingKey(queueOf(parsed)), JSON.stringify(parsed));
+            recovered++;
         }
         return recovered;
     }
+    /**
+     * File a job as failed, keeping the list to `maxFailedJobs`.
+     *
+     * Unbounded, the failed list is a leak with no ceiling and no owner: nothing
+     * trims it, and `failed()` reads all of it in one LRANGE. The memory driver
+     * has capped its own at a thousand from the start; this is the same cap on
+     * the driver where the list actually survives a restart.
+     */
+    async #pushFailed(client, job) {
+        await client.rpush(this.#failedKey(), JSON.stringify(job));
+        if (this.#maxFailedJobs === 0 || !client.ltrim)
+            return;
+        await client.ltrim(this.#failedKey(), -this.#maxFailedJobs, -1);
+    }
     /**
      * Remove the entry for `job` from the processing list. The string in
      * Redis is whatever pop() pushed, but QueueManager mutates `job` after
      * pop returns (attempts++, status="processing", processedAt, then
      * completed/failed/pending). LREM-ing on `JSON.stringify(job)` would
-     * therefore miss every real-world entry. Use the lease — set to the
-     * exact raw string at pop() time — and fall back to a list scan when
+     * therefore miss every real-world entry. Use the lease — which carries
+     * the exact raw string pop() moved — and fall back to a list scan when
      * the lease has expired (e.g. recoverStale already handled it).
      */
     async #removeFromProcessing(job) {
         const client = await this.#client();
         const stored = await client.get(this.#leaseKey(job.id));
         if (stored !== null) {
-            const removed = await client.lrem(this.#processingKey(), 1, stored);
+            const { raw } = readLease(stored);
+            const removed = await client.lrem(this.#processingKey(), 1, raw);
             if (removed > 0)
                 return;
         }
@@ -278,9 +413,58 @@ export class RedisDriver {
         })
             .filter((j) => j !== null);
     }
-    async size() {
+    /**
+     * How many jobs are waiting on `queue` — its list plus its delayed set.
+     *
+     * A delayed job is queued; it is simply not due. Counting only the list
+     * reported an empty queue to anything draining one before shutdown.
+     */
+    async size(queue = DEFAULT_QUEUE) {
         const client = await this.#client();
-        return client.llen(this.#pendingKey());
+        const waiting = await client.llen(this.#pendingKey(queue));
+        const delayed = client.zcard
+            ? await client.zcard(this.#delayedKey(queue))
+            : 0;
+        return waiting + delayed;
+    }
+    /**
+     * Move `queue`'s due jobs out of the delayed set and onto its list.
+     *
+     * `ZREM` is the claim: two workers can read the same due entry, and only
+     * the one whose removal returns 1 owns it. Without that the job is pushed
+     * onto the list once per worker that saw it.
+     */
+    async #promoteDue(client, queue) {
+        if (!client.zrangebyscore || !client.zrem)
+            return;
+        const due = await client.zrangebyscore(this.#delayedKey(queue), 0, Date.now(), "LIMIT", "0", "100");
+        for (const raw of due) {
+            const claimed = await client.zrem(this.#delayedKey(queue), raw);
+            if (claimed !== 1)
+                continue;
+            let parsed;
+            try {
+                parsed = JSON.parse(raw);
+            }
+            catch {
+                // Already removed from the set; there is nothing runnable to push.
+                continue;
+            }
+            if (!isValidJob(parsed))
+                continue;
+            parsed.runAt = undefined;
+            await client.rpush(this.#pendingKey(queue), JSON.stringify(parsed));
+        }
+    }
+    /** Take the head of one queue, claiming it in `processing`. */
+    async #take(client, queue) {
+        if (client.lmove) {
+            return client.lmove(this.#pendingKey(queue), this.#processingKey(), "LEFT", "RIGHT");
+        }
+        const raw = await client.lpop(this.#pendingKey(queue));
+        if (raw)
+            await client.rpush(this.#processingKey(), raw);
+        return raw;
     }
 }
 //# sourceMappingURL=RedisDriver.js.map