@nocobase/plugin-workflow 1.0.0-alpha.3 → 1.0.0-alpha.4

package/dist/externalVersion.js

@@ -11,23 +11,23 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.12.8",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/client": "1.0.0-alpha.3",
+  "@nocobase/client": "1.0.0-alpha.4",
   "react-router-dom": "6.21.0",
-  "@nocobase/utils": "1.0.0-alpha.3",
+  "@nocobase/utils": "1.0.0-alpha.4",
   "react-i18next": "11.18.6",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/database": "1.0.0-alpha.3",
-  "@nocobase/server": "1.0.0-alpha.3",
-  "@nocobase/logger": "1.0.0-alpha.3",
-  "@nocobase/evaluators": "1.0.0-alpha.3",
+  "@nocobase/database": "1.0.0-alpha.4",
+  "@nocobase/server": "1.0.0-alpha.4",
+  "@nocobase/logger": "1.0.0-alpha.4",
+  "@nocobase/evaluators": "1.0.0-alpha.4",
   "@formily/shared": "2.3.0",
   "lodash": "4.17.21",
   "@formily/antd-v5": "1.1.9",
-  "@nocobase/actions": "1.0.0-alpha.3",
-  "@nocobase/data-source-manager": "1.0.0-alpha.3",
+  "@nocobase/actions": "1.0.0-alpha.4",
+  "@nocobase/data-source-manager": "1.0.0-alpha.4",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-workflow-test": "1.0.0-alpha.3",
-  "@nocobase/test": "1.0.0-alpha.3",
+  "@nocobase/plugin-workflow-test": "1.0.0-alpha.4",
+  "@nocobase/test": "1.0.0-alpha.4",
   "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":"2024-04-30T08:30:18.759Z"}
+{"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-05-02T02:58:11.510Z"}

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-04-30T08:30:18.423Z"}
+{"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-05-02T02:58:11.181Z"}

package/dist/server/Plugin.d.ts

@@ -16,6 +16,11 @@ import Trigger from './triggers';
 import { InstructionInterface } from './instructions';
 import type { ExecutionModel, WorkflowModel } from './types';
 type ID = number | string;
+type EventOptions = {
+    eventKey?: string;
+    context?: any;
+    [key: string]: any;
+} & Transactionable;
 export default class PluginWorkflowServer extends Plugin {
     instructions: Registry<InstructionInterface>;
     triggers: Registry<Trigger>;
@@ -53,9 +58,7 @@ export default class PluginWorkflowServer extends Plugin {
      */
     load(): Promise<void>;
     private toggle;
-    trigger(workflow: WorkflowModel, context: object, options?: {
-        [key: string]: any;
-    } & Transactionable): void | Promise<Processor | null>;
+    trigger(workflow: WorkflowModel, context: object, options?: EventOptions): void | Promise<Processor | null>;
     private triggerSync;
     resume(job: any): Promise<void>;
     createProcessor(execution: ExecutionModel, options?: {}): Processor;

package/dist/server/Plugin.js

@@ -40,6 +40,7 @@ __export(Plugin_exports, {
 });
 module.exports = __toCommonJS(Plugin_exports);
 var import_path = __toESM(require("path"));
+var import_crypto = require("crypto");
 var import_lru_cache = __toESM(require("lru-cache"));
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
@@ -343,14 +344,23 @@ class PluginWorkflowServer extends import_server.Plugin {
       }
       return null;
     }
-    const execution = await workflow.createExecution(
-      {
-        context,
-        key: workflow.key,
-        status: import_constants.EXECUTION_STATUS.QUEUEING
-      },
-      { transaction }
-    );
+    let execution;
+    try {
+      execution = await workflow.createExecution(
+        {
+          context,
+          key: workflow.key,
+          eventKey: options.eventKey ?? (0, import_crypto.randomUUID)(),
+          status: import_constants.EXECUTION_STATUS.QUEUEING
+        },
+        { transaction }
+      );
+    } catch (err) {
+      if (!options.transaction) {
+        await transaction.rollback();
+      }
+      throw err;
+    }
     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") {

package/dist/server/collections/executions.js

@@ -44,6 +44,11 @@ var executions_default = {
       type: "string",
       name: "key"
     },
+    {
+      type: "string",
+      name: "eventKey",
+      unique: true
+    },
     {
       type: "hasMany",
       name: "jobs",

package/dist/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.js

@@ -298,12 +298,18 @@ class ScheduleTrigger {
       appends: workflow.config.appends,
       transaction
     });
-    const key = `${workflow.id}:${recordPk}@${nextTime}`;
-    this.cache.delete(key);
-    this.workflow.trigger(workflow, {
-      data: data.toJSON(),
-      date: new Date(nextTime)
-    });
+    const eventKey = `${workflow.id}:${recordPk}@${nextTime}`;
+    this.cache.delete(eventKey);
+    this.workflow.trigger(
+      workflow,
+      {
+        data: data.toJSON(),
+        date: new Date(nextTime)
+      },
+      {
+        eventKey
+      }
+    );
     if (!workflow.config.repeat || workflow.config.limit && workflow.allExecuted >= workflow.config.limit - 1) {
       return;
     }

package/dist/server/triggers/ScheduleTrigger/StaticScheduleTrigger.d.ts

@@ -7,17 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import type Plugin from '../../Plugin';
+import { WorkflowModel } from '../../types';
 export default class StaticScheduleTrigger {
     workflow: Plugin;
     private timers;
     constructor(workflow: Plugin);
-    inspect(workflows: any): void;
-    getNextTime({ config, allExecuted }: {
-        config: any;
-        allExecuted: any;
-    }, currentDate: any, nextSecond?: boolean): any;
-    schedule(workflow: any, nextTime: any, toggle?: boolean): void;
-    trigger(workflow: any, time: any): Promise<void>;
+    inspect(workflows: WorkflowModel[]): void;
+    getNextTime({ config, allExecuted }: WorkflowModel, currentDate: Date, nextSecond?: boolean): number;
+    schedule(workflow: WorkflowModel, nextTime: number, toggle?: boolean): void;
+    trigger(workflow: WorkflowModel, time: number): Promise<void>;
     on(workflow: any): void;
     off(workflow: any): void;
 }

package/dist/server/triggers/ScheduleTrigger/StaticScheduleTrigger.js

@@ -133,8 +133,9 @@ class StaticScheduleTrigger {
     }
   }
   async trigger(workflow, time) {
-    this.timers.delete(`${workflow.id}@${time}`);
-    this.workflow.trigger(workflow, { date: new Date(time) });
+    const eventKey = `${workflow.id}@${time}`;
+    this.timers.delete(eventKey);
+    this.workflow.trigger(workflow, { date: new Date(time) }, { eventKey });
     if (!workflow.config.repeat || workflow.config.limit && workflow.allExecuted >= workflow.config.limit - 1) {
       return;
     }

package/dist/server/triggers/ScheduleTrigger/index.d.ts

@@ -6,10 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Transactionable } from 'sequelize';
 import Trigger from '..';
 import type Plugin from '../../Plugin';
-import { WorkflowModel } from '../../types';
 export default class ScheduleTrigger extends Trigger {
     sync: boolean;
     private modes;
@@ -17,5 +15,4 @@ export default class ScheduleTrigger extends Trigger {
     private getTrigger;
     on(workflow: any): void;
     off(workflow: any): void;
-    validateEvent(workflow: WorkflowModel, context: any, options: Transactionable): Promise<boolean>;
 }

package/dist/server/triggers/ScheduleTrigger/index.js

@@ -68,16 +68,17 @@ class ScheduleTrigger extends import__.default {
       trigger.off(workflow);
     }
   }
-  async validateEvent(workflow, context, options) {
-    if (!context.date) {
-      return false;
-    }
-    const existed = await workflow.countExecutions({
-      where: {
-        "context.date": context.date instanceof Date ? context.date.toISOString() : context.date
-      },
-      transaction: options.transaction
-    });
-    return !existed;
-  }
+  // async validateEvent(workflow: WorkflowModel, context: any, options: Transactionable): Promise<boolean> {
+  //   if (!context.date) {
+  //     return false;
+  //   }
+  //   const existed = await workflow.getExecutions({
+  //     attributes: ['id'],
+  //     where: {
+  //       'context.date': context.date instanceof Date ? context.date.toISOString() : context.date,
+  //     },
+  //     transaction: options.transaction,
+  //   });
+  //   return !existed.length;
+  // }
 }

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.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "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.0.0-alpha.3"
+    "@nocobase/plugin-workflow-test": "1.0.0-alpha.4"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -44,7 +44,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "7ccb137c7616cba5d238f87368239640e1d9ace1",
+  "gitHead": "7a7005ce3bddf33498580a6486c45b5d9ea64ffb",
   "keywords": [
     "Workflow"
   ]