@nocobase/plugin-workflow 2.0.61 → 2.0.62

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.0.61",
-  "@nocobase/utils": "2.0.61",
+  "@nocobase/client": "2.0.62",
+  "@nocobase/utils": "2.0.62",
   "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.0.61",
-  "@nocobase/plugin-mobile": "2.0.61",
+  "@nocobase/flow-engine": "2.0.62",
+  "@nocobase/plugin-mobile": "2.0.62",
   "sequelize": "6.35.2",
-  "@nocobase/server": "2.0.61",
-  "@nocobase/database": "2.0.61",
-  "@nocobase/data-source-manager": "2.0.61",
-  "@nocobase/logger": "2.0.61",
-  "@nocobase/evaluators": "2.0.61",
+  "@nocobase/server": "2.0.62",
+  "@nocobase/database": "2.0.62",
+  "@nocobase/data-source-manager": "2.0.62",
+  "@nocobase/logger": "2.0.62",
+  "@nocobase/evaluators": "2.0.62",
   "@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.0.61",
+  "@nocobase/actions": "2.0.62",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "2.0.61",
-  "@nocobase/test": "2.0.61"
+  "@nocobase/plugin-workflow-test": "2.0.62",
+  "@nocobase/test": "2.0.62"
 };

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-03T12:38:47.051Z"}
+{"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-10T17:43:37.897Z"}

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":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-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"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2026-06-03T12:38:46.744Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-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"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2026-06-10T17:43:37.569Z"}

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-03T12:38:46.544Z"}
+{"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-10T17:43:37.364Z"}

package/dist/server/Dispatcher.d.ts

@@ -55,8 +55,10 @@ export default class Dispatcher {
     private createExecution;
     private acquirePendingExecution;
     private acquireQueueingExecution;
+    private acquireWithRetry;
     private getExecutionLockKey;
     private isLockAcquireError;
+    private isConcurrentAcquireError;
     private process;
 }
 export {};

package/dist/server/Dispatcher.js

@@ -33,6 +33,7 @@ var import_node_crypto = require("node:crypto");
 var import_sequelize = require("sequelize");
 var import_constants = require("./constants");
 var import_Plugin = require("./Plugin");
+const EXECUTION_ACQUIRE_MAX_ATTEMPTS = 5;
 class Dispatcher {
   constructor(plugin) {
     this.plugin = plugin;
@@ -338,27 +339,38 @@ class Dispatcher {
   async acquirePendingExecution(execution) {
     const logger = this.plugin.getLogger(execution.workflowId);
     const isolationLevel = this.plugin.db.options.dialect === "sqlite" ? [][0] : import_sequelize.Transaction.ISOLATION_LEVELS.REPEATABLE_READ;
-    let fetched = execution;
+    let fetched = null;
     try {
-      await this.plugin.db.sequelize.transaction({ isolationLevel }, async (transaction) => {
-        const ExecutionModelClass = this.plugin.db.getModel("executions");
-        const [affected] = await ExecutionModelClass.update(
-          { dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED },
-          {
-            where: {
-              id: execution.id,
-              dispatched: false
-            },
-            transaction
-          }
-        );
-        if (!affected) {
-          fetched = null;
-          return;
+      await this.acquireWithRetry(
+        async () => {
+          await this.plugin.db.sequelize.transaction({ isolationLevel }, async (transaction) => {
+            const ExecutionModelClass = this.plugin.db.getModel("executions");
+            const [affected] = await ExecutionModelClass.update(
+              { dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED },
+              {
+                where: {
+                  id: execution.id,
+                  dispatched: false
+                },
+                transaction
+              }
+            );
+            if (!affected) {
+              return;
+            }
+            await execution.reload({ transaction });
+            fetched = execution;
+          });
+          return false;
+        },
+        {
+          logger,
+          conflictMessage: `acquiring pending execution (${execution.id}) conflicted with another worker, retrying`,
+          maxAttemptsMessage: `acquiring pending execution (${execution.id}) reached max retry attempts`
         }
-        await execution.reload({ transaction });
-      });
+      );
     } catch (error) {
+      fetched = null;
       logger.error(`acquiring pending execution failed: ${error.message}`, { error });
     }
     return fetched;
@@ -367,33 +379,57 @@ class Dispatcher {
     const isolationLevel = this.plugin.db.options.dialect === "sqlite" ? [][0] : import_sequelize.Transaction.ISOLATION_LEVELS.REPEATABLE_READ;
     let fetched = null;
     try {
-      await this.plugin.db.sequelize.transaction(
-        {
-          isolationLevel
-        },
-        async (transaction) => {
-          const execution = await this.plugin.db.getRepository("executions").findOne({
-            filter: {
-              dispatched: false,
-              "workflow.enabled": true
+      await this.acquireWithRetry(
+        async () => {
+          let shouldRetry = false;
+          await this.plugin.db.sequelize.transaction(
+            {
+              isolationLevel
             },
-            sort: "id",
-            transaction
-          });
-          if (execution) {
-            this.plugin.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
-            await execution.update(
-              {
-                dispatched: true,
-                status: import_constants.EXECUTION_STATUS.STARTED
-              },
-              { transaction }
-            );
-            execution.workflow = this.plugin.enabledCache.get(execution.workflowId);
-            fetched = execution;
-          } else {
-            this.plugin.getLogger("dispatcher").debug(`no execution in db queued to process`);
-          }
+            async (transaction) => {
+              const execution = await this.plugin.db.getRepository("executions").findOne({
+                filter: {
+                  dispatched: false,
+                  "workflow.enabled": true
+                },
+                sort: "id",
+                transaction
+              });
+              if (!execution) {
+                this.plugin.getLogger("dispatcher").debug(`no execution in db queued to process`);
+                return;
+              }
+              const ExecutionModelClass = this.plugin.db.getModel("executions");
+              const [affected] = await ExecutionModelClass.update(
+                {
+                  dispatched: true,
+                  status: import_constants.EXECUTION_STATUS.STARTED
+                },
+                {
+                  where: {
+                    id: execution.id,
+                    dispatched: false
+                  },
+                  transaction
+                }
+              );
+              if (!affected) {
+                shouldRetry = true;
+                this.plugin.getLogger(execution.workflowId).warn(`execution (${execution.id}) was already acquired by another worker, retrying`);
+                return;
+              }
+              this.plugin.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
+              await execution.reload({ transaction });
+              execution.workflow = this.plugin.enabledCache.get(execution.workflowId);
+              fetched = execution;
+            }
+          );
+          return shouldRetry;
+        },
+        {
+          logger: this.plugin.getLogger("dispatcher"),
+          conflictMessage: `acquiring execution conflicted with another worker, retrying`,
+          maxAttemptsMessage: `acquiring execution reached max retry attempts, will retry on next dispatch`
         }
       );
     } catch (error) {
@@ -401,12 +437,43 @@ class Dispatcher {
     }
     return fetched;
   }
+  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;
+        }
+        shouldRetry = true;
+        options.logger.warn(options.conflictMessage, { error });
+      }
+      if (!shouldRetry) {
+        break;
+      }
+      if (attempt >= EXECUTION_ACQUIRE_MAX_ATTEMPTS) {
+        options.logger.warn(options.maxAttemptsMessage);
+        break;
+      }
+    }
+  }
   getExecutionLockKey(executionId) {
     return `workflow:execution:${executionId}`;
   }
   isLockAcquireError(error) {
     return error instanceof Error && error.constructor.name === "LockAcquireError";
   }
+  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);

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.0.61",
+  "version": "2.0.62",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
@@ -48,7 +48,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "974b351c96c0a7a8ce9fd8cdc70a732a332bd7cf",
+  "gitHead": "b21b0a5111d188ba495eb579fdae674c5680fff2",
   "keywords": [
     "Workflow"
   ]