@open-mercato/core 0.8.1-develop.7296.1.2111d779db → 0.8.1-develop.7297.1.67605e74f9

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

@@ -460,11 +460,12 @@ async function executeActivityByType(em, container, activity, context, signal) {
     signal
   });
 }
-async function executeSendEmail(config, context, container) {
+async function executeSendEmail(config, context, container, signal) {
   const { to, subject, template, templateData, body } = config;
   if (!to || !subject) {
     throw new Error('SEND_EMAIL requires "to" and "subject" fields');
   }
+  throwIfAborted(signal);
   logger.info("Send email activity invoked", { component: "SEND_EMAIL", subject });
   let emailService;
   try {
@@ -473,19 +474,26 @@ async function executeSendEmail(config, context, container) {
     emailService = void 0;
   }
   if (emailService && typeof emailService.send === "function") {
-    await emailService.send({
-      to,
-      subject,
-      template,
-      templateData,
-      body
-    });
+    await raceAbortable(
+      Promise.resolve(
+        emailService.send({
+          to,
+          subject,
+          template,
+          templateData,
+          body,
+          signal
+        })
+      ),
+      signal
+    );
+    throwIfAborted(signal);
     return { sent: true, to, subject, via: "emailService" };
   }
   logger.warn("SEND_EMAIL has no registered email service; email was not sent", { component: "SEND_EMAIL", subject });
   return { sent: false, simulated: true, to, subject, via: "console", reason: "no-email-service" };
 }
-async function executeEmitEvent(config, context, container) {
+async function executeEmitEvent(config, context, container, signal) {
   const { eventName, payload } = config;
   if (!eventName) {
     throw new Error('EMIT_EVENT requires "eventName" field');
@@ -499,6 +507,7 @@ async function executeEmitEvent(config, context, container) {
       `EMIT_EVENT payload contains unresolved template variables for: ${unresolvedPayloadKeys.join(", ")}. Check that the workflow context provides these keys.`
     );
   }
+  throwIfAborted(signal);
   const eventBus = container.resolve("eventBus");
   if (!eventBus || typeof eventBus.emitEvent !== "function") {
     throw new Error("Event bus not available in container");
@@ -512,10 +521,16 @@ async function executeEmitEvent(config, context, container) {
       organizationId: context.workflowInstance.organizationId
     }
   };
-  await eventBus.emitEvent(eventName, enrichedPayload, {
-    tenantId: context.workflowInstance.tenantId,
-    organizationId: context.workflowInstance.organizationId
-  });
+  await raceAbortable(
+    Promise.resolve(
+      eventBus.emitEvent(eventName, enrichedPayload, {
+        tenantId: context.workflowInstance.tenantId,
+        organizationId: context.workflowInstance.organizationId
+      })
+    ),
+    signal
+  );
+  throwIfAborted(signal);
   return { emitted: true, eventName, payload: enrichedPayload };
 }
 const UNRESOLVED_TEMPLATE_PATTERN = /\{\{[^}]+\}\}/;
@@ -533,7 +548,7 @@ function findUnresolvedTemplateKeys(value, path = "") {
   }
   return [];
 }
-async function executeUpdateEntity(em, config, context, container) {
+async function executeUpdateEntity(em, config, context, container, signal) {
   const { commandId, input, statusDictionary } = config;
   if (!commandId) {
     throw new Error('UPDATE_ENTITY requires "commandId" field (e.g., "sales.documents.update")');
@@ -546,6 +561,7 @@ async function executeUpdateEntity(em, config, context, container) {
     container,
     context.workflowInstance.tenantId
   );
+  throwIfAborted(signal);
   if (!isWorkflowCommandEnabled(workflowSafeCommand, commandPolicy)) {
     throw new Error("UPDATE_ENTITY command is not enabled for this tenant");
   }
@@ -563,6 +579,7 @@ async function executeUpdateEntity(em, config, context, container) {
     context.workflowInstance.tenantId,
     context.workflowInstance.organizationId
   );
+  throwIfAborted(signal);
   if (!authorized) {
     throw new Error("UPDATE_ENTITY command is not authorized");
   }
@@ -585,6 +602,7 @@ async function executeUpdateEntity(em, config, context, container) {
       context.workflowInstance.tenantId,
       context.workflowInstance.organizationId
     );
+    throwIfAborted(signal);
     if (statusEntryId) {
       finalInput.statusEntryId = statusEntryId;
     }
@@ -602,10 +620,17 @@ async function executeUpdateEntity(em, config, context, container) {
     selectedOrganizationId: context.workflowInstance.organizationId,
     organizationIds: context.workflowInstance.organizationId ? [context.workflowInstance.organizationId] : null
   };
-  const { result, logEntry } = await commandBus.execute(commandId, {
-    input: finalInput,
-    ctx
-  });
+  throwIfAborted(signal);
+  const { result, logEntry } = await raceAbortable(
+    Promise.resolve(
+      commandBus.execute(commandId, {
+        input: finalInput,
+        ctx
+      })
+    ),
+    signal
+  );
+  throwIfAborted(signal);
   return {
     executed: true,
     commandId,
@@ -705,18 +730,23 @@ async function executeCallWebhook(config, context, deps = {}) {
     result
   };
 }
-async function executeFunction(config, context, container) {
+async function executeFunction(config, context, container, signal) {
   const { functionName, args = {} } = config;
   if (!functionName) {
     throw new Error('EXECUTE_FUNCTION requires "functionName" field');
   }
+  throwIfAborted(signal);
   const fnKey = `workflowFunction:${functionName}`;
   try {
     const fn = container.resolve(fnKey);
     if (typeof fn !== "function") {
       throw new Error(`Registered workflow function "${functionName}" is not a function`);
     }
-    const result = await fn(args, context);
+    const result = await raceAbortable(
+      Promise.resolve(fn(args, context, signal)),
+      signal
+    );
+    throwIfAborted(signal);
     return { executed: true, functionName, result };
   } catch (error) {
     if (error instanceof Error && error.message.includes("not registered")) {
@@ -1168,6 +1198,43 @@ async function executeWithTimeout(executor, timeoutMs) {
     clearTimeout(timeoutId);
   }
 }
+function createActivityAbortError(signal) {
+  if (signal?.reason instanceof Error) return signal.reason;
+  try {
+    return new DOMException("The operation was aborted", "AbortError");
+  } catch {
+    const error = new Error("The operation was aborted");
+    error.name = "AbortError";
+    return error;
+  }
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted) {
+    throw createActivityAbortError(signal);
+  }
+}
+function raceAbortable(promise, signal) {
+  if (!signal) return promise;
+  if (signal.aborted) {
+    return Promise.reject(createActivityAbortError(signal));
+  }
+  return new Promise((resolve, reject) => {
+    const onAbort = () => {
+      reject(createActivityAbortError(signal));
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then(
+      (value) => {
+        signal.removeEventListener("abort", onAbort);
+        resolve(value);
+      },
+      (error) => {
+        signal.removeEventListener("abort", onAbort);
+        reject(error);
+      }
+    );
+  });
+}
 bindActivityExecutor({
   executeSendEmail,
   executeEmitEvent,