@nocobase/plugin-workflow 2.0.0-alpha.4 → 2.0.0-alpha.41

package/dist/client/nodes/condition.d.ts

@@ -98,9 +98,6 @@ export default class extends Instruction {
     branching: ({ rejectOnFalse }?: {
         rejectOnFalse?: boolean;
     }) => false | ({
-        label: string;
-        value: boolean;
-    } | {
         label: string;
         value: 1;
     } | {

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

@@ -140,9 +140,9 @@ export declare const executionSchema: {
                         unique?: undefined;
                         onDelete?: undefined;
                     } | {
-                        interface: string;
                         type: string;
                         name: string;
+                        interface: string;
                         uiSchema: {
                             type: string;
                             title: string;

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

@@ -129,9 +129,9 @@ declare const _default: {
         unique?: undefined;
         onDelete?: undefined;
     } | {
-        interface: string;
         type: string;
         name: string;
+        interface: string;
         uiSchema: {
             type: string;
             title: string;

package/dist/common/collections/executions.js

@@ -115,9 +115,9 @@ var executions_default = {
       name: "output"
     },
     {
-      interface: "createdAt",
       type: "datetime",
       name: "createdAt",
+      interface: "createdAt",
       uiSchema: {
         type: "datetime",
         title: `{{t("Triggered at", { ns: "${import_constants.NAMESPACE}" })}}`,
@@ -125,6 +125,18 @@ var executions_default = {
         "x-component-props": {},
         "x-read-pretty": true
       }
+    },
+    {
+      type: "boolean",
+      name: "manually",
+      interface: "checkbox",
+      uiSchema: {
+        type: "boolean",
+        title: `{{t("Triggered manually", { ns: "${import_constants.NAMESPACE}" })}}`,
+        "x-component": "Checkbox",
+        "x-component-props": {},
+        "x-read-pretty": true
+      }
     }
   ],
   indexes: [{ fields: ["dispatched", "id"] }]

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.0.0-alpha.4",
-  "@nocobase/utils": "2.0.0-alpha.4",
+  "@nocobase/client": "2.0.0-alpha.41",
+  "@nocobase/utils": "2.0.0-alpha.41",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.30.1",
@@ -20,17 +20,17 @@ module.exports = {
   "lodash": "4.17.21",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.7",
-  "@nocobase/plugin-mobile": "2.0.0-alpha.4",
+  "@nocobase/plugin-mobile": "2.0.0-alpha.41",
   "sequelize": "6.35.2",
-  "@nocobase/database": "2.0.0-alpha.4",
-  "@nocobase/server": "2.0.0-alpha.4",
-  "@nocobase/data-source-manager": "2.0.0-alpha.4",
-  "@nocobase/logger": "2.0.0-alpha.4",
-  "@nocobase/evaluators": "2.0.0-alpha.4",
+  "@nocobase/database": "2.0.0-alpha.41",
+  "@nocobase/server": "2.0.0-alpha.41",
+  "@nocobase/data-source-manager": "2.0.0-alpha.41",
+  "@nocobase/logger": "2.0.0-alpha.41",
+  "@nocobase/evaluators": "2.0.0-alpha.41",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.7",
-  "@nocobase/actions": "2.0.0-alpha.4",
+  "@nocobase/actions": "2.0.0-alpha.41",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "2.0.0-alpha.4",
-  "@nocobase/test": "2.0.0-alpha.4"
+  "@nocobase/plugin-workflow-test": "2.0.0-alpha.41",
+  "@nocobase/test": "2.0.0-alpha.41"
 };

package/dist/locale/zh-CN.json

@@ -179,16 +179,19 @@
   "Calculation result": "计算结果",
   "True": "真",
   "False": "假",
-  "concat": "连接",
+  "Concat": "连接",
   "Condition": "条件判断",
   "Based on boolean result of the calculation to determine whether to \"continue\" or \"exit\" the process, or continue on different branches of \"yes\" and \"no\".":
     "基于计算结果的真假来决定“继续”或“退出”流程，或者在“是”与“否”的分支上分别继续。",
   "Mode": "模式",
+  "Yes": "是",
+  "No": "否",
   "Continue when \"Yes\"": "“是”则继续",
   "Branch into \"Yes\" and \"No\"": "“是”和“否”分别继续",
   "Condition expression": "条件表达式",
-  "Inside of \"Yes\" branch": "“是”分支内",
-  "Inside of \"No\" branch": "“否”分支内",
+  "Inside of \"{{branchName}}\" branch": "“{{branchName}}”分支内",
+  "\"{{branchName}}\" branch": "“{{branchName}}”分支",
+  "Branch {{index}}": "分支 {{index}}",
   "Create record": "新增数据",
   "Add new record to a collection. You can use variables from upstream nodes to assign values to fields.":
     "向一个数据表中添加新的数据。可以使用上游节点里的变量为字段赋值。",
@@ -235,7 +238,10 @@
   "Succeeded": "成功",
   "Test run": "测试执行",
   "Test run will do the actual data manipulating or API calling, please use with caution.": "测试执行会进行实际的数据操作或 API 调用，请谨慎使用。",
+  "Replace variables": "替换变量",
   "No variable": "无变量",
+  "Result": "结果",
+  "Log": "日志",
 
   "Add node": "添加节点",
   "Move all downstream nodes to": "将所有下游节点移至",
@@ -246,6 +252,11 @@
   "New version enabled": "已启用新版本",
   "Workflow is not exists": "工作流不存在",
 
+  "Delete node": "删除节点",
+  "Branch to keep": "保留分支",
+  "Delete all": "删除全部",
+  "Keep": "保留",
+
   "Select users": "选择用户",
   "Query users": "查询用户",
   "Add": "添加",

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":"2025-10-05T10:00:23.201Z"}
+{"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":"2025-11-19T01:23:32.490Z"}

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":"2025-10-05T10:00:22.839Z"}
+{"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":"2025-11-19T01:23:32.138Z"}

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":"2025-10-05T10:00:22.636Z"}
+{"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":"2025-11-19T01:23:31.948Z"}

package/dist/server/Dispatcher.d.ts

@@ -14,7 +14,7 @@ import type PluginWorkflowServer from './Plugin';
 type Pending = {
     execution: ExecutionModel;
     job?: JobModel;
-    force?: boolean;
+    loaded?: boolean;
 };
 export type EventOptions = {
     eventKey?: string;
@@ -26,7 +26,6 @@ export type EventOptions = {
     onTriggerFail?: Function;
     [key: string]: any;
 } & Transactionable;
-export declare const WORKER_JOB_WORKFLOW_PROCESS = "workflow:process";
 export default class Dispatcher {
     private readonly plugin;
     private ready;
@@ -38,7 +37,6 @@ export default class Dispatcher {
     constructor(plugin: PluginWorkflowServer);
     readonly onQueueExecution: QueueEventOptions['process'];
     setReady(ready: boolean): void;
-    isReady(): boolean;
     getEventsCount(): number;
     trigger(workflow: WorkflowModel, context: object, options?: EventOptions): void | Promise<Processor | null>;
     resume(job: any): Promise<void>;

package/dist/server/Dispatcher.js

@@ -26,14 +26,13 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Dispatcher_exports = {};
 __export(Dispatcher_exports, {
-  WORKER_JOB_WORKFLOW_PROCESS: () => WORKER_JOB_WORKFLOW_PROCESS,
   default: () => Dispatcher
 });
 module.exports = __toCommonJS(Dispatcher_exports);
 var import_crypto = require("crypto");
 var import_sequelize = require("sequelize");
 var import_constants = require("./constants");
-const WORKER_JOB_WORKFLOW_PROCESS = "workflow:process";
+var import_Plugin = require("./Plugin");
 class Dispatcher {
   constructor(plugin) {
     this.plugin = plugin;
@@ -45,7 +44,7 @@ class Dispatcher {
   events = [];
   eventsCount = 0;
   get idle() {
-    return !this.executing && !this.pending.length && !this.events.length;
+    return this.ready && !this.executing && !this.pending.length && !this.events.length;
   }
   onQueueExecution = async (event) => {
     const ExecutionRepo = this.plugin.db.getRepository("executions");
@@ -62,9 +61,6 @@ class Dispatcher {
   setReady(ready) {
     this.ready = ready;
   }
-  isReady() {
-    return this.ready;
-  }
   getEventsCount() {
     return this.eventsCount;
   }
@@ -112,14 +108,14 @@ class Dispatcher {
       execution = await job.getExecution();
     }
     this.plugin.getLogger(execution.workflowId).info(`execution (${execution.id}) resuming from job (${job.id}) added to pending list`);
-    this.run({ execution, job, force: true });
+    this.run({ execution, job, loaded: true });
   }
   async start(execution) {
     if (execution.status) {
       return;
     }
     this.plugin.getLogger(execution.workflowId).info(`starting deferred execution (${execution.id})`);
-    this.run({ execution, force: true });
+    this.run({ execution, loaded: true });
   }
   async beforeStop() {
     this.ready = false;
@@ -135,10 +131,6 @@ class Dispatcher {
       this.plugin.getLogger("dispatcher").warn(`app is not ready, new dispatching will be ignored`);
       return;
     }
-    if (!this.plugin.app.serving(WORKER_JOB_WORKFLOW_PROCESS)) {
-      this.plugin.getLogger("dispatcher").warn(`${WORKER_JOB_WORKFLOW_PROCESS} is not serving, new dispatching will be ignored`);
-      return;
-    }
     if (this.executing) {
       this.plugin.getLogger("dispatcher").warn(`workflow executing is not finished, new dispatching will be ignored`);
       return;
@@ -151,25 +143,31 @@ class Dispatcher {
       let execution = null;
       if (this.pending.length) {
         const pending = this.pending.shift();
-        execution = pending.force ? pending.execution : await this.acquirePendingExecution(pending.execution);
+        execution = pending.loaded ? pending.execution : await this.acquirePendingExecution(pending.execution);
         if (execution) {
           next = [execution, pending.job];
           this.plugin.getLogger(next[0].workflowId).info(`pending execution (${next[0].id}) ready to process`);
         }
       } else {
-        execution = await this.acquireQueueingExecution();
-        if (execution) {
-          next = [execution];
+        if (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`);
         }
       }
       if (next) {
         await this.process(...next);
       }
-      this.executing = null;
-      if (next || this.pending.length) {
-        this.plugin.getLogger("dispatcher").debug(`last process finished, will do another dispatch`);
-        this.dispatch();
-      }
+      setImmediate(() => {
+        this.executing = null;
+        if (next || this.pending.length) {
+          this.plugin.getLogger("dispatcher").debug(`last process finished, will do another dispatch`);
+          this.dispatch();
+        }
+      });
     })();
   }
   async run(pending) {
@@ -237,7 +235,9 @@ class Dispatcher {
           key: workflow.key,
           eventKey: options.eventKey ?? (0, import_crypto.randomUUID)(),
           stack: options.stack,
-          dispatched: deferred ?? false
+          dispatched: deferred ?? false,
+          status: deferred ? import_constants.EXECUTION_STATUS.STARTED : import_constants.EXECUTION_STATUS.QUEUEING,
+          manually: options.manually
         },
         { transaction }
       );
@@ -283,13 +283,15 @@ class Dispatcher {
     try {
       const execution = await this.createExecution(...event);
       if (!(execution == null ? void 0 : execution.dispatched)) {
-        if (!this.executing && !this.pending.length) {
+        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(`local pending list is not empty, sending execution (${execution.id}) to queue`);
+          logger.info(
+            `instance is not serving as worker or local pending list is not empty, sending execution (${execution.id}) to queue`
+          );
           if (this.ready) {
-            this.plugin.app.backgroundJobManager.publish(`${this.plugin.name}.pendingExecution`, {
+            this.plugin.app.eventQueue.publish(this.plugin.channelPendingExecution, {
               executionId: execution.id
             });
           }
@@ -396,7 +398,3 @@ class Dispatcher {
     return processor;
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  WORKER_JOB_WORKFLOW_PROCESS
-});

package/dist/server/Plugin.d.ts

@@ -18,6 +18,7 @@ import Trigger from './triggers';
 import { InstructionInterface } from './instructions';
 import type { ExecutionModel, WorkflowModel } from './types';
 type ID = number | string;
+export declare const WORKER_JOB_WORKFLOW_PROCESS = "workflow:process";
 export default class PluginWorkflowServer extends Plugin {
     instructions: Registry<InstructionInterface>;
     triggers: Registry<Trigger>;
@@ -25,6 +26,7 @@ export default class PluginWorkflowServer extends Plugin {
     enabledCache: Map<number, WorkflowModel>;
     snowflake: Snowflake;
     private dispatcher;
+    get channelPendingExecution(): string;
     private loggerCache;
     private meter;
     private checker;
@@ -35,6 +37,7 @@ export default class PluginWorkflowServer extends Plugin {
     private onAfterStart;
     private onBeforeStop;
     handleSyncMessage(message: any): Promise<void>;
+    serving(): boolean;
     /**
      * @experimental
      */

package/dist/server/Plugin.js

@@ -36,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Plugin_exports = {};
 __export(Plugin_exports, {
+  WORKER_JOB_WORKFLOW_PROCESS: () => WORKER_JOB_WORKFLOW_PROCESS,
   default: () => PluginWorkflowServer
 });
 module.exports = __toCommonJS(Plugin_exports);
@@ -59,6 +60,7 @@ var import_DestroyInstruction = __toESM(require("./instructions/DestroyInstructi
 var import_QueryInstruction = __toESM(require("./instructions/QueryInstruction"));
 var import_UpdateInstruction = __toESM(require("./instructions/UpdateInstruction"));
 var import_WorkflowRepository = __toESM(require("./repositories/WorkflowRepository"));
+const WORKER_JOB_WORKFLOW_PROCESS = "workflow:process";
 class PluginWorkflowServer extends import_server.Plugin {
   instructions = new import_utils.Registry();
   triggers = new import_utils.Registry();
@@ -66,6 +68,9 @@ class PluginWorkflowServer extends import_server.Plugin {
   enabledCache = /* @__PURE__ */ new Map();
   snowflake;
   dispatcher = new import_Dispatcher.default(this);
+  get channelPendingExecution() {
+    return `${this.name}.pendingExecution`;
+  }
   loggerCache;
   meter = null;
   checker = null;
@@ -138,7 +143,6 @@ class PluginWorkflowServer extends import_server.Plugin {
   //   * add all hooks for enabled workflows
   //   * add hooks for create/update[enabled]/delete workflow to add/remove specific hooks
   onAfterStart = async () => {
-    this.dispatcher.setReady(true);
     const collection = this.db.getCollection("workflows");
     const workflows = await collection.repository.find({
       appends: ["versionStats"]
@@ -165,11 +169,13 @@ class PluginWorkflowServer extends import_server.Plugin {
       this.app.logger.info("workflow:dispatch");
       this.dispatcher.dispatch();
     });
+    this.dispatcher.setReady(true);
     this.getLogger("dispatcher").info("(starting) check for queueing executions");
     this.dispatcher.dispatch();
-    this.dispatcher.setReady(true);
   };
   onBeforeStop = async () => {
+    this.dispatcher.setReady(false);
+    this.app.eventQueue.unsubscribe(this.channelPendingExecution);
     this.app.logger.info(`stopping workflow plugin before app (${this.app.name}) shutdown...`);
     for (const workflow of this.enabledCache.values()) {
       this.toggle(workflow, false, { silent: true });
@@ -202,13 +208,16 @@ class PluginWorkflowServer extends import_server.Plugin {
       }
     }
   }
+  serving() {
+    return this.app.serving(WORKER_JOB_WORKFLOW_PROCESS);
+  }
   /**
    * @experimental
    */
   getLogger(workflowId = "dispatcher") {
     const now = /* @__PURE__ */ new Date();
     const date = `${now.getFullYear()}-${`0${now.getMonth() + 1}`.slice(-2)}-${`0${now.getDate()}`.slice(-2)}`;
-    const key = `${date}-${workflowId}}`;
+    const key = `${date}-${workflowId}`;
     if (this.loggerCache.has(key)) {
       return this.loggerCache.get(key);
     }
@@ -279,10 +288,6 @@ class PluginWorkflowServer extends import_server.Plugin {
     this.snowflake = new import_nodejs_snowflake.Snowflake({
       custom_epoch: pluginRecord == null ? void 0 : pluginRecord.createdAt.getTime()
     });
-    this.app.backgroundJobManager.subscribe(`${this.name}.pendingExecution`, {
-      idle: () => this.app.serving(import_Dispatcher.WORKER_JOB_WORKFLOW_PROCESS) && this.dispatcher.idle,
-      process: this.dispatcher.onQueueExecution
-    });
   }
   /**
    * @internal
@@ -297,14 +302,23 @@ class PluginWorkflowServer extends import_server.Plugin {
       max: 20,
       updateAgeOnGet: true,
       dispose(logger) {
-        logger.end();
+        const cachedLogger = logger;
+        if (!cachedLogger) {
+          return;
+        }
+        cachedLogger.silent = true;
+        if (typeof cachedLogger.close === "function") {
+          cachedLogger.close();
+        }
       }
     });
     this.meter = this.app.telemetry.metric.getMeter();
-    const counter = this.meter.createObservableGauge("workflow.events.counter");
-    counter.addCallback((result) => {
-      result.observe(this.dispatcher.getEventsCount());
-    });
+    if (this.meter) {
+      const counter = this.meter.createObservableGauge("workflow.events.counter");
+      counter.addCallback((result) => {
+        result.observe(this.dispatcher.getEventsCount());
+      });
+    }
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.workflows`,
       actions: [
@@ -333,12 +347,18 @@ class PluginWorkflowServer extends import_server.Plugin {
     db.on("workflows.afterDestroy", this.onAfterDestroy);
     this.app.on("afterStart", this.onAfterStart);
     this.app.on("beforeStop", this.onBeforeStop);
+    this.app.eventQueue.subscribe(this.channelPendingExecution, {
+      idle: () => this.serving() && this.dispatcher.idle,
+      process: this.dispatcher.onQueueExecution
+    });
   }
   toggle(workflow, enable, { silent, transaction } = {}) {
     const type = workflow.get("type");
     const trigger = this.triggers.get(type);
     if (!trigger) {
-      this.getLogger(workflow.id).error(`trigger type ${workflow.type} of workflow ${workflow.id} is not implemented`);
+      this.getLogger(workflow.id).error(`trigger type ${workflow.type} of workflow ${workflow.id} is not implemented`, {
+        workflowId: workflow.id
+      });
       return;
     }
     const next = enable ?? workflow.get("enabled");
@@ -346,14 +366,20 @@ class PluginWorkflowServer extends import_server.Plugin {
       const prev = workflow.previous();
       if (prev.config) {
         trigger.off({ ...workflow.get(), ...prev });
-        this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id} based on configuration before updated`);
+        this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id} based on configuration before updated`, {
+          workflowId: workflow.id
+        });
       }
       trigger.on(workflow);
-      this.getLogger(workflow.id).info(`toggle ON workflow ${workflow.id}`);
+      this.getLogger(workflow.id).info(`toggle ON workflow ${workflow.id}`, {
+        workflowId: workflow.id
+      });
       this.enabledCache.set(workflow.id, workflow);
     } else {
       trigger.off(workflow);
-      this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id}`);
+      this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id}`, {
+        workflowId: workflow.id
+      });
       this.enabledCache.delete(workflow.id);
     }
     if (!silent) {
@@ -453,3 +479,7 @@ class PluginWorkflowServer extends import_server.Plugin {
     }
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WORKER_JOB_WORKFLOW_PROCESS
+});

package/dist/server/Processor.js

@@ -144,7 +144,9 @@ class Processor {
   async start() {
     const { execution } = this;
     if (execution.status) {
-      this.logger.warn(`execution was ended with status ${execution.status} before, could not be started again`);
+      this.logger.warn(`execution was ended with status ${execution.status} before, could not be started again`, {
+        workflowId: execution.workflowId
+      });
       return;
     }
     await this.prepare();
@@ -158,7 +160,9 @@ class Processor {
   async resume(job) {
     const { execution } = this;
     if (execution.status) {
-      this.logger.warn(`execution was ended with status ${execution.status} before, could not be resumed`);
+      this.logger.warn(`execution was ended with status ${execution.status} before, could not be resumed`, {
+        workflowId: execution.workflowId
+      });
       return;
     }
     await this.prepare();
@@ -168,7 +172,7 @@ class Processor {
   async exec(instruction, node, prevJob) {
     let job;
     try {
-      this.logger.debug(`config of node`, { data: node.config });
+      this.logger.debug(`config of node`, { data: node.config, workflowId: node.workflowId });
       job = await instruction(node, prevJob, this);
       if (job === null) {
         return this.exit();
@@ -179,7 +183,7 @@ class Processor {
     } catch (err) {
       this.logger.error(
         `execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id}) failed: `,
-        err
+        { error: err, workflowId: node.workflowId }
       );
       job = {
         result: err instanceof Error ? {
@@ -199,7 +203,10 @@ class Processor {
     }
     const savedJob = this.saveJob(job);
     this.logger.info(
-      `execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id}) finished as status: ${savedJob.status}`
+      `execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id}) finished as status: ${savedJob.status}`,
+      {
+        workflowId: node.workflowId
+      }
     );
     this.logger.debug(`result of node`, { data: savedJob.result });
     if (savedJob.status === import_constants.JOB_STATUS.RESOLVED && node.downstream) {
@@ -217,7 +224,9 @@ class Processor {
     if (typeof instruction.run !== "function") {
       return Promise.reject(new Error("`run` should be implemented for customized execution of the node"));
     }
-    this.logger.info(`execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id})`);
+    this.logger.info(`execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id})`, {
+      workflowId: node.workflowId
+    });
     return this.exec(instruction.run.bind(instruction), node, input);
   }
   // parent node should take over the control
@@ -225,7 +234,9 @@ class Processor {
     this.logger.debug(`branch ended at node (${node.id})`);
     const parentNode = this.findBranchParentNode(node);
     if (parentNode) {
-      this.logger.debug(`not on main, recall to parent entry node (${node.id})})`);
+      this.logger.debug(`not on main, recall to parent entry node (${node.id})})`, {
+        workflowId: node.workflowId
+      });
       await this.recall(parentNode, job);
       return null;
     }
@@ -242,7 +253,9 @@ class Processor {
         new Error(`"resume" method should be implemented for [${node.type}] instruction of node (#${node.id})`)
       );
     }
-    this.logger.info(`execution (${this.execution.id}) resume instruction [${node.type}] for node (${node.id})`);
+    this.logger.info(`execution (${this.execution.id}) resume instruction [${node.type}] for node (${node.id})`, {
+      workflowId: node.workflowId
+    });
     return this.exec(instruction.resume.bind(instruction), node, job);
   }
   async exit(s) {
@@ -295,7 +308,9 @@ class Processor {
     if (this.mainTransaction && this.mainTransaction !== this.transaction) {
       await this.mainTransaction.commit();
     }
-    this.logger.info(`execution (${this.execution.id}) exiting with status ${this.execution.status}`);
+    this.logger.info(`execution (${this.execution.id}) exiting with status ${this.execution.status}`, {
+      workflowId: this.execution.workflowId
+    });
     return null;
   }
   /**
@@ -326,7 +341,9 @@ class Processor {
     this.lastSavedJob = job;
     this.jobsMapByNodeKey[job.nodeKey] = job;
     this.jobResultsMapByNodeKey[job.nodeKey] = job.result;
-    this.logger.debug(`job added to save list: ${JSON.stringify(job)}`);
+    this.logger.debug(`job added to save list: ${JSON.stringify(job)}`, {
+      workflowId: this.execution.workflowId
+    });
     return job;
   }
   /**