@nocobase/plugin-workflow-mailer 1.9.0-beta.5 → 1.9.0-beta.6

package/dist/externalVersion.js

@@ -11,8 +11,8 @@ module.exports = {
   "@ant-design/icons": "5.6.1",
   "@formily/antd-v5": "1.2.3",
   "react": "18.2.0",
-  "@nocobase/client": "1.9.0-beta.5",
-  "@nocobase/plugin-workflow": "1.9.0-beta.5",
+  "@nocobase/client": "1.9.0-beta.6",
+  "@nocobase/plugin-workflow": "1.9.0-beta.6",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.9.0-beta.5"
+  "@nocobase/server": "1.9.0-beta.6"
 };

package/dist/node_modules/nodemailer/package.json

@@ -1 +1 @@
-{"name":"nodemailer","version":"6.9.13","description":"Easy as cake e-mail sending from your Node.js applications","main":"lib/nodemailer.js","scripts":{"test":"node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","test:coverage":"c8 node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","lint":"eslint .","update":"rm -rf node_modules/ package-lock.json && ncu -u && npm install"},"repository":{"type":"git","url":"https://github.com/nodemailer/nodemailer.git"},"keywords":["Nodemailer"],"author":"Andris Reinman","license":"MIT-0","bugs":{"url":"https://github.com/nodemailer/nodemailer/issues"},"homepage":"https://nodemailer.com/","devDependencies":{"@aws-sdk/client-ses":"3.529.1","bunyan":"1.8.15","c8":"9.1.0","eslint":"8.57.0","eslint-config-nodemailer":"1.2.0","eslint-config-prettier":"9.1.0","libbase64":"1.3.0","libmime":"5.3.4","libqp":"2.1.0","nodemailer-ntlm-auth":"1.0.4","proxy":"1.0.2","proxy-test-server":"1.0.0","smtp-server":"3.13.3"},"engines":{"node":">=6.0.0"},"_lastModified":"2025-07-24T15:20:22.896Z"}
+{"name":"nodemailer","version":"6.9.13","description":"Easy as cake e-mail sending from your Node.js applications","main":"lib/nodemailer.js","scripts":{"test":"node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","test:coverage":"c8 node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js","lint":"eslint .","update":"rm -rf node_modules/ package-lock.json && ncu -u && npm install"},"repository":{"type":"git","url":"https://github.com/nodemailer/nodemailer.git"},"keywords":["Nodemailer"],"author":"Andris Reinman","license":"MIT-0","bugs":{"url":"https://github.com/nodemailer/nodemailer/issues"},"homepage":"https://nodemailer.com/","devDependencies":{"@aws-sdk/client-ses":"3.529.1","bunyan":"1.8.15","c8":"9.1.0","eslint":"8.57.0","eslint-config-nodemailer":"1.2.0","eslint-config-prettier":"9.1.0","libbase64":"1.3.0","libmime":"5.3.4","libqp":"2.1.0","nodemailer-ntlm-auth":"1.0.4","proxy":"1.0.2","proxy-test-server":"1.0.0","smtp-server":"3.13.3"},"engines":{"node":">=6.0.0"},"_lastModified":"2025-08-22T09:53:43.257Z"}

package/dist/server/MailerInstruction.d.ts

@@ -8,6 +8,9 @@
  */
 import { FlowNodeModel, Instruction, Processor } from '@nocobase/plugin-workflow';
 export default class extends Instruction {
-    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<any>;
+    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
+        status: 1 | -1;
+        result: any;
+    }>;
     resume(node: FlowNodeModel, job: any, processor: Processor): Promise<any>;
 }

package/dist/server/MailerInstruction.js

@@ -82,32 +82,31 @@ class MailerInstruction_default extends import_plugin_workflow.Instruction {
         };
       }
     }
-    const job = processor.saveJob({
+    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
     });
-    send(payload).then((response) => {
+    await processor.exit();
+    const jobDone = { status: import_plugin_workflow.JOB_STATUS.PENDING };
+    try {
+      const response = await send(payload);
       processor.logger.info(`smtp-mailer (#${node.id}) sent successfully.`);
-      job.set({
-        status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-        result: response
-      });
-    }).catch((error) => {
+      jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
+      jobDone.result = response;
+    } catch (error) {
       processor.logger.warn(`smtp-mailer (#${node.id}) sent failed: ${error.message}`);
-      job.set({
-        status: import_plugin_workflow.JOB_STATUS.FAILED,
-        result: error
-      });
-    }).finally(() => {
+      jobDone.status = import_plugin_workflow.JOB_STATUS.FAILED;
+      jobDone.result = error;
+    } finally {
       processor.logger.debug(`smtp-mailer (#${node.id}) sending ended, resume workflow...`);
-      setImmediate(() => {
-        this.workflow.resume(job);
+      const job = await this.workflow.app.db.getRepository("jobs").findOne({
+        filterByTk: id
       });
-    });
-    processor.logger.info(`smtp-mailer (#${node.id}) sent, waiting for response...`);
-    return processor.exit();
+      job.set(jobDone);
+      this.workflow.resume(job);
+    }
   }
   async resume(node, job, processor) {
     const { ignoreFail } = node.config;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "1.9.0-beta.5",
+  "version": "1.9.0-beta.6",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
@@ -21,7 +21,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6",
+  "gitHead": "ada5e359a91135cb9baf605c04c5c380f067a046",
   "keywords": [
     "NocoBase",
     "Workflow",