@open-mercato/core 0.10.1-develop.7708.1.5a5c248637 → 0.10.1-develop.7709.1.046124599c

package/dist/modules/workflows/lib/activity-executor.js

@@ -170,7 +170,7 @@ async function enqueueActivity(em, activity, context) {
     workflowContext,
     stepContext,
     retryPolicy: activity.retryPolicy,
-    timeoutMs: activity.timeoutMs,
+    timeoutMs: resolveActivityTimeoutMs(activity),
     tenantId: workflowInstance.tenantId,
     organizationId: workflowInstance.organizationId,
     userId: context.userId
@@ -458,7 +458,8 @@ async function executeActivityByType(em, container, activity, context, signal) {
   return await entry.execute(interpolatedConfig, context, {
     em,
     container,
-    signal
+    signal,
+    timeoutMs: resolveActivityTimeoutMs(activity)
   });
 }
 async function executeSendEmail(config, context, container, signal) {
@@ -669,6 +670,34 @@ async function resolveDictionaryEntryId(em, dictionaryKey, value, tenantId, orga
     return null;
   }
 }
+const WEBHOOK_TIMEOUT_MS = 3e4;
+const WEBHOOK_MAX_RESPONSE_BYTES = 1024 * 1024;
+async function readWebhookResponse(response, signal) {
+  const declaredLength = Number(response.headers.get("content-length"));
+  if (declaredLength > WEBHOOK_MAX_RESPONSE_BYTES) {
+    throw new Error(`[internal] CALL_WEBHOOK response exceeds ${WEBHOOK_MAX_RESPONSE_BYTES} bytes`);
+  }
+  if (!response.body) return "";
+  const reader = response.body.getReader();
+  const chunks = [];
+  let totalBytes = 0;
+  try {
+    for (; ; ) {
+      throwIfAborted(signal);
+      const { done, value } = await raceAbortable(reader.read(), signal);
+      if (done) break;
+      totalBytes += value.byteLength;
+      if (totalBytes > WEBHOOK_MAX_RESPONSE_BYTES) {
+        throw new Error(`[internal] CALL_WEBHOOK response exceeds ${WEBHOOK_MAX_RESPONSE_BYTES} bytes`);
+      }
+      chunks.push(value);
+    }
+    return new TextDecoder().decode(Buffer.concat(chunks, totalBytes));
+  } finally {
+    void reader.cancel().catch(() => void 0);
+    reader.releaseLock();
+  }
+}
 async function executeCallWebhook(config, context, deps = {}) {
   const parsed = callWebhookConfigSchema.safeParse(config);
   if (!parsed.success) {
@@ -678,58 +707,56 @@ async function executeCallWebhook(config, context, deps = {}) {
   const { url, method, headers: rawHeaders, body } = parsed.data;
   const headers = rawHeaders ?? {};
   const allowPrivate = deps.allowPrivate ?? isAllowPrivateWorkflowWebhookUrlsEnabled();
-  let response;
-  try {
-    response = await safeOutboundFetch(
-      url,
-      {
-        method,
-        headers: {
-          "Content-Type": "application/json",
-          ...headers
+  return executeWithTimeout(async (deadlineSignal) => {
+    const signal = deps.signal ? AbortSignal.any([deadlineSignal, deps.signal]) : deadlineSignal;
+    throwIfAborted(signal);
+    let response;
+    try {
+      response = await raceAbortable(safeOutboundFetch(
+        url,
+        {
+          method,
+          headers: {
+            "Content-Type": "application/json",
+            ...headers
+          },
+          body: body !== void 0 && body !== null ? JSON.stringify(body) : void 0,
+          redirect: "manual",
+          signal
         },
-        body: body !== void 0 && body !== null ? JSON.stringify(body) : void 0,
-        redirect: "manual",
-        signal: deps.signal
-      },
-      {
-        subject: "Workflow webhook URL",
-        allowPrivate,
-        lookupHost: deps.lookupHost,
-        fetchImpl: deps.fetchImpl
+        {
+          subject: "Workflow webhook URL",
+          allowPrivate,
+          lookupHost: deps.lookupHost,
+          fetchImpl: deps.fetchImpl
+        }
+      ), signal);
+      if (response.status >= 300 && response.status < 400) {
+        const location = response.headers.get("location");
+        throw new Error(
+          `CALL_WEBHOOK refused to follow redirect ${response.status} to ${location ?? "(no Location header)"}`
+        );
       }
-    );
-  } catch (error) {
-    if (error instanceof UnsafeOutboundUrlError) {
-      throw new Error(
-        `CALL_WEBHOOK rejected unsafe URL (reason=${error.reason}): ${error.message}`
-      );
+      const text = await readWebhookResponse(response, signal);
+      const contentType = response.headers.get("content-type");
+      const result = contentType?.includes("application/json") ? JSON.parse(text) : text;
+      if (!response.ok) {
+        throw new Error(
+          `Webhook request failed with status ${response.status}: ${JSON.stringify(result)}`
+        );
+      }
+      return { status: response.status, statusText: response.statusText, result };
+    } catch (error) {
+      if (error instanceof UnsafeOutboundUrlError) {
+        throw new Error(
+          `CALL_WEBHOOK rejected unsafe URL (reason=${error.reason}): ${error.message}`
+        );
+      }
+      throw error;
+    } finally {
+      void response?.body?.cancel().catch(() => void 0);
     }
-    throw error;
-  }
-  if (response.status >= 300 && response.status < 400) {
-    const location = response.headers.get("location");
-    throw new Error(
-      `CALL_WEBHOOK refused to follow redirect ${response.status} to ${location ?? "(no Location header)"}`
-    );
-  }
-  let result;
-  const contentType = response.headers.get("content-type");
-  if (contentType && contentType.includes("application/json")) {
-    result = await response.json();
-  } else {
-    result = await response.text();
-  }
-  if (!response.ok) {
-    throw new Error(
-      `Webhook request failed with status ${response.status}: ${JSON.stringify(result)}`
-    );
-  }
-  return {
-    status: response.status,
-    statusText: response.statusText,
-    result
-  };
+  }, deps.timeoutMs && deps.timeoutMs > 0 ? deps.timeoutMs : WEBHOOK_TIMEOUT_MS);
 }
 async function executeFunction(config, context, container, signal) {
   const { functionName, args = {} } = config;