@bobfrankston/rmfmail 1.0.664 → 1.0.666

package/client/app.ts

@@ -997,7 +997,21 @@ function sanitizeQuotedBody(msg: any): string {
     body = body.replace(/<style[^>]*>[\s\S]*?<\/style>/gi, "");
     body = body.replace(/\s+style="[^"]*"/gi, "");
     body = body.replace(/\s+class="[^"]*"/gi, "");
-    body = body.replace(/\s+(width|height|align|valign|bgcolor|cellpadding|cellspacing|border)="[^"]*"/gi, "");
+    // Strip layout-table attrs only off non-<img> tags. Earlier this regex
+    // ate width/height on <img> too, which is what made App Store / Play
+    // Store buttons render huge in quoted replies (the source ad had
+    // explicit width="120" height="40" on each image). Q138.
+    body = body.replace(/<(?!img\b)([^>]*?)\s+(width|height|align|valign|bgcolor|cellpadding|cellspacing|border)="[^"]*"([^>]*)>/gi,
+        (_m: string, before: string, _attr: string, after: string) => `<${before}${after}>`);
+    // Loop until no more matches — a single tag with multiple stripped
+    // attrs needs more than one pass since the regex only handles one
+    // attribute per match.
+    let prev = "";
+    while (prev !== body) {
+        prev = body;
+        body = body.replace(/<(?!img\b)([^>]*?)\s+(width|height|align|valign|bgcolor|cellpadding|cellspacing|border)="[^"]*"([^>]*)>/gi,
+            (_m: string, before: string, _attr: string, after: string) => `<${before}${after}>`);
+    }
     body = body.replace(/<table[^>]*>/gi, "<div>").replace(/<\/table>/gi, "</div>");
     body = body.replace(/<t[rdh][^>]*>/gi, "").replace(/<\/t[rdh]>/gi, " ");
     body = body.replace(/<thead[^>]*>|<\/thead>|<tbody[^>]*>|<\/tbody>/gi, "");
@@ -3762,7 +3776,28 @@ optEditorTiptap?.addEventListener("change", () => {
     if (optEditorTiptap.checked) saveEditorSetting("tiptap");
 });
 optEditorTinymce?.addEventListener("change", () => {
-    if (optEditorTinymce.checked) saveEditorSetting("tinymce");
+    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 */ }
+    }
 });
 
 // External editor preference (Edit-in-Word handoff target). Stored under
@@ -4162,3 +4197,35 @@ if (isApp) {
     window.addEventListener("beforeunload", sendGeometry);
     setInterval(sendGeometry, 60_000);
 }
+
+// Boot-snapshot writer — captures key DOM regions to localStorage so the
+// next cold start hydrates instantly (see index.html's hydrateFromBootSnapshot).
+// Saves every 30 s and on beforeunload; pages with no inbox open just save
+// empty strings, which the loader treats as "skip this region."
+function saveBootSnapshot(): void {
+    try {
+        const folderTree = document.getElementById("folder-tree");
+        const messageList = document.getElementById("ml-body");
+        const folderTitle = document.getElementById("ml-folder-title");
+        // Only save when at least one region has content. An in-flight render
+        // (e.g. user clicked a folder, list is empty for a tick) would
+        // otherwise clobber the previous good snapshot.
+        const ftHtml = folderTree?.innerHTML?.trim() || "";
+        const mlHtml = messageList?.innerHTML?.trim() || "";
+        if (!ftHtml && !mlHtml) return;
+        const snap = {
+            folderTree:  ftHtml,
+            messageList: mlHtml,
+            folderTitle: folderTitle?.innerHTML?.trim() || "",
+            savedAt: Date.now(),
+        };
+        localStorage.setItem("mailx-boot-snapshot", JSON.stringify(snap));
+    } catch { /* best-effort */ }
+}
+window.addEventListener("beforeunload", saveBootSnapshot);
+// Also save when the user tabs away — a Windows kill of an inactive
+// app would otherwise lose the snapshot up to 30 s old.
+document.addEventListener("visibilitychange", () => {
+    if (document.visibilityState === "hidden") saveBootSnapshot();
+});
+setInterval(saveBootSnapshot, 30_000);