@nocobase/plugin-workflow 1.4.0-beta.1 → 1.5.0-alpha.1

package/dist/externalVersion.js

@@ -11,24 +11,24 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.4.0-beta.1",
-  "@nocobase/utils": "1.4.0-beta.1",
+  "@nocobase/client": "1.5.0-alpha.1",
+  "@nocobase/utils": "1.5.0-alpha.1",
   "antd": "5.12.8",
   "@ant-design/icons": "5.2.6",
   "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
   "@formily/shared": "2.3.2",
   "lodash": "4.17.21",
-  "@nocobase/database": "1.4.0-beta.1",
-  "@nocobase/server": "1.4.0-beta.1",
-  "@nocobase/logger": "1.4.0-beta.1",
-  "@nocobase/evaluators": "1.4.0-beta.1",
+  "@nocobase/database": "1.5.0-alpha.1",
+  "@nocobase/server": "1.5.0-alpha.1",
+  "@nocobase/logger": "1.5.0-alpha.1",
+  "@nocobase/evaluators": "1.5.0-alpha.1",
   "@formily/antd-v5": "1.1.9",
   "@formily/reactive": "2.3.0",
-  "@nocobase/actions": "1.4.0-beta.1",
+  "@nocobase/actions": "1.5.0-alpha.1",
   "dayjs": "1.11.10",
-  "@nocobase/data-source-manager": "1.4.0-beta.1",
+  "@nocobase/data-source-manager": "1.5.0-alpha.1",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-workflow-test": "1.4.0-beta.1",
-  "@nocobase/test": "1.4.0-beta.1"
+  "@nocobase/plugin-workflow-test": "1.5.0-alpha.1",
+  "@nocobase/test": "1.5.0-alpha.1"
 };

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":"2024-11-19T15:04:19.419Z"}
+{"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":"2024-11-19T15:55:44.890Z"}

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":"2024-11-19T15:04:18.981Z"}
+{"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":"2024-11-19T15:55:44.476Z"}

package/dist/server/Plugin.d.ts

@@ -36,7 +36,7 @@ export default class PluginWorkflowServer extends Plugin {
     private meter;
     private checker;
     private onBeforeSave;
-    onSync(message: any): Promise<void>;
+    handleSyncMessage(message: any): Promise<void>;
     /**
      * @experimental
      */

package/dist/server/Plugin.js

@@ -71,7 +71,7 @@ class PluginWorkflowServer extends import_server.Plugin {
   loggerCache;
   meter = null;
   checker = null;
-  onBeforeSave = async (instance, options) => {
+  onBeforeSave = async (instance, { transaction }) => {
     const Model = instance.constructor;
     if (instance.enabled) {
       instance.set("current", true);
@@ -80,7 +80,7 @@ class PluginWorkflowServer extends import_server.Plugin {
         where: {
           key: instance.key
         },
-        transaction: options.transaction
+        transaction
       });
       if (!count) {
         instance.set("current", true);
@@ -97,39 +97,37 @@ class PluginWorkflowServer extends import_server.Plugin {
           [import_database.Op.ne]: instance.id
         }
       },
-      transaction: options.transaction
+      transaction
     });
     if (previous) {
       await previous.update(
         { enabled: false, current: null },
         {
-          transaction: options.transaction,
+          transaction,
           hooks: false
         }
       );
-      this.toggle(previous, false);
+      this.toggle(previous, false, { transaction });
     }
   };
-  async onSync(message) {
+  async handleSyncMessage(message) {
     if (message.type === "statusChange") {
-      const workflowId = Number.parseInt(message.workflowId, 10);
-      const enabled = Number.parseInt(message.enabled, 10);
-      if (enabled) {
-        let workflow = this.enabledCache.get(workflowId);
+      if (message.enabled) {
+        let workflow = this.enabledCache.get(message.workflowId);
         if (workflow) {
           await workflow.reload();
         } else {
           workflow = await this.db.getRepository("workflows").findOne({
-            filterByTk: workflowId
+            filterByTk: message.workflowId
           });
         }
         if (workflow) {
-          this.toggle(workflow, true, true);
+          this.toggle(workflow, true, { silent: true });
         }
       } else {
-        const workflow = this.enabledCache.get(workflowId);
+        const workflow = this.enabledCache.get(message.workflowId);
         if (workflow) {
-          this.toggle(workflow, false, true);
+          this.toggle(workflow, false, { silent: true });
         }
       }
     }
@@ -248,13 +246,19 @@ class PluginWorkflowServer extends import_server.Plugin {
       }
     });
     db.on("workflows.beforeSave", this.onBeforeSave);
-    db.on("workflows.afterCreate", (model) => {
+    db.on("workflows.afterCreate", (model, { transaction }) => {
       if (model.enabled) {
-        this.toggle(model);
+        this.toggle(model, true, { transaction });
       }
     });
-    db.on("workflows.afterUpdate", (model) => this.toggle(model));
-    db.on("workflows.beforeDestroy", (model) => this.toggle(model, false));
+    db.on(
+      "workflows.afterUpdate",
+      (model, { transaction }) => this.toggle(model, model.enabled, { transaction })
+    );
+    db.on(
+      "workflows.afterDestroy",
+      (model, { transaction }) => this.toggle(model, false, { transaction })
+    );
     this.app.on("afterStart", async () => {
       this.app.setMaintainingMessage("check for not started executions");
       this.ready = true;
@@ -263,7 +267,7 @@ class PluginWorkflowServer extends import_server.Plugin {
         filter: { enabled: true }
       });
       workflows.forEach((workflow) => {
-        this.toggle(workflow);
+        this.toggle(workflow, true, { silent: true });
       });
       this.checker = setInterval(() => {
         this.dispatch();
@@ -272,7 +276,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     });
     this.app.on("beforeStop", async () => {
       for (const workflow of this.enabledCache.values()) {
-        this.toggle(workflow, false);
+        this.toggle(workflow, false, { silent: true });
       }
       this.ready = false;
       if (this.events.length) {
@@ -286,7 +290,7 @@ class PluginWorkflowServer extends import_server.Plugin {
       }
     });
   }
-  toggle(workflow, enable, silent = false) {
+  toggle(workflow, enable, { silent, transaction } = {}) {
     const type = workflow.get("type");
     const trigger = this.triggers.get(type);
     if (!trigger) {
@@ -306,15 +310,22 @@ class PluginWorkflowServer extends import_server.Plugin {
       this.enabledCache.delete(workflow.id);
     }
     if (!silent) {
-      this.sync({
-        type: "statusChange",
-        workflowId: `${workflow.id}`,
-        enabled: `${Number(next)}`
-      });
+      this.sendSyncMessage(
+        {
+          type: "statusChange",
+          workflowId: workflow.id,
+          enabled: next
+        },
+        { transaction }
+      );
     }
   }
   trigger(workflow, context, options = {}) {
     const logger = this.getLogger(workflow.id);
+    if (!workflow.enabled) {
+      logger.warn(`workflow ${workflow.id} is not enabled, event will be ignored`);
+      return;
+    }
     if (!this.ready) {
       logger.warn(`app is not ready, event of workflow ${workflow.id} will be ignored`);
       logger.debug(`ignored event data:`, context);

package/package.json

@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "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 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "1.4.0-beta.1",
+  "version": "1.5.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "1.4.0-beta.1"
+    "@nocobase/plugin-workflow-test": "1.5.0-alpha.1"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -44,7 +44,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "1ece4e558ba445088dbb658bd458eb0004295326",
+  "gitHead": "abe58fad69534a13c2502a47da86425a597c3ba3",
   "keywords": [
     "Workflow"
   ]