@marlinjai/email-mcp 1.8.0 → 1.8.1

package/dist/setup/wizard.js

@@ -892,6 +892,53 @@ function buildGmailQuery(query) {
   return parts.join(" ");
 }
 
+// src/providers/mime.ts
+import MailComposer from "nodemailer/lib/mail-composer/index.js";
+import { convert } from "html-to-text";
+function htmlToText(html) {
+  return convert(html, {
+    wordwrap: false,
+    selectors: [
+      { selector: "img", format: "skip" },
+      { selector: "a", options: { hideLinkHrefIfSameAsText: true } }
+    ]
+  }).trim();
+}
+function normalizeBody(body) {
+  const html = body.html ? body.html : void 0;
+  if (body.text) return { text: body.text, html };
+  if (html) return { text: htmlToText(html), html };
+  return { text: "" };
+}
+function toAddress(contact) {
+  return contact.name ? { name: contact.name, address: contact.email } : contact.email;
+}
+function toAddressList(contacts) {
+  return contacts?.length ? contacts.map(toAddress) : void 0;
+}
+async function buildMimeMessage(from, params) {
+  const { text, html } = normalizeBody(params.body);
+  const mail = {
+    from,
+    to: toAddressList(params.to),
+    cc: toAddressList(params.cc),
+    bcc: toAddressList(params.bcc),
+    subject: params.subject,
+    text,
+    html,
+    inReplyTo: params.inReplyTo,
+    references: params.references?.length ? params.references : void 0,
+    attachments: params.attachments?.map((a) => ({
+      filename: a.filename,
+      content: a.content,
+      contentType: a.contentType
+    }))
+  };
+  const node = new MailComposer(mail).compile();
+  node.keepBcc = true;
+  return node.build();
+}
+
 // src/providers/gmail/adapter.ts
 var GmailAdapter = class {
   providerType = ProviderType.Gmail;
@@ -1034,7 +1081,7 @@ var GmailAdapter = class {
   }
   async sendEmail(params) {
     const gmail = this.ensureConnected();
-    const raw = this.buildRfc2822(params);
+    const raw = await this.buildRaw(params);
     const res = await gmail.users.messages.send({
       userId: "me",
       requestBody: { raw }
@@ -1046,7 +1093,7 @@ var GmailAdapter = class {
   }
   async createDraft(params) {
     const gmail = this.ensureConnected();
-    const raw = this.buildRfc2822(params);
+    const raw = await this.buildRaw(params);
     const res = await gmail.users.drafts.create({
       userId: "me",
       requestBody: {
@@ -1057,7 +1104,7 @@ var GmailAdapter = class {
   }
   async updateDraft(draftId, params) {
     const gmail = this.ensureConnected();
-    const raw = this.buildRfc2822(params);
+    const raw = await this.buildRaw(params);
     const res = await gmail.users.drafts.update({
       userId: "me",
       id: draftId,
@@ -1386,30 +1433,15 @@ var GmailAdapter = class {
     const gmail = this.ensureConnected();
     await gmail.users.settings.filters.delete({ userId: "me", id: ruleId });
   }
-  buildRfc2822(params) {
-    const lines = [];
-    lines.push(`From: ${this.email}`);
-    lines.push(
-      `To: ${params.to.map((c) => c.name ? `"${c.name}" <${c.email}>` : c.email).join(", ")}`
-    );
-    if (params.cc?.length) {
-      lines.push(`Cc: ${params.cc.map((c) => c.email).join(", ")}`);
-    }
-    if (params.bcc?.length) {
-      lines.push(`Bcc: ${params.bcc.map((c) => c.email).join(", ")}`);
-    }
-    lines.push(`Subject: ${params.subject}`);
-    if (params.inReplyTo) {
-      lines.push(`In-Reply-To: ${params.inReplyTo}`);
-    }
-    if (params.references?.length) {
-      lines.push(`References: ${params.references.join(" ")}`);
-    }
-    lines.push("MIME-Version: 1.0");
-    lines.push("Content-Type: text/plain; charset=UTF-8");
-    lines.push("");
-    lines.push(params.body.text || params.body.html || "");
-    return Buffer.from(lines.join("\r\n")).toString("base64url");
+  /**
+   * Builds the base64url `raw` payload Gmail expects for send, draft create and
+   * draft update: a full MIME message with a text part, an HTML part when one
+   * was given (or a text part derived from HTML-only input), encoded headers
+   * and any attachments. See `buildMimeMessage`.
+   */
+  async buildRaw(params) {
+    const message = await buildMimeMessage(this.email, params);
+    return message.toString("base64url");
   }
 };
 
@@ -2094,14 +2126,15 @@ function createSmtpTransport(email, creds) {
   });
 }
 async function sendViaSmtp(transport, from, params) {
+  const { text, html } = normalizeBody(params.body);
   const result = await transport.sendMail({
     from,
-    to: params.to.map((c) => c.name ? `"${c.name}" <${c.email}>` : c.email).join(", "),
-    cc: params.cc?.map((c) => c.email).join(", "),
-    bcc: params.bcc?.map((c) => c.email).join(", "),
+    to: params.to.map(toAddress),
+    cc: params.cc?.length ? params.cc.map(toAddress) : void 0,
+    bcc: params.bcc?.length ? params.bcc.map(toAddress) : void 0,
     subject: params.subject,
-    text: params.body.text,
-    html: params.body.html,
+    text,
+    html,
     inReplyTo: params.inReplyTo,
     references: params.references?.join(" "),
     attachments: params.attachments?.map((a) => ({
@@ -2572,26 +2605,17 @@ var ImapAdapter = class {
     const messageId = await sendViaSmtp(transport, this.email, params);
     return { id: messageId };
   }
-  buildDraftRfc2822(params) {
-    const lines = [];
-    lines.push(`From: ${this.email}`);
-    lines.push(`To: ${params.to.map((c) => c.name ? `"${c.name}" <${c.email}>` : c.email).join(", ")}`);
-    if (params.cc?.length) {
-      lines.push(`Cc: ${params.cc.map((c) => c.email).join(", ")}`);
-    }
-    lines.push(`Subject: ${params.subject}`);
-    lines.push(`Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`);
-    if (params.inReplyTo) lines.push(`In-Reply-To: ${params.inReplyTo}`);
-    if (params.references?.length) lines.push(`References: ${params.references.join(" ")}`);
-    lines.push("MIME-Version: 1.0");
-    lines.push("Content-Type: text/plain; charset=utf-8");
-    lines.push("");
-    lines.push(params.body.text || "");
-    return lines.join("\r\n");
+  /**
+   * Builds the full MIME message a draft is stored as: text and HTML parts,
+   * Bcc kept so the draft remembers its recipients, encoded headers and any
+   * attachments. See `buildMimeMessage`.
+   */
+  buildDraftMessage(params) {
+    return buildMimeMessage(this.email, params);
   }
   async createDraft(params) {
     const client = await this.ensureConnected();
-    const rawMessage = this.buildDraftRfc2822(params);
+    const rawMessage = await this.buildDraftMessage(params);
     const draftsFolder = await this.resolveFolder("Drafts");
     const result = await client.append(draftsFolder, rawMessage, ["\\Draft", "\\Seen"]);
     if (!result) throw new Error("Failed to append draft");
@@ -2606,6 +2630,7 @@ var ImapAdapter = class {
   async updateDraft(draftId, params, sourceFolder) {
     const client = await this.ensureConnected();
     const draftsFolder = sourceFolder ? await this.resolveFolder(sourceFolder) : await this.resolveFolder("Drafts");
+    const rawMessage = await this.buildDraftMessage(params);
     let lock;
     try {
       lock = await client.getMailboxLock(draftsFolder);
@@ -2617,7 +2642,6 @@ var ImapAdapter = class {
     } finally {
       lock.release();
     }
-    const rawMessage = this.buildDraftRfc2822(params);
     const result = await client.append(draftsFolder, rawMessage, ["\\Draft", "\\Seen"]);
     if (!result) throw new Error("Failed to append updated draft");
     return { id: String(result.uid || result) };