@upstash/workflow 0.1.2-canary-astro → 0.1.2-omit-errors

package/svelte.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();
@@ -1681,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);
@@ -1725,7 +1762,7 @@ var getPayload = async (request) => {
     return;
   }
 };
-var parsePayload = async (rawPayload, debug) => {
+var parsePayload = (rawPayload) => {
   const [encodedInitialPayload, ...encodedSteps] = JSON.parse(rawPayload);
   const rawInitialPayload = decodeBase64(encodedInitialPayload.body);
   const initialStep = {
@@ -1736,27 +1773,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,
@@ -1828,7 +1859,7 @@ var parseRequest = async (requestPayload, isFirstInvocation, debug) => {
     if (!requestPayload) {
       throw new QStashWorkflowError("Only first call can have an empty body");
     }
-    const { rawInitialPayload, steps } = await parsePayload(requestPayload, debug);
+    const { rawInitialPayload, steps } = parsePayload(requestPayload);
     const isLastDuplicate = await checkIfLastOneIsDuplicate(steps, debug);
     const deduplicatedSteps = deduplicateSteps(steps);
     return {
@@ -1880,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";
   /**
@@ -1905,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"
       }),
@@ -1932,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
     }),
@@ -1961,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,
@@ -2083,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 });
@@ -2109,7 +2141,7 @@ var serve = (routeFunction, options) => {
 };
 
 // src/client/index.ts
-var import_qstash5 = require("@upstash/qstash");
+var import_qstash6 = require("@upstash/qstash");
 
 // platforms/svelte.ts
 var serve2 = (routeFunction, options) => {

package/svelte.mjs

@@ -1,6 +1,6 @@
 import {
   serve
-} from "./chunk-EKVRVBHL.mjs";
+} from "./chunk-ZPVH5ACW.mjs";
 
 // platforms/svelte.ts
 var serve2 = (routeFunction, options) => {

package/{types-p7sxktVE.d.mts → types-CI-2skYU.d.mts}

@@ -340,7 +340,7 @@ declare class WorkflowContext<TInitialPayload = unknown> {
      * @param duration sleep duration in seconds
      * @returns undefined
      */
-    sleep(stepName: string, duration: number): Promise<void>;
+    sleep(stepName: string, duration: number | Duration): Promise<void>;
     /**
      * Stops the execution until the date time provided.
      *
@@ -416,7 +416,7 @@ declare class WorkflowContext<TInitialPayload = unknown> {
      *   timeout is true if the wait times out, if notified it is false. eventData
      *   is the value passed to `client.notify`.
      */
-    waitForEvent(stepName: string, eventId: string, timeout: number): Promise<WaitStepResponse>;
+    waitForEvent(stepName: string, eventId: string, timeout: number | Duration): Promise<WaitStepResponse>;
     notify(stepName: string, eventId: string, eventData: unknown): Promise<NotifyStepResponse>;
     /**
      * Adds steps to the executor. Needed so that it can be overwritten in
@@ -492,7 +492,7 @@ type Step<TResult = unknown, TBody = unknown> = {
     /**
      * sleep duration in seconds. Set when context.sleep is used.
      */
-    sleepFor?: number;
+    sleepFor?: number | Duration;
     /**
      * unix timestamp (in seconds) to wait until. Set when context.sleepUntil is used.
      */
@@ -675,5 +675,6 @@ type CallResponse = {
     body: unknown;
     header: Record<string, string[]>;
 };
+type Duration = `${bigint}s` | `${bigint}m` | `${bigint}h` | `${bigint}d`;
 
-export { type AsyncStepFunction as A, type CallResponse as C, type FinishCondition as F, type LogLevel as L, type NotifyResponse as N, type ParallelCallState as P, type RouteFunction as R, type Step as S, type WorkflowServeOptions as W, type Waiter as a, WorkflowContext as b, type WorkflowClient as c, type WorkflowReceiver as d, StepTypes as e, type StepType as f, type RawStep as g, type SyncStepFunction as h, type StepFunction as i, type FailureFunctionPayload as j, type RequiredExceptFields as k, type WaitRequest as l, type WaitStepResponse as m, type NotifyStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };
+export { type AsyncStepFunction as A, type CallResponse as C, type Duration as D, type FinishCondition as F, type LogLevel as L, type NotifyResponse as N, type ParallelCallState as P, type RouteFunction as R, type Step as S, type WorkflowServeOptions as W, type Waiter as a, WorkflowContext as b, type WorkflowClient as c, type WorkflowReceiver as d, StepTypes as e, type StepType as f, type RawStep as g, type SyncStepFunction as h, type StepFunction as i, type FailureFunctionPayload as j, type RequiredExceptFields as k, type WaitRequest as l, type WaitStepResponse as m, type NotifyStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };

package/{types-p7sxktVE.d.ts → types-CI-2skYU.d.ts}

@@ -340,7 +340,7 @@ declare class WorkflowContext<TInitialPayload = unknown> {
      * @param duration sleep duration in seconds
      * @returns undefined
      */
-    sleep(stepName: string, duration: number): Promise<void>;
+    sleep(stepName: string, duration: number | Duration): Promise<void>;
     /**
      * Stops the execution until the date time provided.
      *
@@ -416,7 +416,7 @@ declare class WorkflowContext<TInitialPayload = unknown> {
      *   timeout is true if the wait times out, if notified it is false. eventData
      *   is the value passed to `client.notify`.
      */
-    waitForEvent(stepName: string, eventId: string, timeout: number): Promise<WaitStepResponse>;
+    waitForEvent(stepName: string, eventId: string, timeout: number | Duration): Promise<WaitStepResponse>;
     notify(stepName: string, eventId: string, eventData: unknown): Promise<NotifyStepResponse>;
     /**
      * Adds steps to the executor. Needed so that it can be overwritten in
@@ -492,7 +492,7 @@ type Step<TResult = unknown, TBody = unknown> = {
     /**
      * sleep duration in seconds. Set when context.sleep is used.
      */
-    sleepFor?: number;
+    sleepFor?: number | Duration;
     /**
      * unix timestamp (in seconds) to wait until. Set when context.sleepUntil is used.
      */
@@ -675,5 +675,6 @@ type CallResponse = {
     body: unknown;
     header: Record<string, string[]>;
 };
+type Duration = `${bigint}s` | `${bigint}m` | `${bigint}h` | `${bigint}d`;
 
-export { type AsyncStepFunction as A, type CallResponse as C, type FinishCondition as F, type LogLevel as L, type NotifyResponse as N, type ParallelCallState as P, type RouteFunction as R, type Step as S, type WorkflowServeOptions as W, type Waiter as a, WorkflowContext as b, type WorkflowClient as c, type WorkflowReceiver as d, StepTypes as e, type StepType as f, type RawStep as g, type SyncStepFunction as h, type StepFunction as i, type FailureFunctionPayload as j, type RequiredExceptFields as k, type WaitRequest as l, type WaitStepResponse as m, type NotifyStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };
+export { type AsyncStepFunction as A, type CallResponse as C, type Duration as D, type FinishCondition as F, type LogLevel as L, type NotifyResponse as N, type ParallelCallState as P, type RouteFunction as R, type Step as S, type WorkflowServeOptions as W, type Waiter as a, WorkflowContext as b, type WorkflowClient as c, type WorkflowReceiver as d, StepTypes as e, type StepType as f, type RawStep as g, type SyncStepFunction as h, type StepFunction as i, type FailureFunctionPayload as j, type RequiredExceptFields as k, type WaitRequest as l, type WaitStepResponse as m, type NotifyStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };