@nocobase/plugin-workflow-mailer 2.2.0-alpha.1 → 2.2.0-alpha.3

package/dist/server/MailerInstruction.js

@@ -42,7 +42,41 @@ module.exports = __toCommonJS(MailerInstruction_exports);
 var import_joi = __toESM(require("joi"));
 var import_nodemailer = __toESM(require("nodemailer"));
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
+var import_plugin_file_manager = __toESM(require("@nocobase/plugin-file-manager"));
 var import_get = __toESM(require("lodash/get"));
+function isRecord(value) {
+  return value !== null && typeof value === "object";
+}
+function toPlainRecord(value) {
+  if (!isRecord(value)) {
+    return null;
+  }
+  if ("dataValues" in value && isRecord(value.dataValues)) {
+    return value.dataValues;
+  }
+  return value;
+}
+function isPlainFileRecord(record) {
+  return Boolean(
+    isRecord(record) && typeof record.title === "string" && typeof record.storageId === "number" && typeof record.path === "string" && typeof record.filename === "string" && record.filename.length > 0
+  );
+}
+function getAttachmentFilename(file) {
+  if (file.title && file.extname) {
+    return `${file.title}${file.extname}`;
+  }
+  return file.title || file.filename;
+}
+function normalizeFiles(value) {
+  if (Array.isArray(value)) {
+    return value.flatMap((item) => normalizeFiles(item));
+  }
+  const record = toPlainRecord(value);
+  if (isPlainFileRecord(record)) {
+    return [record];
+  }
+  return [];
+}
 const transporterMap = /* @__PURE__ */ new Map();
 const configMap = /* @__PURE__ */ new Map();
 function getTransporterKey(provider) {
@@ -73,7 +107,11 @@ function getTransporter(provider) {
     }
     return createNewTransporter(key, newConfig);
   }
-  return transporterMap.get(key);
+  const transporter = transporterMap.get(key);
+  if (!transporter) {
+    return createNewTransporter(key, newConfig);
+  }
+  return transporter;
 }
 function discardTransporter(key, transporter) {
   transporter.close();
@@ -180,40 +218,57 @@ class MailerInstruction extends import_plugin_workflow.Instruction {
     contentType: import_joi.default.string().valid("html", "text").default("html"),
     html: import_joi.default.string(),
     text: import_joi.default.string(),
+    attachments: import_joi.default.any(),
     ignoreFail: import_joi.default.boolean().default(false)
   });
+  async getAttachments(attachments = []) {
+    const files = normalizeFiles(attachments);
+    if (!files.length) {
+      return void 0;
+    }
+    const fileManager = this.workflow.app.pm.get(import_plugin_file_manager.default);
+    if (!fileManager) {
+      throw new Error("[workflow-mailer] file-manager plugin is required to send attachments");
+    }
+    return Promise.all(
+      files.map(async (file) => {
+        const { stream, contentType } = await fileManager.getFileStream(file);
+        const resolvedContentType = contentType || file.mimetype;
+        return {
+          filename: getAttachmentFilename(file),
+          content: stream,
+          ...resolvedContentType ? { contentType: resolvedContentType } : {}
+        };
+      })
+    );
+  }
+  async getPayload(config) {
+    const { provider, contentType, to = [], cc, bcc, subject, html, text, ignoreFail, attachments, ...others } = config;
+    return {
+      ...others,
+      ...contentType === "html" ? { html } : { text },
+      subject: subject == null ? void 0 : subject.trim(),
+      to: to ? to.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : void 0,
+      cc: cc ? cc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : [],
+      bcc: bcc ? bcc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : [],
+      attachments: await this.getAttachments(attachments)
+    };
+  }
   async run(node, prevJob, processor, options) {
     var _a, _b;
-    const {
-      provider,
-      contentType,
-      to = [],
-      cc,
-      bcc,
-      subject,
-      html,
-      text,
-      ignoreFail,
-      ...others
-    } = processor.getParsedValue(node.config, node.id);
+    const config = processor.getParsedValue(node.config, node.id);
+    const { provider, ignoreFail } = config;
     const { workflow } = processor.execution;
     const currentWorkflow = (workflow == null ? void 0 : workflow.options) || ((_a = workflow == null ? void 0 : workflow.get) == null ? void 0 : _a.call(workflow, "options")) ? workflow : await node.getWorkflow();
-    const sync = this.workflow.isWorkflowSync(currentWorkflow);
+    const sync = processor.isInstructionSync(node);
     const workflowOptions = (currentWorkflow == null ? void 0 : currentWorkflow.options) ?? ((_b = currentWorkflow == null ? void 0 : currentWorkflow.get) == null ? void 0 : _b.call(currentWorkflow, "options")) ?? {};
     const workflowTimeout = Number(workflowOptions.timeout ?? 0);
     const transporterKey = getTransporterKey(provider);
     const transporter = getTransporter(provider);
     const mailAbort = createAbortSignal(processor, options == null ? void 0 : options.signal, workflowTimeout);
-    const payload = {
-      ...others,
-      ...contentType === "html" ? { html } : { text },
-      subject: subject == null ? void 0 : subject.trim(),
-      to: to ? to.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : void 0,
-      cc: cc ? cc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : [],
-      bcc: bcc ? bcc.flat().map((item) => item == null ? void 0 : item.trim()).filter(Boolean) : []
-    };
     if (sync) {
       try {
+        const payload = await this.getPayload(config);
         const result = await sendMail(transporter, transporterKey, payload, mailAbort.signal);
         return {
           status: import_plugin_workflow.JOB_STATUS.RESOLVED,
@@ -240,6 +295,7 @@ class MailerInstruction extends import_plugin_workflow.Instruction {
     await processor.exit();
     const jobDone = { status: import_plugin_workflow.JOB_STATUS.PENDING };
     try {
+      const payload = await this.getPayload(config);
       const response = await sendMail(transporter, transporterKey, payload, mailAbort.signal);
       processor.logger.info(`smtp-mailer (#${node.id}) sent successfully.`);
       jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;

package/package.json

@@ -6,7 +6,7 @@
   "description": "Send email in workflow.",
   "description.ru-RU": "Отправляет электронное письмо в рамках рабочего процесса.",
   "description.zh-CN": "可用于在工作流中发送电子邮件。",
-  "version": "2.2.0-alpha.1",
+  "version": "2.2.0-alpha.3",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-smtp-mailer",
@@ -20,12 +20,14 @@
   },
   "peerDependencies": {
     "@nocobase/client": "2.x",
+    "@nocobase/client-v2": "2.x",
     "@nocobase/database": "2.x",
+    "@nocobase/plugin-file-manager": "2.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "303663aba6c6eefa27e6a6435b4c0352074ec40f",
+  "gitHead": "e3ec19361fd7981af9fe2a7f24ad335025cbefcd",
   "keywords": [
     "NocoBase",
     "Workflow",