@nocobase/plugin-workflow 1.9.0-beta.15 → 1.9.0-beta.17

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;
@@ -170,6 +175,7 @@ class PluginWorkflowServer extends import_server.Plugin {
   };
   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,6 +208,9 @@ class PluginWorkflowServer extends import_server.Plugin {
       }
     }
   }
+  serving() {
+    return this.app.serving(WORKER_JOB_WORKFLOW_PROCESS);
+  }
   /**
    * @experimental
    */
@@ -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
@@ -340,12 +345,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");
@@ -353,14 +364,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) {
@@ -460,3 +477,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;
   }
   /**

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/dist/server/triggers/CollectionTrigger.js

@@ -147,14 +147,20 @@ class CollectionTrigger extends import__.default {
     };
   }
   on(workflow) {
-    var _a, _b;
+    var _a;
     const { collection, mode } = workflow.config;
     if (!collection) {
       return;
     }
     const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
-    const { db } = ((_b = (_a = this.workflow.app.dataSourceManager) == null ? void 0 : _a.dataSources.get(dataSourceName)) == null ? void 0 : _b.collectionManager) ?? {};
+    const dataSource = (_a = this.workflow.app.dataSourceManager) == null ? void 0 : _a.dataSources.get(dataSourceName);
+    if (!dataSource) {
+      this.workflow.getLogger().warn(`[CollectionTrigger] data source not exists: ${dataSourceName}`);
+      return;
+    }
+    const { db } = dataSource.collectionManager;
     if (!db || !db.getCollection(collectionName)) {
+      this.workflow.getLogger().warn(`[CollectionTrigger] collection not exists: ${dataSourceName}`);
       return;
     }
     for (const [key, type] of MODE_BITMAP_EVENTS.entries()) {
@@ -182,8 +188,14 @@ class CollectionTrigger extends import__.default {
       return;
     }
     const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
-    const { db } = ((_a = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName)) == null ? void 0 : _a.collectionManager) ?? {};
+    const dataSource = (_a = this.workflow.app.dataSourceManager) == null ? void 0 : _a.dataSources.get(dataSourceName);
+    if (!dataSource) {
+      this.workflow.getLogger().warn(`[CollectionTrigger] data source not exists: ${dataSourceName}`);
+      return;
+    }
+    const { db } = dataSource.collectionManager;
     if (!db || !db.getCollection(collectionName)) {
+      this.workflow.getLogger().warn(`[CollectionTrigger] collection not exists: ${dataSourceName}`);
       return;
     }
     for (const [key, type] of MODE_BITMAP_EVENTS.entries()) {

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

@@ -379,6 +379,10 @@ class DateFieldScheduleTrigger {
     };
     this.events.set(name, listener);
     const dataSource = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
+    if (!dataSource) {
+      this.workflow.getLogger().warn(`[Schedule on date field] data source not exists: ${dataSourceName}`);
+      return;
+    }
     const { db } = dataSource.collectionManager;
     db.on(event, listener);
   }
@@ -396,6 +400,10 @@ class DateFieldScheduleTrigger {
     const listener = this.events.get(name);
     if (listener) {
       const dataSource = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName);
+      if (!dataSource) {
+        this.workflow.getLogger().warn(`[Schedule on date field] data source not exists: ${dataSourceName}`);
+        return;
+      }
       const { db } = dataSource.collectionManager;
       db.off(event, listener);
       this.events.delete(name);

package/package.json

@@ -2,13 +2,16 @@
   "name": "@nocobase/plugin-workflow",
   "displayName": "Workflow",
   "displayName.zh-CN": "工作流",
+  "displayName.ru-RU": "Рабочий процесс",
   "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.9.0-beta.15",
+  "description.ru-RU": "Мощный инструмент BPM, обеспечивающий базовую поддержку автоматизации бизнес-процессов с возможностью неограниченного расширения триггеров и узлов.",
+  "version": "1.9.0-beta.17",
   "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",
+  "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/workflow",
   "devDependencies": {
     "@ant-design/icons": "5.x",
     "@formily/antd-v5": "1.x",
@@ -45,7 +48,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "f7285eff753fd268350cfd65cd079a35b8957f0e",
+  "gitHead": "4f95b676235fa3f7583493412279d8132a20c4d0",
   "keywords": [
     "Workflow"
   ]