@nocobase/plugin-workflow-notification 2.1.0-alpha.14 → 2.1.0-alpha.15

package/dist/externalVersion.js

@@ -10,9 +10,9 @@
 module.exports = {
   "react": "18.2.0",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/plugin-workflow": "2.1.0-alpha.14",
-  "@nocobase/plugin-notification-manager": "2.1.0-alpha.14",
-  "@nocobase/client": "2.1.0-alpha.14",
+  "@nocobase/plugin-workflow": "2.1.0-alpha.15",
+  "@nocobase/plugin-notification-manager": "2.1.0-alpha.15",
+  "@nocobase/client": "2.1.0-alpha.15",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-alpha.14"
+  "@nocobase/server": "2.1.0-alpha.15"
 };

package/dist/server/NotificationInstruction.d.ts

@@ -10,7 +10,19 @@ import { Processor, Instruction, FlowNodeModel } from '@nocobase/plugin-workflow
 export default class extends Instruction {
     run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
         status: 1 | -1;
-        result: any;
+        result: {
+            status: "success";
+            triggerFrom: string;
+            channelName: string;
+            receivers: import("@nocobase/plugin-notification-manager").ReceiversOptions;
+            queued: boolean;
+        } | {
+            status: "failure";
+            reason: string;
+            triggerFrom: string;
+            channelName: string;
+            receivers: import("@nocobase/plugin-notification-manager").ReceiversOptions;
+        };
     } | {
         status: 1 | -2;
         result: any;

package/dist/server/NotificationInstruction.js

@@ -53,62 +53,22 @@ 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...`);
-      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;
-      }
-    } 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.info(`notification (#${node.id}) queued for delivery.`);
+      const result = await notificationServer.send({
+        ...sendParams,
+        transaction: processor.mainTransaction
       });
+      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}) 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 +83,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-alpha.14",
+  "version": "2.1.0-alpha.15",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
@@ -27,5 +27,5 @@
   "keywords": [
     "Workflow"
   ],
-  "gitHead": "d8735b541de0ff9557bba704de49c799b4962672"
+  "gitHead": "7c86e75b0af4b9f532c8ebf5ef96a7423b0ab60e"
 }