@upstash/workflow 0.2.8 → 0.2.10-hono-generics

package/index.js

@@ -97,12 +97,13 @@ 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";
 var NO_CONCURRENCY = 1;
 var DEFAULT_RETRIES = 3;
-var VERSION = "v0.2.3";
+var VERSION = "v0.2.7";
 var SDK_TELEMETRY = `@upstash/workflow@${VERSION}`;
 var TELEMETRY_HEADER_SDK = "Upstash-Telemetry-Sdk";
 var TELEMETRY_HEADER_FRAMEWORK = "Upstash-Telemetry-Framework";
@@ -149,6 +150,31 @@ var formatWorkflowError = (error) => {
   };
 };
 
+// src/utils.ts
+var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
+var NANOID_LENGTH = 21;
+function getRandomInt() {
+  return Math.floor(Math.random() * NANOID_CHARS.length);
+}
+function nanoid() {
+  return Array.from({ length: NANOID_LENGTH }).map(() => NANOID_CHARS[getRandomInt()]).join("");
+}
+function getWorkflowRunId(id) {
+  return `wfr_${id ?? nanoid()}`;
+}
+function decodeBase64(base64) {
+  try {
+    const binString = atob(base64);
+    const intArray = Uint8Array.from(binString, (m) => m.codePointAt(0));
+    return new TextDecoder().decode(intArray);
+  } catch (error) {
+    console.warn(
+      `Upstash Qstash: Failed while decoding base64 "${base64}". Decoding with atob and returning it instead. ${error}`
+    );
+    return atob(base64);
+  }
+}
+
 // src/context/steps.ts
 var BaseLazyStep = class {
   stepName;
@@ -253,8 +279,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;
@@ -262,6 +289,7 @@ var LazyCallStep = class extends BaseLazyStep {
     this.headers = headers;
     this.retries = retries;
     this.timeout = timeout;
+    this.flowControl = flowControl;
   }
   getPlanStep(concurrent, targetStep) {
     return {
@@ -329,6 +357,49 @@ var LazyNotifyStep = class extends LazyFunctionStep {
     });
   }
 };
+var LazyInvokeStep = class extends BaseLazyStep {
+  stepType = "Invoke";
+  params;
+  constructor(stepName, {
+    workflow,
+    body,
+    headers = {},
+    workflowRunId,
+    retries,
+    flowControl
+  }) {
+    super(stepName);
+    this.params = {
+      workflow,
+      body,
+      headers,
+      workflowRunId: getWorkflowRunId(workflowRunId),
+      retries,
+      flowControl
+    };
+  }
+  getPlanStep(concurrent, targetStep) {
+    return {
+      stepId: 0,
+      stepName: this.stepName,
+      stepType: this.stepType,
+      concurrent,
+      targetStep
+    };
+  }
+  /**
+   * won't be used as it's the server who will add the result step
+   * in Invoke step.
+   */
+  getResultStep(concurrent, stepId) {
+    return Promise.resolve({
+      stepId,
+      stepName: this.stepName,
+      stepType: this.stepType,
+      concurrent
+    });
+  }
+};
 
 // node_modules/neverthrow/dist/index.es.js
 var defaultErrorConfig = {
@@ -753,7 +824,8 @@ var StepTypes = [
   "SleepUntil",
   "Call",
   "Wait",
-  "Notify"
+  "Notify",
+  "Invoke"
 ];
 
 // src/workflow-requests.ts
@@ -762,7 +834,8 @@ var triggerFirstInvocation = async ({
   workflowContext,
   useJSONContent,
   telemetry,
-  debug
+  debug,
+  invokeCount
 }) => {
   const { headers } = getHeaders({
     initHeaderValue: "true",
@@ -771,7 +844,9 @@ var triggerFirstInvocation = async ({
     userHeaders: workflowContext.headers,
     failureUrl: workflowContext.failureUrl,
     retries: workflowContext.retries,
-    telemetry
+    telemetry,
+    invokeCount,
+    flowControl: workflowContext.flowControl
   });
   if (workflowContext.headers.get("content-type")) {
     headers["content-type"] = workflowContext.headers.get("content-type");
@@ -817,8 +892,8 @@ var triggerRouteFunction = async ({
   debug
 }) => {
   try {
-    await onStep();
-    await onCleanup();
+    const result = await onStep();
+    await onCleanup(result);
     return ok("workflow-finished");
   } catch (error) {
     const error_ = error;
@@ -839,14 +914,15 @@ var triggerRouteFunction = async ({
     }
   }
 };
-var triggerWorkflowDelete = async (workflowContext, debug, cancel = false) => {
+var triggerWorkflowDelete = async (workflowContext, result, debug, cancel = false) => {
   await debug?.log("SUBMIT", "SUBMIT_CLEANUP", {
     deletedWorkflowRunId: workflowContext.workflowRunId
   });
   await workflowContext.qstashClient.http.request({
     path: ["v2", "workflows", "runs", `${workflowContext.workflowRunId}?cancel=${cancel}`],
     method: "DELETE",
-    parseResponseAsJson: false
+    parseResponseAsJson: false,
+    body: JSON.stringify(result)
   });
   await debug?.log(
     "SUBMIT",
@@ -876,6 +952,7 @@ var handleThirdPartyCallResult = async ({
   failureUrl,
   retries,
   telemetry,
+  flowControl,
   debug
 }) => {
   try {
@@ -923,6 +1000,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({
@@ -943,7 +1021,9 @@ ${atob(callbackMessage.body ?? "")}`
         userHeaders,
         failureUrl,
         retries,
-        telemetry
+        telemetry,
+        invokeCount: Number(invokeCount),
+        flowControl
       });
       const callResponse = {
         status: callbackMessage.status,
@@ -999,15 +1079,24 @@ var getHeaders = ({
   step,
   callRetries,
   callTimeout,
-  telemetry
+  telemetry,
+  invokeCount,
+  flowControl,
+  callFlowControl
 }) => {
+  const contentType = (userHeaders ? userHeaders.get("Content-Type") : void 0) ?? DEFAULT_CONTENT_TYPE;
   const baseHeaders = {
     [WORKFLOW_INIT_HEADER]: initHeaderValue,
     [WORKFLOW_ID_HEADER]: workflowRunId,
     [WORKFLOW_URL_HEADER]: workflowUrl,
     [WORKFLOW_FEATURE_HEADER]: "LazyFetch,InitialBody",
+    [WORKFLOW_PROTOCOL_VERSION_HEADER]: WORKFLOW_PROTOCOL_VERSION,
+    "content-type": contentType,
     ...telemetry ? getTelemetryHeaders(telemetry) : {}
   };
+  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;
   }
@@ -1024,6 +1113,11 @@ var getHeaders = ({
     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;
     }
@@ -1035,9 +1129,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()) {
@@ -1049,7 +1160,6 @@ var getHeaders = ({
       baseHeaders[`Upstash-Failure-Callback-Forward-${header}`] = userHeaders.get(header);
     }
   }
-  const contentType = (userHeaders ? userHeaders.get("Content-Type") : void 0) ?? DEFAULT_CONTENT_TYPE;
   if (step?.callHeaders) {
     const forwardedHeaders = Object.fromEntries(
       Object.entries(step.callHeaders).map(([header, value]) => [
@@ -1073,6 +1183,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"
       }
     };
@@ -1099,8 +1210,7 @@ var getHeaders = ({
         "Upstash-Workflow-Runid": [workflowRunId],
         [WORKFLOW_INIT_HEADER]: ["false"],
         [WORKFLOW_URL_HEADER]: [workflowUrl],
-        "Upstash-Workflow-CallType": ["step"],
-        "Content-Type": [contentType]
+        "Upstash-Workflow-CallType": ["step"]
       }
     };
   }
@@ -1131,9 +1241,98 @@ 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 invokeWorkflow = async ({
+  settings,
+  invokeStep,
+  context,
+  invokeCount,
+  telemetry
+}) => {
+  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,
+    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,
+    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();
@@ -1142,14 +1341,16 @@ var AutoExecutor = class _AutoExecutor {
   nonPlanStepCount;
   steps;
   indexInCurrentList = 0;
+  invokeCount;
   telemetry;
   stepCount = 0;
   planStepCount = 0;
   executingStep = false;
-  constructor(context, steps, telemetry, debug) {
+  constructor(context, steps, telemetry, invokeCount, debug) {
     this.context = context;
     this.steps = steps;
     this.telemetry = telemetry;
+    this.invokeCount = invokeCount ?? 0;
     this.debug = debug;
     this.nonPlanStepCount = this.steps.filter((step) => !step.targetStep).length;
   }
@@ -1372,7 +1573,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,
@@ -1395,7 +1598,19 @@ var AutoExecutor = class _AutoExecutor {
         method: "POST",
         parseResponseAsJson: false
       });
-      throw new WorkflowAbort(steps[0].stepName, steps[0]);
+      throw new WorkflowAbort(waitStep.stepName, waitStep);
+    }
+    if (steps.length === 1 && lazySteps[0] instanceof LazyInvokeStep) {
+      const invokeStep = steps[0];
+      const lazyInvokeStep = lazySteps[0];
+      await invokeWorkflow({
+        settings: lazyInvokeStep.params,
+        invokeStep,
+        context: this.context,
+        invokeCount: this.invokeCount,
+        telemetry: this.telemetry
+      });
+      throw new WorkflowAbort(invokeStep.stepName, invokeStep);
     }
     const result = await this.context.qstashClient.batchJSON(
       steps.map((singleStep, index) => {
@@ -1410,11 +1625,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
@@ -1756,7 +1974,7 @@ var WorkflowTool = class {
    */
   executeAsStep;
   /**
-   * 
+   *
    * @param description description of the tool
    * @param schema schema of the tool
    * @param invoke function to invoke the tool
@@ -2102,6 +2320,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,
@@ -2113,7 +2336,9 @@ var WorkflowContext = class {
     initialPayload,
     env,
     retries,
-    telemetry
+    telemetry,
+    invokeCount,
+    flowControl
   }) {
     this.qstashClient = qstashClient;
     this.workflowRunId = workflowRunId;
@@ -2124,7 +2349,8 @@ var WorkflowContext = class {
     this.requestPayload = initialPayload;
     this.env = env ?? {};
     this.retries = retries ?? DEFAULT_RETRIES;
-    this.executor = new AutoExecutor(this, this.steps, telemetry, debug);
+    this.flowControl = flowControl;
+    this.executor = new AutoExecutor(this, this.steps, telemetry, invokeCount, debug);
   }
   /**
    * Executes a workflow step
@@ -2226,7 +2452,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,
@@ -2235,7 +2461,8 @@ var WorkflowContext = class {
         body,
         headers,
         retries,
-        timeout
+        timeout,
+        flowControl
       )
     );
     if (typeof result === "string") {
@@ -2344,6 +2571,13 @@ var WorkflowContext = class {
       return result;
     }
   }
+  async invoke(stepName, settings) {
+    const result = await this.addStep(new LazyInvokeStep(stepName, settings));
+    return {
+      ...result,
+      body: result.body ? JSON.parse(result.body) : void 0
+    };
+  }
   /**
    * Cancel the current workflow run
    *
@@ -2421,31 +2655,6 @@ var WorkflowLogger = class _WorkflowLogger {
   }
 };
 
-// src/utils.ts
-var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
-var NANOID_LENGTH = 21;
-function getRandomInt() {
-  return Math.floor(Math.random() * NANOID_CHARS.length);
-}
-function nanoid() {
-  return Array.from({ length: NANOID_LENGTH }).map(() => NANOID_CHARS[getRandomInt()]).join("");
-}
-function getWorkflowRunId(id) {
-  return `wfr_${id ?? nanoid()}`;
-}
-function decodeBase64(base64) {
-  try {
-    const binString = atob(base64);
-    const intArray = Uint8Array.from(binString, (m) => m.codePointAt(0));
-    return new TextDecoder().decode(intArray);
-  } catch (error) {
-    console.warn(
-      `Upstash Qstash: Failed while decoding base64 "${base64}". Decoding with atob and returning it instead. ${error}`
-    );
-    return atob(base64);
-  }
-}
-
 // src/serve/authorization.ts
 var import_qstash8 = require("@upstash/qstash");
 var DisabledWorkflowContext = class _DisabledWorkflowContext extends WorkflowContext {
@@ -2490,7 +2699,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);
@@ -2643,7 +2853,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");
   }
@@ -2655,22 +2865,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
     });
@@ -2797,7 +3006,8 @@ var serveBase = (routeFunction, telemetry, options) => {
     env,
     retries,
     useJSONContent,
-    disableTelemetry
+    disableTelemetry,
+    flowControl
   } = processOptions(options);
   telemetry = disableTelemetry ? void 0 : telemetry;
   const debug = WorkflowLogger.getLogger(verbose);
@@ -2838,6 +3048,7 @@ var serveBase = (routeFunction, telemetry, options) => {
       failureFunction,
       env,
       retries,
+      flowControl,
       debug
     );
     if (failureCheck.isErr()) {
@@ -2846,6 +3057,7 @@ var serveBase = (routeFunction, telemetry, 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,
@@ -2857,7 +3069,9 @@ var serveBase = (routeFunction, telemetry, options) => {
       debug,
       env,
       retries,
-      telemetry
+      telemetry,
+      invokeCount,
+      flowControl
     });
     const authCheck = await DisabledWorkflowContext.tryAuthentication(
       routeFunction,
@@ -2880,6 +3094,7 @@ var serveBase = (routeFunction, telemetry, options) => {
       workflowUrl,
       failureUrl: workflowFailureUrl,
       retries,
+      flowControl,
       telemetry,
       debug
     });
@@ -2889,10 +3104,16 @@ var serveBase = (routeFunction, telemetry, options) => {
       });
       throw callReturnCheck.error;
     } else if (callReturnCheck.value === "continue-workflow") {
-      const result = isFirstInvocation ? await triggerFirstInvocation({ workflowContext, useJSONContent, telemetry, debug }) : await triggerRouteFunction({
+      const result = isFirstInvocation ? await triggerFirstInvocation({
+        workflowContext,
+        useJSONContent,
+        telemetry,
+        debug,
+        invokeCount
+      }) : await triggerRouteFunction({
         onStep: async () => routeFunction(workflowContext),
-        onCleanup: async () => {
-          await triggerWorkflowDelete(workflowContext, debug);
+        onCleanup: async (result2) => {
+          await triggerWorkflowDelete(workflowContext, result2, debug);
         },
         onCancel: async () => {
           await makeCancelRequest(workflowContext.qstashClient.http, workflowRunId);
@@ -3095,7 +3316,8 @@ var Client4 = class {
     body,
     headers,
     workflowRunId,
-    retries
+    retries,
+    flowControl
   }) {
     const finalWorkflowRunId = getWorkflowRunId(workflowRunId);
     const context = new WorkflowContext({
@@ -3107,8 +3329,9 @@ var Client4 = class {
       url,
       workflowRunId: finalWorkflowRunId,
       retries,
-      telemetry: void 0
+      telemetry: void 0,
       // can't know workflow telemetry here
+      flowControl
     });
     const result = await triggerFirstInvocation({
       workflowContext: context,
@@ -3122,35 +3345,35 @@ var Client4 = class {
     }
   }
   /**
-    * Fetches logs for workflow runs.
-    *
-    * @param workflowRunId - The ID of the workflow run to fetch logs for.
-    * @param cursor - The cursor for pagination.
-    * @param count - Number of runs to fetch. Default value is 10.
-    * @param state - The state of the workflow run.
-    * @param workflowUrl - The URL of the workflow. Should be an exact match.
-    * @param workflowCreatedAt - The creation time of the workflow. If you have two workflow runs with the same URL, you can use this to filter them.
-    * @returns A promise that resolves to either a `WorkflowRunLog` or a `WorkflowRunResponse`.
-    *
-    * @example
-    * Fetch logs for a specific workflow run:
-    * ```typescript
-    * const { runs } = await client.logs({ workflowRunId: '12345' });
-    * const steps = runs[0].steps; // access steps
-    * ```
-    *
-    * @example
-    * Fetch logs with pagination:
-    * ```typescript
-    * const { runs, cursor } = await client.logs();
-    * const steps = runs[0].steps // access steps
-    * 
-    * const { runs: nextRuns, cursor: nextCursor } = await client.logs({ cursor, count: 2 });
-    * ```
-    */
+   * Fetches logs for workflow runs.
+   *
+   * @param workflowRunId - The ID of the workflow run to fetch logs for.
+   * @param cursor - The cursor for pagination.
+   * @param count - Number of runs to fetch. Default value is 10.
+   * @param state - The state of the workflow run.
+   * @param workflowUrl - The URL of the workflow. Should be an exact match.
+   * @param workflowCreatedAt - The creation time of the workflow. If you have two workflow runs with the same URL, you can use this to filter them.
+   * @returns A promise that resolves to either a `WorkflowRunLog` or a `WorkflowRunResponse`.
+   *
+   * @example
+   * Fetch logs for a specific workflow run:
+   * ```typescript
+   * const { runs } = await client.logs({ workflowRunId: '12345' });
+   * const steps = runs[0].steps; // access steps
+   * ```
+   *
+   * @example
+   * Fetch logs with pagination:
+   * ```typescript
+   * const { runs, cursor } = await client.logs();
+   * const steps = runs[0].steps // access steps
+   *
+   * const { runs: nextRuns, cursor: nextCursor } = await client.logs({ cursor, count: 2 });
+   * ```
+   */
   async logs(params) {
     const { workflowRunId, cursor, count, state, workflowUrl, workflowCreatedAt } = params ?? {};
-    const urlParams = new URLSearchParams({ "groupBy": "workflowRunId" });
+    const urlParams = new URLSearchParams({ groupBy: "workflowRunId" });
     if (workflowRunId) {
       urlParams.append("workflowRunId", workflowRunId);
     }