@bobfrankston/rmfmail 1.2.231 → 1.2.233

package/client/android-bootstrap.bundle.js

@@ -2408,6 +2408,141 @@ var init_mime_inline_images = __esm({
   }
 });
 
+// packages/mailx-types/mime-build.js
+function wrap76(s) {
+  return s.match(/.{1,76}/g)?.join("\r\n") || s;
+}
+function buildMimeMessage(opts) {
+  const now = opts.now || /* @__PURE__ */ new Date();
+  const unique = opts.unique || (() => `${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`);
+  const newBoundary = () => `mailx_${unique()}`;
+  const messageId = opts.omitMessageId ? "" : opts.messageId || `<${Date.now()}.${Math.random().toString(36).slice(2)}@${opts.domain}>`;
+  const hasHtml = !!opts.bodyHtml;
+  const headers = [
+    `From: ${encodeAddressHeader(opts.from)}`,
+    opts.to ? `To: ${encodeAddressHeader(opts.to)}` : null,
+    opts.cc ? `Cc: ${encodeAddressHeader(opts.cc)}` : null,
+    // Bcc belongs IN a draft — the SEND path strips it, so that a saved
+    // draft reopened for editing still shows who was on Bcc.
+    opts.bcc ? `Bcc: ${encodeAddressHeader(opts.bcc)}` : null,
+    `Subject: ${encodeHeaderWord(opts.subject)}`,
+    `Date: ${now.toUTCString()}`,
+    messageId ? `Message-ID: ${messageId}` : null,
+    opts.inReplyTo ? `In-Reply-To: ${opts.inReplyTo}` : null,
+    opts.references?.length ? `References: ${opts.references.join(" ")}` : null,
+    ...opts.extraHeaders || [],
+    `MIME-Version: 1.0`
+  ];
+  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);
+    return { raw: raw2, messageId, inlineImageCount: 0 };
+  }
+  const extracted = hasHtml ? extractInlineImages(opts.bodyHtml, opts.domain) : { html: "", images: [] };
+  const htmlBody = extracted.html;
+  const inlineImages = extracted.images;
+  const textBody = opts.bodyText || (hasHtml ? htmlToPlainText(htmlBody) : "");
+  const htmlEncoded = hasHtml ? encodeQuotedPrintable(htmlBody) : "";
+  const textEncoded = encodeQuotedPrintable(textBody);
+  const makeInner = () => {
+    if (hasHtml) {
+      const altBoundary = newBoundary();
+      const body = `--${altBoundary}\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+${textEncoded}\r
+--${altBoundary}\r
+Content-Type: text/html; charset=UTF-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+${htmlEncoded}\r
+--${altBoundary}--\r
+`;
+      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`
+      ],
+      body: textEncoded
+    };
+  };
+  const attachments = opts.attachments || [];
+  let raw;
+  if (attachments.length > 0) {
+    const mixedBoundary = newBoundary();
+    const inner = makeInner();
+    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
+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
+\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"() {
+    "use strict";
+    init_mailx_types();
+    init_mime_inline_images();
+  }
+});
+
 // packages/mailx-types/index.js
 var mailx_types_exports = {};
 __export(mailx_types_exports, {
@@ -2416,6 +2551,7 @@ __export(mailx_types_exports, {
   addContactsDenylistEntry: () => addContactsDenylistEntry,
   addContactsPreferredEntry: () => addContactsPreferredEntry,
   answeredOf: () => answeredOf,
+  buildMimeMessage: () => buildMimeMessage,
   deletedOf: () => deletedOf,
   draftOf: () => draftOf,
   encodeAddressHeader: () => encodeAddressHeader,
@@ -2698,6 +2834,7 @@ var init_mailx_types = __esm({
     init_groups();
     init_reminder_state();
     init_mime_inline_images();
+    init_mime_build();
     _SEEN = "\\Seen";
     _FLAGGED = "\\Flagged";
     _ANSWERED = "\\Answered";
@@ -2732,14 +2869,12 @@ __export(web_settings_exports, {
   loadAccountsFromCloud: () => loadAccountsFromCloud,
   loadAllowlist: () => loadAllowlist,
   loadAutocomplete: () => loadAutocomplete,
-  loadDeviceState: () => loadDeviceState,
   loadPreferences: () => loadPreferences,
   loadSettings: () => loadSettings,
   primeSharedConfigs: () => primeSharedConfigs,
   saveAccounts: () => saveAccounts,
   saveAllowlist: () => saveAllowlist,
   saveAutocomplete: () => saveAutocomplete,
-  saveDeviceState: () => saveDeviceState,
   savePreferences: () => savePreferences,
   saveSettings: () => saveSettings,
   setGDriveFolderId: () => setGDriveFolderId,
@@ -3236,33 +3371,6 @@ function getDeviceId() {
   }
   return id;
 }
-async function saveDeviceState(state) {
-  const deviceId = getDeviceId();
-  const filename = `devices/${deviceId}/state.json`;
-  const content = JSON.stringify(state, null, 2);
-  await idbWrite(filename, content);
-  await gDriveWrite(filename, content);
-}
-async function loadDeviceState() {
-  const deviceId = getDeviceId();
-  const filename = `devices/${deviceId}/state.json`;
-  const cached = await idbRead(filename);
-  if (cached) {
-    try {
-      return parseJsonc(cached);
-    } catch {
-    }
-  }
-  const content = await gDriveRead(filename);
-  if (content) {
-    await idbWrite(filename, content);
-    try {
-      return parseJsonc(content);
-    } catch {
-    }
-  }
-  return {};
-}
 var IDB_NAME2, IDB_VERSION, STORE_NAME2, gDriveFolderId, gDriveFolderName, gDriveFolderPath, gDriveFolderOwner, tokenProvider, PROVIDERS, DEFAULT_PREFERENCES, DEFAULT_ALLOWLIST, PREV_KEEP, SHARED_REFRESH_MS, SHARED_FILES, __lastSharedRefresh, ALLOWLIST_KEYS, DEVICE_ID_KEY;
 var init_web_settings = __esm({
   "packages/mailx-store-web/web-settings.js"() {
@@ -6299,110 +6407,20 @@ var WebMailxService = class _WebMailxService {
     const to = msg.to.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
     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 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 envelope = [
-      `From: ${fromHeader}`,
-      `To: ${to}`,
-      cc ? `Cc: ${cc}` : null,
-      bcc ? `Bcc: ${bcc}` : null,
-      `Subject: ${encodeHeaderWord(msg.subject)}`,
-      `Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`,
-      `Message-ID: ${messageId}`,
-      msg.inReplyTo ? `In-Reply-To: ${msg.inReplyTo}` : null,
-      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 = newBoundary();
-        const body = `--${altBoundary}\r
-Content-Type: text/plain; charset=UTF-8\r
-Content-Transfer-Encoding: quoted-printable\r
-\r
-${textEncoded}\r
---${altBoundary}\r
-Content-Type: text/html; charset=UTF-8\r
-Content-Transfer-Encoding: quoted-printable\r
-\r
-${htmlEncoded}\r
---${altBoundary}--\r
-`;
-        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`],
-        body: textEncoded
-      };
-    };
-    const atts = Array.isArray(msg.attachments) ? msg.attachments : [];
-    let rawMessage;
-    if (atts.length > 0) {
-      const mixedBoundary = `mailxmix_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
-      const inner = makeInner();
-      const parts = [];
-      parts.push(`--${mixedBoundary}\r
-` + inner.headers.join("\r\n") + `\r
-\r
-` + inner.body);
-      for (const att of atts) {
-        const filename = (att.filename || "attachment").replace(/[\r\n"]/g, "_");
-        const mime = att.mimeType || "application/octet-stream";
-        const wrapped = wrap76(att.dataBase64 || "");
-        parts.push(`--${mixedBoundary}\r
-Content-Type: ${mime}; name="${filename}"\r
-Content-Disposition: attachment; filename="${filename}"\r
-Content-Transfer-Encoding: base64\r
-\r
-${wrapped}\r
-`);
-      }
-      const headers = [
-        ...envelope,
-        `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`
-      ].join("\r\n");
-      rawMessage = `${headers}\r
-\r
-${parts.join("")}--${mixedBoundary}--\r
-`;
-    } else {
-      const inner = makeInner();
-      const headers = [...envelope, ...inner.headers].join("\r\n");
-      rawMessage = `${headers}\r
-\r
-${inner.body}`;
-    }
+    const built = buildMimeMessage({
+      from: fromHeader,
+      to,
+      cc,
+      bcc,
+      subject: msg.subject,
+      bodyHtml: msg.bodyHtml,
+      bodyText: msg.bodyText,
+      attachments: msg.attachments,
+      inReplyTo: msg.inReplyTo,
+      references: msg.references,
+      domain: account.email.split("@")[1] || "mailx.local"
+    });
+    const rawMessage = built.raw;
     await this.syncManager.queueOutgoingLocal(account.id, rawMessage);
     for (const addr of msg.to)
       this.db.recordSentAddress(addr.name, addr.address);
@@ -6458,25 +6476,19 @@ ${inner.body}`;
     if (!account)
       throw new Error(`Unknown account: ${accountId}`);
     const id = draftId || `mailx-draft-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-    const body = bodyHtml || bodyText || "";
-    const bodyEncoded = encodeQuotedPrintable(body);
-    const headers = [
-      // Same rule as desktop: the compose From (reply-to-alias) wins
-      // over the account default (Bob 2026-07-30).
-      `From: ${from?.trim() || `${account.name} <${account.email}>`}`,
-      to ? `To: ${to}` : null,
-      cc ? `Cc: ${cc}` : null,
-      bcc ? `Bcc: ${bcc}` : null,
-      `Subject: ${encodeHeaderWord(subject || "(no subject)")}`,
-      `Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`,
-      `X-Mailx-Draft-ID: ${id}`,
-      `MIME-Version: 1.0`,
-      `Content-Type: text/html; charset=UTF-8`,
-      `Content-Transfer-Encoding: quoted-printable`
-    ].filter((h) => h !== null).join("\r\n");
-    const raw = `${headers}\r
-\r
-${bodyEncoded}`;
+    const raw = buildMimeMessage({
+      from: from?.trim() || `${account.name} <${account.email}>`,
+      to,
+      cc,
+      bcc,
+      subject: subject || "(no subject)",
+      bodyHtml,
+      bodyText,
+      domain: account.email.split("@")[1] || "mailx.local",
+      extraHeaders: [`X-Mailx-Draft-ID: ${id}`],
+      omitMessageId: true,
+      simpleHtml: true
+    }).raw;
     const draftUid = await this.syncManager.saveDraft(accountId, raw, previousDraftUid, id);
     return { draftUid, draftId: id };
   }