@nocobase/plugin-workflow-mailer 1.2.9-alpha → 1.2.10-alpha

package/dist/externalVersion.js

@@ -9,8 +9,8 @@
 
 module.exports = {
   "@formily/antd-v5": "1.1.9",
-  "@nocobase/client": "1.2.9-alpha",
-  "@nocobase/plugin-workflow": "1.2.9-alpha",
+  "@nocobase/client": "1.2.10-alpha",
+  "@nocobase/plugin-workflow": "1.2.10-alpha",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.2.9-alpha"
+  "@nocobase/server": "1.2.10-alpha"
 };

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":"2024-06-27T03:13:49.290Z"}
+{"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":"2024-06-27T14:17:52.022Z"}

package/dist/server/MailerInstruction.js

@@ -50,6 +50,7 @@ class MailerInstruction_default extends import_plugin_workflow.Instruction {
       to = [],
       cc,
       bcc,
+      subject,
       html,
       text,
       ignoreFail,
@@ -59,12 +60,17 @@ class MailerInstruction_default extends import_plugin_workflow.Instruction {
     const sync = this.workflow.isWorkflowSync(workflow);
     const transporter = import_nodemailer.default.createTransport(provider);
     const send = (0, import_util.promisify)(transporter.sendMail.bind(transporter));
+    const payload = {
+      ...options,
+      ...contentType === "html" ? { html } : { text },
+      subject: subject == null ? void 0 : subject.trim(),
+      to: to.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean),
+      cc: cc ? cc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : null,
+      bcc: bcc ? bcc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : null
+    };
     if (sync) {
       try {
-        const result = await send({
-          ...options,
-          ...contentType === "html" ? { html } : { text }
-        });
+        const result = await send(payload);
         return {
           status: import_plugin_workflow.JOB_STATUS.RESOLVED,
           result
@@ -82,19 +88,14 @@ class MailerInstruction_default extends import_plugin_workflow.Instruction {
       nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
-    send({
-      ...options,
-      ...contentType === "html" ? { html } : { text },
-      to: to.flat().filter(Boolean),
-      cc: cc ? cc.flat().filter(Boolean) : null,
-      bcc: bcc ? bcc.flat().filter(Boolean) : null
-    }).then((response) => {
+    send(payload).then((response) => {
       processor.logger.info(`smtp-mailer (#${node.id}) sent successfully.`);
       job.set({
         status: import_plugin_workflow.JOB_STATUS.RESOLVED,
         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

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：邮件发送节点",
   "description": "Send email in workflow.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "1.2.9-alpha",
+  "version": "1.2.10-alpha",
   "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": "b80e4678e8098d60755195ec63f865122aba021a",
+  "gitHead": "378bfb33c8d124ef79074e5474c1cf2199aeb8da",
   "keywords": [
     "NocoBase",
     "Workflow",