@upstash/workflow 0.1.4 → 0.2.0

package/express.js

@@ -15316,9 +15316,19 @@ var require_object_inspect = __commonJS({
     var utilInspect = require_util_inspect();
     var inspectCustom = utilInspect.custom;
     var inspectSymbol = isSymbol(inspectCustom) ? inspectCustom : null;
+    var quotes = {
+      __proto__: null,
+      "double": '"',
+      single: "'"
+    };
+    var quoteREs = {
+      __proto__: null,
+      "double": /(["\\])/g,
+      single: /(['\\])/g
+    };
     module2.exports = function inspect_(obj, options, depth, seen) {
       var opts = options || {};
-      if (has(opts, "quoteStyle") && (opts.quoteStyle !== "single" && opts.quoteStyle !== "double")) {
+      if (has(opts, "quoteStyle") && !has(quotes, opts.quoteStyle)) {
         throw new TypeError('option "quoteStyle" must be "single" or "double"');
       }
       if (has(opts, "maxStringLength") && (typeof opts.maxStringLength === "number" ? opts.maxStringLength < 0 && opts.maxStringLength !== Infinity : opts.maxStringLength !== null)) {
@@ -15499,7 +15509,8 @@ var require_object_inspect = __commonJS({
       return String(obj);
     };
     function wrapQuotes(s, defaultStyle, opts) {
-      var quoteChar = (opts.quoteStyle || defaultStyle) === "double" ? '"' : "'";
+      var style = opts.quoteStyle || defaultStyle;
+      var quoteChar = quotes[style];
       return quoteChar + s + quoteChar;
     }
     function quote(s) {
@@ -15674,7 +15685,9 @@ var require_object_inspect = __commonJS({
         var trailer = "... " + remaining + " more character" + (remaining > 1 ? "s" : "");
         return inspectString($slice.call(str, 0, opts.maxStringLength), opts) + trailer;
       }
-      var s = $replace.call($replace.call(str, /(['\\])/g, "\\$1"), /[\x00-\x1f]/g, lowbyte);
+      var quoteRE = quoteREs[opts.quoteStyle || "single"];
+      quoteRE.lastIndex = 0;
+      var s = $replace.call($replace.call(str, quoteRE, "\\$1"), /[\x00-\x1f]/g, lowbyte);
       return wrapQuotes(s, "single", opts);
     }
     function lowbyte(c) {
@@ -19657,14 +19670,14 @@ var require_etag = __commonJS({
   "node_modules/etag/index.js"(exports2, module2) {
     "use strict";
     module2.exports = etag;
-    var crypto2 = require("crypto");
+    var crypto = require("crypto");
     var Stats = require("fs").Stats;
     var toString = Object.prototype.toString;
     function entitytag(entity) {
       if (entity.length === 0) {
         return '"0-2jmj7l5rSw0yVb/vlWAYkK/YBwk"';
       }
-      var hash = crypto2.createHash("sha1").update(entity, "utf8").digest("base64").substring(0, 27);
+      var hash = crypto.createHash("sha1").update(entity, "utf8").digest("base64").substring(0, 27);
       var len = typeof entity === "string" ? Buffer.byteLength(entity, "utf8") : entity.length;
       return '"' + len.toString(16) + "-" + hash + '"';
     }
@@ -22560,11 +22573,11 @@ var require_request = __commonJS({
 var require_cookie_signature = __commonJS({
   "node_modules/cookie-signature/index.js"(exports2) {
     "use strict";
-    var crypto2 = require("crypto");
+    var crypto = require("crypto");
     exports2.sign = function(val, secret) {
       if ("string" != typeof val) throw new TypeError("Cookie value must be provided as a string.");
       if ("string" != typeof secret) throw new TypeError("Secret string must be provided.");
-      return val + "." + crypto2.createHmac("sha256", secret).update(val).digest("base64").replace(/\=+$/, "");
+      return val + "." + crypto.createHmac("sha256", secret).update(val).digest("base64").replace(/\=+$/, "");
     };
     exports2.unsign = function(val, secret) {
       if ("string" != typeof val) throw new TypeError("Signed cookie string must be provided.");
@@ -22573,7 +22586,7 @@ var require_cookie_signature = __commonJS({
       return sha1(mac) == sha1(val) ? str : false;
     };
     function sha1(str) {
-      return crypto2.createHash("sha1").update(str).digest("hex");
+      return crypto.createHash("sha1").update(str).digest("hex");
     }
   }
 });
@@ -23549,22 +23562,33 @@ module.exports = __toCommonJS(express_exports);
 
 // src/error.ts
 var import_qstash = require("@upstash/qstash");
-var QStashWorkflowError = class extends import_qstash.QstashError {
+var WorkflowError = class extends import_qstash.QstashError {
   constructor(message) {
     super(message);
-    this.name = "QStashWorkflowError";
+    this.name = "WorkflowError";
   }
 };
-var QStashWorkflowAbort = class extends Error {
+var WorkflowAbort = class extends Error {
   stepInfo;
   stepName;
-  constructor(stepName, stepInfo) {
+  /**
+   * 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 = "QStashWorkflowAbort";
+    this.name = "WorkflowAbort";
     this.stepName = stepName;
     this.stepInfo = stepInfo;
+    this.cancelWorkflow = cancelWorkflow;
   }
 };
 var formatWorkflowError = (error) => {
@@ -23586,6 +23610,44 @@ var makeNotifyRequest = async (requester, eventId, eventData) => {
   });
   return result;
 };
+var makeCancelRequest = async (requester, workflowRunId) => {
+  await requester.request({
+    path: ["v2", "workflows", "runs", `${workflowRunId}?cancel=true`],
+    method: "DELETE",
+    parseResponseAsJson: false
+  });
+  return true;
+};
+var getSteps = async (requester, workflowRunId, messageId, debug) => {
+  try {
+    const steps = await requester.request({
+      path: ["v2", "workflows", "runs", workflowRunId],
+      parseResponseAsJson: true
+    });
+    if (!messageId) {
+      await debug?.log("INFO", "ENDPOINT_START", {
+        message: `Pulled ${steps.length} steps from QStashand returned them without filtering with messageId.`
+      });
+      return steps;
+    } else {
+      const index = steps.findIndex((item) => item.messageId === messageId);
+      if (index === -1) {
+        return [];
+      }
+      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;
+    }
+  } catch (error) {
+    await debug?.log("ERROR", "ERROR", {
+      message: "failed while fetching steps.",
+      error
+    });
+    throw new WorkflowError(`Failed while pulling steps. ${error}`);
+  }
+};
 
 // src/context/steps.ts
 var BaseLazyStep = class {
@@ -24200,6 +24262,7 @@ var StepTypes = [
 ];
 
 // src/workflow-requests.ts
+var import_qstash2 = require("@upstash/qstash");
 var triggerFirstInvocation = async (workflowContext, retries, debug) => {
   const { headers } = getHeaders(
     "true",
@@ -24210,20 +24273,32 @@ var triggerFirstInvocation = async (workflowContext, retries, debug) => {
     workflowContext.failureUrl,
     retries
   );
-  await debug?.log("SUBMIT", "SUBMIT_FIRST_INVOCATION", {
-    headers,
-    requestPayload: workflowContext.requestPayload,
-    url: workflowContext.url
-  });
   try {
     const body = typeof workflowContext.requestPayload === "string" ? workflowContext.requestPayload : JSON.stringify(workflowContext.requestPayload);
-    await workflowContext.qstashClient.publish({
+    const result = await workflowContext.qstashClient.publish({
       headers,
       method: "POST",
       body,
       url: workflowContext.url
     });
-    return ok("success");
+    if (result.deduplicated) {
+      await debug?.log("WARN", "SUBMIT_FIRST_INVOCATION", {
+        message: `Workflow run ${workflowContext.workflowRunId} already exists. A new one isn't created.`,
+        headers,
+        requestPayload: workflowContext.requestPayload,
+        url: workflowContext.url,
+        messageId: result.messageId
+      });
+      return ok("workflow-run-already-exists");
+    } else {
+      await debug?.log("SUBMIT", "SUBMIT_FIRST_INVOCATION", {
+        headers,
+        requestPayload: workflowContext.requestPayload,
+        url: workflowContext.url,
+        messageId: result.messageId
+      });
+      return ok("success");
+    }
   } catch (error) {
     const error_ = error;
     return err(error_);
@@ -24231,7 +24306,9 @@ var triggerFirstInvocation = async (workflowContext, retries, debug) => {
 };
 var triggerRouteFunction = async ({
   onCleanup,
-  onStep
+  onStep,
+  onCancel,
+  debug
 }) => {
   try {
     await onStep();
@@ -24239,19 +24316,50 @@ var triggerRouteFunction = async ({
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
-    return error_ instanceof QStashWorkflowAbort ? ok("step-finished") : err(error_);
+    if (error instanceof import_qstash2.QstashError && error.status === 400) {
+      await debug?.log("WARN", "RESPONSE_WORKFLOW", {
+        message: `tried to append to a cancelled workflow. exiting without publishing.`,
+        name: error.name,
+        errorMessage: error.message
+      });
+      return ok("workflow-was-finished");
+    } else if (!(error_ instanceof WorkflowAbort)) {
+      return err(error_);
+    } else if (error_.cancelWorkflow) {
+      await onCancel();
+      return ok("workflow-finished");
+    } else {
+      return ok("step-finished");
+    }
   }
 };
 var triggerWorkflowDelete = async (workflowContext, debug, cancel = false) => {
   await debug?.log("SUBMIT", "SUBMIT_CLEANUP", {
     deletedWorkflowRunId: workflowContext.workflowRunId
   });
-  const result = await workflowContext.qstashClient.http.request({
-    path: ["v2", "workflows", "runs", `${workflowContext.workflowRunId}?cancel=${cancel}`],
-    method: "DELETE",
-    parseResponseAsJson: false
-  });
-  await debug?.log("SUBMIT", "SUBMIT_CLEANUP", result);
+  try {
+    await workflowContext.qstashClient.http.request({
+      path: ["v2", "workflows", "runs", `${workflowContext.workflowRunId}?cancel=${cancel}`],
+      method: "DELETE",
+      parseResponseAsJson: false
+    });
+    await debug?.log(
+      "SUBMIT",
+      "SUBMIT_CLEANUP",
+      `workflow run ${workflowContext.workflowRunId} deleted.`
+    );
+    return { deleted: true };
+  } catch (error) {
+    if (error instanceof import_qstash2.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,
+        errorMessage: error.message
+      });
+      return { deleted: false };
+    }
+    throw error;
+  }
 };
 var recreateUserHeaders = (headers) => {
   const filteredHeaders = new Headers();
@@ -24267,15 +24375,32 @@ var recreateUserHeaders = (headers) => {
 var handleThirdPartyCallResult = async (request, requestPayload, client, workflowUrl, failureUrl, retries, debug) => {
   try {
     if (request.headers.get("Upstash-Workflow-Callback")) {
-      const callbackMessage = JSON.parse(requestPayload);
+      let callbackPayload;
+      if (requestPayload) {
+        callbackPayload = requestPayload;
+      } else {
+        const workflowRunId2 = request.headers.get("upstash-workflow-runid");
+        const messageId = request.headers.get("upstash-message-id");
+        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 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.`)
+          );
+        callbackPayload = atob(failingStep.body);
+      }
+      const callbackMessage = JSON.parse(callbackPayload);
       if (!(callbackMessage.status >= 200 && callbackMessage.status < 300) && callbackMessage.maxRetries && callbackMessage.retried !== callbackMessage.maxRetries) {
         await debug?.log("WARN", "SUBMIT_THIRD_PARTY_RESULT", {
           status: callbackMessage.status,
-          body: atob(callbackMessage.body)
+          body: atob(callbackMessage.body ?? "")
         });
         console.warn(
           `Workflow Warning: "context.call" failed with status ${callbackMessage.status} and will retry (retried ${callbackMessage.retried ?? 0} out of ${callbackMessage.maxRetries} times). Error Message:
-${atob(callbackMessage.body)}`
+${atob(callbackMessage.body ?? "")}`
         );
         return ok("call-will-retry");
       }
@@ -24309,7 +24434,7 @@ ${atob(callbackMessage.body)}`
       );
       const callResponse = {
         status: callbackMessage.status,
-        body: atob(callbackMessage.body),
+        body: atob(callbackMessage.body ?? ""),
         header: callbackMessage.header
       };
       const callResultStep = {
@@ -24340,9 +24465,7 @@ ${atob(callbackMessage.body)}`
   } catch (error) {
     const isCallReturn = request.headers.get("Upstash-Workflow-Callback");
     return err(
-      new QStashWorkflowError(
-        `Error when handling call return (isCallReturn=${isCallReturn}): ${error}`
-      )
+      new WorkflowError(`Error when handling call return (isCallReturn=${isCallReturn}): ${error}`)
     );
   }
 };
@@ -24350,7 +24473,8 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
   const baseHeaders = {
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
-    [WORKFLOW_URL_HEADER]: workflowUrl
+    [WORKFLOW_URL_HEADER]: workflowUrl,
+    [WORKFLOW_FEATURE_HEADER]: "LazyFetch,InitialBody"
   };
   if (!step?.callUrl) {
     baseHeaders[`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`] = WORKFLOW_PROTOCOL_VERSION;
@@ -24363,8 +24487,8 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
   }
   if (step?.callUrl) {
     baseHeaders["Upstash-Retries"] = callRetries?.toString() ?? "0";
-    baseHeaders[WORKFLOW_FEATURE_HEADER] = "WF_NoDelete";
-    if (retries) {
+    baseHeaders[WORKFLOW_FEATURE_HEADER] = "WF_NoDelete,InitialBody";
+    if (retries !== void 0) {
       baseHeaders["Upstash-Callback-Retries"] = retries.toString();
       baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
     }
@@ -24399,6 +24523,7 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
         "Upstash-Callback-Workflow-CallType": "fromCallback",
         "Upstash-Callback-Workflow-Init": "false",
         "Upstash-Callback-Workflow-Url": workflowUrl,
+        "Upstash-Callback-Feature-Set": "LazyFetch,InitialBody",
         "Upstash-Callback-Forward-Upstash-Workflow-Callback": "true",
         "Upstash-Callback-Forward-Upstash-Workflow-StepId": step.stepId.toString(),
         "Upstash-Callback-Forward-Upstash-Workflow-StepName": step.stepName,
@@ -24447,7 +24572,7 @@ var verifyRequest = async (body, signature, verifier) => {
       throw new Error("Signature in `Upstash-Signature` header is not valid");
     }
   } catch (error) {
-    throw new QStashWorkflowError(
+    throw new WorkflowError(
       `Failed to verify that the Workflow request comes from QStash: ${error}
 
 If signature is missing, trigger the workflow endpoint by publishing your request to QStash instead of calling it directly.
@@ -24487,14 +24612,14 @@ var AutoExecutor = class _AutoExecutor {
    *
    * If a function is already executing (this.executingStep), this
    * means that there is a nested step which is not allowed. In this
-   * case, addStep throws QStashWorkflowError.
+   * case, addStep throws WorkflowError.
    *
    * @param stepInfo step plan to add
    * @returns result of the step function
    */
   async addStep(stepInfo) {
     if (this.executingStep) {
-      throw new QStashWorkflowError(
+      throw new WorkflowError(
         `A step can not be run inside another step. Tried to run '${stepInfo.stepName}' inside '${this.executingStep}'`
       );
     }
@@ -24579,7 +24704,7 @@ var AutoExecutor = class _AutoExecutor {
     const sortedSteps = sortSteps(this.steps);
     const plannedParallelStepCount = sortedSteps[initialStepCount + this.planStepCount]?.concurrent;
     if (parallelCallState !== "first" && plannedParallelStepCount !== parallelSteps.length) {
-      throw new QStashWorkflowError(
+      throw new WorkflowError(
         `Incompatible number of parallel steps when call state was '${parallelCallState}'. Expected ${parallelSteps.length}, got ${plannedParallelStepCount} from the request.`
       );
     }
@@ -24601,7 +24726,7 @@ var AutoExecutor = class _AutoExecutor {
       case "partial": {
         const planStep = this.steps.at(-1);
         if (!planStep || planStep.targetStep === void 0) {
-          throw new QStashWorkflowError(
+          throw new WorkflowError(
             `There must be a last step and it should have targetStep larger than 0.Received: ${JSON.stringify(planStep)}`
           );
         }
@@ -24615,17 +24740,17 @@ var AutoExecutor = class _AutoExecutor {
           );
           await this.submitStepsToQStash([resultStep], [parallelStep]);
         } catch (error) {
-          if (error instanceof QStashWorkflowAbort) {
+          if (error instanceof WorkflowAbort) {
             throw error;
           }
-          throw new QStashWorkflowError(
+          throw new WorkflowError(
             `Error submitting steps to QStash in partial parallel step execution: ${error}`
           );
         }
         break;
       }
       case "discard": {
-        throw new QStashWorkflowAbort("discarded parallel");
+        throw new WorkflowAbort("discarded parallel");
       }
       case "last": {
         const parallelResultSteps = sortedSteps.filter((step) => step.stepId >= initialStepCount).slice(0, parallelSteps.length);
@@ -24676,7 +24801,7 @@ var AutoExecutor = class _AutoExecutor {
    */
   async submitStepsToQStash(steps, lazySteps) {
     if (steps.length === 0) {
-      throw new QStashWorkflowError(
+      throw new WorkflowError(
         `Unable to submit steps to QStash. Provided list is empty. Current step: ${this.stepCount}`
       );
     }
@@ -24716,7 +24841,7 @@ var AutoExecutor = class _AutoExecutor {
         method: "POST",
         parseResponseAsJson: false
       });
-      throw new QStashWorkflowAbort(steps[0].stepName, steps[0]);
+      throw new WorkflowAbort(steps[0].stepName, steps[0]);
     }
     const result = await this.context.qstashClient.batchJSON(
       steps.map((singleStep, index) => {
@@ -24768,7 +24893,7 @@ var AutoExecutor = class _AutoExecutor {
         };
       })
     });
-    throw new QStashWorkflowAbort(steps[0].stepName, steps[0]);
+    throw new WorkflowAbort(steps[0].stepName, steps[0]);
   }
   /**
    * Get the promise by executing the lazt steps list. If there is a single
@@ -24793,7 +24918,7 @@ var AutoExecutor = class _AutoExecutor {
     } else if (Array.isArray(result) && lazyStepList.length === result.length && index < lazyStepList.length) {
       return result[index];
     } else {
-      throw new QStashWorkflowError(
+      throw new WorkflowError(
         `Unexpected parallel call result while executing step ${index}: '${result}'. Expected ${lazyStepList.length} many items`
       );
     }
@@ -24805,12 +24930,12 @@ var AutoExecutor = class _AutoExecutor {
 };
 var validateStep = (lazyStep, stepFromRequest) => {
   if (lazyStep.stepName !== stepFromRequest.stepName) {
-    throw new QStashWorkflowError(
+    throw new WorkflowError(
       `Incompatible step name. Expected '${lazyStep.stepName}', got '${stepFromRequest.stepName}' from the request`
     );
   }
   if (lazyStep.stepType !== stepFromRequest.stepType) {
-    throw new QStashWorkflowError(
+    throw new WorkflowError(
       `Incompatible step type. Expected '${lazyStep.stepType}', got '${stepFromRequest.stepType}' from the request`
     );
   }
@@ -24821,12 +24946,12 @@ var validateParallelSteps = (lazySteps, stepsFromRequest) => {
       validateStep(lazySteps[index], stepFromRequest);
     }
   } catch (error) {
-    if (error instanceof QStashWorkflowError) {
+    if (error instanceof WorkflowError) {
       const lazyStepNames = lazySteps.map((lazyStep) => lazyStep.stepName);
       const lazyStepTypes = lazySteps.map((lazyStep) => lazyStep.stepType);
       const requestStepNames = stepsFromRequest.map((step) => step.stepName);
       const requestStepTypes = stepsFromRequest.map((step) => step.stepType);
-      throw new QStashWorkflowError(
+      throw new WorkflowError(
         `Incompatible steps detected in parallel execution: ${error.message}
   > Step Names from the request: ${JSON.stringify(requestStepNames)}
     Step Types from the request: ${JSON.stringify(requestStepTypes)}
@@ -24939,10 +25064,6 @@ var WorkflowContext = class {
    * headers of the initial request
    */
   headers;
-  /**
-   * initial payload as a raw string
-   */
-  rawInitialPayload;
   /**
    * Map of environment variables and their values.
    *
@@ -24977,7 +25098,6 @@ var WorkflowContext = class {
     failureUrl,
     debug,
     initialPayload,
-    rawInitialPayload,
     env,
     retries
   }) {
@@ -24988,7 +25108,6 @@ var WorkflowContext = class {
     this.failureUrl = failureUrl;
     this.headers = headers;
     this.requestPayload = initialPayload;
-    this.rawInitialPayload = rawInitialPayload ?? JSON.stringify(this.requestPayload);
     this.env = env ?? {};
     this.retries = retries ?? DEFAULT_RETRIES;
     this.executor = new AutoExecutor(this, this.steps, debug);
@@ -25009,7 +25128,7 @@ var WorkflowContext = class {
    * const [result1, result2] = await Promise.all([
    *   context.run("step 1", () => {
    *     return "result1"
-   *   })
+   *   }),
    *   context.run("step 2", async () => {
    *     return await fetchResults()
    *   })
@@ -25027,6 +25146,10 @@ var WorkflowContext = class {
   /**
    * Stops the execution for the duration provided.
    *
+   * ```typescript
+   * await context.sleep('sleep1', 3) // wait for three seconds
+   * ```
+   *
    * @param stepName
    * @param duration sleep duration in seconds
    * @returns undefined
@@ -25037,6 +25160,10 @@ var WorkflowContext = class {
   /**
    * Stops the execution until the date time provided.
    *
+   * ```typescript
+   * await context.sleepUntil('sleep1', Date.now() / 1000 + 3) // wait for three seconds
+   * ```
+   *
    * @param stepName
    * @param datetime time to sleep until. Can be provided as a number (in unix seconds),
    *   as a Date object or a string (passed to `new Date(datetimeString)`)
@@ -25060,7 +25187,7 @@ var WorkflowContext = class {
    * const { status, body } = await context.call<string>(
    *   "post call step",
    *   {
-   *     url: `https://www.some-endpoint.com/api`,
+   *     url: "https://www.some-endpoint.com/api",
    *     method: "POST",
    *     body: "my-payload"
    *   }
@@ -25114,45 +25241,43 @@ var WorkflowContext = class {
     }
   }
   /**
-   * Makes the workflow run wait until a notify request is sent or until the
-   * timeout ends
+   * Pauses workflow execution until a specific event occurs or a timeout is reached.
    *
-   * ```ts
-   * const { eventData, timeout } = await context.waitForEvent(
-   *   "wait for event step",
-   *   "my-event-id",
-   *   100 // timeout after 100 seconds
-   * );
-   * ```
+   *```ts
+   * const result = await workflow.waitForEvent("payment-confirmed", {
+   *   timeout: "5m"
+   * });
+   *```
    *
-   * To notify a waiting workflow run, you can use the notify method:
+   * To notify a waiting workflow:
    *
    * ```ts
    * import { Client } from "@upstash/workflow";
    *
-   * const client = new Client({ token: });
+   * const client = new Client({ token: "<QSTASH_TOKEN>" });
    *
    * await client.notify({
-   *   eventId: "my-event-id",
-   *   eventData: "eventData"
+   *   eventId: "payment.confirmed",
+   *   data: {
+   *     amount: 99.99,
+   *     currency: "USD"
+   *   }
    * })
    * ```
    *
+   * Alternatively, you can use the `context.notify` method.
+   *
    * @param stepName
-   * @param eventId event id to wake up the waiting workflow run
-   * @param timeout timeout duration in seconds
-   * @returns wait response as `{ timeout: boolean, eventData: unknown }`.
-   *   timeout is true if the wait times out, if notified it is false. eventData
-   *   is the value passed to `client.notify`.
+   * @param eventId - Unique identifier for the event to wait for
+   * @param options - Configuration options.
+   * @returns `{ timeout: boolean, eventData: unknown }`.
+   *   The `timeout` property specifies if the workflow has timed out. The `eventData`
+   *   is the data passed when notifying this workflow of an event.
    */
-  async waitForEvent(stepName, eventId, timeout) {
-    const result = await this.addStep(
-      new LazyWaitForEventStep(
-        stepName,
-        eventId,
-        typeof timeout === "string" ? timeout : `${timeout}s`
-      )
-    );
+  async waitForEvent(stepName, eventId, options = {}) {
+    const { timeout = "7d" } = options;
+    const timeoutStr = typeof timeout === "string" ? timeout : `${timeout}s`;
+    const result = await this.addStep(new LazyWaitForEventStep(stepName, eventId, timeoutStr));
     try {
       return {
         ...result,
@@ -25162,6 +25287,27 @@ var WorkflowContext = class {
       return result;
     }
   }
+  /**
+   * Notify workflow runs waiting for an event
+   *
+   * ```ts
+   * const { eventId, eventData, notifyResponse } = await context.notify(
+   *   "notify step", "event-id", "event-data"
+   * );
+   * ```
+   *
+   * Upon `context.notify`, the workflow runs waiting for the given eventId (context.waitForEvent)
+   * will receive the given event data and resume execution.
+   *
+   * The response includes the same eventId and eventData. Additionally, there is
+   * a notifyResponse field which contains a list of `Waiter` objects, each corresponding
+   * to a notified workflow run.
+   *
+   * @param stepName
+   * @param eventId event id to notify
+   * @param eventData event data to notify with
+   * @returns notify response which has event id, event data and list of waiters which were notified
+   */
   async notify(stepName, eventId, eventData) {
     const result = await this.addStep(
       new LazyNotifyStep(stepName, eventId, eventData, this.qstashClient.http)
@@ -25175,6 +25321,15 @@ var WorkflowContext = class {
       return result;
     }
   }
+  /**
+   * Cancel the current workflow run
+   *
+   * Will throw WorkflowAbort to stop workflow execution.
+   * Shouldn't be inside try/catch.
+   */
+  async cancel() {
+    throw new WorkflowAbort("cancel", void 0, true);
+  }
   /**
    * Adds steps to the executor. Needed so that it can be overwritten in
    * DisabledWorkflowContext.
@@ -25215,7 +25370,8 @@ var WorkflowLogger = class _WorkflowLogger {
   }
   writeToConsole(logEntry) {
     const JSON_SPACING = 2;
-    console.log(JSON.stringify(logEntry, void 0, JSON_SPACING));
+    const logMethod = logEntry.logLevel === "ERROR" ? console.error : logEntry.logLevel === "WARN" ? console.warn : console.log;
+    logMethod(JSON.stringify(logEntry, void 0, JSON_SPACING));
   }
   shouldLog(level) {
     return LOG_LEVELS.indexOf(level) >= LOG_LEVELS.indexOf(this.options.logLevel);
@@ -25233,11 +25389,13 @@ var WorkflowLogger = class _WorkflowLogger {
 };
 
 // src/utils.ts
-var import_node_crypto = __toESM(require("crypto"));
 var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 var NANOID_LENGTH = 21;
+function getRandomInt() {
+  return Math.floor(Math.random() * NANOID_CHARS.length);
+}
 function nanoid() {
-  return [...import_node_crypto.default.getRandomValues(new Uint8Array(NANOID_LENGTH))].map((x) => NANOID_CHARS[x % NANOID_CHARS.length]).join("");
+  return Array.from({ length: NANOID_LENGTH }).map(() => NANOID_CHARS[getRandomInt()]).join("");
 }
 function getWorkflowRunId(id) {
   return `wfr_${id ?? nanoid()}`;
@@ -25255,6 +25413,63 @@ function decodeBase64(base64) {
   }
 }
 
+// src/serve/authorization.ts
+var import_qstash3 = require("@upstash/qstash");
+var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowContext {
+  static disabledMessage = "disabled-qstash-worklfow-run";
+  /**
+   * overwrite the WorkflowContext.addStep method to always raise WorkflowAbort
+   * error in order to stop the execution whenever we encounter a step.
+   *
+   * @param _step
+   */
+  async addStep(_step) {
+    throw new WorkflowAbort(_DisabledWorkflowContext.disabledMessage);
+  }
+  /**
+   * overwrite cancel method to do nothing
+   */
+  async cancel() {
+    return;
+  }
+  /**
+   * copies the passed context to create a DisabledWorkflowContext. Then, runs the
+   * route function with the new context.
+   *
+   * - returns "run-ended" if there are no steps found or
+   *      if the auth failed and user called `return`
+   * - returns "step-found" if DisabledWorkflowContext.addStep is called.
+   * - if there is another error, returns the error.
+   *
+   * @param routeFunction
+   */
+  static async tryAuthentication(routeFunction, context) {
+    const disabledContext = new _DisabledWorkflowContext({
+      qstashClient: new import_qstash3.Client({
+        baseUrl: "disabled-client",
+        token: "disabled-client"
+      }),
+      workflowRunId: context.workflowRunId,
+      headers: context.headers,
+      steps: [],
+      url: context.url,
+      failureUrl: context.failureUrl,
+      initialPayload: context.requestPayload,
+      env: context.env,
+      retries: context.retries
+    });
+    try {
+      await routeFunction(disabledContext);
+    } catch (error) {
+      if (error instanceof WorkflowAbort && error.stepName === this.disabledMessage) {
+        return ok("step-found");
+      }
+      return err(error);
+    }
+    return ok("run-ended");
+  }
+};
+
 // src/workflow-parser.ts
 var getPayload = async (request) => {
   try {
@@ -25263,8 +25478,8 @@ var getPayload = async (request) => {
     return;
   }
 };
-var parsePayload = async (rawPayload, debug) => {
-  const [encodedInitialPayload, ...encodedSteps] = JSON.parse(rawPayload);
+var processRawSteps = (rawSteps) => {
+  const [encodedInitialPayload, ...encodedSteps] = rawSteps;
   const rawInitialPayload = decodeBase64(encodedInitialPayload.body);
   const initialStep = {
     stepId: 0,
@@ -25274,27 +25489,21 @@ var parsePayload = async (rawPayload, debug) => {
     concurrent: NO_CONCURRENCY
   };
   const stepsToDecode = encodedSteps.filter((step) => step.callType === "step");
-  const otherSteps = await Promise.all(
-    stepsToDecode.map(async (rawStep) => {
-      const step = JSON.parse(decodeBase64(rawStep.body));
-      try {
-        step.out = JSON.parse(step.out);
-      } catch {
-        await debug?.log("WARN", "ENDPOINT_START", {
-          message: "failed while parsing out field of step",
-          step
-        });
-      }
-      if (step.waitEventId) {
-        const newOut = {
-          eventData: step.out ? decodeBase64(step.out) : void 0,
-          timeout: step.waitTimeout ?? false
-        };
-        step.out = newOut;
-      }
-      return step;
-    })
-  );
+  const otherSteps = stepsToDecode.map((rawStep) => {
+    const step = JSON.parse(decodeBase64(rawStep.body));
+    try {
+      step.out = JSON.parse(step.out);
+    } catch {
+    }
+    if (step.waitEventId) {
+      const newOut = {
+        eventData: step.out ? decodeBase64(step.out) : void 0,
+        timeout: step.waitTimeout ?? false
+      };
+      step.out = newOut;
+    }
+    return step;
+  });
   const steps = [initialStep, ...otherSteps];
   return {
     rawInitialPayload,
@@ -25342,20 +25551,20 @@ var validateRequest = (request) => {
   const versionHeader = request.headers.get(WORKFLOW_PROTOCOL_VERSION_HEADER);
   const isFirstInvocation = !versionHeader;
   if (!isFirstInvocation && versionHeader !== WORKFLOW_PROTOCOL_VERSION) {
-    throw new QStashWorkflowError(
+    throw new WorkflowError(
       `Incompatible workflow sdk protocol version. Expected ${WORKFLOW_PROTOCOL_VERSION}, got ${versionHeader} from the request.`
     );
   }
   const workflowRunId = isFirstInvocation ? getWorkflowRunId() : request.headers.get(WORKFLOW_ID_HEADER) ?? "";
   if (workflowRunId.length === 0) {
-    throw new QStashWorkflowError("Couldn't get workflow id from header");
+    throw new WorkflowError("Couldn't get workflow id from header");
   }
   return {
     isFirstInvocation,
     workflowRunId
   };
 };
-var parseRequest = async (requestPayload, isFirstInvocation, debug) => {
+var parseRequest = async (requestPayload, isFirstInvocation, workflowRunId, requester, messageId, debug) => {
   if (isFirstInvocation) {
     return {
       rawInitialPayload: requestPayload ?? "",
@@ -25363,10 +25572,18 @@ var parseRequest = async (requestPayload, isFirstInvocation, debug) => {
       isLastDuplicate: false
     };
   } else {
+    let rawSteps;
     if (!requestPayload) {
-      throw new QStashWorkflowError("Only first call can have an empty body");
+      await debug?.log(
+        "INFO",
+        "ENDPOINT_START",
+        "request payload is empty, steps will be fetched from QStash."
+      );
+      rawSteps = await getSteps(requester, workflowRunId, messageId, debug);
+    } else {
+      rawSteps = JSON.parse(requestPayload);
     }
-    const { rawInitialPayload, steps } = await parsePayload(requestPayload, debug);
+    const { rawInitialPayload, steps } = processRawSteps(rawSteps);
     const isLastDuplicate = await checkIfLastOneIsDuplicate(steps, debug);
     const deduplicatedSteps = deduplicateSteps(steps);
     return {
@@ -25376,13 +25593,13 @@ var parseRequest = async (requestPayload, isFirstInvocation, debug) => {
     };
   }
 };
-var handleFailure = async (request, requestPayload, qstashClient, initialPayloadParser, failureFunction, debug) => {
+var handleFailure = async (request, requestPayload, qstashClient, initialPayloadParser, routeFunction, failureFunction, debug) => {
   if (request.headers.get(WORKFLOW_FAILURE_HEADER) !== "true") {
     return ok("not-failure-callback");
   }
   if (!failureFunction) {
     return err(
-      new QStashWorkflowError(
+      new WorkflowError(
         "Workflow endpoint is called to handle a failure, but a failureFunction is not provided in serve options. Either provide a failureUrl or a failureFunction."
       )
     );
@@ -25393,92 +25610,48 @@ var handleFailure = async (request, requestPayload, qstashClient, initialPayload
     );
     const decodedBody = body ? decodeBase64(body) : "{}";
     const errorPayload = JSON.parse(decodedBody);
-    const {
-      rawInitialPayload,
-      steps,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      isLastDuplicate: _isLastDuplicate
-    } = await parseRequest(decodeBase64(sourceBody), false, debug);
     const workflowContext = new WorkflowContext({
       qstashClient,
       workflowRunId,
-      initialPayload: initialPayloadParser(rawInitialPayload),
-      rawInitialPayload,
+      initialPayload: initialPayloadParser(decodeBase64(sourceBody)),
       headers: recreateUserHeaders(new Headers(sourceHeader)),
-      steps,
+      steps: [],
       url,
       failureUrl: url,
       debug
     });
-    await failureFunction(workflowContext, status, errorPayload.message, header);
+    const authCheck = await DisabledWorkflowContext.tryAuthentication(
+      routeFunction,
+      workflowContext
+    );
+    if (authCheck.isErr()) {
+      await debug?.log("ERROR", "ERROR", { error: authCheck.error.message });
+      throw authCheck.error;
+    } else if (authCheck.value === "run-ended") {
+      return err(new WorkflowError("Not authorized to run the failure function."));
+    }
+    await failureFunction({
+      context: workflowContext,
+      failStatus: status,
+      failResponse: errorPayload.message,
+      failHeaders: header
+    });
   } catch (error) {
     return err(error);
   }
   return ok("is-failure-callback");
 };
 
-// src/serve/authorization.ts
-var import_qstash2 = require("@upstash/qstash");
-var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowContext {
-  static disabledMessage = "disabled-qstash-worklfow-run";
-  /**
-   * overwrite the WorkflowContext.addStep method to always raise QStashWorkflowAbort
-   * error in order to stop the execution whenever we encounter a step.
-   *
-   * @param _step
-   */
-  async addStep(_step) {
-    throw new QStashWorkflowAbort(_DisabledWorkflowContext.disabledMessage);
-  }
-  /**
-   * copies the passed context to create a DisabledWorkflowContext. Then, runs the
-   * route function with the new context.
-   *
-   * - returns "run-ended" if there are no steps found or
-   *      if the auth failed and user called `return`
-   * - returns "step-found" if DisabledWorkflowContext.addStep is called.
-   * - if there is another error, returns the error.
-   *
-   * @param routeFunction
-   */
-  static async tryAuthentication(routeFunction, context) {
-    const disabledContext = new _DisabledWorkflowContext({
-      qstashClient: new import_qstash2.Client({
-        baseUrl: "disabled-client",
-        token: "disabled-client"
-      }),
-      workflowRunId: context.workflowRunId,
-      headers: context.headers,
-      steps: [],
-      url: context.url,
-      failureUrl: context.failureUrl,
-      initialPayload: context.requestPayload,
-      rawInitialPayload: context.rawInitialPayload,
-      env: context.env,
-      retries: context.retries
-    });
-    try {
-      await routeFunction(disabledContext);
-    } catch (error) {
-      if (error instanceof QStashWorkflowAbort && error.stepName === this.disabledMessage) {
-        return ok("step-found");
-      }
-      return err(error);
-    }
-    return ok("run-ended");
-  }
-};
-
 // src/serve/options.ts
-var import_qstash3 = require("@upstash/qstash");
 var import_qstash4 = require("@upstash/qstash");
+var import_qstash5 = 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_qstash4.Client({
+    qstashClient: new import_qstash5.Client({
       baseUrl: environment.QSTASH_URL,
       token: environment.QSTASH_TOKEN
     }),
@@ -25499,7 +25672,7 @@ var processOptions = (options) => {
         throw error;
       }
     },
-    receiver: receiverEnvironmentVariablesSet ? new import_qstash3.Receiver({
+    receiver: receiverEnvironmentVariablesSet ? new import_qstash4.Receiver({
       currentSigningKey: environment.QSTASH_CURRENT_SIGNING_KEY,
       nextSigningKey: environment.QSTASH_NEXT_SIGNING_KEY
     }) : void 0,
@@ -25561,6 +25734,9 @@ var serve = (routeFunction, options) => {
     const { rawInitialPayload, steps, isLastDuplicate } = await parseRequest(
       requestPayload,
       isFirstInvocation,
+      workflowRunId,
+      qstashClient.http,
+      request.headers.get("upstash-message-id"),
       debug
     );
     if (isLastDuplicate) {
@@ -25571,6 +25747,7 @@ var serve = (routeFunction, options) => {
       requestPayload,
       qstashClient,
       initialPayloadParser,
+      routeFunction,
       failureFunction
     );
     if (failureCheck.isErr()) {
@@ -25583,7 +25760,6 @@ var serve = (routeFunction, options) => {
       qstashClient,
       workflowRunId,
       initialPayload: initialPayloadParser(rawInitialPayload),
-      rawInitialPayload,
       headers: recreateUserHeaders(request.headers),
       steps,
       url: workflowUrl,
@@ -25621,7 +25797,11 @@ var serve = (routeFunction, options) => {
         onStep: async () => routeFunction(workflowContext),
         onCleanup: async () => {
           await triggerWorkflowDelete(workflowContext, debug);
-        }
+        },
+        onCancel: async () => {
+          await makeCancelRequest(workflowContext.qstashClient.http, workflowRunId);
+        },
+        debug
       });
       if (result.isErr()) {
         await debug?.log("ERROR", "ERROR", { error: result.error.message });
@@ -25647,7 +25827,7 @@ var serve = (routeFunction, options) => {
 };
 
 // src/client/index.ts
-var import_qstash5 = require("@upstash/qstash");
+var import_qstash6 = require("@upstash/qstash");
 
 // platforms/express.ts
 var import_express = __toESM(require_express2());