@upstash/workflow 0.2.8-rc-invoke → 0.2.9

package/express.js

@@ -23704,6 +23704,7 @@ 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_INVOKE_COUNT_HEADER = "Upstash-Workflow-Invoke-Count";
 var WORKFLOW_PROTOCOL_VERSION = "1";
 var WORKFLOW_PROTOCOL_VERSION_HEADER = "Upstash-Workflow-Sdk-Version";
 var DEFAULT_CONTENT_TYPE = "application/json";
@@ -23938,8 +23939,9 @@ var LazyCallStep = class extends BaseLazyStep {
   headers;
   retries;
   timeout;
+  flowControl;
   stepType = "Call";
-  constructor(stepName, url, method, body, headers, retries, timeout) {
+  constructor(stepName, url, method, body, headers, retries, timeout, flowControl) {
     super(stepName);
     this.url = url;
     this.method = method;
@@ -23947,6 +23949,7 @@ var LazyCallStep = class extends BaseLazyStep {
     this.headers = headers;
     this.retries = retries;
     this.timeout = timeout;
+    this.flowControl = flowControl;
   }
   getPlanStep(concurrent, targetStep) {
     return {
@@ -24017,14 +24020,22 @@ var LazyNotifyStep = class extends LazyFunctionStep {
 var LazyInvokeStep = class extends BaseLazyStep {
   stepType = "Invoke";
   params;
-  constructor(stepName, { workflow, body, headers = {}, workflowRunId, retries }) {
+  constructor(stepName, {
+    workflow,
+    body,
+    headers = {},
+    workflowRunId,
+    retries,
+    flowControl
+  }) {
     super(stepName);
     this.params = {
       workflow,
       body,
       headers,
       workflowRunId: getWorkflowRunId(workflowRunId),
-      retries
+      retries,
+      flowControl
     };
   }
   getPlanStep(concurrent, targetStep) {
@@ -24483,7 +24494,8 @@ var triggerFirstInvocation = async ({
   workflowContext,
   useJSONContent,
   telemetry: telemetry2,
-  debug
+  debug,
+  invokeCount
 }) => {
   const { headers } = getHeaders({
     initHeaderValue: "true",
@@ -24492,7 +24504,9 @@ var triggerFirstInvocation = async ({
     userHeaders: workflowContext.headers,
     failureUrl: workflowContext.failureUrl,
     retries: workflowContext.retries,
-    telemetry: telemetry2
+    telemetry: telemetry2,
+    invokeCount,
+    flowControl: workflowContext.flowControl
   });
   if (workflowContext.headers.get("content-type")) {
     headers["content-type"] = workflowContext.headers.get("content-type");
@@ -24598,6 +24612,7 @@ var handleThirdPartyCallResult = async ({
   failureUrl,
   retries,
   telemetry: telemetry2,
+  flowControl,
   debug
 }) => {
   try {
@@ -24645,6 +24660,7 @@ ${atob(callbackMessage.body ?? "")}`
       const stepType = request.headers.get("Upstash-Workflow-StepType");
       const concurrentString = request.headers.get("Upstash-Workflow-Concurrent");
       const contentType = request.headers.get("Upstash-Workflow-ContentType");
+      const invokeCount = request.headers.get(WORKFLOW_INVOKE_COUNT_HEADER);
       if (!(workflowRunId && stepIdString && stepName && StepTypes.includes(stepType) && concurrentString && contentType)) {
         throw new Error(
           `Missing info in callback message source header: ${JSON.stringify({
@@ -24665,7 +24681,9 @@ ${atob(callbackMessage.body ?? "")}`
         userHeaders,
         failureUrl,
         retries,
-        telemetry: telemetry2
+        telemetry: telemetry2,
+        invokeCount: Number(invokeCount),
+        flowControl
       });
       const callResponse = {
         status: callbackMessage.status,
@@ -24721,7 +24739,10 @@ var getHeaders = ({
   step,
   callRetries,
   callTimeout,
-  telemetry: telemetry2
+  telemetry: telemetry2,
+  invokeCount,
+  flowControl,
+  callFlowControl
 }) => {
   const contentType = (userHeaders ? userHeaders.get("Content-Type") : void 0) ?? DEFAULT_CONTENT_TYPE;
   const baseHeaders = {
@@ -24733,6 +24754,9 @@ var getHeaders = ({
     "content-type": contentType,
     ...telemetry2 ? getTelemetryHeaders(telemetry2) : {}
   };
+  if (invokeCount !== void 0 && !step?.callUrl) {
+    baseHeaders[`Upstash-Forward-${WORKFLOW_INVOKE_COUNT_HEADER}`] = invokeCount.toString();
+  }
   if (!step?.callUrl) {
     baseHeaders[`Upstash-Forward-${WORKFLOW_PROTOCOL_VERSION_HEADER}`] = WORKFLOW_PROTOCOL_VERSION;
   }
@@ -24741,13 +24765,23 @@ var getHeaders = ({
   }
   if (failureUrl) {
     baseHeaders[`Upstash-Failure-Callback-Forward-${WORKFLOW_FAILURE_HEADER}`] = "true";
+    baseHeaders[`Upstash-Failure-Callback-Forward-Upstash-Workflow-Failure-Callback`] = "true";
+    baseHeaders["Upstash-Failure-Callback-Workflow-Runid"] = workflowRunId;
+    baseHeaders["Upstash-Failure-Callback-Workflow-Init"] = "false";
+    baseHeaders["Upstash-Failure-Callback-Workflow-Url"] = workflowUrl;
+    baseHeaders["Upstash-Failure-Callback-Workflow-Calltype"] = "failureCall";
+    if (retries !== void 0) {
+      baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
+    }
+    if (flowControl) {
+      const { flowControlKey, flowControlValue } = prepareFlowControl(flowControl);
+      baseHeaders["Upstash-Failure-Callback-Flow-Control-Key"] = flowControlKey;
+      baseHeaders["Upstash-Failure-Callback-Flow-Control-Value"] = flowControlValue;
+    }
     if (!step?.callUrl) {
       baseHeaders["Upstash-Failure-Callback"] = failureUrl;
     }
   }
-  if (step?.stepType === "Invoke") {
-    baseHeaders["upstash-workflow-invoke"] = "true";
-  }
   if (step?.callUrl) {
     baseHeaders["Upstash-Retries"] = callRetries?.toString() ?? "0";
     baseHeaders[WORKFLOW_FEATURE_HEADER] = "WF_NoDelete,InitialBody";
@@ -24755,9 +24789,26 @@ var getHeaders = ({
       baseHeaders["Upstash-Callback-Retries"] = retries.toString();
       baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
     }
-  } else if (retries !== void 0) {
-    baseHeaders["Upstash-Retries"] = retries.toString();
-    baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
+    if (callFlowControl) {
+      const { flowControlKey, flowControlValue } = prepareFlowControl(callFlowControl);
+      baseHeaders["Upstash-Flow-Control-Key"] = flowControlKey;
+      baseHeaders["Upstash-Flow-Control-Value"] = flowControlValue;
+    }
+    if (flowControl) {
+      const { flowControlKey, flowControlValue } = prepareFlowControl(flowControl);
+      baseHeaders["Upstash-Callback-Flow-Control-Key"] = flowControlKey;
+      baseHeaders["Upstash-Callback-Flow-Control-Value"] = flowControlValue;
+    }
+  } else {
+    if (flowControl) {
+      const { flowControlKey, flowControlValue } = prepareFlowControl(flowControl);
+      baseHeaders["Upstash-Flow-Control-Key"] = flowControlKey;
+      baseHeaders["Upstash-Flow-Control-Value"] = flowControlValue;
+    }
+    if (retries !== void 0) {
+      baseHeaders["Upstash-Retries"] = retries.toString();
+      baseHeaders["Upstash-Failure-Callback-Retries"] = retries.toString();
+    }
   }
   if (userHeaders) {
     for (const header of userHeaders.keys()) {
@@ -24792,6 +24843,7 @@ var getHeaders = ({
         "Upstash-Callback-Forward-Upstash-Workflow-StepType": step.stepType,
         "Upstash-Callback-Forward-Upstash-Workflow-Concurrent": step.concurrent.toString(),
         "Upstash-Callback-Forward-Upstash-Workflow-ContentType": contentType,
+        [`Upstash-Callback-Forward-${WORKFLOW_INVOKE_COUNT_HEADER}`]: (invokeCount ?? 0).toString(),
         "Upstash-Workflow-CallType": "toCallback"
       }
     };
@@ -24849,9 +24901,159 @@ If you want to disable QStash Verification, you should clear env variables QSTAS
     );
   }
 };
+var prepareFlowControl = (flowControl) => {
+  const parallelism = flowControl.parallelism?.toString();
+  const rate = flowControl.ratePerSecond?.toString();
+  const controlValue = [
+    parallelism ? `parallelism=${parallelism}` : void 0,
+    rate ? `rate=${rate}` : void 0
+  ].filter(Boolean);
+  if (controlValue.length === 0) {
+    throw new import_qstash3.QstashError("Provide at least one of parallelism or ratePerSecond for flowControl");
+  }
+  return {
+    flowControlKey: flowControl.key,
+    flowControlValue: controlValue.join(", ")
+  };
+};
 
 // src/context/auto-executor.ts
 var import_qstash4 = require("@upstash/qstash");
+
+// src/serve/serve-many.ts
+var getWorkflowId = (url) => {
+  const components = url.split("/");
+  const lastComponent = components[components.length - 1];
+  return lastComponent.split("?")[0];
+};
+var serveManyBase = ({
+  workflows,
+  getUrl,
+  serveMethod,
+  options
+}) => {
+  const workflowIds = [];
+  const workflowMap = Object.fromEntries(
+    Object.entries(workflows).map((workflow) => {
+      const workflowId = workflow[0];
+      if (workflowIds.includes(workflowId)) {
+        throw new WorkflowError(
+          `Duplicate workflow name found: '${workflowId}'. Please set different workflow names in serveMany.`
+        );
+      }
+      if (workflowId.includes("/")) {
+        throw new WorkflowError(
+          `Invalid workflow name found: '${workflowId}'. Workflow name cannot contain '/'.`
+        );
+      }
+      workflowIds.push(workflowId);
+      workflow[1].workflowId = workflowId;
+      workflow[1].options = {
+        ...options,
+        ...workflow[1].options
+      };
+      const params = [workflow[1].routeFunction, workflow[1].options];
+      const handler = serveMethod(...params);
+      return [workflowId, handler];
+    })
+  );
+  return {
+    handler: async (...params) => {
+      const url = getUrl(...params);
+      const pickedWorkflowId = getWorkflowId(url);
+      if (!pickedWorkflowId) {
+        return new Response(
+          `Unexpected request in serveMany. workflowId not set. Please update the URL of your request.`,
+          {
+            status: 404
+          }
+        );
+      }
+      const workflow = workflowMap[pickedWorkflowId];
+      if (!workflow) {
+        return new Response(
+          `No workflows in serveMany found for '${pickedWorkflowId}'. Please update the URL of your request.`,
+          {
+            status: 404
+          }
+        );
+      }
+      return await workflow(...params);
+    }
+  };
+};
+var invokeWorkflow = async ({
+  settings,
+  invokeStep,
+  context,
+  invokeCount,
+  telemetry: telemetry2
+}) => {
+  const {
+    body,
+    workflow,
+    headers = {},
+    workflowRunId = getWorkflowRunId(),
+    retries,
+    flowControl
+  } = settings;
+  const { workflowId } = workflow;
+  const {
+    retries: workflowRetries,
+    failureFunction,
+    failureUrl,
+    useJSONContent,
+    flowControl: workflowFlowControl
+  } = workflow.options;
+  if (!workflowId) {
+    throw new WorkflowError("You can only invoke workflow which has a workflowId");
+  }
+  const { headers: invokerHeaders } = getHeaders({
+    initHeaderValue: "false",
+    workflowRunId: context.workflowRunId,
+    workflowUrl: context.url,
+    userHeaders: context.headers,
+    failureUrl: context.failureUrl,
+    retries: context.retries,
+    telemetry: telemetry2,
+    invokeCount,
+    flowControl: context.flowControl
+  });
+  invokerHeaders["Upstash-Workflow-Runid"] = context.workflowRunId;
+  const newUrl = context.url.replace(/[^/]+$/, workflowId);
+  const { headers: triggerHeaders } = getHeaders({
+    initHeaderValue: "true",
+    workflowRunId,
+    workflowUrl: newUrl,
+    userHeaders: new Headers(headers),
+    retries: retries ?? workflowRetries,
+    telemetry: telemetry2,
+    failureUrl: failureFunction ? newUrl : failureUrl,
+    invokeCount: invokeCount + 1,
+    flowControl: flowControl ?? workflowFlowControl
+  });
+  triggerHeaders["Upstash-Workflow-Invoke"] = "true";
+  if (useJSONContent) {
+    triggerHeaders["content-type"] = "application/json";
+  }
+  const request = {
+    body: JSON.stringify(body),
+    headers: Object.fromEntries(
+      Object.entries(invokerHeaders).map((pairs) => [pairs[0], [pairs[1]]])
+    ),
+    workflowRunId,
+    workflowUrl: context.url,
+    step: invokeStep
+  };
+  await context.qstashClient.publish({
+    headers: triggerHeaders,
+    method: "POST",
+    body: JSON.stringify(request),
+    url: newUrl
+  });
+};
+
+// src/context/auto-executor.ts
 var AutoExecutor = class _AutoExecutor {
   context;
   promises = /* @__PURE__ */ new WeakMap();
@@ -24860,14 +25062,16 @@ var AutoExecutor = class _AutoExecutor {
   nonPlanStepCount;
   steps;
   indexInCurrentList = 0;
+  invokeCount;
   telemetry;
   stepCount = 0;
   planStepCount = 0;
   executingStep = false;
-  constructor(context, steps, telemetry2, debug) {
+  constructor(context, steps, telemetry2, invokeCount, debug) {
     this.context = context;
     this.steps = steps;
     this.telemetry = telemetry2;
+    this.invokeCount = invokeCount ?? 0;
     this.debug = debug;
     this.nonPlanStepCount = this.steps.filter((step) => !step.targetStep).length;
   }
@@ -25090,7 +25294,9 @@ var AutoExecutor = class _AutoExecutor {
         step: waitStep,
         failureUrl: this.context.failureUrl,
         retries: this.context.retries,
-        telemetry: this.telemetry
+        telemetry: this.telemetry,
+        invokeCount: this.invokeCount,
+        flowControl: this.context.flowControl
       });
       const waitBody = {
         url: this.context.url,
@@ -25118,17 +25324,13 @@ var AutoExecutor = class _AutoExecutor {
     if (steps.length === 1 && lazySteps[0] instanceof LazyInvokeStep) {
       const invokeStep = steps[0];
       const lazyInvokeStep = lazySteps[0];
-      await lazyInvokeStep.params.workflow.callback(
-        {
-          body: lazyInvokeStep.params.body,
-          headers: lazyInvokeStep.params.headers,
-          workflowRunId: lazyInvokeStep.params.workflowRunId,
-          workflow: lazyInvokeStep.params.workflow,
-          retries: lazyInvokeStep.params.retries
-        },
+      await invokeWorkflow({
+        settings: lazyInvokeStep.params,
         invokeStep,
-        this.context
-      );
+        context: this.context,
+        invokeCount: this.invokeCount,
+        telemetry: this.telemetry
+      });
       throw new WorkflowAbort(invokeStep.stepName, invokeStep);
     }
     const result = await this.context.qstashClient.batchJSON(
@@ -25144,11 +25346,14 @@ var AutoExecutor = class _AutoExecutor {
           retries: this.context.retries,
           callRetries: lazyStep instanceof LazyCallStep ? lazyStep.retries : void 0,
           callTimeout: lazyStep instanceof LazyCallStep ? lazyStep.timeout : void 0,
-          telemetry: this.telemetry
+          telemetry: this.telemetry,
+          invokeCount: this.invokeCount,
+          flowControl: this.context.flowControl,
+          callFlowControl: lazyStep instanceof LazyCallStep ? lazyStep.flowControl : void 0
         });
         const willWait = singleStep.concurrent === NO_CONCURRENCY || singleStep.stepId === 0;
         singleStep.out = JSON.stringify(singleStep.out);
-        return singleStep.callUrl ? (
+        return singleStep.callUrl && lazyStep instanceof LazyCallStep ? (
           // if the step is a third party call, we call the third party
           // url (singleStep.callUrl) and pass information about the workflow
           // in the headers (handled in getHeaders). QStash makes the request
@@ -25448,9 +25653,10 @@ var wrapTools = ({
   return Object.fromEntries(
     Object.entries(tools).map((toolInfo) => {
       const [toolName, tool3] = toolInfo;
+      const executeAsStep = "executeAsStep" in tool3 ? tool3.executeAsStep : true;
       const aiSDKTool = convertToAISDKTool(tool3);
       const execute = aiSDKTool.execute;
-      if (execute) {
+      if (execute && executeAsStep) {
         const wrappedExecute = (...params) => {
           return context.run(`Run tool ${toolName}`, () => execute(...params));
         };
@@ -25804,6 +26010,11 @@ var WorkflowContext = class {
    * Number of retries
    */
   retries;
+  /**
+   * Settings for controlling the number of active requests
+   * and number of requests per second with the same key.
+   */
+  flowControl;
   constructor({
     qstashClient,
     workflowRunId,
@@ -25815,7 +26026,9 @@ var WorkflowContext = class {
     initialPayload,
     env,
     retries,
-    telemetry: telemetry2
+    telemetry: telemetry2,
+    invokeCount,
+    flowControl
   }) {
     this.qstashClient = qstashClient;
     this.workflowRunId = workflowRunId;
@@ -25826,7 +26039,8 @@ var WorkflowContext = class {
     this.requestPayload = initialPayload;
     this.env = env ?? {};
     this.retries = retries ?? DEFAULT_RETRIES;
-    this.executor = new AutoExecutor(this, this.steps, telemetry2, debug);
+    this.flowControl = flowControl;
+    this.executor = new AutoExecutor(this, this.steps, telemetry2, invokeCount, debug);
   }
   /**
    * Executes a workflow step
@@ -25928,7 +26142,7 @@ var WorkflowContext = class {
    *   }
    */
   async call(stepName, settings) {
-    const { url, method = "GET", body, headers = {}, retries = 0, timeout } = settings;
+    const { url, method = "GET", body, headers = {}, retries = 0, timeout, flowControl } = settings;
     const result = await this.addStep(
       new LazyCallStep(
         stepName,
@@ -25937,7 +26151,8 @@ var WorkflowContext = class {
         body,
         headers,
         retries,
-        timeout
+        timeout,
+        flowControl
       )
     );
     if (typeof result === "string") {
@@ -26174,7 +26389,8 @@ var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowCon
       failureUrl: context.failureUrl,
       initialPayload: context.requestPayload,
       env: context.env,
-      retries: context.retries
+      retries: context.retries,
+      flowControl: context.flowControl
     });
     try {
       await routeFunction(disabledContext);
@@ -26327,7 +26543,7 @@ var parseRequest = async (requestPayload, isFirstInvocation, workflowRunId, requ
     };
   }
 };
-var handleFailure = async (request, requestPayload, qstashClient, initialPayloadParser, routeFunction, failureFunction, env, retries, debug) => {
+var handleFailure = async (request, requestPayload, qstashClient, initialPayloadParser, routeFunction, failureFunction, env, retries, flowControl, debug) => {
   if (request.headers.get(WORKFLOW_FAILURE_HEADER) !== "true") {
     return ok("not-failure-callback");
   }
@@ -26339,22 +26555,21 @@ var handleFailure = async (request, requestPayload, qstashClient, initialPayload
     );
   }
   try {
-    const { status, header, body, url, sourceHeader, sourceBody, workflowRunId } = JSON.parse(
-      requestPayload
-    );
+    const { status, header, body, url, sourceBody, workflowRunId } = JSON.parse(requestPayload);
     const decodedBody = body ? decodeBase64(body) : "{}";
     const errorPayload = JSON.parse(decodedBody);
     const workflowContext = new WorkflowContext({
       qstashClient,
       workflowRunId,
       initialPayload: sourceBody ? initialPayloadParser(decodeBase64(sourceBody)) : void 0,
-      headers: recreateUserHeaders(new Headers(sourceHeader)),
+      headers: recreateUserHeaders(request.headers),
       steps: [],
       url,
       failureUrl: url,
       debug,
       env,
       retries,
+      flowControl,
       telemetry: void 0
       // not going to make requests in authentication check
     });
@@ -26481,7 +26696,8 @@ var serveBase = (routeFunction, telemetry2, options) => {
     env,
     retries,
     useJSONContent,
-    disableTelemetry
+    disableTelemetry,
+    flowControl
   } = processOptions(options);
   telemetry2 = disableTelemetry ? void 0 : telemetry2;
   const debug = WorkflowLogger.getLogger(verbose);
@@ -26522,6 +26738,7 @@ var serveBase = (routeFunction, telemetry2, options) => {
       failureFunction,
       env,
       retries,
+      flowControl,
       debug
     );
     if (failureCheck.isErr()) {
@@ -26530,6 +26747,7 @@ var serveBase = (routeFunction, telemetry2, options) => {
       await debug?.log("WARN", "RESPONSE_DEFAULT", "failureFunction executed");
       return onStepFinish(workflowRunId, "failure-callback");
     }
+    const invokeCount = Number(request.headers.get(WORKFLOW_INVOKE_COUNT_HEADER) ?? "0");
     const workflowContext = new WorkflowContext({
       qstashClient,
       workflowRunId,
@@ -26541,7 +26759,9 @@ var serveBase = (routeFunction, telemetry2, options) => {
       debug,
       env,
       retries,
-      telemetry: telemetry2
+      telemetry: telemetry2,
+      invokeCount,
+      flowControl
     });
     const authCheck = await DisabledWorkflowContext.tryAuthentication(
       routeFunction,
@@ -26564,6 +26784,7 @@ var serveBase = (routeFunction, telemetry2, options) => {
       workflowUrl,
       failureUrl: workflowFailureUrl,
       retries,
+      flowControl,
       telemetry: telemetry2,
       debug
     });
@@ -26573,7 +26794,13 @@ var serveBase = (routeFunction, telemetry2, options) => {
       });
       throw callReturnCheck.error;
     } else if (callReturnCheck.value === "continue-workflow") {
-      const result = isFirstInvocation ? await triggerFirstInvocation({ workflowContext, useJSONContent, telemetry: telemetry2, debug }) : await triggerRouteFunction({
+      const result = isFirstInvocation ? await triggerFirstInvocation({
+        workflowContext,
+        useJSONContent,
+        telemetry: telemetry2,
+        debug,
+        invokeCount
+      }) : await triggerRouteFunction({
         onStep: async () => routeFunction(workflowContext),
         onCleanup: async (result2) => {
           await triggerWorkflowDelete(workflowContext, result2, debug);
@@ -26610,93 +26837,6 @@ var serveBase = (routeFunction, telemetry2, options) => {
 
 // platforms/express.ts
 var import_express = __toESM(require_express2());
-
-// src/serve/serve-many.ts
-var serveManyBase = ({
-  workflows,
-  getWorkflowId
-}) => {
-  const workflowIds = [];
-  const workflowMap = Object.fromEntries(
-    Object.entries(workflows).map((workflow) => {
-      const workflowId = workflow[0];
-      if (workflowIds.includes(workflowId)) {
-        throw new WorkflowError(
-          `Duplicate workflow name found: '${workflowId}'. Please set different workflow names in serveMany.`
-        );
-      }
-      if (workflowId.includes("/")) {
-        throw new WorkflowError(
-          `Invalid workflow name found: '${workflowId}'. Workflow name cannot contain '/'.`
-        );
-      }
-      workflowIds.push(workflowId);
-      workflow[1].workflowId = workflowId;
-      return [workflowId, workflow[1].handler];
-    })
-  );
-  return {
-    handler: async (...params) => {
-      const pickedWorkflowId = getWorkflowId(...params);
-      if (!pickedWorkflowId) {
-        throw new WorkflowError(`Unexpected request in serveMany. workflowId not set. Please update the URL of your request.`);
-      }
-      const workflow = workflowMap[pickedWorkflowId];
-      if (!workflow) {
-        throw new WorkflowError(`No workflows in serveMany found for '${pickedWorkflowId}'. Please update the URL of your request.`);
-      }
-      return await workflow(...params);
-    }
-  };
-};
-var createInvokeCallback = (telemetry2) => {
-  const invokeCallback = async (settings, invokeStep, context) => {
-    const { body, workflow, headers = {}, workflowRunId = getWorkflowRunId(), retries } = settings;
-    const { workflowId } = workflow;
-    if (!workflowId) {
-      throw new WorkflowError("You can only invoke workflow which has a workflowId");
-    }
-    const { headers: invokerHeaders } = getHeaders({
-      initHeaderValue: "false",
-      workflowRunId: context.workflowRunId,
-      workflowUrl: context.url,
-      userHeaders: context.headers,
-      failureUrl: context.failureUrl,
-      retries: context.retries,
-      telemetry: telemetry2
-    });
-    invokerHeaders["Upstash-Workflow-Runid"] = context.workflowRunId;
-    const newUrl = context.url.replace(/[^/]+$/, workflowId);
-    const { headers: triggerHeaders } = getHeaders({
-      initHeaderValue: "true",
-      workflowRunId,
-      workflowUrl: newUrl,
-      userHeaders: new Headers(headers),
-      retries,
-      telemetry: telemetry2
-    });
-    triggerHeaders["Upstash-Workflow-Invoke"] = "true";
-    const request = {
-      body: JSON.stringify(body),
-      headers: Object.fromEntries(
-        Object.entries(invokerHeaders).map((pairs) => [pairs[0], [pairs[1]]])
-      ),
-      workflowRunId,
-      workflowUrl: context.url,
-      step: invokeStep
-    };
-    await context.qstashClient.publish({
-      headers: triggerHeaders,
-      method: "POST",
-      body: JSON.stringify(request),
-      url: newUrl
-    });
-    return void 0;
-  };
-  return invokeCallback;
-};
-
-// platforms/express.ts
 var isEmptyRequest = (req) => {
   return req.headers["content-type"] === "application/json" && req.headers["content-length"] === "0";
 };
@@ -26730,14 +26870,10 @@ function createExpressHandler(params) {
       headers: new Headers(request_.headers),
       body: requestBody
     });
-    const { handler: serveHandler } = serveBase(
-      routeFunction,
-      telemetry,
-      {
-        ...options,
-        useJSONContent: true
-      }
-    );
+    const { handler: serveHandler } = serveBase(routeFunction, telemetry, {
+      ...options,
+      useJSONContent: true
+    });
     const response = await serveHandler(webRequest);
     res.status(response.status).json(await response.json());
   };
@@ -26749,21 +26885,22 @@ function serve(routeFunction, options) {
   return router;
 }
 var createWorkflow = (...params) => {
-  const handler = createExpressHandler(params);
+  const [routeFunction, options = {}] = params;
   return {
-    callback: createInvokeCallback(telemetry),
-    handler,
+    routeFunction,
+    options,
     workflowId: void 0
   };
 };
-var serveMany = (workflows) => {
+var serveMany = (workflows, options) => {
   const router = (0, import_express.Router)();
   const { handler } = serveManyBase({
     workflows,
-    getWorkflowId(...params) {
-      const components = params[0].url.split("/");
-      return components[components.length - 1];
-    }
+    getUrl(...params) {
+      return params[0].url;
+    },
+    serveMethod: (...params) => createExpressHandler(params),
+    options
   });
   router.all("*", handler);
   return router;