@mastra/inngest 0.0.0-custom-instrumentation-20250626084921 → 0.0.0-custom-instrumentation-20250708222033

package/dist/index.js

@@ -10,13 +10,17 @@ import { z } from 'zod';
 // src/index.ts
 function serve({ mastra, inngest }) {
   const wfs = mastra.getWorkflows();
-  const functions = Object.values(wfs).flatMap((wf) => {
-    if (wf instanceof InngestWorkflow) {
-      wf.__registerMastra(mastra);
-      return wf.getFunctions();
-    }
-    return [];
-  });
+  const functions = Array.from(
+    new Set(
+      Object.values(wfs).flatMap((wf) => {
+        if (wf instanceof InngestWorkflow) {
+          wf.__registerMastra(mastra);
+          return wf.getFunctions();
+        }
+        return [];
+      })
+    )
+  );
   return serve$1({
     client: inngest,
     functions
@@ -46,8 +50,15 @@ var InngestRun = class extends Run {
     while (runs?.[0]?.status !== "Completed" || runs?.[0]?.event_id !== eventId) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
       runs = await this.getRuns(eventId);
-      if (runs?.[0]?.status === "Failed" || runs?.[0]?.status === "Cancelled") {
+      if (runs?.[0]?.status === "Failed") {
+        console.log("run", runs?.[0]);
         throw new Error(`Function run ${runs?.[0]?.status}`);
+      } else if (runs?.[0]?.status === "Cancelled") {
+        const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
+          workflowName: this.workflowId,
+          runId: this.runId
+        });
+        return { output: { result: { steps: snapshot?.context, status: "canceled" } } };
       }
     }
     return runs?.[0];
@@ -58,6 +69,28 @@ var InngestRun = class extends Run {
       data
     });
   }
+  async cancel() {
+    await this.inngest.send({
+      name: `cancel.workflow.${this.workflowId}`,
+      data: {
+        runId: this.runId
+      }
+    });
+    const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
+      workflowName: this.workflowId,
+      runId: this.runId
+    });
+    if (snapshot) {
+      await this.#mastra?.storage?.persistWorkflowSnapshot({
+        workflowName: this.workflowId,
+        runId: this.runId,
+        snapshot: {
+          ...snapshot,
+          status: "canceled"
+        }
+      });
+    }
+  }
   async start({
     inputData
   }) {
@@ -91,7 +124,9 @@ var InngestRun = class extends Run {
     if (result.status === "failed") {
       result.error = new Error(result.error);
     }
-    this.cleanup?.();
+    if (result.status !== "suspended") {
+      this.cleanup?.();
+    }
     return result;
   }
   async resume(params) {
@@ -293,23 +328,26 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       this.inngest
     );
     this.runs.set(runIdToUse, run);
-    await this.mastra?.getStorage()?.persistWorkflowSnapshot({
-      workflowName: this.id,
-      runId: runIdToUse,
-      snapshot: {
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse);
+    if (!workflowSnapshotInStorage) {
+      await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+        workflowName: this.id,
         runId: runIdToUse,
-        status: "pending",
-        value: {},
-        context: {},
-        activePaths: [],
-        serializedStepGraph: this.serializedStepGraph,
-        suspendedPaths: {},
-        result: void 0,
-        error: void 0,
-        // @ts-ignore
-        timestamp: Date.now()
-      }
-    });
+        snapshot: {
+          runId: runIdToUse,
+          status: "pending",
+          value: {},
+          context: {},
+          activePaths: [],
+          serializedStepGraph: this.serializedStepGraph,
+          suspendedPaths: {},
+          result: void 0,
+          error: void 0,
+          // @ts-ignore
+          timestamp: Date.now()
+        }
+      });
+    }
     return run;
   }
   getFunction() {
@@ -317,8 +355,12 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       return this.function;
     }
     this.function = this.inngest.createFunction(
-      // @ts-ignore
-      { id: `workflow.${this.id}`, retries: this.retryConfig?.attempts ?? 0 },
+      {
+        id: `workflow.${this.id}`,
+        // @ts-ignore
+        retries: this.retryConfig?.attempts ?? 0,
+        cancelOn: [{ event: `cancel.workflow.${this.id}` }]
+      },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
         let { inputData, runId, resume } = event.data;
@@ -360,7 +402,8 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           retryConfig: this.retryConfig,
           runtimeContext: new RuntimeContext(),
           // TODO
-          resume
+          resume,
+          abortController: new AbortController()
         });
         return { result, runId };
       }
@@ -404,7 +447,7 @@ function createStep(params) {
       outputSchema: z.object({
         text: z.string()
       }),
-      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext }) => {
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -424,8 +467,12 @@ function createStep(params) {
           runtimeContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
-          }
+          },
+          abortSignal
         });
+        if (abortSignal.aborted) {
+          return abort();
+        }
         for await (const chunk of fullStream) {
           switch (chunk.type) {
             case "text-delta":
@@ -600,6 +647,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
+    abortController,
     runtimeContext
   }) {
     return super.executeStep({
@@ -611,11 +659,107 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       resume,
       prevOutput,
       emitter,
+      abortController,
       runtimeContext
     });
   }
-  async executeSleep({ id, duration }) {
-    await this.inngestStep.sleep(id, duration);
+  // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
+  //   await this.inngestStep.sleep(id, duration);
+  // }
+  async executeSleep({
+    workflowId,
+    runId,
+    entry,
+    prevOutput,
+    stepResults,
+    emitter,
+    abortController,
+    runtimeContext
+  }) {
+    let { duration, fn } = entry;
+    if (fn) {
+      duration = await this.inngestStep.run(`workflow.${workflowId}.sleep.${entry.id}`, async () => {
+        return await fn({
+          runId,
+          mastra: this.mastra,
+          runtimeContext,
+          inputData: prevOutput,
+          runCount: -1,
+          getInitData: () => stepResults?.input,
+          getStepResult: (step) => {
+            if (!step?.id) {
+              return null;
+            }
+            const result = stepResults[step.id];
+            if (result?.status === "success") {
+              return result.output;
+            }
+            return null;
+          },
+          // TODO: this function shouldn't have suspend probably?
+          suspend: async (_suspendPayload) => {
+          },
+          bail: () => {
+          },
+          abort: () => {
+            abortController?.abort();
+          },
+          [EMITTER_SYMBOL]: emitter,
+          engine: { step: this.inngestStep },
+          abortSignal: abortController?.signal
+        });
+      });
+    }
+    await this.inngestStep.sleep(entry.id, !duration || duration < 0 ? 0 : duration);
+  }
+  async executeSleepUntil({
+    workflowId,
+    runId,
+    entry,
+    prevOutput,
+    stepResults,
+    emitter,
+    abortController,
+    runtimeContext
+  }) {
+    let { date, fn } = entry;
+    if (fn) {
+      date = await this.inngestStep.run(`workflow.${workflowId}.sleepUntil.${entry.id}`, async () => {
+        return await fn({
+          runId,
+          mastra: this.mastra,
+          runtimeContext,
+          inputData: prevOutput,
+          runCount: -1,
+          getInitData: () => stepResults?.input,
+          getStepResult: (step) => {
+            if (!step?.id) {
+              return null;
+            }
+            const result = stepResults[step.id];
+            if (result?.status === "success") {
+              return result.output;
+            }
+            return null;
+          },
+          // TODO: this function shouldn't have suspend probably?
+          suspend: async (_suspendPayload) => {
+          },
+          bail: () => {
+          },
+          abort: () => {
+            abortController?.abort();
+          },
+          [EMITTER_SYMBOL]: emitter,
+          engine: { step: this.inngestStep },
+          abortSignal: abortController?.signal
+        });
+      });
+    }
+    if (!(date instanceof Date)) {
+      return;
+    }
+    await this.inngestStep.sleepUntil(entry.id, date);
   }
   async executeWaitForEvent({ event, timeout }) {
     const eventData = await this.inngestStep.waitForEvent(`user-event-${event}`, {
@@ -634,6 +778,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
+    abortController,
     runtimeContext
   }) {
     const startedAt = await this.inngestStep.run(
@@ -664,7 +809,10 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         await emitter.emit("watch-v2", {
           type: "step-start",
           payload: {
-            id: step.id
+            id: step.id,
+            status: "running",
+            payload: prevOutput,
+            startedAt: startedAt2
           }
         });
         return startedAt2;
@@ -732,7 +880,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               type: "step-result",
               payload: {
                 id: step.id,
-                status: "failed"
+                status: "failed",
+                error: result?.error,
+                payload: prevOutput
               }
             });
             return { executionContext, result: { status: "failed", error: result?.error } };
@@ -764,7 +914,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               await emitter.emit("watch-v2", {
                 type: "step-suspended",
                 payload: {
-                  id: step.id
+                  id: step.id,
+                  status: "suspended"
                 }
               });
               return {
@@ -817,6 +968,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             },
             eventTimestamp: Date.now()
           });
+          await emitter.emit("watch-v2", {
+            type: "step-result",
+            payload: {
+              id: step.id,
+              status: "success",
+              output: result?.result
+            }
+          });
           await emitter.emit("watch-v2", {
             type: "step-finish",
             payload: {
@@ -865,7 +1024,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           [EMITTER_SYMBOL]: emitter,
           engine: {
             step: this.inngestStep
-          }
+          },
+          abortSignal: abortController.signal
         });
         const endedAt = Date.now();
         execResults = {
@@ -927,8 +1087,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           type: "step-suspended",
           payload: {
             id: step.id,
-            status: execResults.status,
-            output: execResults.status === "success" ? execResults?.output : void 0
+            ...execResults
           }
         });
       } else {
@@ -936,8 +1095,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           type: "step-result",
           payload: {
             id: step.id,
-            status: execResults.status,
-            output: execResults.status === "success" ? execResults?.output : void 0
+            ...execResults
           }
         });
         await emitter.emit("watch-v2", {
@@ -998,6 +1156,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     resume,
     executionContext,
     emitter,
+    abortController,
     runtimeContext
   }) {
     let execResults;
@@ -1009,6 +1168,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               runId,
               mastra: this.mastra,
               runtimeContext,
+              runCount: -1,
               inputData: prevOutput,
               getInitData: () => stepResults?.input,
               getStepResult: (step) => {
@@ -1026,10 +1186,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               },
               bail: () => {
               },
+              abort: () => {
+                abortController.abort();
+              },
               [EMITTER_SYMBOL]: emitter,
               engine: {
                 step: this.inngestStep
-              }
+              },
+              abortSignal: abortController.signal
             });
             return result ? index : null;
           } catch (e) {
@@ -1058,6 +1222,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             executionSpan: executionContext.executionSpan
           },
           emitter,
+          abortController,
           runtimeContext
         })
       )

package/docker-compose.yaml

@@ -2,9 +2,9 @@ version: '3'
 
 services:
   inngest:
-    image: inngest/inngest
-    command: inngest dev -u http://host.docker.internal:3000/api/inngest --poll-interval=1
+    image: inngest/inngest:v1.8.2
+    command: inngest dev -p 4000 -u http://host.docker.internal:4001/inngest/api --poll-interval=1
     ports:
-      - '8288:8288'
+      - '4000:4000'
     extra_hosts:
       - 'host.docker.internal:host-gateway'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/inngest",
-  "version": "0.0.0-custom-instrumentation-20250626084921",
+  "version": "0.0.0-custom-instrumentation-20250708222033",
   "description": "Mastra Inngest integration",
   "type": "module",
   "main": "dist/index.js",
@@ -21,10 +21,11 @@
   "dependencies": {
     "@inngest/realtime": "^0.3.1",
     "@opentelemetry/api": "^1.9.0",
-    "inngest": "^3.39.1",
+    "inngest": "^3.40.0",
     "zod": "^3.25.67"
   },
   "devDependencies": {
+    "inngest-cli": "1.8.2",
     "@ai-sdk/openai": "^1.3.22",
     "@hono/node-server": "^1.14.4",
     "@microsoft/api-extractor": "^7.52.8",
@@ -33,22 +34,22 @@
     "eslint": "^9.29.0",
     "execa": "^9.6.0",
     "get-port": "7.1.0",
-    "hono": "^4.7.11",
+    "hono": "^4.8.4",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "vitest": "^2.1.9",
-    "@internal/lint": "0.0.0-custom-instrumentation-20250626084921",
-    "@mastra/core": "0.0.0-custom-instrumentation-20250626084921",
-    "@mastra/libsql": "0.0.0-custom-instrumentation-20250626084921",
-    "@mastra/deployer": "0.0.0-custom-instrumentation-20250626084921"
+    "vitest": "^3.2.4",
+    "@internal/lint": "0.0.0-custom-instrumentation-20250708222033",
+    "@mastra/libsql": "0.0.0-custom-instrumentation-20250708222033",
+    "@mastra/deployer": "0.0.0-custom-instrumentation-20250708222033",
+    "@mastra/core": "0.0.0-custom-instrumentation-20250708222033"
   },
   "peerDependencies": {
-    "@mastra/core": "0.0.0-custom-instrumentation-20250626084921"
+    "@mastra/core": "0.0.0-custom-instrumentation-20250708222033"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",
     "build:watch": "pnpm build --watch",
-    "test": "vitest run",
+    "test": "docker-compose up -d && vitest run --no-isolate --bail=1 --retry=1 && docker-compose down",
     "lint": "eslint ."
   }
 }