@nocobase/plugin-workflow 0.18.0-alpha.8 → 0.18.0-alpha.9

package/dist/externalVersion.js

@@ -2,21 +2,21 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.12.2",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/client": "0.18.0-alpha.8",
+  "@nocobase/client": "0.18.0-alpha.9",
   "react-router-dom": "6.21.0",
-  "@nocobase/utils": "0.18.0-alpha.8",
+  "@nocobase/utils": "0.18.0-alpha.9",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "0.18.0-alpha.8",
-  "@nocobase/server": "0.18.0-alpha.8",
-  "@nocobase/logger": "0.18.0-alpha.8",
-  "@nocobase/evaluators": "0.18.0-alpha.8",
+  "@nocobase/database": "0.18.0-alpha.9",
+  "@nocobase/server": "0.18.0-alpha.9",
+  "@nocobase/logger": "0.18.0-alpha.9",
+  "@nocobase/evaluators": "0.18.0-alpha.9",
   "@formily/react": "2.3.0",
   "@formily/core": "2.3.0",
   "lodash": "4.17.21",
   "@formily/antd-v5": "1.1.9",
-  "@nocobase/actions": "0.18.0-alpha.8",
+  "@nocobase/actions": "0.18.0-alpha.9",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-workflow-test": "0.18.0-alpha.8",
-  "@nocobase/test": "0.18.0-alpha.8",
+  "@nocobase/plugin-workflow-test": "0.18.0-alpha.9",
+  "@nocobase/test": "0.18.0-alpha.9",
   "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-29T08:00:23.052Z"}
+{"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-01-03T02:11:26.806Z"}

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-29T08:00:22.763Z"}
+{"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-01-03T02:11:26.452Z"}

package/dist/server/Plugin.d.ts

@@ -15,7 +15,9 @@ export default class WorkflowPlugin extends Plugin {
     private executing;
     private pending;
     private events;
+    private eventsCount;
     private loggerCache;
+    private meter;
     getLogger(workflowId: ID): Logger;
     onBeforeSave: (instance: WorkflowModel, options: any) => Promise<void>;
     registerTrigger<T extends Trigger>(type: string, trigger: T | {

package/dist/server/Plugin.js

@@ -55,7 +55,9 @@ class WorkflowPlugin extends import_server.Plugin {
   executing = null;
   pending = [];
   events = [];
+  eventsCount = 0;
   loggerCache;
+  meter = null;
   getLogger(workflowId) {
     const now = /* @__PURE__ */ new Date();
     const date = `${now.getFullYear()}-${`0${now.getMonth() + 1}`.slice(-2)}-${`0${now.getDate()}`.slice(-2)}`;
@@ -159,6 +161,11 @@ class WorkflowPlugin extends import_server.Plugin {
         logger.end();
       }
     });
+    this.meter = this.app.telemetry.metric.getMeter();
+    const counter = this.meter.createObservableGauge("workflow.events.counter");
+    counter.addCallback((result) => {
+      result.observe(this.eventsCount);
+    });
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.workflows`,
       actions: [
@@ -248,6 +255,7 @@ class WorkflowPlugin extends import_server.Plugin {
       return;
     }
     this.events.push([workflow, context, options]);
+    this.eventsCount = this.events.length;
     logger.info(`new event triggered, now events: ${this.events.length}`);
     logger.debug(`event data:`, {
       data: context
@@ -286,8 +294,8 @@ class WorkflowPlugin extends import_server.Plugin {
         return null;
       }
     }
-    const execution = await this.db.sequelize.transaction(async (transaction) => {
-      const execution2 = await workflow.createExecution(
+    return this.db.sequelize.transaction(async (transaction) => {
+      const execution = await workflow.createExecution(
         {
           context,
           key: workflow.key,
@@ -295,6 +303,7 @@ class WorkflowPlugin extends import_server.Plugin {
         },
         { transaction }
       );
+      this.getLogger(workflow.id).info(`execution of workflow ${workflow.id} created as ${execution.id}`);
       await workflow.increment(["executed", "allExecuted"], { transaction });
       if (this.db.options.dialect !== "postgres") {
         await workflow.reload({ transaction });
@@ -310,17 +319,13 @@ class WorkflowPlugin extends import_server.Plugin {
           transaction
         }
       );
-      execution2.workflow = workflow;
-      return execution2;
+      execution.workflow = workflow;
+      return execution;
     });
-    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();
+    this.eventsCount = this.events.length;
     if (!event) {
       this.getLogger("dispatcher").warn(`events queue is empty, no need to prepare`);
       return;
@@ -328,7 +333,10 @@ class WorkflowPlugin extends import_server.Plugin {
     const logger = this.getLogger(event[0].id);
     logger.info(`preparing execution for event`);
     try {
-      await this.createExecution(event);
+      const execution = await this.createExecution(event);
+      if (!this.executing && !this.pending.length) {
+        this.pending.push([execution]);
+      }
     } catch (err) {
       logger.error(`failed to create execution: ${err.message}`, err);
     }

package/package.json

@@ -4,11 +4,11 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.18.0-alpha.8",
+  "version": "0.18.0-alpha.9",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "0.18.0-alpha.8"
+    "@nocobase/plugin-workflow-test": "0.18.0-alpha.9"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -43,5 +43,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
+  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
 }