@nocobase/plugin-workflow 1.8.31 → 1.8.33

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

@@ -122,9 +122,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

@@ -111,9 +111,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

@@ -110,9 +110,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}" })}}`,
@@ -120,6 +120,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
+      }
     }
   ]
 };

package/dist/externalVersion.js

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

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-17T15:36:20.496Z"}
+{"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-29T13:12:35.861Z"}

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-17T15:36:20.139Z"}
+{"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-29T13:12:35.517Z"}

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-17T15:36:19.940Z"}
+{"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-29T13:12:35.326Z"}

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;
@@ -38,7 +38,7 @@ export default class Dispatcher {
     constructor(plugin: PluginWorkflowServer);
     readonly onQueueExecution: QueueEventOptions['process'];
     setReady(ready: boolean): void;
-    isReady(): boolean;
+    private serving;
     getEventsCount(): number;
     trigger(workflow: WorkflowModel, context: object, options?: EventOptions): void | Promise<Processor | null>;
     resume(job: any): Promise<void>;

package/dist/server/Dispatcher.js

@@ -63,8 +63,8 @@ class Dispatcher {
   setReady(ready) {
     this.ready = ready;
   }
-  isReady() {
-    return this.ready;
+  serving() {
+    return this.plugin.app.serving(WORKER_JOB_WORKFLOW_PROCESS);
   }
   getEventsCount() {
     return this.eventsCount;
@@ -113,14 +113,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 !== import_constants.EXECUTION_STATUS.STARTED) {
       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;
@@ -136,10 +136,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;
@@ -152,12 +148,16 @@ 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 {
+        if (!this.serving()) {
+          this.plugin.getLogger("dispatcher").warn(`${WORKER_JOB_WORKFLOW_PROCESS} is not serving on this instance, new dispatching will be ignored`);
+          return;
+        }
         execution = await this.acquireQueueingExecution();
         if (execution) {
           next = [execution];
@@ -238,6 +238,7 @@ class Dispatcher {
           key: workflow.key,
           eventKey: options.eventKey ?? (0, import_crypto.randomUUID)(),
           stack: options.stack,
+          manually: options.manually,
           status: deferred ? import_constants.EXECUTION_STATUS.STARTED : import_constants.EXECUTION_STATUS.QUEUEING
         },
         { transaction }
@@ -284,11 +285,13 @@ class Dispatcher {
     try {
       const execution = await this.createExecution(...event);
       if ((execution == null ? void 0 : execution.status) === import_constants.EXECUTION_STATUS.QUEUEING) {
-        if (!this.executing && !this.pending.length) {
+        if (this.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`, {
               executionId: execution.id

package/dist/server/Plugin.js

@@ -138,7 +138,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 +164,12 @@ 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.logger.info(`stopping workflow plugin before app (${this.app.name}) shutdown...`);
     for (const workflow of this.enabledCache.values()) {
       this.toggle(workflow, false, { silent: true });
@@ -208,7 +208,7 @@ class PluginWorkflowServer extends import_server.Plugin {
   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);
     }
@@ -297,7 +297,14 @@ 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();

package/dist/server/actions/nodes.js

@@ -158,7 +158,7 @@ async function destroy(context, next) {
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, keepBranch } = context.action.params;
   const keepBranchIndex = keepBranch == null || keepBranch === "" ? null : Number.parseInt(keepBranch, 10);
-  const fields = ["id", "upstreamId", "downstreamId", "branchIndex"];
+  const fields = ["id", "upstreamId", "downstreamId", "branchIndex", "key"];
   const instance = await repository.findOne({
     filterByTk,
     fields: [...fields, "workflowId"],

package/package.json

@@ -4,7 +4,7 @@
   "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.8.31",
+  "version": "1.8.33",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
@@ -45,7 +45,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "02ade1124cfbb5b3a2e8813ac4c141cbade7a443",
+  "gitHead": "0aa6b2823a7fe1d674f79512d9beaff96b647214",
   "keywords": [
     "Workflow"
   ]