@spooled/sdk 1.0.34 → 1.0.35

package/dist/{index-CYEamGDj.d.cts → index-B96n0WUe.d.cts}

@@ -107,11 +107,11 @@ declare const DEFAULT_CONFIG: {
         successThreshold: number;
         timeout: number;
     };
-    readonly userAgent: "@spooled/sdk-nodejs/1.0.33";
+    readonly userAgent: "@spooled/sdk-nodejs/1.0.35";
     readonly autoRefreshToken: true;
 };
 /** SDK version */
-declare const SDK_VERSION = "1.0.33";
+declare const SDK_VERSION = "1.0.35";
 /** API version prefix */
 declare const API_VERSION = "v1";
 /**
@@ -559,7 +559,7 @@ interface Job {
     parentJobId?: string;
     completionWebhook?: string;
     assignedWorkerId?: string;
-    leaseId?: string;
+    leaseId?: string | null;
     leaseExpiresAt?: string;
     idempotencyKey?: string;
     updatedAt: string;
@@ -653,7 +653,7 @@ interface ClaimedJob {
      * worker actually holds (backend rejects stale leases with 409
      * LEASE_EXPIRED). Omitted = legacy behavior.
      */
-    leaseId?: string;
+    leaseId?: string | null;
 }
 /** Parameters for claiming jobs */
 interface ClaimJobsParams {
@@ -2620,7 +2620,7 @@ interface GrpcJob {
      * in Complete/Fail/RenewLease so the operation applies only to the lease
      * this worker actually holds (empty = legacy worker_id fence).
      */
-    leaseId?: string;
+    leaseId?: string | null;
 }
 /** Enqueue request */
 interface GrpcEnqueueRequest {
@@ -3369,6 +3369,7 @@ interface WorkerEventData {
 }
 /** Active job tracking */
 interface ActiveJob {
+    readonly executionId: symbol;
     job: ClaimedJob;
     startedAt: Date;
     heartbeatTimer?: ReturnType<typeof setInterval>;

package/dist/{index-CYEamGDj.d.ts → index-B96n0WUe.d.ts}

@@ -107,11 +107,11 @@ declare const DEFAULT_CONFIG: {
         successThreshold: number;
         timeout: number;
     };
-    readonly userAgent: "@spooled/sdk-nodejs/1.0.33";
+    readonly userAgent: "@spooled/sdk-nodejs/1.0.35";
     readonly autoRefreshToken: true;
 };
 /** SDK version */
-declare const SDK_VERSION = "1.0.33";
+declare const SDK_VERSION = "1.0.35";
 /** API version prefix */
 declare const API_VERSION = "v1";
 /**
@@ -559,7 +559,7 @@ interface Job {
     parentJobId?: string;
     completionWebhook?: string;
     assignedWorkerId?: string;
-    leaseId?: string;
+    leaseId?: string | null;
     leaseExpiresAt?: string;
     idempotencyKey?: string;
     updatedAt: string;
@@ -653,7 +653,7 @@ interface ClaimedJob {
      * worker actually holds (backend rejects stale leases with 409
      * LEASE_EXPIRED). Omitted = legacy behavior.
      */
-    leaseId?: string;
+    leaseId?: string | null;
 }
 /** Parameters for claiming jobs */
 interface ClaimJobsParams {
@@ -2620,7 +2620,7 @@ interface GrpcJob {
      * in Complete/Fail/RenewLease so the operation applies only to the lease
      * this worker actually holds (empty = legacy worker_id fence).
      */
-    leaseId?: string;
+    leaseId?: string | null;
 }
 /** Enqueue request */
 interface GrpcEnqueueRequest {
@@ -3369,6 +3369,7 @@ interface WorkerEventData {
 }
 /** Active job tracking */
 interface ActiveJob {
+    readonly executionId: symbol;
     job: ClaimedJob;
     startedAt: Date;
     heartbeatTimer?: ReturnType<typeof setInterval>;

package/dist/index.cjs

@@ -49,10 +49,10 @@ var DEFAULT_CONFIG = {
     successThreshold: 3,
     timeout: 3e4
   },
-  userAgent: "@spooled/sdk-nodejs/1.0.33",
+  userAgent: "@spooled/sdk-nodejs/1.0.35",
   autoRefreshToken: true
 };
-var SDK_VERSION = "1.0.33";
+var SDK_VERSION = "1.0.35";
 var API_VERSION = "v1";
 var API_BASE_PATH = `/api/${API_VERSION}`;
 function normalizeCredential(value) {
@@ -3288,7 +3288,7 @@ var SpooledWorker = class {
       ...DEFAULT_OPTIONS,
       hostname: os.hostname(),
       workerType: "nodejs",
-      version: "1.0.34",
+      version: SDK_VERSION,
       metadata: {},
       ...options
     };
@@ -3395,11 +3395,11 @@ var SpooledWorker = class {
         this.waitForActiveJobs(),
         this.sleep(this.options.shutdownTimeout)
       ]);
-      const remaining = Array.from(this.activeJobs.entries());
-      for (const [jobId, active] of remaining) {
-        this.debug(`Force-failing job ${jobId} due to shutdown timeout`);
+      const remaining = Array.from(this.activeJobs.values());
+      for (const active of remaining) {
+        this.debug(`Force-failing job ${active.job.id} due to shutdown timeout`);
         await this.failJob(active.job, "Worker shutdown timeout");
-        this.cleanupJob(jobId);
+        this.cleanupJob(active);
       }
     }
     if (this.workerId) {
@@ -3482,14 +3482,15 @@ var SpooledWorker = class {
     this.emit("job:claimed", { jobId: job.id, queueName: job.queueName });
     const abortController = new AbortController();
     const activeJob = {
+      executionId: Symbol(job.id),
       job,
       startedAt: /* @__PURE__ */ new Date(),
       abortController
     };
-    this.activeJobs.set(job.id, activeJob);
+    this.activeJobs.set(activeJob.executionId, activeJob);
     const heartbeatInterval = this.options.leaseDuration * this.options.heartbeatFraction * 1e3;
     activeJob.heartbeatTimer = setInterval(() => {
-      this.sendJobHeartbeat(job.id);
+      this.sendJobHeartbeat(activeJob);
     }, heartbeatInterval);
     this.executeHandler(activeJob);
   }
@@ -3525,7 +3526,7 @@ var SpooledWorker = class {
       const errorMessage = error instanceof Error ? error.message : String(error);
       await this.failJob(job, errorMessage);
     } finally {
-      this.cleanupJob(job.id);
+      this.cleanupJob(activeJob);
     }
   }
   async completeJob(job, result) {
@@ -3534,7 +3535,7 @@ var SpooledWorker = class {
       await this.client.jobs.complete(job.id, {
         workerId: this.workerId,
         result,
-        ...job.leaseId !== void 0 && { leaseId: job.leaseId }
+        ...job.leaseId != null && { leaseId: job.leaseId }
       });
       this.emit("job:completed", {
         jobId: job.id,
@@ -3552,7 +3553,7 @@ var SpooledWorker = class {
       await this.client.jobs.fail(job.id, {
         workerId: this.workerId,
         error: errorMessage,
-        ...job.leaseId !== void 0 && { leaseId: job.leaseId }
+        ...job.leaseId != null && { leaseId: job.leaseId }
       });
       this.emit("job:failed", {
         jobId: job.id,
@@ -3564,24 +3565,26 @@ var SpooledWorker = class {
       this.debug(`Failed to fail job ${job.id}`, error);
     }
   }
-  cleanupJob(jobId) {
-    const activeJob = this.activeJobs.get(jobId);
-    if (activeJob?.heartbeatTimer) {
+  cleanupJob(activeJob) {
+    if (activeJob.heartbeatTimer) {
       clearInterval(activeJob.heartbeatTimer);
+      activeJob.heartbeatTimer = void 0;
+    }
+    if (this.activeJobs.get(activeJob.executionId) === activeJob) {
+      this.activeJobs.delete(activeJob.executionId);
     }
-    this.activeJobs.delete(jobId);
   }
-  async sendJobHeartbeat(jobId) {
+  async sendJobHeartbeat(activeJob) {
     if (!this.workerId) return;
-    const leaseId = this.activeJobs.get(jobId)?.job.leaseId;
+    const { job } = activeJob;
     try {
-      await this.client.jobs.heartbeat(jobId, {
+      await this.client.jobs.heartbeat(job.id, {
         workerId: this.workerId,
         leaseDurationSecs: this.options.leaseDuration,
-        ...leaseId !== void 0 && { leaseId }
+        ...job.leaseId != null && { leaseId: job.leaseId }
       });
     } catch (error) {
-      this.debug(`Job heartbeat failed for ${jobId}`, error);
+      this.debug(`Job heartbeat failed for ${job.id}`, error);
     }
   }
   async sendWorkerHeartbeat() {