@bobfrankston/rmfmail 1.1.104 → 1.1.106

package/client/app.ts

@@ -4194,28 +4194,41 @@ optEditorTiptap?.addEventListener("change", () => {
     if (optEditorTiptap.checked) saveEditorSetting("tiptap");
 });
 optEditorTinymce?.addEventListener("change", () => {
-    if (optEditorTinymce.checked) {
-        saveEditorSetting("tinymce");
-        // Q133 pre-warm — fire the TinyMCE bundle fetch right now so the
-        // next compose-open finds tinymce.min.js already in WebView2's
-        // HTTP cache. Without this, the first compose after picking
-        // TinyMCE in Settings blocks ~1 s while the bundle downloads.
-        try {
-            // Default points at the locally bundled TinyMCE (build-tinymce.js
-            // copies it from node_modules). Path is relative to index.html
-            // which lives at the client/ root; compose.html (in client/compose/)
-            // uses `../lib/tinymce/...` instead.
-            const cdnUrl = localStorage.getItem("mailx-tinymce-cdn") || "lib/tinymce/tinymce.min.js";
-            // Use <link rel="prefetch"> — fires the request as a hint,
-            // doesn't execute the script (we don't want a stray global
-            // tinymce in the main window; it lives in the compose iframe).
-            const link = document.createElement("link");
-            link.rel = "prefetch";
-            link.as = "script";
-            link.href = cdnUrl;
-            document.head.appendChild(link);
-        } catch { /* prefetch is best-effort */ }
+    if (!optEditorTinymce.checked) return;
+    saveEditorSetting("tinymce");
+    // Q133 + 2026-05-21 — warm the TinyMCE bundle into the HTTP cache so the
+    // first compose-open doesn't stall downloading it. The old code used a
+    // silent <link rel=prefetch> — no completion signal, so picking TinyMCE
+    // looked like a frozen UI ("hang while fetching"). Now we do an explicit
+    // fetch() (I/O, already off the UI thread — a Worker buys nothing for a
+    // download) and surface a pending → ready indicator on the menu item.
+    const cdnUrl = localStorage.getItem("mailx-tinymce-cdn") || "lib/tinymce/tinymce.min.js";
+    const label = optEditorTinymce.closest("label");
+    let status = document.getElementById("opt-editor-tinymce-status");
+    if (label && !status) {
+        status = document.createElement("span");
+        status.id = "opt-editor-tinymce-status";
+        status.className = "tb-menu-status";
+        label.appendChild(status);
     }
+    const setStatus = (text: string, state: string): void => {
+        if (!status) return;
+        status.textContent = text;
+        status.dataset.state = state;
+    };
+    setStatus(" loading…", "pending");  // CSS ::before draws the spinner
+    fetch(cdnUrl, { cache: "force-cache" })
+        .then(r => (r.ok ? r.arrayBuffer() : Promise.reject(new Error(`HTTP ${r.status}`))))
+        .then(() => {
+            setStatus(" ✓ ready", "ready");
+            // Clear the badge after a few seconds — but only if still "ready"
+            // (don't wipe a later pending/error state from a re-pick).
+            setTimeout(() => { if (status?.dataset.state === "ready") setStatus("", "idle"); }, 4000);
+        })
+        .catch(e => {
+            setStatus(" ⚠ load failed", "error");
+            console.error("[tinymce] pre-warm fetch failed:", e?.message || e);
+        });
 });
 
 // External editor preference (Edit-in-Word handoff target). Stored under

package/client/styles/components.css

@@ -125,6 +125,24 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
 .tb-menu-item input[type="radio"] { accent-color: var(--color-accent); }
 .tb-sep { width: 1px; height: 1.2rem; background: var(--color-border); margin: 0 var(--gap-xs); }
 
+/* Inline load-status badge on the TinyMCE menu item (pending → ready). */
+.tb-menu-status { font-size: 0.8em; color: var(--color-text-muted); }
+.tb-menu-status[data-state="pending"] { color: var(--color-accent); }
+.tb-menu-status[data-state="ready"]   { color: oklch(0.6 0.13 150); }
+.tb-menu-status[data-state="error"]   { color: oklch(0.55 0.18 25); }
+.tb-menu-status[data-state="pending"]::before {
+    content: "";
+    display: inline-block;
+    width: 0.7em; height: 0.7em;
+    margin-right: 0.3em;
+    border: 2px solid currentColor;
+    border-right-color: transparent;
+    border-radius: 50%;
+    animation: tb-menu-spin 0.7s linear infinite;
+    vertical-align: -0.05em;
+}
+@keyframes tb-menu-spin { to { transform: rotate(360deg); } }
+
 /* Submenu — single-line label that expands a nested popout. Used for the
    Theme picker so the parent dropdown isn't cluttered with three radios. */
 .tb-menu-submenu { position: relative; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/rmfmail",
-  "version": "1.1.104",
+  "version": "1.1.106",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/packages/mailx-store/charset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charset.d.ts","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQtD"}
+{"version":3,"file":"charset.d.ts","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAiBtD"}

package/packages/mailx-store/charset.js

@@ -17,11 +17,31 @@ export function sniffAndFixCharset(raw) {
     const re = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
     if (!re.test(head))
         return raw;
+    // The rewrite is only sound when the raw bytes ARE the body bytes — i.e.
+    // an 8bit / binary part. For a quoted-printable or base64 part the raw
+    // .eml is pure ASCII (the high bytes live inside `=XX` / base64 chars),
+    // so isValidUtf8(raw) passes vacuously and we would relabel a genuine
+    // Windows-1252 part as utf-8 — every smart-quote / em-dash then decodes
+    // as mojibake (Bob's 2026-05-21 report: a QP Windows-1252 Outlook mail).
+    // Requiring an actual non-ASCII byte in the raw gates the heuristic to
+    // the only case where the UTF-8 sniff is meaningful.
+    if (!hasNonAscii(raw))
+        return raw;
     if (!isValidUtf8(raw))
         return raw;
     const fixed = head.replace(/charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi, "charset=utf-8");
     return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
 }
+/** True if the buffer contains at least one byte >= 0x80. A pure-ASCII
+ *  buffer is trivially valid UTF-8, so the isValidUtf8 sniff tells us
+ *  nothing about a quoted-printable / base64 body — gate on this first. */
+function hasNonAscii(buf) {
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] >= 0x80)
+            return true;
+    }
+    return false;
+}
 /** Strict UTF-8 validity check: rejects overlong forms, invalid start
  *  bytes, and dangling continuations. Used to confirm the body is really
  *  UTF-8 before overriding a Latin-1 declaration. */

package/packages/mailx-store/charset.js.map

@@ -1 +1 @@
-{"version":3,"file":"charset.js","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,+DAA+D,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,+DAA+D,EAAE,eAAe,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;qDAEqD;AACrD,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAChC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;YAAE,IAAI,GAAG,CAAC,CAAC;aAClC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;;YAClE,OAAO,KAAK,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;QACnD,CAAC;QACD,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"charset.js","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,+DAA+D,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/B,yEAAyE;IACzE,uEAAuE;IACvE,wEAAwE;IACxE,sEAAsE;IACtE,wEAAwE;IACxE,yEAAyE;IACzE,uEAAuE;IACvE,qDAAqD;IACrD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,+DAA+D,EAAE,eAAe,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;2EAE2E;AAC3E,SAAS,WAAW,CAAC,GAAW;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;IACpC,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;qDAEqD;AACrD,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAChC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;YAAE,IAAI,GAAG,CAAC,CAAC;aAClC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;;YAClE,OAAO,KAAK,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;QACnD,CAAC;QACD,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/packages/mailx-store/charset.ts

@@ -17,11 +17,30 @@ export function sniffAndFixCharset(raw: Buffer): Buffer {
     const head = raw.subarray(0, Math.min(HEAD_LIMIT, raw.length)).toString("latin1");
     const re = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
     if (!re.test(head)) return raw;
+    // The rewrite is only sound when the raw bytes ARE the body bytes — i.e.
+    // an 8bit / binary part. For a quoted-printable or base64 part the raw
+    // .eml is pure ASCII (the high bytes live inside `=XX` / base64 chars),
+    // so isValidUtf8(raw) passes vacuously and we would relabel a genuine
+    // Windows-1252 part as utf-8 — every smart-quote / em-dash then decodes
+    // as mojibake (Bob's 2026-05-21 report: a QP Windows-1252 Outlook mail).
+    // Requiring an actual non-ASCII byte in the raw gates the heuristic to
+    // the only case where the UTF-8 sniff is meaningful.
+    if (!hasNonAscii(raw)) return raw;
     if (!isValidUtf8(raw)) return raw;
     const fixed = head.replace(/charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi, "charset=utf-8");
     return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
 }
 
+/** True if the buffer contains at least one byte >= 0x80. A pure-ASCII
+ *  buffer is trivially valid UTF-8, so the isValidUtf8 sniff tells us
+ *  nothing about a quoted-printable / base64 body — gate on this first. */
+function hasNonAscii(buf: Buffer): boolean {
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] >= 0x80) return true;
+    }
+    return false;
+}
+
 /** Strict UTF-8 validity check: rejects overlong forms, invalid start
  *  bytes, and dangling continuations. Used to confirm the body is really
  *  UTF-8 before overriding a Latin-1 declaration. */