@upstash/workflow 0.2.1 → 0.2.2

package/express.js

@@ -23556,52 +23556,12 @@ var require_express2 = __commonJS({
 // platforms/express.ts
 var express_exports = {};
 __export(express_exports, {
-  serve: () => serve2
+  serve: () => serve
 });
 module.exports = __toCommonJS(express_exports);
 
-// src/error.ts
-var import_qstash = require("@upstash/qstash");
-var WorkflowError = class extends import_qstash.QstashError {
-  constructor(message) {
-    super(message);
-    this.name = "WorkflowError";
-  }
-};
-var WorkflowAbort = class extends Error {
-  stepInfo;
-  stepName;
-  /**
-   * whether workflow is to be canceled on abort
-   */
-  cancelWorkflow;
-  /**
-   *
-   * @param stepName name of the aborting step
-   * @param stepInfo step information
-   * @param cancelWorkflow
-   */
-  constructor(stepName, stepInfo, cancelWorkflow = false) {
-    super(
-      `This is an Upstash Workflow error thrown after a step executes. It is expected to be raised. Make sure that you await for each step. Also, if you are using try/catch blocks, you should not wrap context.run/sleep/sleepUntil/call methods with try/catch. Aborting workflow after executing step '${stepName}'.`
-    );
-    this.name = "WorkflowAbort";
-    this.stepName = stepName;
-    this.stepInfo = stepInfo;
-    this.cancelWorkflow = cancelWorkflow;
-  }
-};
-var formatWorkflowError = (error) => {
-  return error instanceof Error ? {
-    error: error.name,
-    message: error.message
-  } : {
-    error: "Error",
-    message: "An error occured while executing workflow."
-  };
-};
-
 // src/client/utils.ts
+var import_qstash = require("@upstash/qstash");
 var makeNotifyRequest = async (requester, eventId, eventData) => {
   const result = await requester.request({
     path: ["v2", "notify", eventId],
@@ -23628,27 +23588,72 @@ var getSteps = async (requester, workflowRunId, messageId, debug) => {
       await debug?.log("INFO", "ENDPOINT_START", {
         message: `Pulled ${steps.length} steps from QStashand returned them without filtering with messageId.`
       });
-      return steps;
+      return { steps, workflowRunEnded: false };
     } else {
       const index = steps.findIndex((item) => item.messageId === messageId);
       if (index === -1) {
-        return [];
+        return { steps: [], workflowRunEnded: false };
       }
       const filteredSteps = steps.slice(0, index + 1);
       await debug?.log("INFO", "ENDPOINT_START", {
         message: `Pulled ${steps.length} steps from QStash and filtered them to ${filteredSteps.length} using messageId.`
       });
-      return filteredSteps;
+      return { steps: filteredSteps, workflowRunEnded: false };
     }
   } catch (error) {
-    await debug?.log("ERROR", "ERROR", {
-      message: "failed while fetching steps.",
-      error
-    });
-    throw new WorkflowError(`Failed while pulling steps. ${error}`);
+    if (error instanceof import_qstash.QstashError && error.status === 404) {
+      await debug?.log("WARN", "ENDPOINT_START", {
+        message: "Couldn't fetch workflow run steps. This can happen if the workflow run succesfully ends before some callback is executed.",
+        error
+      });
+      return { steps: void 0, workflowRunEnded: true };
+    } else {
+      throw error;
+    }
   }
 };
 
+// src/error.ts
+var import_qstash2 = require("@upstash/qstash");
+var WorkflowError = class extends import_qstash2.QstashError {
+  constructor(message) {
+    super(message);
+    this.name = "WorkflowError";
+  }
+};
+var WorkflowAbort = class extends Error {
+  stepInfo;
+  stepName;
+  /**
+   * whether workflow is to be canceled on abort
+   */
+  cancelWorkflow;
+  /**
+   *
+   * @param stepName name of the aborting step
+   * @param stepInfo step information
+   * @param cancelWorkflow
+   */
+  constructor(stepName, stepInfo, cancelWorkflow = false) {
+    super(
+      `This is an Upstash Workflow error thrown after a step executes. It is expected to be raised. Make sure that you await for each step. Also, if you are using try/catch blocks, you should not wrap context.run/sleep/sleepUntil/call methods with try/catch. Aborting workflow after executing step '${stepName}'.`
+    );
+    this.name = "WorkflowAbort";
+    this.stepName = stepName;
+    this.stepInfo = stepInfo;
+    this.cancelWorkflow = cancelWorkflow;
+  }
+};
+var formatWorkflowError = (error) => {
+  return error instanceof Error ? {
+    error: error.name,
+    message: error.message
+  } : {
+    error: "Error",
+    message: "An error occured while executing workflow."
+  };
+};
+
 // src/context/steps.ts
 var BaseLazyStep = class {
   stepName;
@@ -24269,8 +24274,8 @@ var StepTypes = [
 ];
 
 // src/workflow-requests.ts
-var import_qstash2 = require("@upstash/qstash");
-var triggerFirstInvocation = async (workflowContext, retries, debug) => {
+var import_qstash3 = require("@upstash/qstash");
+var triggerFirstInvocation = async (workflowContext, retries, useJSONContent, debug) => {
   const { headers } = getHeaders(
     "true",
     workflowContext.workflowRunId,
@@ -24280,6 +24285,9 @@ var triggerFirstInvocation = async (workflowContext, retries, debug) => {
     workflowContext.failureUrl,
     retries
   );
+  if (useJSONContent) {
+    headers["content-type"] = "application/json";
+  }
   try {
     const body = typeof workflowContext.requestPayload === "string" ? workflowContext.requestPayload : JSON.stringify(workflowContext.requestPayload);
     const result = await workflowContext.qstashClient.publish({
@@ -24323,7 +24331,7 @@ var triggerRouteFunction = async ({
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
-    if (error instanceof import_qstash2.QstashError && error.status === 400) {
+    if (error instanceof import_qstash3.QstashError && error.status === 400) {
       await debug?.log("WARN", "RESPONSE_WORKFLOW", {
         message: `tried to append to a cancelled workflow. exiting without publishing.`,
         name: error.name,
@@ -24357,7 +24365,7 @@ var triggerWorkflowDelete = async (workflowContext, debug, cancel = false) => {
     );
     return { deleted: true };
   } catch (error) {
-    if (error instanceof import_qstash2.QstashError && error.status === 404) {
+    if (error instanceof import_qstash3.QstashError && error.status === 404) {
       await debug?.log("WARN", "SUBMIT_CLEANUP", {
         message: `Failed to remove workflow run ${workflowContext.workflowRunId} as it doesn't exist.`,
         name: error.name,
@@ -24394,11 +24402,19 @@ var handleThirdPartyCallResult = async (request, requestPayload, client, workflo
         if (!workflowRunId2)
           throw new WorkflowError("workflow run id missing in context.call lazy fetch.");
         if (!messageId) throw new WorkflowError("message id missing in context.call lazy fetch.");
-        const steps = await getSteps(client.http, workflowRunId2, messageId, debug);
+        const { steps, workflowRunEnded } = await getSteps(
+          client.http,
+          workflowRunId2,
+          messageId,
+          debug
+        );
+        if (workflowRunEnded) {
+          return ok("workflow-ended");
+        }
         const failingStep = steps.find((step) => step.messageId === messageId);
         if (!failingStep)
           throw new WorkflowError(
-            "Failed to submit the context.call." + (steps.length === 0 ? "No steps found." : `No step was found with matching messageId ${messageId} out of ${steps.length} steps.`)
+            "Failed to submit the context.call. " + (steps.length === 0 ? "No steps found." : `No step was found with matching messageId ${messageId} out of ${steps.length} steps.`)
           );
         callbackPayload = atob(failingStep.body);
       }
@@ -25437,7 +25453,7 @@ function decodeBase64(base64) {
 }
 
 // src/serve/authorization.ts
-var import_qstash3 = require("@upstash/qstash");
+var import_qstash4 = require("@upstash/qstash");
 var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowContext {
   static disabledMessage = "disabled-qstash-worklfow-run";
   /**
@@ -25468,7 +25484,7 @@ var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowCon
    */
   static async tryAuthentication(routeFunction, context) {
     const disabledContext = new _DisabledWorkflowContext({
-      qstashClient: new import_qstash3.Client({
+      qstashClient: new import_qstash4.Client({
         baseUrl: "disabled-client",
         token: "disabled-client"
       }),
@@ -25592,7 +25608,8 @@ var parseRequest = async (requestPayload, isFirstInvocation, workflowRunId, requ
     return {
       rawInitialPayload: requestPayload ?? "",
       steps: [],
-      isLastDuplicate: false
+      isLastDuplicate: false,
+      workflowRunEnded: false
     };
   } else {
     let rawSteps;
@@ -25602,7 +25619,21 @@ var parseRequest = async (requestPayload, isFirstInvocation, workflowRunId, requ
         "ENDPOINT_START",
         "request payload is empty, steps will be fetched from QStash."
       );
-      rawSteps = await getSteps(requester, workflowRunId, messageId, debug);
+      const { steps: fetchedSteps, workflowRunEnded } = await getSteps(
+        requester,
+        workflowRunId,
+        messageId,
+        debug
+      );
+      if (workflowRunEnded) {
+        return {
+          rawInitialPayload: void 0,
+          steps: void 0,
+          isLastDuplicate: void 0,
+          workflowRunEnded: true
+        };
+      }
+      rawSteps = fetchedSteps;
     } else {
       rawSteps = JSON.parse(requestPayload);
     }
@@ -25612,7 +25643,8 @@ var parseRequest = async (requestPayload, isFirstInvocation, workflowRunId, requ
     return {
       rawInitialPayload,
       steps: deduplicatedSteps,
-      isLastDuplicate
+      isLastDuplicate,
+      workflowRunEnded: false
     };
   }
 };
@@ -25666,15 +25698,15 @@ var handleFailure = async (request, requestPayload, qstashClient, initialPayload
 };
 
 // src/serve/options.ts
-var import_qstash4 = require("@upstash/qstash");
 var import_qstash5 = require("@upstash/qstash");
+var import_qstash6 = require("@upstash/qstash");
 var processOptions = (options) => {
   const environment = options?.env ?? (typeof process === "undefined" ? {} : process.env);
   const receiverEnvironmentVariablesSet = Boolean(
     environment.QSTASH_CURRENT_SIGNING_KEY && environment.QSTASH_NEXT_SIGNING_KEY
   );
   return {
-    qstashClient: new import_qstash5.Client({
+    qstashClient: new import_qstash6.Client({
       baseUrl: environment.QSTASH_URL,
       token: environment.QSTASH_TOKEN
     }),
@@ -25708,13 +25740,14 @@ var processOptions = (options) => {
         throw error;
       }
     },
-    receiver: receiverEnvironmentVariablesSet ? new import_qstash4.Receiver({
+    receiver: receiverEnvironmentVariablesSet ? new import_qstash5.Receiver({
       currentSigningKey: environment.QSTASH_CURRENT_SIGNING_KEY,
       nextSigningKey: environment.QSTASH_NEXT_SIGNING_KEY
     }) : void 0,
     baseUrl: environment.UPSTASH_WORKFLOW_URL,
     env: environment,
     retries: DEFAULT_RETRIES,
+    useJSONContent: false,
     ...options
   };
 };
@@ -25731,6 +25764,16 @@ var determineUrls = async (request, url, baseUrl, failureFunction, failureUrl, d
     });
   }
   const workflowFailureUrl = failureFunction ? workflowUrl : failureUrl;
+  if (workflowUrl.includes("localhost")) {
+    await debug?.log("WARN", "ENDPOINT_START", {
+      message: `Workflow URL contains localhost. This can happen in local development, but shouldn't happen in production unless you have a route which contains localhost. Received: ${workflowUrl}`
+    });
+  }
+  if (!(workflowUrl.startsWith("http://") || workflowUrl.startsWith("https://"))) {
+    throw new WorkflowError(
+      `Workflow URL should start with 'http://' or 'https://'. Recevied is '${workflowUrl}'`
+    );
+  }
   return {
     workflowUrl,
     workflowFailureUrl
@@ -25739,7 +25782,7 @@ var determineUrls = async (request, url, baseUrl, failureFunction, failureUrl, d
 var AUTH_FAIL_MESSAGE = `Failed to authenticate Workflow request. If this is unexpected, see the caveat https://upstash.com/docs/workflow/basics/caveats#avoid-non-deterministic-code-outside-context-run`;
 
 // src/serve/index.ts
-var serve = (routeFunction, options) => {
+var serveBase = (routeFunction, options) => {
   const {
     qstashClient,
     onStepFinish,
@@ -25751,7 +25794,8 @@ var serve = (routeFunction, options) => {
     failureFunction,
     baseUrl,
     env,
-    retries
+    retries,
+    useJSONContent
   } = processOptions(options);
   const debug = WorkflowLogger.getLogger(verbose);
   const handler = async (request) => {
@@ -25768,7 +25812,7 @@ var serve = (routeFunction, options) => {
     await verifyRequest(requestPayload, request.headers.get("upstash-signature"), receiver);
     const { isFirstInvocation, workflowRunId } = validateRequest(request);
     debug?.setWorkflowRunId(workflowRunId);
-    const { rawInitialPayload, steps, isLastDuplicate } = await parseRequest(
+    const { rawInitialPayload, steps, isLastDuplicate, workflowRunEnded } = await parseRequest(
       requestPayload,
       isFirstInvocation,
       workflowRunId,
@@ -25776,8 +25820,11 @@ var serve = (routeFunction, options) => {
       request.headers.get("upstash-message-id"),
       debug
     );
+    if (workflowRunEnded) {
+      return onStepFinish(workflowRunId, "workflow-already-ended");
+    }
     if (isLastDuplicate) {
-      return onStepFinish("no-workflow-id", "duplicate-step");
+      return onStepFinish(workflowRunId, "duplicate-step");
     }
     const failureCheck = await handleFailure(
       request,
@@ -25791,7 +25838,7 @@ var serve = (routeFunction, options) => {
       throw failureCheck.error;
     } else if (failureCheck.value === "is-failure-callback") {
       await debug?.log("WARN", "RESPONSE_DEFAULT", "failureFunction executed");
-      return onStepFinish("no-workflow-id", "failure-callback");
+      return onStepFinish(workflowRunId, "failure-callback");
     }
     const workflowContext = new WorkflowContext({
       qstashClient,
@@ -25834,7 +25881,7 @@ var serve = (routeFunction, options) => {
       });
       throw callReturnCheck.error;
     } else if (callReturnCheck.value === "continue-workflow") {
-      const result = isFirstInvocation ? await triggerFirstInvocation(workflowContext, retries, debug) : await triggerRouteFunction({
+      const result = isFirstInvocation ? await triggerFirstInvocation(workflowContext, retries, useJSONContent, debug) : await triggerRouteFunction({
         onStep: async () => routeFunction(workflowContext),
         onCleanup: async () => {
           await triggerWorkflowDelete(workflowContext, debug);
@@ -25850,6 +25897,8 @@ var serve = (routeFunction, options) => {
       }
       await debug?.log("INFO", "RESPONSE_WORKFLOW");
       return onStepFinish(workflowContext.workflowRunId, "success");
+    } else if (callReturnCheck.value === "workflow-ended") {
+      return onStepFinish(workflowContext.workflowRunId, "workflow-already-ended");
     }
     await debug?.log("INFO", "RESPONSE_DEFAULT");
     return onStepFinish("no-workflow-id", "fromCallback");
@@ -25867,21 +25916,22 @@ var serve = (routeFunction, options) => {
   return { handler: safeHandler };
 };
 
-// src/client/index.ts
-var import_qstash6 = require("@upstash/qstash");
-
 // platforms/express.ts
 var import_express = __toESM(require_express2());
-function serve2(routeFunction, options) {
+function serve(routeFunction, options) {
   const router = (0, import_express.Router)();
   const handler = async (request_, res) => {
     if (request_.method.toUpperCase() !== "POST") {
       res.status(405).json("Only POST requests are allowed in workflows");
       return;
     }
-    if (request_.headers["content-type"] !== "application/json") {
-      res.status(400).json("Only application/json content type is allowed in express workflows");
-      return;
+    let requestBody;
+    if (request_.headers["content-type"]?.includes("text/plain")) {
+      requestBody = request_.body;
+    } else if (request_.headers["content-type"]?.includes("application/json")) {
+      requestBody = JSON.stringify(request_.body);
+    } else {
+      requestBody = typeof request_.body === "string" ? request_.body : JSON.stringify(request_.body);
     }
     const protocol = request_.protocol;
     const host = request_.get("host") || "localhost";
@@ -25889,11 +25939,14 @@ function serve2(routeFunction, options) {
     const webRequest = new Request(url, {
       method: request_.method,
       headers: new Headers(request_.headers),
-      body: JSON.stringify(request_.body)
+      body: requestBody
     });
-    const { handler: serveHandler } = serve(
+    const { handler: serveHandler } = serveBase(
       (workflowContext) => routeFunction(workflowContext),
-      options
+      {
+        ...options,
+        useJSONContent: true
+      }
     );
     const response = await serveHandler(webRequest);
     res.status(response.status).json(await response.json());

package/express.mjs

@@ -2,8 +2,8 @@ import {
   __commonJS,
   __require,
   __toESM,
-  serve
-} from "./chunk-ADOBNR4O.mjs";
+  serveBase
+} from "./chunk-Z7WS5XIR.mjs";
 
 // node_modules/depd/index.js
 var require_depd = __commonJS({
@@ -23530,16 +23530,20 @@ var require_express2 = __commonJS({
 
 // platforms/express.ts
 var import_express = __toESM(require_express2());
-function serve2(routeFunction, options) {
+function serve(routeFunction, options) {
   const router = (0, import_express.Router)();
   const handler = async (request_, res) => {
     if (request_.method.toUpperCase() !== "POST") {
       res.status(405).json("Only POST requests are allowed in workflows");
       return;
     }
-    if (request_.headers["content-type"] !== "application/json") {
-      res.status(400).json("Only application/json content type is allowed in express workflows");
-      return;
+    let requestBody;
+    if (request_.headers["content-type"]?.includes("text/plain")) {
+      requestBody = request_.body;
+    } else if (request_.headers["content-type"]?.includes("application/json")) {
+      requestBody = JSON.stringify(request_.body);
+    } else {
+      requestBody = typeof request_.body === "string" ? request_.body : JSON.stringify(request_.body);
     }
     const protocol = request_.protocol;
     const host = request_.get("host") || "localhost";
@@ -23547,11 +23551,14 @@ function serve2(routeFunction, options) {
     const webRequest = new Request(url, {
       method: request_.method,
       headers: new Headers(request_.headers),
-      body: JSON.stringify(request_.body)
+      body: requestBody
     });
-    const { handler: serveHandler } = serve(
+    const { handler: serveHandler } = serveBase(
       (workflowContext) => routeFunction(workflowContext),
-      options
+      {
+        ...options,
+        useJSONContent: true
+      }
     );
     const response = await serveHandler(webRequest);
     res.status(response.status).json(await response.json());
@@ -23560,7 +23567,7 @@ function serve2(routeFunction, options) {
   return router;
 }
 export {
-  serve2 as serve
+  serve
 };
 /*! Bundled license information:
 

package/h3.d.mts

@@ -1,8 +1,8 @@
 import * as h3 from 'h3';
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-Be4hC1mu.mjs';
+import { R as RouteFunction, j as PublicServeOptions } from './types-APRap-aV.mjs';
 import '@upstash/qstash';
 
-declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options?: Omit<WorkflowServeOptions<Response, TInitialPayload>, "onStepFinish">) => {
+declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options?: PublicServeOptions<TInitialPayload>) => {
     handler: h3.EventHandler<h3.EventHandlerRequest, Promise<Response | {
         status: number;
         body: string;

package/h3.d.ts

@@ -1,8 +1,8 @@
 import * as h3 from 'h3';
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-Be4hC1mu.js';
+import { R as RouteFunction, j as PublicServeOptions } from './types-APRap-aV.js';
 import '@upstash/qstash';
 
-declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options?: Omit<WorkflowServeOptions<Response, TInitialPayload>, "onStepFinish">) => {
+declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options?: PublicServeOptions<TInitialPayload>) => {
     handler: h3.EventHandler<h3.EventHandlerRequest, Promise<Response | {
         status: number;
         body: string;