@upstash/workflow 0.1.0 → 0.1.1-canary

package/solidjs.js

@@ -474,6 +474,7 @@ var WORKFLOW_ID_HEADER = "Upstash-Workflow-RunId";
 var WORKFLOW_INIT_HEADER = "Upstash-Workflow-Init";
 var WORKFLOW_URL_HEADER = "Upstash-Workflow-Url";
 var WORKFLOW_FAILURE_HEADER = "Upstash-Workflow-Is-Failure";
+var WORKFLOW_FEATURE_HEADER = "Upstash-Feature-Set";
 var WORKFLOW_PROTOCOL_VERSION = "1";
 var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
 var DEFAULT_CONTENT_TYPE = "application/json";
@@ -559,13 +560,13 @@ var handleThirdPartyCallResult = async (request, requestPayload, client, workflo
   try {
     if (request.headers.get("Upstash-Workflow-Callback")) {
       const callbackMessage = JSON.parse(requestPayload);
-      if (!(callbackMessage.status >= 200 && callbackMessage.status < 300)) {
+      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)
         });
         console.warn(
-          `Workflow Warning: "context.call" failed with status ${callbackMessage.status} and will retry (if there are retries remaining). Error Message:
+          `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)}`
         );
         return ok("call-will-retry");
@@ -602,7 +603,11 @@ ${atob(callbackMessage.body)}`
         stepId: Number(stepIdString),
         stepName,
         stepType,
-        out: atob(callbackMessage.body),
+        out: {
+          status: callbackMessage.status,
+          body: atob(callbackMessage.body),
+          header: callbackMessage.header
+        },
         concurrent: Number(concurrentString)
       };
       await debug?.log("SUBMIT", "SUBMIT_THIRD_PARTY_RESULT", {
@@ -637,15 +642,24 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
     [WORKFLOW_URL_HEADER]: workflowUrl,
-    [`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`]: WORKFLOW_PROTOCOL_VERSION,
-    ...failureUrl ? {
-      [`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`]: "true",
-      "Upstash-Failure-Callback": failureUrl
-    } : {},
-    ...retries === void 0 ? {} : {
-      "Upstash-Retries": retries.toString()
-    }
+    [WORKFLOW_FEATURE_HEADER]: "WF_NoDelete",
+    [`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`]: WORKFLOW_PROTOCOL_VERSION
   };
+  if (failureUrl) {
+    if (!step?.callUrl) {
+      baseHeaders[`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`] = "true";
+    }
+    baseHeaders["Upstash-Failure-Callback"] = failureUrl;
+  }
+  if (step?.callUrl) {
+    baseHeaders["Upstash-Retries"] = "0";
+    if (retries) {
+      baseHeaders["Upstash-Callback-Retries"] = retries.toString();
+      baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
+    }
+  } else if (retries !== void 0) {
+    baseHeaders["Upstash-Retries"] = retries.toString();
+  }
   if (userHeaders) {
     for (const header of userHeaders.keys()) {
       if (step?.callHeaders) {
@@ -1504,15 +1518,12 @@ var WorkflowContext = class {
    * @returns call result (parsed as JSON if possible)
    */
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
-  async call(stepName, url, method, body, headers) {
+  async call(stepName, callSettings) {
+    const { url, method = "GET", body, headers = {} } = callSettings;
     const result = await this.addStep(
-      new LazyCallStep(stepName, url, method, body, headers ?? {})
+      new LazyCallStep(stepName, url, method, body, headers)
     );
-    try {
-      return JSON.parse(result);
-    } catch {
-      return result;
-    }
+    return result;
   }
   async waitForEvent(stepName, eventId, timeout) {
     const result = await this.addStep(
@@ -1880,6 +1891,7 @@ var serve = (routeFunction, options) => {
   } = processOptions(options);
   const debug = WorkflowLogger.getLogger(verbose);
   const handler = async (request) => {
+    await debug?.log("INFO", "ENDPOINT_START");
     const { workflowUrl, workflowFailureUrl } = await determineUrls(
       request,
       url,
@@ -1923,7 +1935,8 @@ var serve = (routeFunction, options) => {
       url: workflowUrl,
       failureUrl: workflowFailureUrl,
       debug,
-      env
+      env,
+      retries
     });
     const authCheck = await DisabledWorkflowContext.tryAuthentication(
       routeFunction,
@@ -1966,7 +1979,7 @@ var serve = (routeFunction, options) => {
     await debug?.log("INFO", "RESPONSE_DEFAULT");
     return onStepFinish("no-workflow-id", "fromCallback");
   };
-  return async (request) => {
+  const safeHandler = async (request) => {
     try {
       return await handler(request);
     } catch (error) {
@@ -1976,6 +1989,7 @@ var serve = (routeFunction, options) => {
       });
     }
   };
+  return { handler: safeHandler };
 };
 
 // src/client/index.ts
@@ -1990,10 +2004,10 @@ var serve2 = (routeFunction, options) => {
         status: 405
       });
     }
-    const serveHandler = serve(routeFunction, options);
+    const { handler: serveHandler } = serve(routeFunction, options);
     return await serveHandler(event.request);
   };
-  return handler;
+  return { POST: handler };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/solidjs.mjs

@@ -1,6 +1,6 @@
 import {
   serve
-} from "./chunk-JDMP6KKR.mjs";
+} from "./chunk-YW5KUHA2.mjs";
 
 // platforms/solidjs.ts
 var serve2 = (routeFunction, options) => {
@@ -11,10 +11,10 @@ var serve2 = (routeFunction, options) => {
         status: 405
       });
     }
-    const serveHandler = serve(routeFunction, options);
+    const { handler: serveHandler } = serve(routeFunction, options);
     return await serveHandler(event.request);
   };
-  return handler;
+  return { POST: handler };
 };
 export {
   serve2 as serve

package/svelte.d.mts

@@ -1,5 +1,5 @@
 import { RequestHandler } from '@sveltejs/kit';
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-CfN1Epuj.mjs';
+import { R as RouteFunction, W as WorkflowServeOptions } from './types-D8FBKkto.mjs';
 import '@upstash/qstash';
 
 /**
@@ -13,6 +13,8 @@ import '@upstash/qstash';
  */
 declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options: Omit<WorkflowServeOptions<Response, TInitialPayload>, "onStepFinish"> & {
     env: WorkflowServeOptions["env"];
-}) => RequestHandler;
+}) => {
+    POST: RequestHandler;
+};
 
 export { serve };

package/svelte.d.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from '@sveltejs/kit';
-import { R as RouteFunction, W as WorkflowServeOptions } from './types-CfN1Epuj.js';
+import { R as RouteFunction, W as WorkflowServeOptions } from './types-D8FBKkto.js';
 import '@upstash/qstash';
 
 /**
@@ -13,6 +13,8 @@ import '@upstash/qstash';
  */
 declare const serve: <TInitialPayload = unknown>(routeFunction: RouteFunction<TInitialPayload>, options: Omit<WorkflowServeOptions<Response, TInitialPayload>, "onStepFinish"> & {
     env: WorkflowServeOptions["env"];
-}) => RequestHandler;
+}) => {
+    POST: RequestHandler;
+};
 
 export { serve };

package/svelte.js

@@ -474,6 +474,7 @@ var WORKFLOW_ID_HEADER = "Upstash-Workflow-RunId";
 var WORKFLOW_INIT_HEADER = "Upstash-Workflow-Init";
 var WORKFLOW_URL_HEADER = "Upstash-Workflow-Url";
 var WORKFLOW_FAILURE_HEADER = "Upstash-Workflow-Is-Failure";
+var WORKFLOW_FEATURE_HEADER = "Upstash-Feature-Set";
 var WORKFLOW_PROTOCOL_VERSION = "1";
 var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
 var DEFAULT_CONTENT_TYPE = "application/json";
@@ -559,13 +560,13 @@ var handleThirdPartyCallResult = async (request, requestPayload, client, workflo
   try {
     if (request.headers.get("Upstash-Workflow-Callback")) {
       const callbackMessage = JSON.parse(requestPayload);
-      if (!(callbackMessage.status >= 200 && callbackMessage.status < 300)) {
+      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)
         });
         console.warn(
-          `Workflow Warning: "context.call" failed with status ${callbackMessage.status} and will retry (if there are retries remaining). Error Message:
+          `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)}`
         );
         return ok("call-will-retry");
@@ -602,7 +603,11 @@ ${atob(callbackMessage.body)}`
         stepId: Number(stepIdString),
         stepName,
         stepType,
-        out: atob(callbackMessage.body),
+        out: {
+          status: callbackMessage.status,
+          body: atob(callbackMessage.body),
+          header: callbackMessage.header
+        },
         concurrent: Number(concurrentString)
       };
       await debug?.log("SUBMIT", "SUBMIT_THIRD_PARTY_RESULT", {
@@ -637,15 +642,24 @@ var getHeaders = (initHeaderValue, workflowRunId, workflowUrl, userHeaders, step
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
     [WORKFLOW_URL_HEADER]: workflowUrl,
-    [`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`]: WORKFLOW_PROTOCOL_VERSION,
-    ...failureUrl ? {
-      [`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`]: "true",
-      "Upstash-Failure-Callback": failureUrl
-    } : {},
-    ...retries === void 0 ? {} : {
-      "Upstash-Retries": retries.toString()
-    }
+    [WORKFLOW_FEATURE_HEADER]: "WF_NoDelete",
+    [`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`]: WORKFLOW_PROTOCOL_VERSION
   };
+  if (failureUrl) {
+    if (!step?.callUrl) {
+      baseHeaders[`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`] = "true";
+    }
+    baseHeaders["Upstash-Failure-Callback"] = failureUrl;
+  }
+  if (step?.callUrl) {
+    baseHeaders["Upstash-Retries"] = "0";
+    if (retries) {
+      baseHeaders["Upstash-Callback-Retries"] = retries.toString();
+      baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
+    }
+  } else if (retries !== void 0) {
+    baseHeaders["Upstash-Retries"] = retries.toString();
+  }
   if (userHeaders) {
     for (const header of userHeaders.keys()) {
       if (step?.callHeaders) {
@@ -1504,15 +1518,12 @@ var WorkflowContext = class {
    * @returns call result (parsed as JSON if possible)
    */
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
-  async call(stepName, url, method, body, headers) {
+  async call(stepName, callSettings) {
+    const { url, method = "GET", body, headers = {} } = callSettings;
     const result = await this.addStep(
-      new LazyCallStep(stepName, url, method, body, headers ?? {})
+      new LazyCallStep(stepName, url, method, body, headers)
     );
-    try {
-      return JSON.parse(result);
-    } catch {
-      return result;
-    }
+    return result;
   }
   async waitForEvent(stepName, eventId, timeout) {
     const result = await this.addStep(
@@ -1880,6 +1891,7 @@ var serve = (routeFunction, options) => {
   } = processOptions(options);
   const debug = WorkflowLogger.getLogger(verbose);
   const handler = async (request) => {
+    await debug?.log("INFO", "ENDPOINT_START");
     const { workflowUrl, workflowFailureUrl } = await determineUrls(
       request,
       url,
@@ -1923,7 +1935,8 @@ var serve = (routeFunction, options) => {
       url: workflowUrl,
       failureUrl: workflowFailureUrl,
       debug,
-      env
+      env,
+      retries
     });
     const authCheck = await DisabledWorkflowContext.tryAuthentication(
       routeFunction,
@@ -1966,7 +1979,7 @@ var serve = (routeFunction, options) => {
     await debug?.log("INFO", "RESPONSE_DEFAULT");
     return onStepFinish("no-workflow-id", "fromCallback");
   };
-  return async (request) => {
+  const safeHandler = async (request) => {
     try {
       return await handler(request);
     } catch (error) {
@@ -1976,6 +1989,7 @@ var serve = (routeFunction, options) => {
       });
     }
   };
+  return { handler: safeHandler };
 };
 
 // src/client/index.ts
@@ -1984,10 +1998,10 @@ var import_qstash5 = require("@upstash/qstash");
 // platforms/svelte.ts
 var serve2 = (routeFunction, options) => {
   const handler = async ({ request }) => {
-    const serveMethod = serve(routeFunction, options);
-    return await serveMethod(request);
+    const { handler: serveHandler } = serve(routeFunction, options);
+    return await serveHandler(request);
   };
-  return handler;
+  return { POST: handler };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/svelte.mjs

@@ -1,14 +1,14 @@
 import {
   serve
-} from "./chunk-JDMP6KKR.mjs";
+} from "./chunk-YW5KUHA2.mjs";
 
 // platforms/svelte.ts
 var serve2 = (routeFunction, options) => {
   const handler = async ({ request }) => {
-    const serveMethod = serve(routeFunction, options);
-    return await serveMethod(request);
+    const { handler: serveHandler } = serve(routeFunction, options);
+    return await serveHandler(request);
   };
-  return handler;
+  return { POST: handler };
 };
 export {
   serve2 as serve

package/{types-CfN1Epuj.d.mts → types-D8FBKkto.d.mts}

@@ -374,7 +374,12 @@ declare class WorkflowContext<TInitialPayload = unknown> {
      * @param headers call headers
      * @returns call result (parsed as JSON if possible)
      */
-    call<TResult = unknown, TBody = unknown>(stepName: string, url: string, method: HTTPMethods, body?: TBody, headers?: Record<string, string>): Promise<TResult>;
+    call(stepName: string, callSettings: {
+        url: string;
+        method?: HTTPMethods;
+        body?: unknown;
+        headers?: Record<string, string>;
+    }): Promise<CallResponse>;
     waitForEvent(stepName: string, eventId: string, timeout: string | number): Promise<WaitStepResponse>;
     /**
      * Adds steps to the executor. Needed so that it can be overwritten in
@@ -612,5 +617,10 @@ type WaitStepResponse = {
     timeout: boolean;
     notifyBody: unknown;
 };
+type CallResponse = {
+    status: number;
+    body: unknown;
+    header: Record<string, string[]>;
+};
 
-export { type AsyncStepFunction as A, 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, WorkflowContext as a, type WorkflowClient as b, type WorkflowReceiver as c, StepTypes as d, type StepType as e, type RawStep as f, type SyncStepFunction as g, type StepFunction as h, type FailureFunctionPayload as i, type RequiredExceptFields as j, type WaitResult as k, type Waiter as l, type WaitRequest as m, type WaitStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };
+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, WorkflowContext as a, type WorkflowClient as b, type WorkflowReceiver as c, StepTypes as d, type StepType as e, type RawStep as f, type SyncStepFunction as g, type StepFunction as h, type FailureFunctionPayload as i, type RequiredExceptFields as j, type WaitResult as k, type Waiter as l, type WaitRequest as m, type WaitStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };

package/{types-CfN1Epuj.d.ts → types-D8FBKkto.d.ts}

@@ -374,7 +374,12 @@ declare class WorkflowContext<TInitialPayload = unknown> {
      * @param headers call headers
      * @returns call result (parsed as JSON if possible)
      */
-    call<TResult = unknown, TBody = unknown>(stepName: string, url: string, method: HTTPMethods, body?: TBody, headers?: Record<string, string>): Promise<TResult>;
+    call(stepName: string, callSettings: {
+        url: string;
+        method?: HTTPMethods;
+        body?: unknown;
+        headers?: Record<string, string>;
+    }): Promise<CallResponse>;
     waitForEvent(stepName: string, eventId: string, timeout: string | number): Promise<WaitStepResponse>;
     /**
      * Adds steps to the executor. Needed so that it can be overwritten in
@@ -612,5 +617,10 @@ type WaitStepResponse = {
     timeout: boolean;
     notifyBody: unknown;
 };
+type CallResponse = {
+    status: number;
+    body: unknown;
+    header: Record<string, string[]>;
+};
 
-export { type AsyncStepFunction as A, 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, WorkflowContext as a, type WorkflowClient as b, type WorkflowReceiver as c, StepTypes as d, type StepType as e, type RawStep as f, type SyncStepFunction as g, type StepFunction as h, type FailureFunctionPayload as i, type RequiredExceptFields as j, type WaitResult as k, type Waiter as l, type WaitRequest as m, type WaitStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };
+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, WorkflowContext as a, type WorkflowClient as b, type WorkflowReceiver as c, StepTypes as d, type StepType as e, type RawStep as f, type SyncStepFunction as g, type StepFunction as h, type FailureFunctionPayload as i, type RequiredExceptFields as j, type WaitResult as k, type Waiter as l, type WaitRequest as m, type WaitStepResponse as n, type WorkflowLoggerOptions as o, WorkflowLogger as p };