@bobfrankston/rmfmail 1.2.252 → 1.2.254

package/client/android-bootstrap.bundle.js

@@ -2458,13 +2458,11 @@ function buildMimeMessage(opts) {
   const commonHeaders = headers.filter((h) => h !== null);
   if (opts.simpleHtml) {
     const body = opts.bodyHtml || opts.bodyText || "";
-    const raw2 = [
-      ...commonHeaders,
-      `Content-Type: text/html; charset=UTF-8`,
-      `Content-Transfer-Encoding: quoted-printable`
-    ].join("\r\n") + `\r
-\r
-` + encodeQuotedPrintable(body);
+    const htmlPart = {
+      headers: [`Content-Type: text/html; charset=UTF-8`, `Content-Transfer-Encoding: quoted-printable`],
+      body: encodeQuotedPrintable(body)
+    };
+    const raw2 = wrapWithAttachments(commonHeaders, htmlPart, opts.attachments || [], newBoundary);
     return { raw: raw2, messageId, inlineImageCount: 0 };
   }
   const extracted = hasHtml ? extractInlineImages(opts.bodyHtml, opts.domain) : { html: "", images: [] };
@@ -2523,39 +2521,38 @@ ${wrap76(im.base64)}\r
       body: textEncoded
     };
   };
-  const attachments = opts.attachments || [];
-  let raw;
-  if (attachments.length > 0) {
-    const mixedBoundary = newBoundary();
-    const inner = makeInner();
-    const parts = [
-      `--${mixedBoundary}\r
+  const raw = wrapWithAttachments(commonHeaders, makeInner(), opts.attachments || [], newBoundary);
+  return { raw, messageId, inlineImageCount: inlineImages.length };
+}
+function wrapWithAttachments(commonHeaders, inner, attachments, newBoundary) {
+  if (attachments.length === 0) {
+    return [...commonHeaders, ...inner.headers].join("\r\n") + `\r
+\r
+` + inner.body;
+  }
+  const mixedBoundary = newBoundary();
+  const endCRLF = (s) => s.endsWith("\r\n") ? s : s + "\r\n";
+  const parts = [
+    `--${mixedBoundary}\r
 ` + inner.headers.join("\r\n") + `\r
 \r
-` + inner.body
-    ];
-    for (const att of attachments) {
-      const filename = (att.filename || "attachment").replace(/[\r\n"]/g, "_");
-      const mime = att.mimeType || "application/octet-stream";
-      parts.push(`--${mixedBoundary}\r
+` + endCRLF(inner.body)
+  ];
+  for (const att of attachments) {
+    const filename = (att.filename || "attachment").replace(/[\r\n"]/g, "_");
+    const mime = att.mimeType || "application/octet-stream";
+    parts.push(`--${mixedBoundary}\r
 Content-Type: ${mime}; name="${filename}"\r
 Content-Disposition: attachment; filename="${filename}"\r
 Content-Transfer-Encoding: base64\r
 \r
 ${wrap76(att.dataBase64 || "")}\r
 `);
-    }
-    raw = [...commonHeaders, `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`].join("\r\n") + `\r
+  }
+  return [...commonHeaders, `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`].join("\r\n") + `\r
 \r
 ` + parts.join("") + `--${mixedBoundary}--\r
 `;
-  } else {
-    const inner = makeInner();
-    raw = [...commonHeaders, ...inner.headers].join("\r\n") + `\r
-\r
-` + inner.body;
-  }
-  return { raw, messageId, inlineImageCount: inlineImages.length };
 }
 var init_mime_build = __esm({
   "packages/mailx-types/mime-build.js"() {
@@ -6492,7 +6489,7 @@ var WebMailxService = class _WebMailxService {
     await this.syncManager.undeleteMessage(accountId, uid, folderId);
   }
   // ── Drafts ──
-  async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc, from) {
+  async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc, from, attachments) {
     const settings = await loadSettings();
     const account = settings.accounts.find((a) => a.id === accountId);
     if (!account)
@@ -6506,6 +6503,7 @@ var WebMailxService = class _WebMailxService {
       subject: subject || "(no subject)",
       bodyHtml,
       bodyText,
+      attachments,
       domain: account.email.split("@")[1] || "mailx.local",
       extraHeaders: [`X-Mailx-Draft-ID: ${id}`],
       omitMessageId: true,
@@ -11753,7 +11751,7 @@ function installBridge() {
       await service.send(msg);
       return { ok: true };
     },
-    saveDraft: (p) => service.saveDraft(p.accountId, p.subject, p.bodyHtml, p.bodyText, p.to, p.cc, p.previousDraftUid, p.draftId, p.bcc, p.from),
+    saveDraft: (p) => service.saveDraft(p.accountId, p.subject, p.bodyHtml, p.bodyText, p.to, p.cc, p.previousDraftUid, p.draftId, p.bcc, p.from, p.attachments),
     deleteDraft: async (accountId, draftUid) => {
       await service.deleteDraft(accountId, draftUid);
       return { ok: true };