@bobfrankston/rmfmail 1.2.178 → 1.2.179

package/client/android-bootstrap.bundle.js

@@ -2386,6 +2386,28 @@ var init_reminder_state = __esm({
   }
 });
 
+// packages/mailx-types/mime-inline-images.js
+function extractInlineImages(html, idDomain) {
+  const images = [];
+  const byDataUri = /* @__PURE__ */ new Map();
+  const stamp = `${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
+  const out = html.replace(/(<img\b[^>]*?\ssrc=)(["'])(data:(image\/[\w.+-]+);base64,([A-Za-z0-9+/=\s]+))\2/gi, (_m, prefix, quote, dataUri, mime, b64) => {
+    let cid = byDataUri.get(dataUri);
+    if (!cid) {
+      cid = `img${images.length + 1}.${stamp}@${idDomain}`;
+      byDataUri.set(dataUri, cid);
+      images.push({ contentId: cid, mime, base64: b64.replace(/\s+/g, "") });
+    }
+    return `${prefix}${quote}cid:${cid}${quote}`;
+  });
+  return { html: out, images };
+}
+var init_mime_inline_images = __esm({
+  "packages/mailx-types/mime-inline-images.js"() {
+    "use strict";
+  }
+});
+
 // packages/mailx-types/index.js
 var mailx_types_exports = {};
 __export(mailx_types_exports, {
@@ -2399,6 +2421,7 @@ __export(mailx_types_exports, {
   encodeQuotedPrintable: () => encodeQuotedPrintable,
   expandRecipients: () => expandRecipients,
   extractAddress: () => extractAddress,
+  extractInlineImages: () => extractInlineImages,
   flaggedOf: () => flaggedOf,
   htmlToPlainText: () => htmlToPlainText,
   isAddressToken: () => isAddressToken,
@@ -2607,6 +2630,7 @@ var init_mailx_types = __esm({
     init_contacts_config();
     init_groups();
     init_reminder_state();
+    init_mime_inline_images();
     _SEEN = "\\Seen";
     _FLAGGED = "\\Flagged";
     _ANSWERED = "\\Answered";
@@ -6170,12 +6194,14 @@ var WebMailxService = class _WebMailxService {
     const cc = msg.cc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
     const bcc = msg.bcc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
     const hasHtml = !!msg.bodyHtml;
-    const htmlBody = msg.bodyHtml || "";
+    const domain = account.email.split("@")[1] || "mailx.local";
+    const messageId = `<${Date.now()}.${Math.random().toString(36).slice(2)}@${domain}>`;
+    const extracted = hasHtml ? extractInlineImages(msg.bodyHtml, domain) : { html: "", images: [] };
+    const htmlBody = extracted.html;
+    const inlineImages = extracted.images;
     const textBody = msg.bodyText || (hasHtml ? htmlToPlainText(htmlBody) : "");
     const htmlEncoded = hasHtml ? encodeQuotedPrintable(htmlBody) : "";
     const textEncoded = encodeQuotedPrintable(textBody);
-    const domain = account.email.split("@")[1] || "mailx.local";
-    const messageId = `<${Date.now()}.${Math.random().toString(36).slice(2)}@${domain}>`;
     const envelope = [
       `From: ${fromHeader}`,
       `To: ${to}`,
@@ -6188,9 +6214,11 @@ var WebMailxService = class _WebMailxService {
       msg.references?.length ? `References: ${msg.references.join(" ")}` : null,
       `MIME-Version: 1.0`
     ].filter((h) => h !== null);
+    const newBoundary = () => `mailx_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+    const wrap76 = (s) => s.match(/.{1,76}/g)?.join("\r\n") || s;
     const makeInner = () => {
       if (hasHtml) {
-        const altBoundary = `mailx_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+        const altBoundary = newBoundary();
         const body = `--${altBoundary}\r
 Content-Type: text/plain; charset=UTF-8\r
 Content-Transfer-Encoding: quoted-printable\r
@@ -6203,7 +6231,29 @@ Content-Transfer-Encoding: quoted-printable\r
 ${htmlEncoded}\r
 --${altBoundary}--\r
 `;
-        return { headers: [`Content-Type: multipart/alternative; boundary="${altBoundary}"`], body };
+        const alt = { headers: [`Content-Type: multipart/alternative; boundary="${altBoundary}"`], body };
+        if (inlineImages.length === 0)
+          return alt;
+        const relBoundary = newBoundary();
+        const relParts = [
+          `--${relBoundary}\r
+` + alt.headers.join("\r\n") + `\r
+\r
+` + alt.body,
+          ...inlineImages.map((im) => `--${relBoundary}\r
+Content-Type: ${im.mime}\r
+Content-ID: <${im.contentId}>\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: base64\r
+\r
+${wrap76(im.base64)}\r
+`)
+        ];
+        return {
+          headers: [`Content-Type: multipart/related; boundary="${relBoundary}"; type="multipart/alternative"`],
+          body: relParts.join("") + `--${relBoundary}--\r
+`
+        };
       }
       return {
         headers: [`Content-Type: text/plain; charset=UTF-8`, `Content-Transfer-Encoding: quoted-printable`],
@@ -6213,7 +6263,6 @@ ${htmlEncoded}\r
     const atts = Array.isArray(msg.attachments) ? msg.attachments : [];
     let rawMessage;
     if (atts.length > 0) {
-      const wrap76 = (s) => s.match(/.{1,76}/g)?.join("\r\n") || s;
       const mixedBoundary = `mailxmix_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
       const inner = makeInner();
       const parts = [];