@nocobase/plugin-workflow 0.16.0-alpha.4 → 0.16.0-alpha.5

package/dist/externalVersion.js

@@ -1,23 +1,23 @@
 module.exports = {
   "@ant-design/icons": "5.1.4",
-  "@nocobase/client": "0.16.0-alpha.4",
+  "@nocobase/client": "0.16.0-alpha.5",
   "antd": "5.8.6",
   "react": "18.2.0",
-  "@nocobase/utils": "0.16.0-alpha.4",
+  "@nocobase/utils": "0.16.0-alpha.5",
   "react-router-dom": "6.14.1",
   "react-i18next": "11.18.6",
   "winston": "3.9.0",
-  "@nocobase/database": "0.16.0-alpha.4",
-  "@nocobase/server": "0.16.0-alpha.4",
-  "@nocobase/logger": "0.16.0-alpha.4",
-  "@nocobase/evaluators": "0.16.0-alpha.4",
+  "@nocobase/database": "0.16.0-alpha.5",
+  "@nocobase/server": "0.16.0-alpha.5",
+  "@nocobase/logger": "0.16.0-alpha.5",
+  "@nocobase/evaluators": "0.16.0-alpha.5",
   "@formily/react": "2.2.27",
   "@formily/core": "2.2.27",
   "@formily/antd-v5": "1.1.7",
   "lodash": "4.17.21",
-  "@nocobase/actions": "0.16.0-alpha.4",
+  "@nocobase/actions": "0.16.0-alpha.5",
   "axios": "0.26.1",
   "sequelize": "6.32.1",
   "dayjs": "1.11.9",
-  "@nocobase/resourcer": "0.16.0-alpha.4"
+  "@nocobase/resourcer": "0.16.0-alpha.5"
 };

package/dist/locale/zh-CN.d.ts

@@ -54,7 +54,7 @@ declare const _default: {
     'Preload associations': string;
     'Please select the associated fields that need to be accessed in subsequent nodes. With more than two levels of to-many associations may cause performance issue, please use with caution.': string;
     'Schedule event': string;
-    'Scheduled job base on time conditions.': string;
+    'Event will be scheduled and triggered base on time conditions.': string;
     'Trigger mode': string;
     'Based on certain date': string;
     'Based on date field of collection': string;

package/dist/locale/zh-CN.js

@@ -76,7 +76,7 @@ var zh_CN_default = {
   "Preload associations": "\u9884\u52A0\u8F7D\u5173\u8054\u6570\u636E",
   "Please select the associated fields that need to be accessed in subsequent nodes. With more than two levels of to-many associations may cause performance issue, please use with caution.": "\u8BF7\u9009\u4E2D\u9700\u8981\u5728\u540E\u7EED\u8282\u70B9\u4E2D\u88AB\u8BBF\u95EE\u7684\u5173\u7CFB\u5B57\u6BB5\u3002\u8D85\u8FC7\u4E24\u5C42\u7684\u5BF9\u591A\u5173\u8054\u53EF\u80FD\u4F1A\u5BFC\u81F4\u6027\u80FD\u95EE\u9898\uFF0C\u8BF7\u8C28\u614E\u4F7F\u7528\u3002",
   "Schedule event": "\u5B9A\u65F6\u4EFB\u52A1",
-  "Scheduled job base on time conditions.": "\u57FA\u4E8E\u65F6\u95F4\u6761\u4EF6\u7684\u8BA1\u5212\u4EFB\u52A1",
+  "Event will be scheduled and triggered base on time conditions.": "\u57FA\u4E8E\u65F6\u95F4\u6761\u4EF6\u8FDB\u884C\u5B9A\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\u3002",
   "Trigger mode": "\u89E6\u53D1\u6A21\u5F0F",
   "Based on certain date": "\u81EA\u5B9A\u4E49\u65F6\u95F4",
   "Based on date field of collection": "\u6839\u636E\u6570\u636E\u8868\u65F6\u95F4\u5B57\u6BB5",

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":"2023-11-24T15:25:40.047Z"}
+{"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":"2023-11-30T04:56:25.322Z"}

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":"2023-11-24T15:25:39.753Z"}
+{"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":"2023-11-30T04:56:25.033Z"}

package/dist/server/Plugin.js

@@ -252,13 +252,21 @@ class WorkflowPlugin extends import_server.Plugin {
           },
           { transaction }
         );
-        await workflow.increment("executed", { transaction });
-        await workflow.constructor.increment("allExecuted", {
-          where: {
-            key: workflow.key
+        await workflow.increment(["executed", "allExecuted"], { transaction });
+        if (this.db.options.dialect !== "postgres") {
+          await workflow.reload({ transaction });
+        }
+        await workflow.constructor.update(
+          {
+            allExecuted: workflow.allExecuted
           },
-          transaction
-        });
+          {
+            where: {
+              key: workflow.key
+            },
+            transaction
+          }
+        );
         execution2.workflow = workflow;
         return execution2;
       });

package/dist/server/Processor.js

@@ -179,7 +179,9 @@ class Processor {
     const { instructions } = this.options.plugin;
     const instruction = instructions.get(node.type);
     if (typeof instruction.resume !== "function") {
-      return Promise.reject(new Error("`resume` should be implemented"));
+      return Promise.reject(
+        new Error(`"resume" method should be implemented for [${node.type}] instruction of node (#${node.id})`)
+      );
     }
     return this.exec(instruction.resume.bind(instruction), node, job);
   }

package/dist/server/triggers/schedule.js

@@ -75,26 +75,27 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
     const timestamp = now.getTime();
     const startTime = parseDateWithoutMs(startsOn);
     if (!startTime || startTime > timestamp) {
-      return;
+      return 0;
     }
     if (repeat) {
       if (typeof repeat === "number") {
         if (Math.round(timestamp - startTime) % repeat) {
-          return;
+          return 0;
         }
       }
       if (endsOn) {
         const endTime = parseDateWithoutMs(endsOn);
         if (!endTime || endTime < timestamp) {
-          return;
+          return 0;
         }
       }
     } else {
       if (startTime !== timestamp) {
-        return;
+        return 0;
       }
     }
-    return this.plugin.trigger(workflow, { date: now });
+    this.plugin.trigger(workflow, { date: now });
+    return 1;
   }
 });
 function getOnTimestampWithOffset(on, now) {
@@ -207,12 +208,12 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     if (repeat) {
       const tsFn = DialectTimestampFnMap[db.options.dialect];
       if (typeof repeat === "number" && repeat > this.cacheCycle && tsFn) {
-        conditions.push(
-          (0, import_database.where)(
-            (0, import_database.fn)("MOD", (0, import_database.literal)(`${Math.round(timestamp / 1e3)} - ${tsFn(startsOn.field)}`), Math.round(repeat / 1e3)),
-            { [import_database.Op.lt]: Math.round(this.cacheCycle / 1e3) }
-          )
+        const modExp = (0, import_database.fn)(
+          "MOD",
+          (0, import_database.literal)(`${Math.round(timestamp / 1e3)} - ${tsFn(startsOn.field)}`),
+          Math.round(repeat / 1e3)
         );
+        conditions.push((0, import_database.where)(modExp, { [import_database.Op.lt]: Math.round(this.cacheCycle / 1e3) }));
       }
       if (endsOn) {
         const endTimestamp = getOnTimestampWithOffset(endsOn, now);
@@ -249,7 +250,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     const timestamp = now.getTime();
     const startTimestamp = getOnTimestampWithOffset(startsOn, now);
     if (!startTimestamp) {
-      return false;
+      return 0;
     }
     const conditions = [
       {
@@ -266,21 +267,21 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
       });
       const tsFn = DialectTimestampFnMap[this.plugin.app.db.options.dialect];
       if (typeof repeat === "number" && tsFn) {
-        conditions.push(
-          (0, import_database.where)(
-            (0, import_database.fn)("MOD", (0, import_database.literal)(`${Math.round(timestamp / 1e3)} - ${tsFn(startsOn.field)}`), Math.round(repeat / 1e3)),
-            { [import_database.Op.eq]: 0 }
-          )
+        const modExp = (0, import_database.fn)(
+          "MOD",
+          (0, import_database.literal)(`${Math.round(timestamp / 1e3)} - ${tsFn(startsOn.field)}`),
+          Math.round(repeat / 1e3)
         );
+        conditions.push((0, import_database.where)(modExp, { [import_database.Op.eq]: 0 }));
       }
       if (endsOn) {
         const endTimestamp = getOnTimestampWithOffset(endsOn, now);
         if (!endTimestamp) {
-          return false;
+          return 0;
         }
         if (typeof endsOn === "string") {
           if (endTimestamp <= timestamp) {
-            return false;
+            return 0;
           }
         } else {
           conditions.push({
@@ -299,10 +300,13 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     }
     const repo = this.plugin.app.db.getRepository(collection);
     const instances = await repo.find({
-      filter: {
-        $and: conditions
+      where: {
+        [import_database.Op.and]: conditions
       },
-      appends
+      appends,
+      ...workflow.config.limit ? {
+        limit: Math.max(workflow.config.limit - workflow.allExecuted, 0)
+      } : {}
     });
     instances.forEach((item) => {
       this.plugin.trigger(workflow, {
@@ -310,6 +314,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
         data: item.toJSON()
       });
     });
+    return instances.length;
   }
 });
 function matchNext(workflow, now, range = this.cacheCycle) {
@@ -362,7 +367,8 @@ class ScheduleTrigger extends import__.Trigger {
     });
   }
   init() {
-    if (this.plugin.app.getPlugin("multi-app-share-collection").enabled && this.plugin.app.name !== "main") {
+    var _a;
+    if (((_a = this.plugin.app.getPlugin("multi-app-share-collection")) == null ? void 0 : _a.enabled) && this.plugin.app.name !== "main") {
       return;
     }
     if (this.timer) {
@@ -405,19 +411,9 @@ class ScheduleTrigger extends import__.Trigger {
     );
   }
   async reload() {
-    const WorkflowModel = this.plugin.app.db.getCollection("workflows").model;
-    const workflows = await WorkflowModel.findAll({
-      where: { enabled: true, type: "schedule" },
-      include: [
-        {
-          association: "executions",
-          attributes: ["id", "createdAt"],
-          separate: true,
-          limit: 1,
-          order: [["createdAt", "DESC"]]
-        }
-      ],
-      group: ["id"]
+    const WorkflowRepo = this.plugin.app.db.getRepository("workflows");
+    const workflows = await WorkflowRepo.find({
+      filter: { enabled: true, type: "schedule" }
     });
     this.cache = /* @__PURE__ */ new Map();
     this.inspect(workflows);

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.16.0-alpha.4",
+  "version": "0.16.0-alpha.5",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -41,5 +41,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "98d65186a22281e59209d11a6756712a62667c07"
+  "gitHead": "3badd2569e4658023897fa381ac4dd30e64d5bce"
 }