nuxt-cf-jobs 0.5.0 → 0.5.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-cf-jobs",
   "configKey": "cfJobs",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/server/batch.d.ts

@@ -1,5 +1,5 @@
 import type { D1DatabaseLike } from './d1.js';
-import type { DurableJobContinuation, DurableJobRecord, DurableJobRepository, QueuePublisher } from './outbox.js';
+import type { DispatchDurableJobBatchResult, DurableJobContinuation, DurableJobRecord, DurableJobRepository, QueuePublisher } from './outbox.js';
 /** A `job_batches` row as the lifecycle helpers consume it (post-decrement view). */
 export interface DurableBatchRecord {
     id: string;
@@ -81,11 +81,7 @@ export interface CreateJobBatchOptions<Name extends string = string, Payload ext
 export interface CreateJobBatchResult {
     batchId: string;
     jobIds: string[];
-    dispatched: Array<{
-        queue: string;
-        dispatched: boolean;
-        error?: unknown;
-    }>;
+    dispatched: Array<DispatchDurableJobBatchResult>;
 }
 /**
  * Atomically register a batch of jobs: insert the `job_batches` row with

package/dist/runtime/server/d1.d.ts

@@ -69,6 +69,14 @@ export interface D1DurableJobRepositoryOptions<Queue extends string = string> {
     jobsTable?: string;
     failedJobsTable?: string;
     batchesTable?: string;
+    /**
+     * Laravel's `retry_after`: when set, `claimJob` also reclaims a reservation
+     * older than this many seconds (a dead worker that never acked/released), in
+     * one atomic statement — so a redelivered message re-runs instead of bouncing
+     * until DLQ. MUST be longer than the slowest job, or a still-running job can be
+     * double-claimed. Default unset = only unreserved rows are claimable.
+     */
+    reclaimAfterSeconds?: number;
     /** Fire-and-forget hook invoked after a successful claim. Errors are swallowed. */
     onJobClaimed?: (input: {
         job: D1DurableJobRecord<Queue>;

package/dist/runtime/server/d1.js

@@ -88,16 +88,17 @@ export function createD1DurableJobRepository(db, opts = {}) {
     },
     async claimJob(id) {
       const now = currentUnixSeconds();
+      const reclaimBefore = typeof opts.reclaimAfterSeconds === "number" ? now - opts.reclaimAfterSeconds : -1;
       const job = await db.prepare(`
         UPDATE ${jobsTable}
         SET reserved_at = ?, attempts = attempts + 1
         WHERE id = ?
-          AND reserved_at IS NULL
+          AND (reserved_at IS NULL OR reserved_at <= ?)
           AND available_at <= ?
           AND completed_at IS NULL
           AND failed_at IS NULL
         RETURNING *
-      `).bind(now, id, now).first();
+      `).bind(now, id, reclaimBefore, now).first();
       if (job)
         fireHook(() => opts.onJobClaimed?.({ job }));
       return job;

package/dist/runtime/server/outbox.d.ts

@@ -200,22 +200,32 @@ export type EnqueueDurableJobResult = {
 export declare function enqueueDurableJob<Queue extends string, Record extends DurableJobRecord<Queue>>(repository: Pick<DurableJobRepository<Queue, Record>, 'insertJob'>, publisher: Pick<QueuePublisher<Queue>, 'send'>, record: Record, opts?: {
     delaySeconds?: number;
 }): Promise<EnqueueDurableJobResult>;
+/**
+ * Per-queue outcome of a durable batch dispatch, discriminated on `status`:
+ * - `sent`: the queue accepted the batch.
+ * - `not-dispatched`: the queue binding was missing, so the send was skipped (no
+ *   throw); the rows are durable and a sweep will redispatch them.
+ * - `failed`: the send threw; `cause` is the raw (infra) throw. Also sweep-recoverable.
+ */
+export type DispatchDurableJobBatchResult<Queue extends string = string> = {
+    queue: Queue;
+    status: 'sent';
+} | {
+    queue: Queue;
+    status: 'not-dispatched';
+} | {
+    queue: Queue;
+    status: 'failed';
+    cause: unknown;
+};
 export interface SweepDurableJobsResult<Queue extends string> {
     swept: number;
-    dispatched: Array<{
-        queue: Queue;
-        dispatched: boolean;
-        error?: unknown;
-    }>;
+    dispatched: Array<DispatchDurableJobBatchResult<Queue>>;
 }
 export declare function sweepDispatchableDurableJobs<Queue extends string>(repository: Pick<DurableJobRecoveryRepository<Queue, Pick<DurableJobRecord<Queue>, 'id' | 'queue'>>, 'findDispatchableJobs'>, publisher: Pick<QueuePublisher<Queue>, 'sendBatch'>, query?: DurableJobRecoveryQuery): Promise<SweepDurableJobsResult<Queue>>;
 export declare function dispatchDurableJobBatch<Queue extends string>(publisher: Pick<QueuePublisher<Queue>, 'sendBatch'>, records: Array<Pick<DurableJobRecord<Queue>, 'id' | 'queue'>>, opts?: {
     delaySeconds?: number;
-}): Promise<Array<{
-    queue: Queue;
-    dispatched: boolean;
-    error?: unknown;
-}>>;
+}): Promise<Array<DispatchDurableJobBatchResult<Queue>>>;
 export type DurableJobMessageStatus = 'invalid-message' | DurableJobClaimMiss | 'dispatch-failed' | 'released' | 'failed' | 'completed' | 'errored';
 export interface RunDurableJobMessageOptions<StoredJob, Job extends DispatchableJob, Message extends QueueJobMessage = QueueJobMessage, Env = unknown, Db = unknown, Logger = unknown, CompleteResult = unknown, FailOptions = unknown> {
     message: Pick<QueueMessage<Message>, 'body' | 'ack' | 'retry'>;

package/dist/runtime/server/outbox.js

@@ -197,12 +197,10 @@ export async function dispatchDurableJobBatch(publisher, records, opts) {
   return await Promise.all(
     [...groups].map(async ([queue, messages]) => {
       try {
-        return {
-          queue,
-          dispatched: await publisher.sendBatch(queue, messages, opts)
-        };
-      } catch (error) {
-        return { queue, dispatched: false, error };
+        const sent = await publisher.sendBatch(queue, messages, opts);
+        return sent ? { queue, status: "sent" } : { queue, status: "not-dispatched" };
+      } catch (cause) {
+        return { queue, status: "failed", cause };
       }
     })
   );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-cf-jobs",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Nuxt module for typed Cloudflare queue jobs.",
   "author": {
     "name": "Harlan Wilton",