@microfox/ai-worker 1.0.2 → 1.0.3

package/dist/index.js

@@ -25,10 +25,13 @@ __export(index_exports, {
   createLambdaEntrypoint: () => createLambdaEntrypoint,
   createLambdaHandler: () => createLambdaHandler,
   createWorker: () => createWorker,
+  createWorkerLogger: () => createWorkerLogger,
   defineWorkerQueue: () => defineWorkerQueue,
   dispatch: () => dispatch,
   dispatchLocal: () => dispatchLocal,
   dispatchQueue: () => dispatchQueue,
+  dispatchWorker: () => dispatchWorker,
+  getQueueStartUrl: () => getQueueStartUrl,
   getWorkersConfig: () => getWorkersConfig,
   getWorkersTriggerUrl: () => getWorkersTriggerUrl,
   resolveQueueUrl: () => resolveQueueUrl,
@@ -38,10 +41,10 @@ module.exports = __toCommonJS(index_exports);
 
 // src/client.ts
 function getWorkersTriggerUrl() {
-  const raw = process.env.WORKER_BASE_URL || process.env.NEXT_PUBLIC_WORKER_BASE_URL || process.env.WORKERS_TRIGGER_API_URL || process.env.NEXT_PUBLIC_WORKERS_TRIGGER_API_URL || process.env.WORKERS_CONFIG_API_URL || process.env.NEXT_PUBLIC_WORKERS_CONFIG_API_URL;
+  const raw = process.env.WORKER_BASE_URL || process.env.WORKERS_TRIGGER_API_URL || process.env.WORKERS_CONFIG_API_URL;
   if (!raw) {
     throw new Error(
-      "WORKER_BASE_URL (preferred) or NEXT_PUBLIC_WORKER_BASE_URL is required for background workers"
+      "WORKER_BASE_URL is required for background workers. Set it server-side only."
     );
   }
   const url = new URL(raw);
@@ -53,6 +56,23 @@ function getWorkersTriggerUrl() {
   url.pathname = `${basePath}/workers/trigger`.replace(/\/+$/, "");
   return url.toString();
 }
+function getQueueStartUrl(queueId) {
+  const raw = process.env.WORKER_BASE_URL || process.env.WORKERS_TRIGGER_API_URL || process.env.WORKERS_CONFIG_API_URL;
+  if (!raw) {
+    throw new Error(
+      "WORKER_BASE_URL is required for background workers. Set it server-side only."
+    );
+  }
+  const url = new URL(raw);
+  url.search = "";
+  url.hash = "";
+  const path = url.pathname || "";
+  url.pathname = path.replace(/\/?workers\/(trigger|config)\/?$/, "");
+  const basePath = url.pathname.replace(/\/+$/, "");
+  const safeSegment = encodeURIComponent(queueId);
+  url.pathname = `${basePath}/queues/${safeSegment}/start`.replace(/\/+$/, "");
+  return url.toString();
+}
 function serializeContext(ctx) {
   const serialized = {};
   if (ctx.requestId) {
@@ -110,109 +130,67 @@ async function dispatch(workerId, input, inputSchema, options, ctx) {
     jobId
   };
 }
-async function dispatchLocal(handler, input, ctx) {
-  return handler({ input, ctx: ctx || {} });
-}
-async function dispatchQueue(queueId, initialInput, options = {}, ctx) {
-  const registry = options.registry;
-  if (!registry?.getQueueById) {
-    throw new Error(
-      "dispatchQueue requires options.registry with getQueueById. Use getQueueRegistry() from your workflows registry (e.g. app/api/workflows/registry/workers) and pass { registry: await getQueueRegistry() }."
-    );
-  }
-  const { getQueueById, invokeMapInput } = registry;
-  const queue = getQueueById(queueId);
-  if (!queue) {
-    throw new Error(`Worker queue "${queueId}" not found in registry`);
-  }
-  if (!queue.steps || queue.steps.length === 0) {
-    throw new Error(`Worker queue "${queueId}" has no steps defined`);
-  }
-  const stepIndex = 0;
-  const firstStep = queue.steps[stepIndex];
-  const firstWorkerId = firstStep.workerId;
-  if (!firstWorkerId) {
-    throw new Error(
-      `Worker queue "${queueId}" has an invalid first step (missing workerId)`
-    );
-  }
-  let firstInput = initialInput;
-  if (firstStep.mapInputFromPrev && typeof invokeMapInput === "function") {
-    firstInput = await invokeMapInput(
-      queueId,
-      stepIndex,
-      void 0,
-      initialInput
-    );
-  }
+async function dispatchWorker(workerId, input, options = {}, ctx) {
   const jobId = options.jobId || `job-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-  const queueContext = {
-    id: queueId,
-    stepIndex,
-    initialInput,
-    queueJobId: jobId
-  };
-  if (options.onCreateQueueJob) {
-    try {
-      await options.onCreateQueueJob({
-        queueJobId: jobId,
-        queueId,
-        firstStep: { workerId: firstWorkerId, workerJobId: jobId },
-        metadata: options.metadata
-      });
-    } catch (err) {
-      console.warn("[dispatchQueue] onCreateQueueJob failed:", err?.message ?? err);
-    }
-  }
-  const normalizedFirstInput = firstInput !== null && typeof firstInput === "object" ? firstInput : { value: firstInput };
-  const inputWithQueue = {
-    ...normalizedFirstInput,
-    __workerQueue: queueContext
-  };
-  const metadataWithQueue = {
-    ...options.metadata || {},
-    __workerQueue: queueContext
-  };
   const triggerUrl = getWorkersTriggerUrl();
   const serializedContext = ctx ? serializeContext(ctx) : {};
   const messageBody = {
-    workerId: firstWorkerId,
+    workerId,
     jobId,
-    input: inputWithQueue,
+    input: input ?? {},
     context: serializedContext,
     webhookUrl: options.webhookUrl,
-    metadata: metadataWithQueue,
+    metadata: options.metadata || {},
     timestamp: (/* @__PURE__ */ new Date()).toISOString()
   };
-  const headers = {
-    "Content-Type": "application/json"
-  };
+  const headers = { "Content-Type": "application/json" };
   const triggerKey = process.env.WORKERS_TRIGGER_API_KEY;
-  if (triggerKey) {
-    headers["x-workers-trigger-key"] = triggerKey;
-  }
+  if (triggerKey) headers["x-workers-trigger-key"] = triggerKey;
   const response = await fetch(triggerUrl, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({ workerId, body: messageBody })
+  });
+  if (!response.ok) {
+    const text = await response.text().catch(() => "");
+    throw new Error(
+      `Failed to trigger worker "${workerId}": ${response.status} ${response.statusText}${text ? ` - ${text}` : ""}`
+    );
+  }
+  const data = await response.json().catch(() => ({}));
+  const messageId = data?.messageId ? String(data.messageId) : `trigger-${jobId}`;
+  return { messageId, status: "queued", jobId };
+}
+async function dispatchLocal(handler, input, ctx) {
+  return handler({ input, ctx: ctx || {} });
+}
+async function dispatchQueue(queueId, initialInput, options = {}, _ctx) {
+  const jobId = options.jobId || `job-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+  const queueStartUrl = getQueueStartUrl(queueId);
+  const normalizedInput = initialInput !== null && typeof initialInput === "object" ? initialInput : { value: initialInput };
+  const headers = { "Content-Type": "application/json" };
+  const triggerKey = process.env.WORKERS_TRIGGER_API_KEY;
+  if (triggerKey) headers["x-workers-trigger-key"] = triggerKey;
+  const response = await fetch(queueStartUrl, {
     method: "POST",
     headers,
     body: JSON.stringify({
-      workerId: firstWorkerId,
-      body: messageBody
+      input: normalizedInput,
+      initialInput: normalizedInput,
+      metadata: options.metadata ?? {},
+      jobId,
+      ...options.webhookUrl ? { webhookUrl: options.webhookUrl } : {}
     })
   });
   if (!response.ok) {
     const text = await response.text().catch(() => "");
     throw new Error(
-      `Failed to trigger queue "${queueId}" (worker "${firstWorkerId}"): ${response.status} ${response.statusText}${text ? ` - ${text}` : ""}`
+      `Failed to start queue "${queueId}": ${response.status} ${response.statusText}${text ? ` - ${text}` : ""}`
     );
   }
   const data = await response.json().catch(() => ({}));
-  const messageId = data?.messageId ? String(data.messageId) : `trigger-${jobId}`;
-  return {
-    queueId,
-    messageId,
-    status: "queued",
-    jobId
-  };
+  const messageId = data?.messageId ?? data?.jobId ?? `queue-${jobId}`;
+  return { queueId, messageId, status: "queued", jobId };
 }
 
 // src/handler.ts
@@ -857,6 +835,25 @@ async function appendQueueJobStepInStore(options) {
 
 // src/handler.ts
 var SQS_MAX_DELAY_SECONDS = 900;
+function createWorkerLogger(jobId, workerId) {
+  const prefix = (level) => `[${level}] [${workerId}] [${jobId}]`;
+  return {
+    info(msg, data) {
+      console.log(prefix("INFO"), msg, data !== void 0 ? JSON.stringify(data) : "");
+    },
+    warn(msg, data) {
+      console.warn(prefix("WARN"), msg, data !== void 0 ? JSON.stringify(data) : "");
+    },
+    error(msg, data) {
+      console.error(prefix("ERROR"), msg, data !== void 0 ? JSON.stringify(data) : "");
+    },
+    debug(msg, data) {
+      if (process.env.DEBUG || process.env.WORKER_DEBUG) {
+        console.debug(prefix("DEBUG"), msg, data !== void 0 ? JSON.stringify(data) : "");
+      }
+    }
+  };
+}
 var WORKER_QUEUE_KEY = "__workerQueue";
 async function notifyQueueJobStep(queueJobId, action, params) {
   try {
@@ -889,14 +886,13 @@ async function notifyQueueJobStep(queueJobId, action, params) {
       output: params.output,
       error: params.error
     });
-    if (process.env.DEBUG_WORKER_QUEUES === "1") {
-      console.log("[Worker] Queue job step updated", {
-        queueJobId,
-        action,
-        stepIndex: params.stepIndex,
-        status
-      });
-    }
+    console.log("[Worker] Queue job step updated", {
+      queueId: params.queueId ?? queueJobId,
+      queueJobId,
+      stepIndex: params.stepIndex,
+      workerId: params.workerId,
+      status
+    });
   } catch (err) {
     console.warn("[Worker] Queue job update error:", {
       queueJobId,
@@ -913,20 +909,52 @@ function wrapHandlerForQueue(handler, queueRuntime) {
       return output;
     }
     const { id: queueId, stepIndex, initialInput, queueJobId } = queueContext;
+    const jobId = params.ctx?.jobId;
+    const workerId = params.ctx?.workerId ?? "";
     const next = queueRuntime.getNextStep(queueId, stepIndex);
-    if (!next) {
-      return output;
-    }
-    const childJobId = `job-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
-    if (queueJobId) {
+    const childJobId = next ? `job-${Date.now()}-${Math.random().toString(36).slice(2, 11)}` : void 0;
+    if (next && queueJobId) {
       await notifyQueueJobStep(queueJobId, "append", {
         workerJobId: childJobId,
         workerId: next.workerId
       });
     }
+    if (queueJobId && typeof stepIndex === "number") {
+      await notifyQueueJobStep(queueJobId, "complete", {
+        queueId,
+        stepIndex,
+        workerJobId: jobId,
+        workerId,
+        output
+      });
+    }
+    if (!next) {
+      return output;
+    }
     let nextInput = output;
     if (next.mapInputFromPrev && typeof queueRuntime.invokeMapInput === "function") {
-      nextInput = await queueRuntime.invokeMapInput(queueId, stepIndex + 1, output, initialInput);
+      let previousOutputs = [];
+      if (queueJobId && typeof queueRuntime.getQueueJob === "function") {
+        try {
+          const job = await queueRuntime.getQueueJob(queueJobId);
+          if (job?.steps) {
+            const fromStore = job.steps.slice(0, stepIndex).map((s, i) => ({ stepIndex: i, workerId: s.workerId, output: s.output }));
+            previousOutputs = fromStore.concat([
+              { stepIndex, workerId: params.ctx?.workerId ?? "", output }
+            ]);
+          }
+        } catch (e) {
+          if (process.env.AI_WORKER_QUEUES_DEBUG === "1") {
+            console.warn("[Worker] getQueueJob failed, mapping without previousOutputs:", e?.message ?? e);
+          }
+        }
+      }
+      nextInput = await queueRuntime.invokeMapInput(
+        queueId,
+        stepIndex + 1,
+        initialInput,
+        previousOutputs
+      );
     }
     const nextInputWithQueue = {
       ...nextInput !== null && typeof nextInput === "object" ? nextInput : { value: nextInput },
@@ -1105,6 +1133,7 @@ function createLambdaHandler(handler, outputSchema) {
         const handlerContext = {
           ...baseContext,
           ...jobStore ? { jobStore } : {},
+          logger: createWorkerLogger(jobId, workerId),
           dispatchWorker: createDispatchWorker(
             jobId,
             workerId,
@@ -1115,9 +1144,12 @@ function createLambdaHandler(handler, outputSchema) {
         if (jobStore) {
           try {
             await jobStore.update({ status: "running" });
+            const queueCtxForLog = input?.__workerQueue ?? metadata?.__workerQueue;
             console.log("[Worker] Job status updated to running:", {
               jobId,
-              workerId
+              workerId,
+              ...queueCtxForLog?.id && { queueId: queueCtxForLog.id },
+              ...queueCtxForLog?.queueJobId && { queueJobId: queueCtxForLog.queueJobId }
             });
           } catch (error) {
             console.warn("[Worker] Failed to update status to running:", {
@@ -1147,6 +1179,7 @@ function createLambdaHandler(handler, outputSchema) {
             }
           }
           await notifyQueueJobStep(queueCtx.queueJobId, "start", {
+            queueId: queueCtx.id,
             stepIndex: queueCtx.stepIndex,
             workerJobId: jobId,
             workerId,
@@ -1195,6 +1228,7 @@ function createLambdaHandler(handler, outputSchema) {
           const queueCtxFail = input?.__workerQueue ?? metadata?.__workerQueue;
           if (queueCtxFail?.queueJobId && typeof queueCtxFail.stepIndex === "number") {
             await notifyQueueJobStep(queueCtxFail.queueJobId, "fail", {
+              queueId: queueCtxFail.id,
               stepIndex: queueCtxFail.stepIndex,
               workerJobId: jobId,
               workerId,
@@ -1224,15 +1258,6 @@ function createLambdaHandler(handler, outputSchema) {
             });
           }
         }
-        const queueCtxSuccess = input?.__workerQueue ?? metadata?.__workerQueue;
-        if (queueCtxSuccess?.queueJobId && typeof queueCtxSuccess.stepIndex === "number") {
-          await notifyQueueJobStep(queueCtxSuccess.queueJobId, "complete", {
-            stepIndex: queueCtxSuccess.stepIndex,
-            workerJobId: jobId,
-            workerId,
-            output
-          });
-        }
         console.log("[Worker] Job completed:", {
           jobId,
           workerId,
@@ -1654,6 +1679,7 @@ function createWorker(config) {
         const handlerContext = {
           ...baseContext,
           ...jobStore ? { jobStore } : {},
+          logger: createWorkerLogger(localJobId, id),
           dispatchWorker: createLocalDispatchWorker(
             localJobId,
             id,
@@ -1741,10 +1767,13 @@ function createLambdaEntrypoint(agent) {
   createLambdaEntrypoint,
   createLambdaHandler,
   createWorker,
+  createWorkerLogger,
   defineWorkerQueue,
   dispatch,
   dispatchLocal,
   dispatchQueue,
+  dispatchWorker,
+  getQueueStartUrl,
   getWorkersConfig,
   getWorkersTriggerUrl,
   resolveQueueUrl,