@bobfrankston/rmfmail 1.2.242 → 1.2.243

package/client/android-bootstrap.bundle.js

@@ -2387,16 +2387,38 @@ var init_reminder_state = __esm({
 });
 
 // packages/mailx-types/mime-inline-images.js
+function utf8ToBase64(text) {
+  const bytes = new TextEncoder().encode(text);
+  const B = globalThis.Buffer;
+  if (B)
+    return B.from(bytes).toString("base64");
+  let bin = "";
+  for (const b of bytes)
+    bin += String.fromCharCode(b);
+  return btoa(bin);
+}
 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) => {
+  const out = html.replace(/(<img\b[^>]*?\ssrc=)(["'])(data:(image\/[\w.+-]+)(;base64)?,([^"']+))\2/gi, (_m, prefix, quote, dataUri, mime, isB64, payload) => {
     let cid = byDataUri.get(dataUri);
     if (!cid) {
+      let base64;
+      if (isB64) {
+        base64 = payload.replace(/\s+/g, "");
+      } else {
+        try {
+          base64 = utf8ToBase64(decodeURIComponent(payload));
+        } catch {
+          return _m;
+        }
+      }
+      if (!base64)
+        return _m;
       cid = `img${images.length + 1}.${stamp}@${idDomain}`;
       byDataUri.set(dataUri, cid);
-      images.push({ contentId: cid, mime, base64: b64.replace(/\s+/g, "") });
+      images.push({ contentId: cid, mime, base64 });
     }
     return `${prefix}${quote}cid:${cid}${quote}`;
   });