@workglow/job-queue 0.0.69 → 0.0.70

package/dist/bun.js

@@ -137,6 +137,71 @@ class Job {
 // src/job/JobQueueClient.ts
 import { JobStatus as JobStatus2 } from "@workglow/storage";
 import { EventEmitter } from "@workglow/util";
+
+// src/job/JobStorageConverters.ts
+function toDate(date) {
+  if (!date)
+    return null;
+  const d = new Date(date);
+  return isNaN(d.getTime()) ? null : d;
+}
+function dateToISOString(date) {
+  if (!date)
+    return null;
+  return isNaN(date.getTime()) ? null : date.toISOString();
+}
+function storageToClass(details, jobClass, options) {
+  const includeWorkerId = options?.includeWorkerId ?? true;
+  return new jobClass({
+    id: details.id,
+    jobRunId: details.job_run_id,
+    queueName: details.queue,
+    fingerprint: details.fingerprint,
+    input: details.input,
+    output: details.output,
+    runAfter: toDate(details.run_after),
+    createdAt: toDate(details.created_at),
+    deadlineAt: toDate(details.deadline_at),
+    lastRanAt: toDate(details.last_ran_at),
+    completedAt: toDate(details.completed_at),
+    progress: details.progress || 0,
+    progressMessage: details.progress_message || "",
+    progressDetails: details.progress_details ?? null,
+    status: details.status,
+    error: details.error ?? null,
+    errorCode: details.error_code ?? null,
+    runAttempts: details.run_attempts ?? 0,
+    maxRetries: details.max_retries ?? 10,
+    ...includeWorkerId ? { workerId: details.worker_id ?? null } : {}
+  });
+}
+function classToStorage(job, queueName) {
+  const now = new Date().toISOString();
+  return {
+    id: job.id,
+    job_run_id: job.jobRunId,
+    queue: job.queueName || queueName,
+    fingerprint: job.fingerprint,
+    input: job.input,
+    status: job.status,
+    output: job.output ?? null,
+    error: job.error === null ? null : String(job.error),
+    error_code: job.errorCode || null,
+    run_attempts: job.runAttempts ?? 0,
+    max_retries: job.maxRetries ?? 10,
+    run_after: dateToISOString(job.runAfter) ?? now,
+    created_at: dateToISOString(job.createdAt) ?? now,
+    deadline_at: dateToISOString(job.deadlineAt),
+    last_ran_at: dateToISOString(job.lastRanAt),
+    completed_at: dateToISOString(job.completedAt),
+    progress: job.progress ?? 0,
+    progress_message: job.progressMessage ?? "",
+    progress_details: job.progressDetails ?? null,
+    worker_id: job.workerId ?? null
+  };
+}
+
+// src/job/JobQueueClient.ts
 class JobQueueClient {
   queueName;
   storage;
@@ -267,7 +332,7 @@ class JobQueueClient {
       throw new JobNotFoundError("Cannot abort job run with undefined jobRunId");
     const jobs = await this.getJobsByRunId(jobRunId);
     await Promise.allSettled(jobs.map((job) => {
-      if ([JobStatus2.PROCESSING, JobStatus2.PENDING].includes(job.status)) {
+      if (job.status === JobStatus2.PROCESSING || job.status === JobStatus2.PENDING) {
         return this.abort(job.id);
       }
     }));
@@ -300,6 +365,9 @@ class JobQueueClient {
   waitOn(event) {
     return this.events.waitOn(event);
   }
+  subscribe(event, listener) {
+    return this.events.subscribe(event, listener);
+  }
   handleJobStart(jobId) {
     this.lastKnownProgress.set(jobId, {
       progress: 0,
@@ -389,33 +457,7 @@ class JobQueueClient {
     }
   }
   storageToClass(details) {
-    const toDate = (date) => {
-      if (!date)
-        return null;
-      const d = new Date(date);
-      return isNaN(d.getTime()) ? null : d;
-    };
-    return new Job({
-      id: details.id,
-      jobRunId: details.job_run_id,
-      queueName: details.queue,
-      fingerprint: details.fingerprint,
-      input: details.input,
-      output: details.output,
-      runAfter: toDate(details.run_after),
-      createdAt: toDate(details.created_at),
-      deadlineAt: toDate(details.deadline_at),
-      lastRanAt: toDate(details.last_ran_at),
-      completedAt: toDate(details.completed_at),
-      progress: details.progress || 0,
-      progressMessage: details.progress_message || "",
-      progressDetails: details.progress_details ?? null,
-      status: details.status,
-      error: details.error ?? null,
-      errorCode: details.error_code ?? null,
-      runAttempts: details.run_attempts ?? 0,
-      maxRetries: details.max_retries ?? 10
-    });
+    return storageToClass(details, Job, { includeWorkerId: true });
   }
   buildErrorFromJob(job) {
     return this.buildErrorFromCode(job.error || "Job failed", job.errorCode ?? undefined);
@@ -737,64 +779,10 @@ class JobQueueWorker {
     this.activeJobAbortControllers.delete(jobId);
   }
   storageToClass(details) {
-    const toDate = (date) => {
-      if (!date)
-        return null;
-      const d = new Date(date);
-      return isNaN(d.getTime()) ? null : d;
-    };
-    return new this.jobClass({
-      id: details.id,
-      jobRunId: details.job_run_id,
-      queueName: details.queue,
-      fingerprint: details.fingerprint,
-      input: details.input,
-      output: details.output,
-      runAfter: toDate(details.run_after),
-      createdAt: toDate(details.created_at),
-      deadlineAt: toDate(details.deadline_at),
-      lastRanAt: toDate(details.last_ran_at),
-      completedAt: toDate(details.completed_at),
-      progress: details.progress || 0,
-      progressMessage: details.progress_message || "",
-      progressDetails: details.progress_details ?? null,
-      status: details.status,
-      error: details.error ?? null,
-      errorCode: details.error_code ?? null,
-      runAttempts: details.run_attempts ?? 0,
-      maxRetries: details.max_retries ?? 10,
-      workerId: details.worker_id ?? null
-    });
+    return storageToClass(details, this.jobClass);
   }
   classToStorage(job) {
-    const dateToISOString = (date) => {
-      if (!date)
-        return null;
-      return isNaN(date.getTime()) ? null : date.toISOString();
-    };
-    const now = new Date().toISOString();
-    return {
-      id: job.id,
-      job_run_id: job.jobRunId,
-      queue: job.queueName || this.queueName,
-      fingerprint: job.fingerprint,
-      input: job.input,
-      status: job.status,
-      output: job.output ?? null,
-      error: job.error === null ? null : String(job.error),
-      error_code: job.errorCode || null,
-      run_attempts: job.runAttempts ?? 0,
-      max_retries: job.maxRetries ?? 10,
-      run_after: dateToISOString(job.runAfter) ?? now,
-      created_at: dateToISOString(job.createdAt) ?? now,
-      deadline_at: dateToISOString(job.deadlineAt),
-      last_ran_at: dateToISOString(job.lastRanAt),
-      completed_at: dateToISOString(job.completedAt),
-      progress: job.progress ?? 0,
-      progress_message: job.progressMessage ?? "",
-      progress_details: job.progressDetails ?? null,
-      worker_id: job.workerId ?? null
-    };
+    return classToStorage(job, this.queueName);
   }
 }
 
@@ -1038,64 +1026,10 @@ class JobQueueServer {
     }
   }
   storageToClass(details) {
-    const toDate = (date) => {
-      if (!date)
-        return null;
-      const d = new Date(date);
-      return isNaN(d.getTime()) ? null : d;
-    };
-    return new this.jobClass({
-      id: details.id,
-      jobRunId: details.job_run_id,
-      queueName: details.queue,
-      fingerprint: details.fingerprint,
-      input: details.input,
-      output: details.output,
-      runAfter: toDate(details.run_after),
-      createdAt: toDate(details.created_at),
-      deadlineAt: toDate(details.deadline_at),
-      lastRanAt: toDate(details.last_ran_at),
-      completedAt: toDate(details.completed_at),
-      progress: details.progress || 0,
-      progressMessage: details.progress_message || "",
-      progressDetails: details.progress_details ?? null,
-      status: details.status,
-      error: details.error ?? null,
-      errorCode: details.error_code ?? null,
-      runAttempts: details.run_attempts ?? 0,
-      maxRetries: details.max_retries ?? 10,
-      workerId: details.worker_id ?? null
-    });
+    return storageToClass(details, this.jobClass);
   }
   classToStorage(job) {
-    const dateToISOString = (date) => {
-      if (!date)
-        return null;
-      return isNaN(date.getTime()) ? null : date.toISOString();
-    };
-    const now = new Date().toISOString();
-    return {
-      id: job.id,
-      job_run_id: job.jobRunId,
-      queue: job.queueName || this.queueName,
-      fingerprint: job.fingerprint,
-      input: job.input,
-      status: job.status,
-      output: job.output ?? null,
-      error: job.error === null ? null : String(job.error),
-      error_code: job.errorCode || null,
-      run_attempts: job.runAttempts ?? 0,
-      max_retries: job.maxRetries ?? 10,
-      run_after: dateToISOString(job.runAfter) ?? now,
-      created_at: dateToISOString(job.createdAt) ?? now,
-      deadline_at: dateToISOString(job.deadlineAt),
-      last_ran_at: dateToISOString(job.lastRanAt),
-      completed_at: dateToISOString(job.completedAt),
-      progress: job.progress ?? 0,
-      progress_message: job.progressMessage ?? "",
-      progress_details: job.progressDetails ?? null,
-      worker_id: job.workerId ?? null
-    };
+    return classToStorage(job, this.queueName);
   }
   getWorkerIds() {
     return this.workers.map((worker) => worker.workerId);
@@ -1378,6 +1312,8 @@ class RateLimiter {
   }
 }
 export {
+  storageToClass,
+  classToStorage,
   RetryableJobError,
   RateLimiter,
   PermanentJobError,
@@ -1401,4 +1337,4 @@ export {
   AbortSignalJobError
 };
 
-//# debugId=CD9E48A8E518D1E664756E2164756E21
+//# debugId=7F9687AF808794FF64756E2164756E21