@nocobase/plugin-workflow-notification 2.1.0-beta.9 → 2.2.0-beta.1

package/dist/server/NotificationInstruction.js

@@ -39,9 +39,14 @@ __export(NotificationInstruction_exports, {
   default: () => NotificationInstruction_default
 });
 module.exports = __toCommonJS(NotificationInstruction_exports);
+var import_joi = __toESM(require("joi"));
 var import_plugin_notification_manager = __toESM(require("@nocobase/plugin-notification-manager"));
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 class NotificationInstruction_default extends import_plugin_workflow.Instruction {
+  configSchema = import_joi.default.object({
+    channelName: import_joi.default.string(),
+    ignoreFail: import_joi.default.boolean().default(false)
+  });
   async run(node, prevJob, processor) {
     const { ignoreFail, ...config } = node.config;
     const options = processor.getParsedValue(config, node.id);
@@ -53,62 +58,19 @@ class NotificationInstruction_default extends import_plugin_workflow.Instruction
       data: scope
     };
     const notificationServer = this.workflow.pm.get(import_plugin_notification_manager.default);
-    const { workflow } = processor.execution;
-    const sync = this.workflow.isWorkflowSync(workflow);
-    if (sync) {
-      try {
-        const result = await notificationServer.send(sendParams);
-        if (result.status === "success") {
-          return {
-            status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-            result
-          };
-        } else {
-          return {
-            status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
-            result
-          };
-        }
-      } catch (error) {
-        return {
-          status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.ERROR,
-          result: error
-        };
-      }
-    }
-    const { id } = processor.saveJob({
-      status: import_plugin_workflow.JOB_STATUS.PENDING,
-      nodeId: node.id,
-      nodeKey: node.key,
-      upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
-    });
-    await processor.exit();
-    const jobDone = { status: import_plugin_workflow.JOB_STATUS.PENDING };
     try {
-      processor.logger.info(`notification (#${node.id}) sent, waiting for response...`);
+      processor.logger.info(`notification (#${node.id}) queued for delivery.`);
       const result = await notificationServer.send(sendParams);
-      if (result.status === "success") {
-        processor.logger.info(`notification (#${node.id}) sent successfully.`);
-        jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
-        jobDone.result = result;
-      } else {
-        processor.logger.info(`notification (#${node.id}) sent failed.`);
-        jobDone.status = ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED;
-        jobDone.result = result;
-      }
+      return {
+        status: result.status === "success" || ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
+        result
+      };
     } catch (error) {
-      processor.logger.warn(`notification (#${node.id}) sent failed: ${error.message}`);
-      jobDone.status = ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED;
-      jobDone.result = error;
-    } finally {
-      const job = await this.workflow.app.db.getRepository("jobs").findOne({
-        filterByTk: id
-      });
-      job.set(jobDone);
-      processor.logger.debug(`notification (#${node.id}) sending ended, resume workflow...`);
-      setImmediate(() => {
-        this.workflow.resume(job);
-      });
+      processor.logger.warn(`notification (#${node.id}) queue failed: ${error.message}`);
+      return {
+        status: ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.ERROR,
+        result: error
+      };
     }
   }
   async resume(node, job, processor) {
@@ -123,7 +85,7 @@ class NotificationInstruction_default extends import_plugin_workflow.Instruction
     };
     const notificationServer = this.workflow.pm.get(import_plugin_notification_manager.default);
     try {
-      const result = await notificationServer.send(sendParams);
+      const result = await notificationServer.sendNow(sendParams);
       if (result.status === "success") {
         return {
           status: import_plugin_workflow.JOB_STATUS.RESOLVED,

package/package.json

@@ -6,7 +6,7 @@
   "description": "Send notification in workflow.",
   "description.ru-RU": "Отправляет уведомления в рамках рабочего процесса.",
   "description.zh-CN": "可用于在工作流中发送各类通知。",
-  "version": "2.1.0-beta.9",
+  "version": "2.2.0-beta.1",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
@@ -14,11 +14,13 @@
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow-smtp-mailer",
   "devDependencies": {
     "antd": "5.x",
+    "joi": "^17.13.3",
     "react": "18.x"
   },
   "peerDependencies": {
     "@nocobase/client": "2.x",
     "@nocobase/database": "2.x",
+    "@nocobase/plugin-notification-manager": "2.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
@@ -26,5 +28,5 @@
   "keywords": [
     "Workflow"
   ],
-  "gitHead": "c3a2875e4cbbb43b1f2361e6f9f5f84a7d3f3c3c"
+  "gitHead": "f82fa9d0c3aa8e00e53dd94e404a312483b4866b"
 }