@upstash/workflow 0.1.1 → 0.1.2-omit-errors

package/astro.mjs

@@ -0,0 +1,18 @@
+import {
+  serve
+} from "./chunk-ZPVH5ACW.mjs";
+
+// platforms/astro.ts
+function serve2(routeFunction, options) {
+  const POST = (apiContext) => {
+    const { handler } = serve(
+      (workflowContext) => routeFunction(workflowContext, apiContext),
+      options
+    );
+    return handler(apiContext.request);
+  };
+  return { POST };
+}
+export {
+  serve2 as serve
+};

package/{chunk-XPMFG3Q4.mjs → chunk-ZPVH5ACW.mjs}

@@ -467,6 +467,7 @@ var StepTypes = [
 ];
 
 // src/workflow-requests.ts
+import { QstashError as QstashError2 } from "@upstash/qstash";
 var triggerFirstInvocation = async (workflowContext, retries, debug) => {
   const { headers } = getHeaders(
     "true",
@@ -477,27 +478,37 @@ var triggerFirstInvocation = async (workflowContext, retries, debug) => {
     workflowContext.failureUrl,
     retries
   );
-  await debug?.log("SUBMIT", "SUBMIT_FIRST_INVOCATION", {
-    headers,
-    requestPayload: workflowContext.requestPayload,
-    url: workflowContext.url
-  });
   try {
-    await workflowContext.qstashClient.publishJSON({
+    const result = await workflowContext.qstashClient.publishJSON({
       headers,
       method: "POST",
       body: workflowContext.requestPayload,
       url: workflowContext.url
     });
+    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;
+    if (error instanceof QstashError2 && error.message.includes("a workflow already exists, can not initialize a new one with same id")) {
+      await debug?.log("WARN", "SUBMIT_FIRST_INVOCATION", {
+        message: `Workflow run ${workflowContext.workflowRunId} already exists.`,
+        name: error.name,
+        originalMessage: error.message
+      });
+      return ok("workflow-run-already-exists");
+    }
     return err(error_);
   }
 };
 var triggerRouteFunction = async ({
   onCleanup,
-  onStep
+  onStep,
+  debug
 }) => {
   try {
     await onStep();
@@ -505,6 +516,14 @@ var triggerRouteFunction = async ({
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
+    if (error instanceof QstashError2 && error.message.includes("can not append to a a cancelled workflow")) {
+      await debug?.log("WARN", "RESPONSE_WORKFLOW", {
+        message: `tried to append to a cancelled workflow. exiting without publishing.`,
+        name: error.name,
+        originalMessage: error.message
+      });
+      return ok("workflow-was-finished");
+    }
     return error_ instanceof QStashWorkflowAbort ? ok("step-finished") : err(error_);
   }
 };
@@ -512,12 +531,29 @@ 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 QstashError2 && error.message.includes(`workflowRun ${workflowContext.workflowRunId} not found`)) {
+      await debug?.log("WARN", "SUBMIT_CLEANUP", {
+        message: `Failed to remove workflow run ${workflowContext.workflowRunId} as it doesn't exist.`,
+        name: error.name,
+        originalMessage: error.message
+      });
+      return { deleted: false };
+    }
+    throw error;
+  }
 };
 var recreateUserHeaders = (headers) => {
   const filteredHeaders = new Headers();
@@ -573,15 +609,16 @@ ${atob(callbackMessage.body)}`
         failureUrl,
         retries
       );
+      const callResponse = {
+        status: callbackMessage.status,
+        body: atob(callbackMessage.body),
+        header: callbackMessage.header
+      };
       const callResultStep = {
         stepId: Number(stepIdString),
         stepName,
         stepType,
-        out: {
-          status: callbackMessage.status,
-          body: atob(callbackMessage.body),
-          header: callbackMessage.header
-        },
+        out: JSON.stringify(callResponse),
         concurrent: Number(concurrentString)
       };
       await debug?.log("SUBMIT", "SUBMIT_THIRD_PARTY_RESULT", {
@@ -615,10 +652,11 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
   const baseHeaders = {
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
-    [WORKFLOW_URL_HEADER]: workflowUrl,
-    [WORKFLOW_FEATURE_HEADER]: "WF_NoDelete",
-    [`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`]: WORKFLOW_PROTOCOL_VERSION
+    [WORKFLOW_URL_HEADER]: workflowUrl
   };
+  if (!step?.callUrl) {
+    baseHeaders[`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`] = WORKFLOW_PROTOCOL_VERSION;
+  }
   if (failureUrl) {
     if (!step?.callUrl) {
       baseHeaders[`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`] = "true";
@@ -627,6 +665,7 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
   }
   if (step?.callUrl) {
     baseHeaders["Upstash-Retries"] = "0";
+    baseHeaders[WORKFLOW_FEATURE_HEADER] = "WF_NoDelete";
     if (retries) {
       baseHeaders["Upstash-Callback-Retries"] = retries.toString();
       baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
@@ -990,6 +1029,7 @@ var AutoExecutor = class _AutoExecutor {
           this.context.retries
         );
         const willWait = singleStep.concurrent === NO_CONCURRENCY || singleStep.stepId === 0;
+        singleStep.out = JSON.stringify(singleStep.out);
         return singleStep.callUrl ? (
           // if the step is a third party call, we call the third party
           // url (singleStep.callUrl) and pass information about the workflow
@@ -1658,7 +1698,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);
@@ -1715,9 +1756,13 @@ var parsePayload = (rawPayload) => {
   const stepsToDecode = encodedSteps.filter((step) => step.callType === "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,
+        eventData: step.out ? decodeBase64(step.out) : void 0,
         timeout: step.waitTimeout ?? false
       };
       step.out = newOut;
@@ -2050,7 +2095,8 @@ var serve = (routeFunction, options) => {
         onStep: async () => routeFunction(workflowContext),
         onCleanup: async () => {
           await triggerWorkflowDelete(workflowContext, debug);
-        }
+        },
+        debug
       });
       if (result.isErr()) {
         await debug?.log("ERROR", "ERROR", { error: result.error.message });

package/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-p7sxktVE.mjs';
+import { R as RouteFunction, W as WorkflowServeOptions } from './types-CI-2skYU.mjs';
 import '@upstash/qstash';
 
 type WorkflowBindings = {

package/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-p7sxktVE.js';
+import { R as RouteFunction, W as WorkflowServeOptions } from './types-CI-2skYU.js';
 import '@upstash/qstash';
 
 type WorkflowBindings = {

package/cloudflare.js

@@ -493,6 +493,7 @@ var StepTypes = [
 ];
 
 // src/workflow-requests.ts
+var import_qstash2 = require("@upstash/qstash");
 var triggerFirstInvocation = async (workflowContext, retries, debug) => {
   const { headers } = getHeaders(
     "true",
@@ -503,27 +504,37 @@ var triggerFirstInvocation = async (workflowContext, retries, debug) => {
     workflowContext.failureUrl,
     retries
   );
-  await debug?.log("SUBMIT", "SUBMIT_FIRST_INVOCATION", {
-    headers,
-    requestPayload: workflowContext.requestPayload,
-    url: workflowContext.url
-  });
   try {
-    await workflowContext.qstashClient.publishJSON({
+    const result = await workflowContext.qstashClient.publishJSON({
       headers,
       method: "POST",
       body: workflowContext.requestPayload,
       url: workflowContext.url
     });
+    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;
+    if (error instanceof import_qstash2.QstashError && error.message.includes("a workflow already exists, can not initialize a new one with same id")) {
+      await debug?.log("WARN", "SUBMIT_FIRST_INVOCATION", {
+        message: `Workflow run ${workflowContext.workflowRunId} already exists.`,
+        name: error.name,
+        originalMessage: error.message
+      });
+      return ok("workflow-run-already-exists");
+    }
     return err(error_);
   }
 };
 var triggerRouteFunction = async ({
   onCleanup,
-  onStep
+  onStep,
+  debug
 }) => {
   try {
     await onStep();
@@ -531,6 +542,14 @@ var triggerRouteFunction = async ({
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
+    if (error instanceof import_qstash2.QstashError && error.message.includes("can not append to a a cancelled workflow")) {
+      await debug?.log("WARN", "RESPONSE_WORKFLOW", {
+        message: `tried to append to a cancelled workflow. exiting without publishing.`,
+        name: error.name,
+        originalMessage: error.message
+      });
+      return ok("workflow-was-finished");
+    }
     return error_ instanceof QStashWorkflowAbort ? ok("step-finished") : err(error_);
   }
 };
@@ -538,12 +557,29 @@ 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.message.includes(`workflowRun ${workflowContext.workflowRunId} not found`)) {
+      await debug?.log("WARN", "SUBMIT_CLEANUP", {
+        message: `Failed to remove workflow run ${workflowContext.workflowRunId} as it doesn't exist.`,
+        name: error.name,
+        originalMessage: error.message
+      });
+      return { deleted: false };
+    }
+    throw error;
+  }
 };
 var recreateUserHeaders = (headers) => {
   const filteredHeaders = new Headers();
@@ -599,15 +635,16 @@ ${atob(callbackMessage.body)}`
         failureUrl,
         retries
       );
+      const callResponse = {
+        status: callbackMessage.status,
+        body: atob(callbackMessage.body),
+        header: callbackMessage.header
+      };
       const callResultStep = {
         stepId: Number(stepIdString),
         stepName,
         stepType,
-        out: {
-          status: callbackMessage.status,
-          body: atob(callbackMessage.body),
-          header: callbackMessage.header
-        },
+        out: JSON.stringify(callResponse),
         concurrent: Number(concurrentString)
       };
       await debug?.log("SUBMIT", "SUBMIT_THIRD_PARTY_RESULT", {
@@ -641,10 +678,11 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
   const baseHeaders = {
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
-    [WORKFLOW_URL_HEADER]: workflowUrl,
-    [WORKFLOW_FEATURE_HEADER]: "WF_NoDelete",
-    [`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`]: WORKFLOW_PROTOCOL_VERSION
+    [WORKFLOW_URL_HEADER]: workflowUrl
   };
+  if (!step?.callUrl) {
+    baseHeaders[`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`] = WORKFLOW_PROTOCOL_VERSION;
+  }
   if (failureUrl) {
     if (!step?.callUrl) {
       baseHeaders[`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`] = "true";
@@ -653,6 +691,7 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
   }
   if (step?.callUrl) {
     baseHeaders["Upstash-Retries"] = "0";
+    baseHeaders[WORKFLOW_FEATURE_HEADER] = "WF_NoDelete";
     if (retries) {
       baseHeaders["Upstash-Callback-Retries"] = retries.toString();
       baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
@@ -1016,6 +1055,7 @@ var AutoExecutor = class _AutoExecutor {
           this.context.retries
         );
         const willWait = singleStep.concurrent === NO_CONCURRENCY || singleStep.stepId === 0;
+        singleStep.out = JSON.stringify(singleStep.out);
         return singleStep.callUrl ? (
           // if the step is a third party call, we call the third party
           // url (singleStep.callUrl) and pass information about the workflow
@@ -1677,7 +1717,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);
@@ -1734,9 +1775,13 @@ var parsePayload = (rawPayload) => {
   const stepsToDecode = encodedSteps.filter((step) => step.callType === "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,
+        eventData: step.out ? decodeBase64(step.out) : void 0,
         timeout: step.waitTimeout ?? false
       };
       step.out = newOut;
@@ -1866,7 +1911,7 @@ var handleFailure = async (request, requestPayload, qstashClient, initialPayload
 };
 
 // src/serve/authorization.ts
-var import_qstash2 = require("@upstash/qstash");
+var import_qstash3 = require("@upstash/qstash");
 var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowContext {
   static disabledMessage = "disabled-qstash-worklfow-run";
   /**
@@ -1891,7 +1936,7 @@ var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowCon
    */
   static async tryAuthentication(routeFunction, context) {
     const disabledContext = new _DisabledWorkflowContext({
-      qstashClient: new import_qstash2.Client({
+      qstashClient: new import_qstash3.Client({
         baseUrl: "disabled-client",
         token: "disabled-client"
       }),
@@ -1918,15 +1963,15 @@ var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowCon
 };
 
 // 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
     }),
@@ -1947,7 +1992,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,
@@ -2069,7 +2114,8 @@ var serve = (routeFunction, options) => {
         onStep: async () => routeFunction(workflowContext),
         onCleanup: async () => {
           await triggerWorkflowDelete(workflowContext, debug);
-        }
+        },
+        debug
       });
       if (result.isErr()) {
         await debug?.log("ERROR", "ERROR", { error: result.error.message });
@@ -2095,7 +2141,7 @@ var serve = (routeFunction, options) => {
 };
 
 // src/client/index.ts
-var import_qstash5 = require("@upstash/qstash");
+var import_qstash6 = require("@upstash/qstash");
 
 // platforms/cloudflare.ts
 var getArgs = (args) => {

package/cloudflare.mjs

@@ -1,6 +1,6 @@
 import {
   serve
-} from "./chunk-XPMFG3Q4.mjs";
+} from "./chunk-ZPVH5ACW.mjs";
 
 // platforms/cloudflare.ts
 var getArgs = (args) => {

package/h3.d.mts

@@ -1,5 +1,5 @@
 import * as h3 from 'h3';
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-p7sxktVE.mjs';
+import { R as RouteFunction, W as WorkflowServeOptions } from './types-CI-2skYU.mjs';
 import '@upstash/qstash';
 
 declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options?: Omit<WorkflowServeOptions<Response, TInitialPayload>, "onStepFinish">) => {

package/h3.d.ts

@@ -1,5 +1,5 @@
 import * as h3 from 'h3';
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-p7sxktVE.js';
+import { R as RouteFunction, W as WorkflowServeOptions } from './types-CI-2skYU.js';
 import '@upstash/qstash';
 
 declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options?: Omit<WorkflowServeOptions<Response, TInitialPayload>, "onStepFinish">) => {