@nocobase/plugin-workflow 2.1.0-beta.1 → 2.1.0-beta.11

package/dist/client/schemas/executions.d.ts

@@ -46,6 +46,28 @@ export declare const executionSchema: {
                         unique?: undefined;
                         onDelete?: undefined;
                         defaultValue?: undefined;
+                    } | {
+                        type: string;
+                        name: string;
+                        interface: string;
+                        uiSchema: {
+                            type: string;
+                            title: string;
+                            'x-component': string;
+                            'x-component-props': {
+                                fieldNames?: undefined;
+                            };
+                            'x-read-pretty': boolean;
+                            'x-decorator'?: undefined;
+                            enum?: undefined;
+                        };
+                        primaryKey?: undefined;
+                        allowNull?: undefined;
+                        target?: undefined;
+                        foreignKey?: undefined;
+                        unique?: undefined;
+                        onDelete?: undefined;
+                        defaultValue?: undefined;
                     } | {
                         type: string;
                         name: string;
@@ -139,28 +161,6 @@ export declare const executionSchema: {
                         foreignKey?: undefined;
                         unique?: undefined;
                         onDelete?: undefined;
-                    } | {
-                        type: string;
-                        name: string;
-                        interface: string;
-                        uiSchema: {
-                            type: string;
-                            title: string;
-                            'x-component': string;
-                            'x-component-props': {
-                                fieldNames?: undefined;
-                            };
-                            'x-read-pretty': boolean;
-                            'x-decorator'?: undefined;
-                            enum?: undefined;
-                        };
-                        primaryKey?: undefined;
-                        allowNull?: undefined;
-                        target?: undefined;
-                        foreignKey?: undefined;
-                        unique?: undefined;
-                        onDelete?: undefined;
-                        defaultValue?: undefined;
                     })[];
                     indexes: {
                         fields: string[];
@@ -189,6 +189,25 @@ export declare const executionSchema: {
                         };
                     };
                     properties: {
+                        filter: {
+                            type: string;
+                            title: string;
+                            'x-action': string;
+                            'x-component': string;
+                            'x-use-component-props': string;
+                            'x-component-props': {
+                                icon: string;
+                                nonfilterable: string[];
+                            };
+                            'x-align': string;
+                            default: {
+                                $and: {
+                                    status: {
+                                        $eq: any;
+                                    };
+                                }[];
+                            };
+                        };
                         refresher: {
                             type: string;
                             title: string;

package/dist/common/collections/executions.d.ts

@@ -35,6 +35,28 @@ declare const _default: {
         unique?: undefined;
         onDelete?: undefined;
         defaultValue?: undefined;
+    } | {
+        type: string;
+        name: string;
+        interface: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-component-props': {
+                fieldNames?: undefined;
+            };
+            'x-read-pretty': boolean;
+            'x-decorator'?: undefined;
+            enum?: undefined;
+        };
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        unique?: undefined;
+        onDelete?: undefined;
+        defaultValue?: undefined;
     } | {
         type: string;
         name: string;
@@ -128,28 +150,6 @@ declare const _default: {
         foreignKey?: undefined;
         unique?: undefined;
         onDelete?: undefined;
-    } | {
-        type: string;
-        name: string;
-        interface: string;
-        uiSchema: {
-            type: string;
-            title: string;
-            'x-component': string;
-            'x-component-props': {
-                fieldNames?: undefined;
-            };
-            'x-read-pretty': boolean;
-            'x-decorator'?: undefined;
-            enum?: undefined;
-        };
-        primaryKey?: undefined;
-        allowNull?: undefined;
-        target?: undefined;
-        foreignKey?: undefined;
-        unique?: undefined;
-        onDelete?: undefined;
-        defaultValue?: undefined;
     })[];
     indexes: {
         fields: string[];

package/dist/common/collections/executions.js

@@ -52,6 +52,18 @@ var executions_default = {
       primaryKey: true,
       allowNull: false
     },
+    {
+      type: "bigInt",
+      name: "workflowId",
+      interface: "id",
+      uiSchema: {
+        type: "number",
+        title: `{{t("Version ID", { ns: "${import_constants.NAMESPACE}" })}}`,
+        "x-component": "InputNumber",
+        "x-component-props": {},
+        "x-read-pretty": true
+      }
+    },
     {
       type: "belongsTo",
       name: "workflow",

package/dist/common/collections/workflows.d.ts

@@ -17,8 +17,21 @@ declare const _default: {
         type: string;
         primaryKey: boolean;
         allowNull: boolean;
-        interface?: undefined;
-        uiSchema?: undefined;
+        interface: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-component-props': {
+                multiple?: undefined;
+                fieldNames?: undefined;
+                mode?: undefined;
+            };
+            'x-read-pretty': boolean;
+            required?: undefined;
+            enum?: undefined;
+            default?: undefined;
+        };
         defaultValue?: undefined;
         required?: undefined;
         target?: undefined;
@@ -53,10 +66,10 @@ declare const _default: {
             type: string;
             'x-component': string;
             required: boolean;
-            enum?: undefined;
-            default?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            enum?: undefined;
+            default?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -88,9 +101,9 @@ declare const _default: {
             })[];
             'x-component': string;
             default: boolean;
-            required?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            required?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -110,11 +123,11 @@ declare const _default: {
             title: string;
             type: string;
             'x-component': string;
+            'x-component-props'?: undefined;
+            'x-read-pretty'?: undefined;
             required?: undefined;
             enum?: undefined;
             default?: undefined;
-            'x-component-props'?: undefined;
-            'x-read-pretty'?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -138,9 +151,9 @@ declare const _default: {
             'x-component': string;
             enum: string;
             required: boolean;
-            default?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            default?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;
@@ -215,9 +228,9 @@ declare const _default: {
                 color: string;
             }[];
             required: boolean;
-            default?: undefined;
             'x-component-props'?: undefined;
             'x-read-pretty'?: undefined;
+            default?: undefined;
         };
         primaryKey?: undefined;
         allowNull?: undefined;

package/dist/common/collections/workflows.js

@@ -41,7 +41,15 @@ var workflows_default = {
       name: "id",
       type: "snowflakeId",
       primaryKey: true,
-      allowNull: false
+      allowNull: false,
+      interface: "id",
+      uiSchema: {
+        type: "number",
+        title: '{{t("ID")}}',
+        "x-component": "InputNumber",
+        "x-component-props": {},
+        "x-read-pretty": true
+      }
     },
     {
       name: "key",

package/dist/externalVersion.js

@@ -11,8 +11,8 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.7",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.1.0-beta.1",
-  "@nocobase/utils": "2.1.0-beta.1",
+  "@nocobase/client": "2.1.0-beta.11",
+  "@nocobase/utils": "2.1.0-beta.11",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.30.1",
@@ -20,18 +20,18 @@ module.exports = {
   "lodash": "4.17.21",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.7",
-  "@nocobase/flow-engine": "2.1.0-beta.1",
-  "@nocobase/plugin-mobile": "2.1.0-beta.1",
+  "@nocobase/flow-engine": "2.1.0-beta.11",
+  "@nocobase/plugin-mobile": "2.1.0-beta.11",
   "sequelize": "6.35.2",
-  "@nocobase/server": "2.1.0-beta.1",
-  "@nocobase/database": "2.1.0-beta.1",
-  "@nocobase/data-source-manager": "2.1.0-beta.1",
-  "@nocobase/logger": "2.1.0-beta.1",
-  "@nocobase/evaluators": "2.1.0-beta.1",
+  "@nocobase/server": "2.1.0-beta.11",
+  "@nocobase/database": "2.1.0-beta.11",
+  "@nocobase/data-source-manager": "2.1.0-beta.11",
+  "@nocobase/logger": "2.1.0-beta.11",
+  "@nocobase/evaluators": "2.1.0-beta.11",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.7",
-  "@nocobase/actions": "2.1.0-beta.1",
+  "@nocobase/actions": "2.1.0-beta.11",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "2.1.0-beta.1",
-  "@nocobase/test": "2.1.0-beta.1"
+  "@nocobase/plugin-workflow-test": "2.1.0-beta.11",
+  "@nocobase/test": "2.1.0-beta.11"
 };

package/dist/locale/zh-CN.json

@@ -223,12 +223,13 @@
   "The workflow tasks page has already been created.": "工作流待办页面已创建。",
   "This is a main version, delete it will cause the whole workflow to be deleted (including all other revisions).": "当前是主版本，删除将导致整个流程被删除（包括所有其他版本）。",
   "This node contains branches, deleting will also be preformed to them, are you sure?": "节点包含分支，将同时删除其所有分支下的子节点，确定继续？",
+  "This type of node can not be used in current type of workflow or execute mode.": "该类型的节点在当前类型的工作流或执行模式中不可用。",
   "This type of trigger has not been supported to be executed manually.": "该类型的触发器暂未支持手动执行。",
   "This will perform all the actions configured in the workflow. Are you sure you want to continue?": "将按照工作流中配置的所有操作执行，确定继续吗？",
   "Trigger": "触发器",
   "Trigger data": "触发数据",
   "Trigger data context": "触发数据上下文",
-  "Trigger in executed workflow cannot be modified": "Trigger in executed workflow cannot be modified",
+  "Trigger in executed workflow cannot be modified": "已执行的工作流中的触发器无法修改",
   "Trigger mode": "触发模式",
   "Trigger on": "触发时机",
   "Trigger time": "触发时间",

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":"2026-02-14T14:45:27.092Z"}
+{"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":"2026-03-20T08:10:07.910Z"}

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":"2026-02-14T14:45:26.722Z"}
+{"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":"2026-03-20T08:10:07.592Z"}

package/dist/node_modules/nodejs-snowflake/package.json

@@ -1 +1 @@
-{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2026-02-14T14:45:26.515Z"}
+{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2026-03-20T08:10:07.400Z"}

package/dist/server/Dispatcher.d.ts

@@ -30,6 +30,7 @@ export default class Dispatcher {
     private readonly plugin;
     private ready;
     private executing;
+    private preparing;
     private pending;
     private events;
     private eventsCount;
@@ -39,15 +40,15 @@ export default class Dispatcher {
     setReady(ready: boolean): void;
     getEventsCount(): number;
     trigger(workflow: WorkflowModel, context: object, options?: EventOptions): void | Promise<Processor | null>;
+    private prepare;
     resume(job: any): Promise<void>;
     start(execution: ExecutionModel): Promise<void>;
     beforeStop(): Promise<void>;
-    dispatch(): Promise<void>;
+    dispatch(): void;
     run(pending: Pending): Promise<void>;
     private triggerSync;
     private validateEvent;
     private createExecution;
-    private prepare;
     private acquirePendingExecution;
     private acquireQueueingExecution;
     private process;

package/dist/server/Dispatcher.js

@@ -29,22 +29,22 @@ __export(Dispatcher_exports, {
   default: () => Dispatcher
 });
 module.exports = __toCommonJS(Dispatcher_exports);
-var import_crypto = require("crypto");
+var import_node_crypto = require("node:crypto");
 var import_sequelize = require("sequelize");
 var import_constants = require("./constants");
 var import_Plugin = require("./Plugin");
 class Dispatcher {
   constructor(plugin) {
     this.plugin = plugin;
-    this.prepare = this.prepare.bind(this);
   }
   ready = false;
   executing = null;
+  preparing = null;
   pending = [];
   events = [];
   eventsCount = 0;
   get idle() {
-    return this.ready && !this.executing && !this.pending.length && !this.events.length;
+    return this.ready && !this.executing && !this.preparing && !this.pending.length && !this.events.length;
   }
   onQueueExecution = async (event) => {
     const ExecutionRepo = this.plugin.db.getRepository("executions");
@@ -96,11 +96,55 @@ class Dispatcher {
     this.eventsCount = this.events.length;
     logger.info(`new event triggered, now events: ${this.events.length}`);
     logger.debug(`event data:`, { context });
-    if (this.events.length > 1) {
-      logger.info(`new event is pending to be prepared after previous preparation is finished`);
+    this.prepare();
+  }
+  prepare() {
+    if (this.preparing) {
       return;
     }
-    setImmediate(this.prepare);
+    this.preparing = (async () => {
+      try {
+        while (this.events.length) {
+          if (this.executing && this.plugin.db.options.dialect === "sqlite") {
+            await this.executing;
+          }
+          const event = this.events.shift();
+          this.eventsCount = this.events.length;
+          if (!event) continue;
+          const logger = this.plugin.getLogger(event[0].id);
+          logger.info(`preparing execution for event`);
+          try {
+            const execution = await this.createExecution(...event);
+            if (!(execution == null ? void 0 : execution.dispatched)) {
+              if (this.plugin.serving() && !this.executing && !this.pending.length) {
+                logger.info(`local pending list is empty, adding execution (${execution.id}) to pending list`);
+                this.pending.push({ execution });
+              } else {
+                logger.info(
+                  `instance is not serving as worker or local pending list is not empty, sending execution (${execution.id}) to queue`
+                );
+                try {
+                  await this.plugin.app.eventQueue.publish(this.plugin.channelPendingExecution, {
+                    executionId: execution.id
+                  });
+                } catch (qErr) {
+                  logger.error(`publishing execution (${execution.id}) to queue failed:`, { error: qErr });
+                }
+              }
+            }
+          } catch (error) {
+            logger.error(`failed to create execution:`, { error });
+          }
+        }
+      } finally {
+        this.preparing = null;
+        if (this.events.length) {
+          this.prepare();
+        } else {
+          this.dispatch();
+        }
+      }
+    })();
   }
   async resume(job) {
     let { execution } = job;
@@ -119,16 +163,26 @@ class Dispatcher {
   }
   async beforeStop() {
     this.ready = false;
-    if (this.events.length) {
-      await this.prepare();
-    }
-    if (this.executing) {
-      await this.executing;
+    this.plugin.getLogger("dispatcher").info("app is stopping, draining local queues...");
+    while (this.preparing || this.executing || this.events.length || this.pending.length) {
+      if (this.preparing) {
+        await this.preparing;
+      }
+      if (this.executing) {
+        await this.executing;
+      }
+      if (this.events.length && !this.preparing) {
+        this.prepare();
+      }
+      if (this.pending.length && !this.executing) {
+        this.dispatch();
+      }
+      await new Promise((resolve) => setImmediate(resolve));
     }
+    this.plugin.getLogger("dispatcher").info("local queues drained");
   }
   dispatch() {
-    if (!this.ready) {
-      this.plugin.getLogger("dispatcher").warn(`app is not ready, new dispatching will be ignored`);
+    if (!this.ready && !this.pending.length && !this.events.length) {
       return;
     }
     if (this.executing) {
@@ -136,7 +190,8 @@ class Dispatcher {
       return;
     }
     if (this.events.length) {
-      return this.prepare();
+      this.prepare();
+      return;
     }
     this.executing = (async () => {
       let next = null;
@@ -149,13 +204,15 @@ class Dispatcher {
           this.plugin.getLogger(next[0].workflowId).info(`pending execution (${next[0].id}) ready to process`);
         }
       } else {
-        if (this.plugin.serving()) {
+        if (this.ready && this.plugin.serving()) {
           execution = await this.acquireQueueingExecution();
           if (execution) {
             next = [execution];
           }
         } else {
-          this.plugin.getLogger("dispatcher").warn(`${import_Plugin.WORKER_JOB_WORKFLOW_PROCESS} is not serving on this instance, new dispatching will be ignored`);
+          this.plugin.getLogger("dispatcher").warn(
+            `${import_Plugin.WORKER_JOB_WORKFLOW_PROCESS} is not serving on this instance or app not ready, new dispatching will be ignored`
+          );
         }
       }
       if (next) {
@@ -233,7 +290,7 @@ class Dispatcher {
         {
           context,
           key: workflow.key,
-          eventKey: options.eventKey ?? (0, import_crypto.randomUUID)(),
+          eventKey: options.eventKey ?? (0, import_node_crypto.randomUUID)(),
           stack: options.stack,
           dispatched: deferred ?? false,
           status: deferred ? import_constants.EXECUTION_STATUS.STARTED : import_constants.EXECUTION_STATUS.QUEUEING,
@@ -268,50 +325,6 @@ class Dispatcher {
     execution.workflow = workflow;
     return execution;
   }
-  prepare = async () => {
-    if (this.executing && this.plugin.db.options.dialect === "sqlite") {
-      await this.executing;
-    }
-    const event = this.events.shift();
-    this.eventsCount = this.events.length;
-    if (!event) {
-      this.plugin.getLogger("dispatcher").info(`events queue is empty, no need to prepare`);
-      return;
-    }
-    const logger = this.plugin.getLogger(event[0].id);
-    logger.info(`preparing execution for event`);
-    try {
-      const execution = await this.createExecution(...event);
-      if (!(execution == null ? void 0 : execution.dispatched)) {
-        if (this.plugin.serving() && !this.executing && !this.pending.length) {
-          logger.info(`local pending list is empty, adding execution (${execution.id}) to pending list`);
-          this.pending.push({ execution });
-        } else {
-          logger.info(
-            `instance is not serving as worker or local pending list is not empty, sending execution (${execution.id}) to queue`
-          );
-          try {
-            await this.plugin.app.eventQueue.publish(this.plugin.channelPendingExecution, {
-              executionId: execution.id
-            });
-          } catch (qErr) {
-            logger.error(`publishing execution (${execution.id}) to queue failed:`, { error: qErr });
-          }
-        }
-      }
-    } catch (error) {
-      logger.error(`failed to create execution:`, { error });
-    }
-    if (this.events.length) {
-      await this.prepare();
-    } else {
-      this.plugin.getLogger("dispatcher").info("no more events need to be prepared, dispatching...");
-      if (this.executing) {
-        await this.executing;
-      }
-      this.dispatch();
-    }
-  };
   async acquirePendingExecution(execution) {
     const logger = this.plugin.getLogger(execution.workflowId);
     const isolationLevel = this.plugin.db.options.dialect === "sqlite" ? [][0] : import_sequelize.Transaction.ISOLATION_LEVELS.REPEATABLE_READ;