@nocobase/plugin-workflow 0.17.0-alpha.6 → 0.18.0-alpha.1

package/dist/externalVersion.js

@@ -1,21 +1,21 @@
 module.exports = {
   "react": "18.2.0",
-  "antd": "5.8.6",
-  "@ant-design/icons": "5.1.4",
-  "@nocobase/client": "0.17.0-alpha.6",
-  "react-router-dom": "6.14.1",
-  "@nocobase/utils": "0.17.0-alpha.6",
+  "antd": "5.12.2",
+  "@ant-design/icons": "5.2.6",
+  "@nocobase/client": "0.18.0-alpha.1",
+  "react-router-dom": "6.21.0",
+  "@nocobase/utils": "0.18.0-alpha.1",
   "react-i18next": "11.18.6",
-  "winston": "3.9.0",
-  "@nocobase/database": "0.17.0-alpha.6",
-  "@nocobase/server": "0.17.0-alpha.6",
-  "@nocobase/logger": "0.17.0-alpha.6",
-  "@nocobase/evaluators": "0.17.0-alpha.6",
-  "@formily/react": "2.2.27",
-  "@formily/core": "2.2.27",
+  "winston": "3.11.0",
+  "@nocobase/database": "0.18.0-alpha.1",
+  "@nocobase/server": "0.18.0-alpha.1",
+  "@nocobase/logger": "0.18.0-alpha.1",
+  "@nocobase/evaluators": "0.18.0-alpha.1",
+  "@formily/react": "2.3.0",
+  "@formily/core": "2.3.0",
   "lodash": "4.17.21",
-  "@formily/antd-v5": "1.1.7",
-  "@nocobase/actions": "0.17.0-alpha.6",
-  "sequelize": "6.32.1",
-  "dayjs": "1.11.9"
+  "@formily/antd-v5": "1.1.9",
+  "@nocobase/actions": "0.18.0-alpha.1",
+  "sequelize": "6.35.2",
+  "dayjs": "1.11.10"
 };

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-12-13T08:47:37.397Z"}
+{"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-12-21T12:51:37.067Z"}

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-12-13T08:47:37.069Z"}
+{"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-12-21T12:51:36.734Z"}

package/dist/server/Plugin.d.ts

@@ -35,6 +35,7 @@ export default class WorkflowPlugin extends Plugin {
     }): void;
     resume(job: any): Promise<void>;
     createProcessor(execution: ExecutionModel, options?: {}): Processor;
+    private createExecution;
     private prepare;
     private dispatch;
     private process;

package/dist/server/Plugin.js

@@ -202,7 +202,9 @@ class WorkflowPlugin extends import_server.Plugin {
         this.toggle(workflow, false);
       });
       this.ready = false;
-      await this.prepare();
+      if (this.events.length) {
+        await this.prepare();
+      }
       if (this.executing) {
         await this.executing;
       }
@@ -222,12 +224,19 @@ class WorkflowPlugin extends import_server.Plugin {
     }
   }
   trigger(workflow, context, options = {}) {
-    if (!this.ready || context == null) {
+    const logger = this.getLogger(workflow.id);
+    if (!this.ready) {
+      logger.warn(`app is not ready, event of workflow ${workflow.id} will be ignored`);
+      logger.debug(`ignored event data:`, { data: context });
+      return;
+    }
+    if (context == null) {
+      logger.warn(`workflow ${workflow.id} event data context is null, event will be ignored`);
       return;
     }
     this.events.push([workflow, context, options]);
-    this.getLogger(workflow.id).info(`new event triggered, now events: ${this.events.length}`);
-    this.getLogger(workflow.id).debug(`event data:`, {
+    logger.info(`new event triggered, now events: ${this.events.length}`);
+    logger.debug(`event data:`, {
       data: context
     });
     if (this.events.length > 1) {
@@ -239,20 +248,18 @@ class WorkflowPlugin extends import_server.Plugin {
     if (!job.execution) {
       job.execution = await job.getExecution();
     }
+    this.getLogger(job.execution.workflowId).info(
+      `execution (${job.execution.id}) resuming from job (${job.id}) added to pending list`
+    );
     this.pending.push([job.execution, job]);
     this.dispatch();
   }
   createProcessor(execution, options = {}) {
     return new import_Processor.default(execution, { ...options, plugin: this });
   }
-  prepare = async () => {
+  async createExecution(event) {
     var _a;
-    const [event] = this.events;
-    if (!event) {
-      return;
-    }
     const [workflow, context, options] = event;
-    let valid = true;
     if ((_a = options.context) == null ? void 0 : _a.executionId) {
       const existed = await workflow.countExecutions({
         where: {
@@ -263,45 +270,55 @@ class WorkflowPlugin extends import_server.Plugin {
         this.getLogger(workflow.id).warn(
           `workflow ${workflow.id} has already been triggered in same execution (${options.context.executionId}), and newly triggering will be skipped.`
         );
-        valid = false;
+        return null;
       }
     }
-    if (valid) {
-      const execution = await this.db.sequelize.transaction(async (transaction) => {
-        const execution2 = await workflow.createExecution(
-          {
-            context,
-            key: workflow.key,
-            status: import_constants.EXECUTION_STATUS.QUEUEING
+    const execution = await this.db.sequelize.transaction(async (transaction) => {
+      const execution2 = await workflow.createExecution(
+        {
+          context,
+          key: workflow.key,
+          status: import_constants.EXECUTION_STATUS.QUEUEING
+        },
+        { transaction }
+      );
+      await workflow.increment(["executed", "allExecuted"], { transaction });
+      if (this.db.options.dialect !== "postgres") {
+        await workflow.reload({ transaction });
+      }
+      await workflow.constructor.update(
+        {
+          allExecuted: workflow.allExecuted
+        },
+        {
+          where: {
+            key: workflow.key
           },
-          { transaction }
-        );
-        await workflow.increment(["executed", "allExecuted"], { transaction });
-        if (this.db.options.dialect !== "postgres") {
-          await workflow.reload({ transaction });
+          transaction
         }
-        await workflow.constructor.update(
-          {
-            allExecuted: workflow.allExecuted
-          },
-          {
-            where: {
-              key: workflow.key
-            },
-            transaction
-          }
-        );
-        execution2.workflow = workflow;
-        return execution2;
-      });
-      this.getLogger(workflow.id).debug(`execution of workflow ${workflow.id} created as ${execution.id}`, {
-        data: execution.context
-      });
-      if (!this.executing && !this.pending.length) {
-        this.pending.push([execution]);
-      }
+      );
+      execution2.workflow = workflow;
+      return execution2;
+    });
+    this.getLogger(workflow.id).info(`execution of workflow ${workflow.id} created as ${execution.id}`);
+    if (!this.executing && !this.pending.length) {
+      this.pending.push([execution]);
+    }
+    return execution;
+  }
+  prepare = async () => {
+    const event = this.events.shift();
+    if (!event) {
+      this.getLogger("dispatcher").warn(`events queue is empty, no need to prepare`);
+      return;
+    }
+    const logger = this.getLogger(event[0].id);
+    logger.info(`preparing execution for event`);
+    try {
+      await this.createExecution(event);
+    } catch (err) {
+      logger.error(`failed to create execution: ${err.message}`, err);
     }
-    this.events.shift();
     if (this.events.length) {
       await this.prepare();
     } else {
@@ -309,7 +326,12 @@ class WorkflowPlugin extends import_server.Plugin {
     }
   };
   dispatch() {
-    if (!this.ready || this.executing) {
+    if (!this.ready) {
+      this.getLogger("dispatcher").warn(`app is not ready, new dispatching will be ignored`);
+      return;
+    }
+    if (this.executing) {
+      this.getLogger("dispatcher").warn(`workflow executing is not finished, new dispatching will be ignored`);
       return;
     }
     this.executing = (async () => {

package/dist/server/Processor.js

@@ -94,7 +94,7 @@ class Processor {
   async start() {
     const { execution } = this;
     if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
-      throw new Error(`execution was ended with status ${execution.status}`);
+      throw new Error(`execution was ended with status ${execution.status} before, could not be started again`);
     }
     await this.prepare();
     if (this.nodes.length) {
@@ -107,7 +107,7 @@ class Processor {
   async resume(job) {
     const { execution } = this;
     if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
-      throw new Error(`execution was ended with status ${execution.status}`);
+      throw new Error(`execution was ended with status ${execution.status} before, could not be resumed`);
     }
     await this.prepare();
     const node = this.nodesMap.get(job.nodeId);

package/dist/server/migrations/20230612021134-manual-collection-block.js

@@ -113,6 +113,7 @@ class manual_collection_block_default extends import_server.Migration {
     }
     const { db } = this.context;
     const NodeRepo = db.getRepository("flow_nodes");
+    await NodeRepo.collection.sync();
     await db.sequelize.transaction(async (transaction) => {
       const nodes = await NodeRepo.find({
         filter: {

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.17.0-alpha.6",
+  "version": "0.18.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -42,5 +42,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "f92f8bcdf6d5baf07566381e9425ebca11e19626"
+  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
 }