duron 0.3.0-beta.5 → 0.3.0-beta.6

package/dist/client.d.ts

@@ -3,7 +3,27 @@ import * as z from 'zod';
 import type { Action } from './action.js';
 import type { Adapter, GetActionsResult, GetJobStepsOptions, GetJobStepsResult, GetJobsOptions, GetJobsResult, GetMetricsOptions, GetMetricsResult, Job, JobStep } from './adapters/adapter.js';
 import type { JobStatusResult, JobStepStatusResult } from './adapters/schemas.js';
+import { type JobStatus } from './constants.js';
 import { type TelemetryAdapter } from './telemetry/index.js';
+type InferActionSchema<T> = T extends z.ZodTypeAny ? z.infer<T> : Record<string, unknown>;
+export interface JobResult {
+    jobId: string;
+    actionName: string;
+    status: JobStatus;
+    groupKey: string;
+    input: unknown;
+    output: unknown;
+    error: Job['error'];
+}
+export interface TypedJobResult<TAction extends Action<any, any, any>> {
+    jobId: string;
+    actionName: string;
+    status: JobStatus;
+    groupKey: string;
+    input: InferActionSchema<NonNullable<TAction['input']>>;
+    output: InferActionSchema<NonNullable<TAction['output']>>;
+    error: Job['error'];
+}
 declare const BaseOptionsSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     syncPattern: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"pull">, z.ZodLiteral<"push">, z.ZodLiteral<"hybrid">, z.ZodLiteral<false>]>>;
@@ -48,6 +68,10 @@ export declare class Client<TActions extends Record<string, Action<any, any, TVa
         id?: string | undefined;
     };
     runAction<TActionName extends keyof TActions>(actionName: TActionName, input?: NonNullable<TActions[TActionName]['input']> extends z.ZodObject ? z.input<NonNullable<TActions[TActionName]['input']>> : never): Promise<string>;
+    runActionAndWait<TActionName extends keyof TActions>(actionName: TActionName, input?: NonNullable<TActions[TActionName]['input']> extends z.ZodObject ? z.input<NonNullable<TActions[TActionName]['input']>> : never, options?: {
+        signal?: AbortSignal;
+        timeout?: number;
+    }): Promise<TypedJobResult<TActions[TActionName]>>;
     fetch(options: FetchOptions): Promise<{
         id: string;
         actionName: string;
@@ -79,7 +103,7 @@ export declare class Client<TActions extends Record<string, Action<any, any, TVa
     waitForJob(jobId: string, options?: {
         timeout?: number;
         signal?: AbortSignal;
-    }): Promise<Job | null>;
+    }): Promise<JobResult | null>;
     getActions(): Promise<GetActionsResult>;
     getMetrics(options: GetMetricsOptions): Promise<GetMetricsResult>;
     getActionsMetadata(): Promise<Array<{

package/dist/client.d.ts.map

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

package/dist/client.js

@@ -117,6 +117,87 @@ export class Client {
         this.#logger.debug({ jobId, actionName: String(actionName), groupKey }, '[Duron] Action sent/created');
         return jobId;
     }
+    async runActionAndWait(actionName, input, options) {
+        if (options?.signal?.aborted) {
+            throw new Error('Operation was aborted');
+        }
+        const jobId = await this.runAction(actionName, input);
+        let abortHandler;
+        if (options?.signal) {
+            abortHandler = () => {
+                this.cancelJob(jobId).catch((err) => {
+                    this.#logger.error({ err, jobId }, '[Duron] Error cancelling job on abort');
+                });
+            };
+            options.signal.addEventListener('abort', abortHandler, { once: true });
+        }
+        let timeoutId;
+        let timeoutAbortController;
+        if (options?.timeout) {
+            timeoutAbortController = new AbortController();
+            timeoutId = setTimeout(() => {
+                timeoutAbortController.abort();
+                this.cancelJob(jobId).catch((err) => {
+                    this.#logger.error({ err, jobId }, '[Duron] Error cancelling job on timeout');
+                });
+            }, options.timeout);
+        }
+        try {
+            let waitSignal;
+            if (options?.signal && timeoutAbortController) {
+                waitSignal = AbortSignal.any([options.signal, timeoutAbortController.signal]);
+            }
+            else if (options?.signal) {
+                waitSignal = options.signal;
+            }
+            else if (timeoutAbortController) {
+                waitSignal = timeoutAbortController.signal;
+            }
+            const job = await this.waitForJob(jobId, { signal: waitSignal });
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            if (options?.signal && abortHandler) {
+                options.signal.removeEventListener('abort', abortHandler);
+            }
+            if (!job) {
+                if (options?.signal?.aborted) {
+                    throw new Error('Operation was aborted');
+                }
+                if (timeoutAbortController?.signal.aborted) {
+                    throw new Error('Operation timed out');
+                }
+                throw new Error('Job not found');
+            }
+            if (job.status === JOB_STATUS_CANCELLED) {
+                if (options?.signal?.aborted) {
+                    throw new Error('Operation was aborted');
+                }
+                if (timeoutAbortController?.signal.aborted) {
+                    throw new Error('Operation timed out');
+                }
+                throw new Error('Job was cancelled');
+            }
+            if (job.status === JOB_STATUS_FAILED) {
+                const errorMessage = job.error?.message ?? 'Job failed';
+                const error = new Error(errorMessage);
+                if (job.error?.stack) {
+                    error.stack = job.error.stack;
+                }
+                throw error;
+            }
+            return job;
+        }
+        catch (err) {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            if (options?.signal && abortHandler) {
+                options.signal.removeEventListener('abort', abortHandler);
+            }
+            throw err;
+        }
+    }
     async fetch(options) {
         await this.start();
         if (!this.#actions) {
@@ -194,7 +275,15 @@ export class Client {
                 if (!job) {
                     return null;
                 }
-                return job;
+                return {
+                    jobId: job.id,
+                    actionName: job.actionName,
+                    status: job.status,
+                    groupKey: job.groupKey,
+                    input: job.input,
+                    output: job.output,
+                    error: job.error,
+                };
             }
         }
         this.#setupJobStatusListener();
@@ -347,6 +436,17 @@ export class Client {
                 return;
             }
             const job = await this.getJobById(event.jobId);
+            const result = job
+                ? {
+                    jobId: job.id,
+                    actionName: job.actionName,
+                    status: job.status,
+                    groupKey: job.groupKey,
+                    input: job.input,
+                    output: job.output,
+                    error: job.error,
+                }
+                : null;
             const waitsToResolve = Array.from(pendingWaits);
             this.#pendingJobWaits.delete(event.jobId);
             for (const wait of waitsToResolve) {
@@ -356,7 +456,7 @@ export class Client {
                 if (wait.signal && wait.abortHandler) {
                     wait.signal.removeEventListener('abort', wait.abortHandler);
                 }
-                wait.resolve(job);
+                wait.resolve(result);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "duron",
-  "version": "0.3.0-beta.5",
+  "version": "0.3.0-beta.6",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/client.ts

@@ -20,6 +20,38 @@ import type { JobStatusResult, JobStepStatusResult } from './adapters/schemas.js
 import { JOB_STATUS_CANCELLED, JOB_STATUS_COMPLETED, JOB_STATUS_FAILED, type JobStatus } from './constants.js'
 import { LocalTelemetryAdapter, noopTelemetryAdapter, type TelemetryAdapter } from './telemetry/index.js'
 
+/**
+ * Extracts the inferred type from an action's input/output schema.
+ * Handles the case where the schema might be undefined.
+ */
+type InferActionSchema<T> = T extends z.ZodTypeAny ? z.infer<T> : Record<string, unknown>
+
+/**
+ * Result returned from waitForJob with untyped input and output.
+ */
+export interface JobResult {
+  jobId: string
+  actionName: string
+  status: JobStatus
+  groupKey: string
+  input: unknown
+  output: unknown
+  error: Job['error']
+}
+
+/**
+ * Result returned from runActionAndWait with typed input and output based on the action's Zod schemas.
+ */
+export interface TypedJobResult<TAction extends Action<any, any, any>> {
+  jobId: string
+  actionName: string
+  status: JobStatus
+  groupKey: string
+  input: InferActionSchema<NonNullable<TAction['input']>>
+  output: InferActionSchema<NonNullable<TAction['output']>>
+  error: Job['error']
+}
+
 const BaseOptionsSchema = z.object({
   /**
    * Unique identifier for this Duron instance.
@@ -184,7 +216,7 @@ export class Client<
   #pendingJobWaits = new Map<
     string,
     Set<{
-      resolve: (job: Job | null) => void
+      resolve: (result: JobResult | null) => void
       timeoutId?: NodeJS.Timeout
       signal?: AbortSignal
       abortHandler?: () => void
@@ -335,6 +367,132 @@ export class Client<
     return jobId
   }
 
+  /**
+   * Run an action and wait for its completion.
+   * This is a convenience method that combines `runAction` and `waitForJob`.
+   *
+   * @param actionName - Name of the action to run
+   * @param input - Input data for the action (validated against action's input schema if provided)
+   * @param options - Options including abort signal and timeout
+   * @returns Promise resolving to the job result with typed input and output
+   * @throws Error if action is not found, job creation fails, job is cancelled, or operation is aborted
+   */
+  async runActionAndWait<TActionName extends keyof TActions>(
+    actionName: TActionName,
+    input?: NonNullable<TActions[TActionName]['input']> extends z.ZodObject
+      ? z.input<NonNullable<TActions[TActionName]['input']>>
+      : never,
+    options?: {
+      /**
+       * AbortSignal to cancel the operation. If aborted, the job will be cancelled and the promise will reject.
+       */
+      signal?: AbortSignal
+      /**
+       * Timeout in milliseconds. If the job doesn't complete within this time, the job will be cancelled and the promise will reject.
+       */
+      timeout?: number
+    },
+  ): Promise<TypedJobResult<TActions[TActionName]>> {
+    // Check if already aborted before starting
+    if (options?.signal?.aborted) {
+      throw new Error('Operation was aborted')
+    }
+
+    // Create the job
+    const jobId = await this.runAction(actionName, input)
+
+    // Set up abort handler to cancel the job if signal is aborted
+    let abortHandler: (() => void) | undefined
+    if (options?.signal) {
+      abortHandler = () => {
+        this.cancelJob(jobId).catch((err) => {
+          this.#logger.error({ err, jobId }, '[Duron] Error cancelling job on abort')
+        })
+      }
+      options.signal.addEventListener('abort', abortHandler, { once: true })
+    }
+
+    // Set up timeout handler to cancel the job if timeout is reached
+    let timeoutId: NodeJS.Timeout | undefined
+    let timeoutAbortController: AbortController | undefined
+    if (options?.timeout) {
+      timeoutAbortController = new AbortController()
+      timeoutId = setTimeout(() => {
+        timeoutAbortController!.abort()
+        this.cancelJob(jobId).catch((err) => {
+          this.#logger.error({ err, jobId }, '[Duron] Error cancelling job on timeout')
+        })
+      }, options.timeout)
+    }
+
+    try {
+      // Combine signals if both are provided
+      let waitSignal: AbortSignal | undefined
+      if (options?.signal && timeoutAbortController) {
+        waitSignal = AbortSignal.any([options.signal, timeoutAbortController.signal])
+      } else if (options?.signal) {
+        waitSignal = options.signal
+      } else if (timeoutAbortController) {
+        waitSignal = timeoutAbortController.signal
+      }
+
+      // Wait for the job to complete
+      const job = await this.waitForJob(jobId, { signal: waitSignal })
+
+      // Clean up
+      if (timeoutId) {
+        clearTimeout(timeoutId)
+      }
+      if (options?.signal && abortHandler) {
+        options.signal.removeEventListener('abort', abortHandler)
+      }
+
+      // Handle null result (aborted or timed out)
+      if (!job) {
+        if (options?.signal?.aborted) {
+          throw new Error('Operation was aborted')
+        }
+        if (timeoutAbortController?.signal.aborted) {
+          throw new Error('Operation timed out')
+        }
+        throw new Error('Job not found')
+      }
+
+      // Handle cancelled job
+      if (job.status === JOB_STATUS_CANCELLED) {
+        if (options?.signal?.aborted) {
+          throw new Error('Operation was aborted')
+        }
+        if (timeoutAbortController?.signal.aborted) {
+          throw new Error('Operation timed out')
+        }
+        throw new Error('Job was cancelled')
+      }
+
+      // Handle failed job
+      if (job.status === JOB_STATUS_FAILED) {
+        const errorMessage = job.error?.message ?? 'Job failed'
+        const error = new Error(errorMessage)
+        if (job.error?.stack) {
+          error.stack = job.error.stack
+        }
+        throw error
+      }
+
+      // Return the job result with typed input/output
+      return job as TypedJobResult<TActions[TActionName]>
+    } catch (err) {
+      // Clean up on error
+      if (timeoutId) {
+        clearTimeout(timeoutId)
+      }
+      if (options?.signal && abortHandler) {
+        options.signal.removeEventListener('abort', abortHandler)
+      }
+      throw err
+    }
+  }
+
   /**
    * Fetch and process jobs from the database.
    * Concurrency limits are determined from the latest job created for each groupKey.
@@ -515,11 +673,11 @@ export class Client<
 
   /**
    * Wait for a job to change status by subscribing to job-status-changed events.
-   * When the job status changes, the job is fetched and returned.
+   * When the job status changes, the job result is returned.
    *
    * @param jobId - The ID of the job to wait for
    * @param options - Optional configuration including timeout
-   * @returns Promise resolving to the job when its status changes, or `null` if timeout
+   * @returns Promise resolving to the job result when its status changes, or `null` if timeout
    */
   async waitForJob(
     jobId: string,
@@ -534,7 +692,7 @@ export class Client<
        */
       signal?: AbortSignal
     },
-  ): Promise<Job | null> {
+  ): Promise<JobResult | null> {
     await this.start()
 
     // First, check if the job already exists and is in a terminal state
@@ -546,14 +704,22 @@ export class Client<
         if (!job) {
           return null
         }
-        return job
+        return {
+          jobId: job.id,
+          actionName: job.actionName,
+          status: job.status,
+          groupKey: job.groupKey,
+          input: job.input,
+          output: job.output,
+          error: job.error,
+        }
       }
     }
 
     // Set up the shared event listener if not already set up
     this.#setupJobStatusListener()
 
-    return new Promise<Job | null>((resolve) => {
+    return new Promise<JobResult | null>((resolve) => {
       // Check if already aborted before setting up wait
       if (options?.signal?.aborted) {
         resolve(null)
@@ -796,6 +962,19 @@ export class Client<
         // Fetch the job once for all pending waits
         const job = await this.getJobById(event.jobId)
 
+        // Transform to JobResult
+        const result: JobResult | null = job
+          ? {
+              jobId: job.id,
+              actionName: job.actionName,
+              status: job.status,
+              groupKey: job.groupKey,
+              input: job.input,
+              output: job.output,
+              error: job.error,
+            }
+          : null
+
         // Resolve all pending waits for this job
         const waitsToResolve = Array.from(pendingWaits)
         this.#pendingJobWaits.delete(event.jobId)
@@ -808,7 +987,7 @@ export class Client<
           if (wait.signal && wait.abortHandler) {
             wait.signal.removeEventListener('abort', wait.abortHandler)
           }
-          wait.resolve(job)
+          wait.resolve(result)
         }
       },
     )
@@ -820,7 +999,7 @@ export class Client<
    * @param jobId - The job ID
    * @param resolve - The resolve function to remove
    */
-  #removeJobWait(jobId: string, resolve: (job: Job | null) => void) {
+  #removeJobWait(jobId: string, resolve: (result: JobResult | null) => void) {
     const pendingWaits = this.#pendingJobWaits.get(jobId)
     if (!pendingWaits) {
       return