@nocobase/plugin-workflow 2.1.0-beta.44 → 2.1.0-beta.46

package/dist/server/utils.js

@@ -91,33 +91,38 @@ function getWorkflowExecutionLogMeta(workflow, processor) {
 }
 async function abortExecution(plugin, execution, options = {}) {
   const logger = plugin.getLogger(execution.workflowId);
-  const ownTransaction = !options.transaction;
-  const transaction = options.transaction ?? await plugin.useDataSourceTransaction("main", null, true);
+  const transaction = options.transaction ?? void 0;
   const ExecutionRepo = plugin.db.getRepository("executions");
   const JobRepo = plugin.db.getRepository("jobs");
   try {
-    const lockedExecution = await ExecutionRepo.findOne({
-      filterByTk: execution.id,
-      transaction,
-      lock: transaction.LOCK.UPDATE
-    });
-    if (!lockedExecution || lockedExecution.status !== import_constants.EXECUTION_STATUS.STARTED) {
-      if (ownTransaction) {
-        await transaction.commit();
+    const abortValues = {
+      status: import_constants.EXECUTION_STATUS.ABORTED,
+      ...options.reason ? {
+        reason: options.reason
+      } : {}
+    };
+    if (transaction) {
+      const lockedExecution = await ExecutionRepo.findOne({
+        filterByTk: execution.id,
+        transaction,
+        lock: transaction.LOCK.UPDATE
+      });
+      if (!lockedExecution || lockedExecution.status !== import_constants.EXECUTION_STATUS.STARTED) {
+        return false;
       }
-      return false;
-    }
-    await lockedExecution.update(
-      {
-        status: import_constants.EXECUTION_STATUS.ABORTED,
-        ...options.reason ? {
-          reason: options.reason
-        } : {}
-      },
-      {
-        transaction
+      await lockedExecution.update(abortValues, { transaction });
+    } else {
+      const [affected] = await ExecutionRepo.model.update(abortValues, {
+        where: {
+          id: execution.id,
+          status: import_constants.EXECUTION_STATUS.STARTED
+        },
+        individualHooks: true
+      });
+      if (!affected) {
+        return false;
       }
-    );
+    }
     const updated = await JobRepo.update({
       values: {
         status: import_constants.JOB_STATUS.ABORTED
@@ -139,24 +144,23 @@ async function abortExecution(plugin, execution, options = {}) {
     for (const child of childExecutions) {
       await abortExecution(plugin, child, { transaction, reason: import_constants.EXECUTION_REASON.PARENT_ABORTED });
     }
-    afterTransactionCommit(transaction, () => {
+    const updateLocalState = () => {
       execution.set("status", import_constants.EXECUTION_STATUS.ABORTED);
       execution.set("reason", options.reason ?? null);
       plugin.timeoutManager.clear(execution.id);
       plugin.abortRunningExecution(execution.id, options.reason);
-    });
+    };
+    if (transaction) {
+      afterTransactionCommit(transaction, updateLocalState);
+    } else {
+      updateLocalState();
+    }
     logger.info(`execution (${execution.id}) aborted`, {
       workflowId: execution.workflowId,
       pendingJobs: Array.isArray(updated) ? updated.length : updated
     });
-    if (ownTransaction) {
-      await transaction.commit();
-    }
     return true;
   } catch (error) {
-    if (ownTransaction && !transaction.finished) {
-      await transaction.rollback();
-    }
     throw error;
   }
 }

package/package.json

@@ -6,7 +6,7 @@
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
   "description.ru-RU": "Мощный инструмент BPM, обеспечивающий базовую поддержку автоматизации бизнес-процессов с возможностью неограниченного расширения триггеров и узлов.",
-  "version": "2.1.0-beta.44",
+  "version": "2.1.0-beta.46",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
@@ -49,7 +49,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "540d4897b1696cc24c0754521b0b766978b4933c",
+  "gitHead": "91fd3ab238a5ff58735bbfca04a8cb05d233b0af",
   "keywords": [
     "Workflow"
   ]