@nocobase/plugin-workflow 2.1.0-beta.43 → 2.1.0-beta.45

package/dist/externalVersion.js

@@ -11,8 +11,8 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.7",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.1.0-beta.43",
-  "@nocobase/utils": "2.1.0-beta.43",
+  "@nocobase/client": "2.1.0-beta.45",
+  "@nocobase/utils": "2.1.0-beta.45",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.30.1",
@@ -20,20 +20,20 @@ module.exports = {
   "lodash": "4.18.1",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.7",
-  "@nocobase/flow-engine": "2.1.0-beta.43",
-  "@nocobase/plugin-mobile": "2.1.0-beta.43",
+  "@nocobase/flow-engine": "2.1.0-beta.45",
+  "@nocobase/plugin-mobile": "2.1.0-beta.45",
   "sequelize": "6.35.2",
-  "@nocobase/server": "2.1.0-beta.43",
-  "@nocobase/database": "2.1.0-beta.43",
-  "@nocobase/data-source-manager": "2.1.0-beta.43",
-  "@nocobase/logger": "2.1.0-beta.43",
-  "@nocobase/evaluators": "2.1.0-beta.43",
+  "@nocobase/server": "2.1.0-beta.45",
+  "@nocobase/database": "2.1.0-beta.45",
+  "@nocobase/data-source-manager": "2.1.0-beta.45",
+  "@nocobase/logger": "2.1.0-beta.45",
+  "@nocobase/evaluators": "2.1.0-beta.45",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.7",
   "@emotion/css": "11.13.0",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/actions": "2.1.0-beta.43",
+  "@nocobase/actions": "2.1.0-beta.45",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "2.1.0-beta.43",
-  "@nocobase/test": "2.1.0-beta.43"
+  "@nocobase/plugin-workflow-test": "2.1.0-beta.45",
+  "@nocobase/test": "2.1.0-beta.45"
 };

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-06-02T14:17:13.022Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-06-08T04:33:04.401Z"}

package/dist/node_modules/joi/package.json

@@ -1 +1 @@
-{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-06-02T14:17:12.766Z"}
+{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-06-08T04:33:04.152Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"11.3.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","prepare":"tshy && bash scripts/build.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig ./.tshy/esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile","lint":"oxlint --fix src test","postsnap":"npm run lint","postlint":"npm run format"},"main":"./dist/commonjs/index.min.js","types":"./dist/commonjs/index.d.ts","tshy":{"esmDialects":["node","browser"],"exports":{"./raw":"./src/index.ts",".":{"import":{"node":{"types":"./dist/esm/node/index.d.ts","default":"./dist/esm/node/index.min.js"},"browser":{"types":"./dist/esm/browser/index.d.ts","default":"./dist/esm/browser/index.min.js"},"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}}},"selfLink":false},"repository":{"type":"git","url":"git+ssh://git@github.com/isaacs/node-lru-cache.git"},"devDependencies":{"benchmark":"^2.1.4","esbuild":"^0.25.9","marked":"^4.2.12","mkdirp":"^3.0.1","oxlint":"^1.58.0","oxlint-tsgolint":"^0.19.0","prettier":"^3.8.1","tap":"^21.6.3","tshy":"^4.1.1","typedoc":"^0.28.18"},"license":"BlueOak-1.0.0","files":["dist"],"engines":{"node":"20 || >=22"},"exports":{"./raw":{"import":{"node":{"types":"./dist/esm/node/index.d.ts","default":"./dist/esm/node/index.js"},"browser":{"types":"./dist/esm/browser/index.d.ts","default":"./dist/esm/browser/index.js"},"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.js"}},".":{"import":{"node":{"types":"./dist/esm/node/index.d.ts","default":"./dist/esm/node/index.min.js"},"browser":{"types":"./dist/esm/browser/index.d.ts","default":"./dist/esm/browser/index.min.js"},"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}}},"type":"module","module":"./dist/esm/index.min.js","_lastModified":"2026-06-02T14:17:11.970Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"11.3.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","prepare":"tshy && bash scripts/build.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig ./.tshy/esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile","lint":"oxlint --fix src test","postsnap":"npm run lint","postlint":"npm run format"},"main":"./dist/commonjs/index.min.js","types":"./dist/commonjs/index.d.ts","tshy":{"esmDialects":["node","browser"],"exports":{"./raw":"./src/index.ts",".":{"import":{"node":{"types":"./dist/esm/node/index.d.ts","default":"./dist/esm/node/index.min.js"},"browser":{"types":"./dist/esm/browser/index.d.ts","default":"./dist/esm/browser/index.min.js"},"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}}},"selfLink":false},"repository":{"type":"git","url":"git+ssh://git@github.com/isaacs/node-lru-cache.git"},"devDependencies":{"benchmark":"^2.1.4","esbuild":"^0.25.9","marked":"^4.2.12","mkdirp":"^3.0.1","oxlint":"^1.58.0","oxlint-tsgolint":"^0.19.0","prettier":"^3.8.1","tap":"^21.6.3","tshy":"^4.1.1","typedoc":"^0.28.18"},"license":"BlueOak-1.0.0","files":["dist"],"engines":{"node":"20 || >=22"},"exports":{"./raw":{"import":{"node":{"types":"./dist/esm/node/index.d.ts","default":"./dist/esm/node/index.js"},"browser":{"types":"./dist/esm/browser/index.d.ts","default":"./dist/esm/browser/index.js"},"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.js"}},".":{"import":{"node":{"types":"./dist/esm/node/index.d.ts","default":"./dist/esm/node/index.min.js"},"browser":{"types":"./dist/esm/browser/index.d.ts","default":"./dist/esm/browser/index.min.js"},"types":"./dist/esm/index.d.ts","default":"./dist/esm/index.min.js"},"require":{"types":"./dist/commonjs/index.d.ts","default":"./dist/commonjs/index.min.js"}}},"type":"module","module":"./dist/esm/index.min.js","_lastModified":"2026-06-08T04:33:03.437Z"}

package/dist/node_modules/nodejs-snowflake/package.json

@@ -1 +1 @@
-{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2026-06-02T14:17:11.788Z"}
+{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2026-06-08T04:33:03.280Z"}

package/dist/server/Dispatcher.d.ts

@@ -52,7 +52,10 @@ export default class Dispatcher {
     private validateEvent;
     private createExecution;
     private prepare;
+    private acquireExecution;
+    private acquireWithRetry;
     private enter;
+    private isConcurrentAcquireError;
     private process;
 }
 export {};

package/dist/server/Dispatcher.js

@@ -34,6 +34,7 @@ var import_sequelize = require("sequelize");
 var import_constants = require("./constants");
 var import_Plugin = require("./Plugin");
 var import_utils = require("./utils");
+const EXECUTION_ACQUIRE_MAX_ATTEMPTS = 5;
 class Dispatcher {
   constructor(plugin) {
     this.plugin = plugin;
@@ -248,9 +249,7 @@ class Dispatcher {
       return null;
     }
     try {
-      const entered = await this.prepare(execution, {
-        transaction: this.plugin.useDataSourceTransaction("main", options.transaction)
-      });
+      const entered = await this.prepare(execution);
       if (!entered) {
         return null;
       }
@@ -274,8 +273,7 @@ class Dispatcher {
       const existed = await workflow.countExecutions({
         where: {
           id: stack
-        },
-        transaction: options.transaction
+        }
       });
       const limitCount = workflow.options.stackLimit || 1;
       if (existed >= limitCount) {
@@ -290,115 +288,146 @@ class Dispatcher {
   async createExecution(workflow, context, options) {
     var _a;
     const { deferred } = options;
-    const transaction = await this.plugin.useDataSourceTransaction("main", options.transaction, true);
-    const sameTransaction = options.transaction === transaction;
     let stack = options.stack;
     if (options.parentExecutionId && !stack) {
       const parentExecution = await this.plugin.db.getRepository("executions").findOne({
-        filterByTk: options.parentExecutionId,
-        transaction
+        filterByTk: options.parentExecutionId
       });
       stack = parentExecution ? [...parentExecution.stack ?? [], parentExecution.id] : [];
     }
-    const valid = await this.validateEvent(workflow, context, { ...options, stack, transaction });
+    const valid = await this.validateEvent(workflow, context, { ...options, stack });
     if (!valid) {
-      if (!sameTransaction) {
-        await transaction.commit();
-      }
       (_a = options.onTriggerFail) == null ? void 0 : _a.call(options, workflow, context, options);
       throw new Error("event is not valid");
     }
-    let execution;
-    try {
-      execution = await workflow.createExecution(
-        {
-          context,
-          key: workflow.key,
-          eventKey: options.eventKey ?? (0, import_node_crypto.randomUUID)(),
-          stack,
-          parentExecutionId: options.parentExecutionId ?? null,
-          dispatched: deferred ?? false,
-          status: deferred ? import_constants.EXECUTION_STATUS.STARTED : import_constants.EXECUTION_STATUS.QUEUEING,
-          manually: options.manually
-        },
-        { transaction }
-      );
-    } catch (err) {
-      if (!sameTransaction) {
-        await transaction.rollback();
-      }
-      throw err;
-    }
+    const execution = await workflow.createExecution({
+      context,
+      key: workflow.key,
+      eventKey: options.eventKey ?? (0, import_node_crypto.randomUUID)(),
+      stack,
+      parentExecutionId: options.parentExecutionId ?? null,
+      dispatched: deferred ?? false,
+      status: deferred ? import_constants.EXECUTION_STATUS.STARTED : import_constants.EXECUTION_STATUS.QUEUEING,
+      manually: options.manually
+    });
     this.plugin.getLogger(workflow.id).info(`execution of workflow ${workflow.id} created as ${execution.id}`);
     if (!workflow.stats) {
-      workflow.stats = await workflow.getStats({ transaction });
+      workflow.stats = await workflow.getStats();
     }
-    await workflow.stats.increment("executed", { transaction });
+    await workflow.stats.increment("executed");
     if (this.plugin.db.options.dialect !== "postgres") {
-      await workflow.stats.reload({ transaction });
+      await workflow.stats.reload();
     }
     if (!workflow.versionStats) {
-      workflow.versionStats = await workflow.getVersionStats({ transaction });
+      workflow.versionStats = await workflow.getVersionStats();
     }
-    await workflow.versionStats.increment("executed", { transaction });
+    await workflow.versionStats.increment("executed");
     if (this.plugin.db.options.dialect !== "postgres") {
-      await workflow.versionStats.reload({ transaction });
-    }
-    if (!sameTransaction) {
-      await transaction.commit();
+      await workflow.versionStats.reload();
     }
     execution.workflow = workflow;
     return execution;
   }
   async prepare(input, options = {}) {
-    const transaction = options.transaction;
-    const ownTransaction = !transaction;
-    const tx = transaction || await this.plugin.db.sequelize.transaction({
-      isolationLevel: this.plugin.db.options.dialect === "sqlite" ? void 0 : import_sequelize.Transaction.ISOLATION_LEVELS.REPEATABLE_READ
-    });
     const logger = input ? this.plugin.getLogger(input.workflowId) : this.plugin.getLogger("dispatcher");
+    if (options.transaction) {
+      try {
+        const { execution } = await this.acquireExecution(input, options, options.transaction);
+        return execution;
+      } catch (error) {
+        if (error instanceof Error) {
+          logger.error(`entering execution failed: ${error.message}`, { error });
+        }
+        return null;
+      }
+    }
+    let result = null;
     try {
-      let execution = input;
-      if (execution) {
-        if (!options.immediate || execution.status !== import_constants.EXECUTION_STATUS.QUEUEING) {
-          await execution.reload({ transaction: tx });
+      await this.acquireWithRetry(
+        async () => {
+          const tx = await this.plugin.db.sequelize.transaction({
+            isolationLevel: this.plugin.db.options.dialect === "sqlite" ? void 0 : import_sequelize.Transaction.ISOLATION_LEVELS.REPEATABLE_READ
+          });
+          try {
+            const { execution, shouldRetry } = await this.acquireExecution(input, options, tx);
+            await tx.commit();
+            result = execution;
+            return shouldRetry;
+          } catch (error) {
+            await tx.rollback();
+            if (this.isConcurrentAcquireError(error)) {
+              throw error;
+            }
+            if (error instanceof Error) {
+              logger.error(`entering execution failed: ${error.message}`, { error });
+            }
+            result = null;
+            return false;
+          }
+        },
+        {
+          logger,
+          conflictMessage: input ? `acquiring pending execution (${input.id}) conflicted with another worker, retrying` : `acquiring execution conflicted with another worker, retrying`,
+          maxAttemptsMessage: input ? `acquiring pending execution (${input.id}) reached max retry attempts` : `acquiring execution reached max retry attempts, will retry on next dispatch`
         }
+      );
+    } catch (error) {
+      if (error instanceof Error) {
+        logger.error(`acquiring execution failed: ${error.message}`, { error });
+      }
+      return null;
+    }
+    return result;
+  }
+  async acquireExecution(input, options, transaction) {
+    let execution = input;
+    if (execution) {
+      if (!options.immediate || execution.status !== import_constants.EXECUTION_STATUS.QUEUEING) {
+        await execution.reload({ transaction });
+      }
+    } else {
+      execution = await this.plugin.db.getRepository("executions").findOne({
+        filter: {
+          dispatched: false,
+          "workflow.enabled": true
+        },
+        sort: "id",
+        transaction,
+        lock: transaction.LOCK.UPDATE,
+        skipLocked: true
+      });
+      if (execution) {
+        this.plugin.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
       } else {
-        execution = await this.plugin.db.getRepository("executions").findOne({
-          filter: {
-            dispatched: false,
-            "workflow.enabled": true
-          },
-          sort: "id",
-          transaction: tx,
-          lock: tx.LOCK.UPDATE,
-          skipLocked: true
-        });
-        if (execution) {
-          this.plugin.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
-        } else {
-          this.plugin.getLogger("dispatcher").debug(`no execution in db queued to process`);
-        }
+        this.plugin.getLogger("dispatcher").debug(`no execution in db queued to process`);
       }
-      if (!execution) {
-        if (ownTransaction) {
-          await tx.commit();
+    }
+    if (!execution) {
+      return { execution: null, shouldRetry: false };
+    }
+    const entered = await this.enter(execution, transaction);
+    const shouldRetry = !input && !entered;
+    return { execution: entered, shouldRetry };
+  }
+  async acquireWithRetry(acquire, options) {
+    for (let attempt = 1; attempt <= EXECUTION_ACQUIRE_MAX_ATTEMPTS; attempt++) {
+      let shouldRetry = false;
+      try {
+        shouldRetry = await acquire();
+      } catch (error) {
+        if (!this.isConcurrentAcquireError(error)) {
+          throw error;
         }
-        return null;
+        shouldRetry = true;
+        options.logger.warn(options.conflictMessage, { error });
       }
-      const entered = await this.enter(execution, tx);
-      if (ownTransaction) {
-        await tx.commit();
+      if (!shouldRetry) {
+        break;
       }
-      return entered;
-    } catch (error) {
-      if (ownTransaction) {
-        await tx.rollback();
-      }
-      if (error instanceof Error) {
-        logger.error(`entering execution failed: ${error.message}`, { error });
+      if (attempt >= EXECUTION_ACQUIRE_MAX_ATTEMPTS) {
+        options.logger.warn(options.maxAttemptsMessage);
+        break;
       }
-      return null;
     }
   }
   async enter(execution, transaction) {
@@ -446,14 +475,23 @@ class Dispatcher {
     execution.workflow = workflow;
     return execution;
   }
+  isConcurrentAcquireError(error) {
+    var _a, _b, _c, _d;
+    if (!(error instanceof Error)) {
+      return false;
+    }
+    const databaseError = error;
+    const code = ((_a = databaseError.parent) == null ? void 0 : _a.code) || ((_b = databaseError.original) == null ? void 0 : _b.code);
+    const errno = ((_c = databaseError.parent) == null ? void 0 : _c.errno) || ((_d = databaseError.original) == null ? void 0 : _d.errno);
+    return code === "40001" || code === "40P01" || code === "ER_LOCK_DEADLOCK" || errno === 1205 || errno === 1213;
+  }
   async process(execution, job = null, options = {}) {
     const { rerun, ...processorOptions } = options;
     const logger = this.plugin.getLogger(execution.workflowId);
     const run = async () => {
       var _a, _b, _c;
       if (!execution.dispatched) {
-        const transaction = await this.plugin.useDataSourceTransaction("main", processorOptions.transaction);
-        await execution.update({ dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED }, { transaction });
+        await execution.update({ dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED });
         logger.info(`execution (${execution.id}) from pending list updated to started`);
       }
       this.plugin.timeoutManager.scheduleExecutionTimeout(execution);
@@ -464,7 +502,7 @@ class Dispatcher {
         logger.info(`execution (${execution.id}) finished with status: ${execution.status}`);
         logger.debug(`execution (${execution.id}) details:`, { execution });
         if (execution.status && ((_c = (_b = (_a = execution.workflow) == null ? void 0 : _a.options) == null ? void 0 : _b.deleteExecutionOnStatus) == null ? void 0 : _c.includes(execution.status))) {
-          await execution.destroy({ transaction: processor.mainTransaction });
+          await execution.destroy();
         }
       } catch (err) {
         if (err instanceof Error) {

package/dist/server/ExecutionTimeoutManager.d.ts

@@ -26,6 +26,7 @@ export default class ExecutionTimeoutManager {
     getRemainingMs(execution: ExecutionModel, now?: Date): number;
     abort(execution: ExecutionModel, options?: Transactionable): Promise<boolean>;
     abortExecutionIfExpired(execution: ExecutionModel, options?: Transactionable): Promise<boolean>;
+    private abortExecutionIfExpiredWithLock;
     clear(executionId: number | string): void;
     shouldContinue(execution: ExecutionModel, options?: Transactionable): Promise<boolean>;
     /**

package/dist/server/ExecutionTimeoutManager.js

@@ -36,6 +36,7 @@ const LOAD_BATCH_SIZE = 1e3;
 const DEFAULT_SCAN_INTERVAL = 3e4;
 const SCAN_JITTER = 5e3;
 const MAX_TIMER_DELAY = 2147483647;
+const EXECUTION_LOCK_TIMEOUT = 6e4;
 class ExecutionTimeoutManager {
   constructor(plugin) {
     this.plugin = plugin;
@@ -105,6 +106,19 @@ class ExecutionTimeoutManager {
     }
     return this.abort(execution, options);
   }
+  async abortExecutionIfExpiredWithLock(executionOrId) {
+    const executionId = typeof executionOrId === "object" ? executionOrId.id : executionOrId;
+    const lock = await this.plugin.app.lockManager.tryAcquire((0, import_utils.getExecutionLockKey)(executionId), EXECUTION_LOCK_TIMEOUT);
+    return lock.runExclusive(async () => {
+      const execution = await this.plugin.db.getRepository("executions").findOne({
+        filterByTk: executionId
+      });
+      if (!execution) {
+        return false;
+      }
+      return this.abortExecutionIfExpired(execution);
+    }, EXECUTION_LOCK_TIMEOUT);
+  }
   clear(executionId) {
     this.clearExecutionTimeout(executionId);
   }
@@ -195,7 +209,7 @@ class ExecutionTimeoutManager {
         limit: LOAD_BATCH_SIZE
       });
       for (const execution of executions) {
-        await this.abortExecutionIfExpired(execution);
+        await this.abortExecutionIfExpiredWithLock(execution);
       }
     })();
     try {
@@ -301,12 +315,6 @@ class ExecutionTimeoutManager {
     if (this.plugin.abortRunningExecution(executionId, import_constants.EXECUTION_REASON.TIMEOUT)) {
       return;
     }
-    const execution = await this.plugin.db.getRepository("executions").findOne({
-      filterByTk: executionId
-    });
-    if (!execution) {
-      return;
-    }
-    await this.abortExecutionIfExpired(execution);
+    await this.abortExecutionIfExpiredWithLock(executionId);
   }
 }

package/dist/server/Plugin.d.ts

@@ -89,10 +89,11 @@ export default class PluginWorkflowServer extends Plugin {
      * @experimental
      * @param {string} dataSourceName
      * @param {Transaction} transaction
-     * @param {boolean} create
-     * @returns {Trasaction}
+     * @param {boolean} create Create a new transaction when the input transaction does not belong to this data source.
+     * @returns {Transaction}
      */
-    useDataSourceTransaction(dataSourceName: string, transaction: any, create?: boolean): any;
+    useDataSourceTransaction(dataSourceName?: string, transaction?: Transaction | null, create?: false): Transaction | undefined;
+    useDataSourceTransaction(dataSourceName: string | undefined, transaction: Transaction | null | undefined, create: true): Transaction | Promise<Transaction> | undefined;
     /**
      * @experimental
      */

package/dist/server/Plugin.js

@@ -477,15 +477,12 @@ class PluginWorkflowServer extends import_server.Plugin {
     }
     return trigger.execute(workflow, values, options);
   }
-  /**
-   * @experimental
-   * @param {string} dataSourceName
-   * @param {Transaction} transaction
-   * @param {boolean} create
-   * @returns {Trasaction}
-   */
   useDataSourceTransaction(dataSourceName = "main", transaction, create = false) {
-    const { db } = this.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager;
+    const dataSource = this.app.dataSourceManager.dataSources.get(dataSourceName);
+    if (!dataSource) {
+      throw new Error(`data source ${dataSourceName} is not found`);
+    }
+    const { db } = dataSource.collectionManager;
     if (!db) {
       return;
     }

package/dist/server/Processor.d.ts

@@ -47,10 +47,6 @@ export default class Processor {
      * @experimental
      */
     transaction?: Transaction | null;
-    /**
-     * @experimental
-     */
-    mainTransaction?: Transaction | null;
     /**
      * @experimental
      */

package/dist/server/Processor.js

@@ -68,10 +68,6 @@ class Processor {
    * @experimental
    */
   transaction = null;
-  /**
-   * @experimental
-   */
-  mainTransaction = null;
   /**
    * @experimental
    */
@@ -210,15 +206,13 @@ class Processor {
       execution,
       options: { plugin }
     } = this;
-    this.mainTransaction = plugin.useDataSourceTransaction("main", this.transaction);
-    const transaction = this.mainTransaction;
     if (!execution.workflow) {
-      execution.workflow = plugin.enabledCache.get(execution.workflowId) || await execution.getWorkflow({ transaction });
+      execution.workflow = plugin.enabledCache.get(execution.workflowId) || await execution.getWorkflow();
     }
     if (!execution.workflow) {
       throw new Error(`workflow (#${execution.workflowId}) not found for execution (#${execution.id})`);
     }
-    const nodes = execution.workflow.nodes || await execution.workflow.getNodes({ transaction });
+    const nodes = execution.workflow.nodes || await execution.workflow.getNodes();
     execution.workflow.nodes = nodes;
     this.makeNodes(nodes);
     const JobDBModel = plugin.db.getModel("jobs");
@@ -228,15 +222,13 @@ class Processor {
       where: {
         executionId: execution.id
       },
-      raw: true,
-      transaction
+      raw: true
     });
     const jobs = await execution.getJobs({
       where: {
         id: jobIds.map((item) => item.id)
       },
-      order: [["id", "ASC"]],
-      transaction
+      order: [["id", "ASC"]]
     });
     execution.jobs = jobs;
     this.makeJobs(jobs);
@@ -478,7 +470,7 @@ class Processor {
           if (changes.length) {
             await this.options.plugin.db.sequelize.query(
               `UPDATE ${JobCollection.quotedTableName()} SET ${changes.map(([key]) => `${key} = ?`)} WHERE id='${job.id}'`,
-              { replacements: changes.map(([, value]) => value), transaction: this.mainTransaction }
+              { replacements: changes.map(([, value]) => value) }
             );
           }
         }
@@ -488,7 +480,6 @@ class Processor {
         await JobsModel.bulkCreate(
           newJobs.map((job) => job.toJSON()),
           {
-            transaction: this.mainTransaction,
             returning: false
           }
         );
@@ -510,18 +501,14 @@ class Processor {
           id: this.execution.id,
           status: import_constants.EXECUTION_STATUS.STARTED
         },
-        individualHooks: true,
-        transaction: this.mainTransaction
+        individualHooks: true
       });
       if (affected) {
         this.execution.set(values);
       } else {
-        await this.execution.reload({ transaction: this.mainTransaction });
+        await this.execution.reload();
       }
     }
-    if (this.mainTransaction && this.mainTransaction !== this.transaction) {
-      await this.mainTransaction.commit();
-    }
     if (this.execution.status === import_constants.EXECUTION_STATUS.STARTED) {
       this.options.plugin.timeoutManager.scheduleExecutionTimeout(this.execution);
     } else {
@@ -598,8 +585,7 @@ class Processor {
     this.setTimeoutGuard(remaining);
   }
   async shouldContinueExecution() {
-    const transaction = this.mainTransaction ?? this.transaction;
-    return this.options.plugin.timeoutManager.shouldContinue(this.execution, { transaction });
+    return this.options.plugin.timeoutManager.shouldContinue(this.execution);
   }
   leaveRunningState() {
     if (this.timeoutGuard) {

package/dist/server/instructions/OutputInstruction.js

@@ -50,7 +50,7 @@ class ExecutionResultInstruction extends import__.Instruction {
     const { value } = node.config;
     const output = processor.getParsedValue(value, node.id);
     try {
-      await processor.execution.update({ output }, { hooks: false, transaction: processor.mainTransaction });
+      await processor.execution.update({ output }, { hooks: false });
     } catch (e) {
       return {
         result: e.message,

package/dist/server/triggers/CollectionTrigger.js

@@ -124,6 +124,12 @@ class CollectionTrigger extends import__.default {
       return;
     }
     if (workflow.sync) {
+      if (transaction && this.workflow.db.options.dialect === "sqlite") {
+        transaction.afterCommit(async () => {
+          await this.workflow.trigger(workflow, ctx, { stack });
+        });
+        return;
+      }
       await this.workflow.trigger(workflow, ctx, {
         transaction,
         stack