@upstash/workflow 0.2.8-rc-invoke → 0.2.8

package/solidjs.js

@@ -88,7 +88,7 @@ var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
 var DEFAULT_CONTENT_TYPE = "application/json";
 var NO_CONCURRENCY = 1;
 var DEFAULT_RETRIES = 3;
-var VERSION = "v0.2.7";
+var VERSION = "v0.2.3";
 var SDK_TELEMETRY = `@upstash/workflow@${VERSION}`;
 var TELEMETRY_HEADER_SDK = "Upstash-Telemetry-Sdk";
 var TELEMETRY_HEADER_FRAMEWORK = "Upstash-Telemetry-Framework";
@@ -135,31 +135,6 @@ var formatWorkflowError = (error) => {
   };
 };
 
-// src/utils.ts
-var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
-var NANOID_LENGTH = 21;
-function getRandomInt() {
-  return Math.floor(Math.random() * NANOID_CHARS.length);
-}
-function nanoid() {
-  return Array.from({ length: NANOID_LENGTH }).map(() => NANOID_CHARS[getRandomInt()]).join("");
-}
-function getWorkflowRunId(id) {
-  return `wfr_${id ?? nanoid()}`;
-}
-function decodeBase64(base64) {
-  try {
-    const binString = atob(base64);
-    const intArray = Uint8Array.from(binString, (m) => m.codePointAt(0));
-    return new TextDecoder().decode(intArray);
-  } catch (error) {
-    console.warn(
-      `Upstash Qstash: Failed while decoding base64 "${base64}". Decoding with atob and returning it instead. ${error}`
-    );
-    return atob(base64);
-  }
-}
-
 // src/context/steps.ts
 var BaseLazyStep = class {
   stepName;
@@ -340,41 +315,6 @@ var LazyNotifyStep = class extends LazyFunctionStep {
     });
   }
 };
-var LazyInvokeStep = class extends BaseLazyStep {
-  stepType = "Invoke";
-  params;
-  constructor(stepName, { workflow, body, headers = {}, workflowRunId, retries }) {
-    super(stepName);
-    this.params = {
-      workflow,
-      body,
-      headers,
-      workflowRunId: getWorkflowRunId(workflowRunId),
-      retries
-    };
-  }
-  getPlanStep(concurrent, targetStep) {
-    return {
-      stepId: 0,
-      stepName: this.stepName,
-      stepType: this.stepType,
-      concurrent,
-      targetStep
-    };
-  }
-  /**
-   * won't be used as it's the server who will add the result step
-   * in Invoke step.
-   */
-  getResultStep(concurrent, stepId) {
-    return Promise.resolve({
-      stepId,
-      stepName: this.stepName,
-      stepType: this.stepType,
-      concurrent
-    });
-  }
-};
 
 // node_modules/neverthrow/dist/index.es.js
 var defaultErrorConfig = {
@@ -799,8 +739,7 @@ var StepTypes = [
   "SleepUntil",
   "Call",
   "Wait",
-  "Notify",
-  "Invoke"
+  "Notify"
 ];
 
 // src/workflow-requests.ts
@@ -864,8 +803,8 @@ var triggerRouteFunction = async ({
   debug
 }) => {
   try {
-    const result = await onStep();
-    await onCleanup(result);
+    await onStep();
+    await onCleanup();
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
@@ -886,15 +825,14 @@ var triggerRouteFunction = async ({
     }
   }
 };
-var triggerWorkflowDelete = async (workflowContext, result, debug, cancel = false) => {
+var triggerWorkflowDelete = async (workflowContext, debug, cancel = false) => {
   await debug?.log("SUBMIT", "SUBMIT_CLEANUP", {
     deletedWorkflowRunId: workflowContext.workflowRunId
   });
   await workflowContext.qstashClient.http.request({
     path: ["v2", "workflows", "runs", `${workflowContext.workflowRunId}?cancel=${cancel}`],
     method: "DELETE",
-    parseResponseAsJson: false,
-    body: JSON.stringify(result)
+    parseResponseAsJson: false
   });
   await debug?.log(
     "SUBMIT",
@@ -1049,14 +987,11 @@ var getHeaders = ({
   callTimeout,
   telemetry
 }) => {
-  const contentType = (userHeaders ? userHeaders.get("Content-Type") : void 0) ?? DEFAULT_CONTENT_TYPE;
   const baseHeaders = {
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
     [WORKFLOW_URL_HEADER]: workflowUrl,
     [WORKFLOW_FEATURE_HEADER]: "LazyFetch,InitialBody",
-    [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION,
-    "content-type": contentType,
     ...telemetry ? getTelemetryHeaders(telemetry) : {}
   };
   if (!step?.callUrl) {
@@ -1067,13 +1002,18 @@ var getHeaders = ({
   }
   if (failureUrl) {
     baseHeaders[`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`] = "true";
+    baseHeaders[`Upstash-Failure-Callback-Forward-Upstash-Workflow-Failure-Callback`] = "true";
+    baseHeaders["Upstash-Failure-Callback-Workflow-Runid"] = workflowRunId;
+    baseHeaders["Upstash-Failure-Callback-Workflow-Init"] = "false";
+    baseHeaders["Upstash-Failure-Callback-Workflow-Url"] = workflowUrl;
+    baseHeaders["Upstash-Failure-Callback-Workflow-Calltype"] = "failureCall";
+    if (retries !== void 0) {
+      baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
+    }
     if (!step?.callUrl) {
       baseHeaders["Upstash-Failure-Callback"] = failureUrl;
     }
   }
-  if (step?.stepType === "Invoke") {
-    baseHeaders["upstash-workflow-invoke"] = "true";
-  }
   if (step?.callUrl) {
     baseHeaders["Upstash-Retries"] = callRetries?.toString() ?? "0";
     baseHeaders[WORKFLOW_FEATURE_HEADER] = "WF_NoDelete,InitialBody";
@@ -1095,6 +1035,7 @@ var getHeaders = ({
       baseHeaders[`Upstash-Failure-Callback-Forward-${header}`] = userHeaders.get(header);
     }
   }
+  const contentType = (userHeaders ? userHeaders.get("Content-Type") : void 0) ?? DEFAULT_CONTENT_TYPE;
   if (step?.callHeaders) {
     const forwardedHeaders = Object.fromEntries(
       Object.entries(step.callHeaders).map(([header, value]) => [
@@ -1144,7 +1085,8 @@ var getHeaders = ({
         "Upstash-Workflow-Runid": [workflowRunId],
         [WORKFLOW_INIT_HEADER]: ["false"],
         [WORKFLOW_URL_HEADER]: [workflowUrl],
-        "Upstash-Workflow-CallType": ["step"]
+        "Upstash-Workflow-CallType": ["step"],
+        "Content-Type": [contentType]
       }
     };
   }
@@ -1439,23 +1381,7 @@ var AutoExecutor = class _AutoExecutor {
         method: "POST",
         parseResponseAsJson: false
       });
-      throw new WorkflowAbort(waitStep.stepName, waitStep);
-    }
-    if (steps.length === 1 && lazySteps[0] instanceof LazyInvokeStep) {
-      const invokeStep = steps[0];
-      const lazyInvokeStep = lazySteps[0];
-      await lazyInvokeStep.params.workflow.callback(
-        {
-          body: lazyInvokeStep.params.body,
-          headers: lazyInvokeStep.params.headers,
-          workflowRunId: lazyInvokeStep.params.workflowRunId,
-          workflow: lazyInvokeStep.params.workflow,
-          retries: lazyInvokeStep.params.retries
-        },
-        invokeStep,
-        this.context
-      );
-      throw new WorkflowAbort(invokeStep.stepName, invokeStep);
+      throw new WorkflowAbort(steps[0].stepName, steps[0]);
     }
     const result = await this.context.qstashClient.batchJSON(
       steps.map((singleStep, index) => {
@@ -1774,9 +1700,10 @@ var wrapTools = ({
   return Object.fromEntries(
     Object.entries(tools).map((toolInfo) => {
       const [toolName, tool3] = toolInfo;
+      const executeAsStep = "executeAsStep" in tool3 ? tool3.executeAsStep : true;
       const aiSDKTool = convertToAISDKTool(tool3);
       const execute = aiSDKTool.execute;
-      if (execute) {
+      if (execute && executeAsStep) {
         const wrappedExecute = (...params) => {
           return context.run(`Run tool ${toolName}`, () => execute(...params));
         };
@@ -2372,13 +2299,6 @@ var WorkflowContext = class {
       return result;
     }
   }
-  async invoke(stepName, settings) {
-    const result = await this.addStep(new LazyInvokeStep(stepName, settings));
-    return {
-      ...result,
-      body: result.body ? JSON.parse(result.body) : void 0
-    };
-  }
   /**
    * Cancel the current workflow run
    *
@@ -2456,6 +2376,31 @@ var WorkflowLogger = class _WorkflowLogger {
   }
 };
 
+// src/utils.ts
+var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
+var NANOID_LENGTH = 21;
+function getRandomInt() {
+  return Math.floor(Math.random() * NANOID_CHARS.length);
+}
+function nanoid() {
+  return Array.from({ length: NANOID_LENGTH }).map(() => NANOID_CHARS[getRandomInt()]).join("");
+}
+function getWorkflowRunId(id) {
+  return `wfr_${id ?? nanoid()}`;
+}
+function decodeBase64(base64) {
+  try {
+    const binString = atob(base64);
+    const intArray = Uint8Array.from(binString, (m) => m.codePointAt(0));
+    return new TextDecoder().decode(intArray);
+  } catch (error) {
+    console.warn(
+      `Upstash Qstash: Failed while decoding base64 "${base64}". Decoding with atob and returning it instead. ${error}`
+    );
+    return atob(base64);
+  }
+}
+
 // src/serve/authorization.ts
 var import_qstash8 = require("@upstash/qstash");
 var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowContext {
@@ -2901,8 +2846,8 @@ var serveBase = (routeFunction, telemetry, options) => {
     } else if (callReturnCheck.value === "continue-workflow") {
       const result = isFirstInvocation ? await triggerFirstInvocation({ workflowContext, useJSONContent, telemetry, debug }) : await triggerRouteFunction({
         onStep: async () => routeFunction(workflowContext),
-        onCleanup: async (result2) => {
-          await triggerWorkflowDelete(workflowContext, result2, debug);
+        onCleanup: async () => {
+          await triggerWorkflowDelete(workflowContext, debug);
         },
         onCancel: async () => {
           await makeCancelRequest(workflowContext.qstashClient.http, workflowRunId);
@@ -2936,11 +2881,6 @@ var serveBase = (routeFunction, telemetry, options) => {
 
 // platforms/solidjs.ts
 var serve = (routeFunction, options) => {
-  const telemetry = {
-    sdk: SDK_TELEMETRY,
-    framework: "solidjs",
-    runtime: process.versions.bun ? `bun@${process.versions.bun}/node@${process.version}` : `node@${process.version}`
-  };
   const handler = async (event) => {
     const method = event.request.method;
     if (method.toUpperCase() !== "POST") {
@@ -2948,7 +2888,15 @@ var serve = (routeFunction, options) => {
         status: 405
       });
     }
-    const { handler: serveHandler } = serveBase(routeFunction, telemetry, options);
+    const { handler: serveHandler } = serveBase(
+      routeFunction,
+      {
+        sdk: SDK_TELEMETRY,
+        framework: "solidjs",
+        runtime: process.versions.bun ? `bun@${process.versions.bun}/node@${process.version}` : `node@${process.version}`
+      },
+      options
+    );
     return await serveHandler(event.request);
   };
   return { POST: handler };

package/solidjs.mjs

@@ -1,15 +1,10 @@
 import {
   SDK_TELEMETRY,
   serveBase
-} from "./chunk-IWAW7GIG.mjs";
+} from "./chunk-BPUSHNSD.mjs";
 
 // platforms/solidjs.ts
 var serve = (routeFunction, options) => {
-  const telemetry = {
-    sdk: SDK_TELEMETRY,
-    framework: "solidjs",
-    runtime: process.versions.bun ? `bun@${process.versions.bun}/node@${process.version}` : `node@${process.version}`
-  };
   const handler = async (event) => {
     const method = event.request.method;
     if (method.toUpperCase() !== "POST") {
@@ -17,7 +12,15 @@ var serve = (routeFunction, options) => {
         status: 405
       });
     }
-    const { handler: serveHandler } = serveBase(routeFunction, telemetry, options);
+    const { handler: serveHandler } = serveBase(
+      routeFunction,
+      {
+        sdk: SDK_TELEMETRY,
+        framework: "solidjs",
+        runtime: process.versions.bun ? `bun@${process.versions.bun}/node@${process.version}` : `node@${process.version}`
+      },
+      options
+    );
     return await serveHandler(event.request);
   };
   return { POST: handler };

package/svelte.d.mts

@@ -1,14 +1,12 @@
-import * as _sveltejs_kit from '@sveltejs/kit';
 import { RequestHandler } from '@sveltejs/kit';
-import { R as RouteFunction, j as PublicServeOptions, t as InvokableWorkflow } from './types-C7Y7WUQd.mjs';
-import { s as serveManyBase } from './serve-many-BlBvXfBS.mjs';
+import { R as RouteFunction, k as PublicServeOptions } from './types-B62AnIU3.mjs';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';
 import '@ai-sdk/openai';
 
 /**
- * Serve method to serve a Upstash Workflow in a Svelte project
+ * Serve method to serve a Upstash Workflow in a Nextjs project
  *
  * See for options https://upstash.com/docs/qstash/workflows/basics/serve
  *
@@ -16,16 +14,10 @@ import '@ai-sdk/openai';
  * @param options workflow options
  * @returns
  */
-declare const serve: <TInitialPayload = unknown, TResult = unknown>(routeFunction: RouteFunction<TInitialPayload, TResult>, options: PublicServeOptions<TInitialPayload> & {
+declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options: PublicServeOptions<TInitialPayload> & {
     env: PublicServeOptions["env"];
 }) => {
     POST: RequestHandler;
 };
-declare const createWorkflow: <TInitialPayload, TResult>(routeFunction: RouteFunction<TInitialPayload, TResult>, options: PublicServeOptions<TInitialPayload> & {
-    env: PublicServeOptions["env"];
-}) => InvokableWorkflow<TInitialPayload, TResult, Parameters<ReturnType<typeof serve<TInitialPayload, TResult>>["POST"]>>;
-declare const serveMany: (workflows: Parameters<typeof serveManyBase>[0]["workflows"]) => {
-    POST: (event: _sveltejs_kit.RequestEvent<Partial<Record<string, string>>, string | null>) => Promise<any>;
-};
 
-export { createWorkflow, serve, serveMany };
+export { serve };

package/svelte.d.ts

@@ -1,14 +1,12 @@
-import * as _sveltejs_kit from '@sveltejs/kit';
 import { RequestHandler } from '@sveltejs/kit';
-import { R as RouteFunction, j as PublicServeOptions, t as InvokableWorkflow } from './types-C7Y7WUQd.js';
-import { s as serveManyBase } from './serve-many-Dw-UUnH6.js';
+import { R as RouteFunction, k as PublicServeOptions } from './types-B62AnIU3.js';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';
 import '@ai-sdk/openai';
 
 /**
- * Serve method to serve a Upstash Workflow in a Svelte project
+ * Serve method to serve a Upstash Workflow in a Nextjs project
  *
  * See for options https://upstash.com/docs/qstash/workflows/basics/serve
  *
@@ -16,16 +14,10 @@ import '@ai-sdk/openai';
  * @param options workflow options
  * @returns
  */
-declare const serve: <TInitialPayload = unknown, TResult = unknown>(routeFunction: RouteFunction<TInitialPayload, TResult>, options: PublicServeOptions<TInitialPayload> & {
+declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options: PublicServeOptions<TInitialPayload> & {
     env: PublicServeOptions["env"];
 }) => {
     POST: RequestHandler;
 };
-declare const createWorkflow: <TInitialPayload, TResult>(routeFunction: RouteFunction<TInitialPayload, TResult>, options: PublicServeOptions<TInitialPayload> & {
-    env: PublicServeOptions["env"];
-}) => InvokableWorkflow<TInitialPayload, TResult, Parameters<ReturnType<typeof serve<TInitialPayload, TResult>>["POST"]>>;
-declare const serveMany: (workflows: Parameters<typeof serveManyBase>[0]["workflows"]) => {
-    POST: (event: _sveltejs_kit.RequestEvent<Partial<Record<string, string>>, string | null>) => Promise<any>;
-};
 
-export { createWorkflow, serve, serveMany };
+export { serve };