@bobfrankston/rmfmail 1.2.68 → 1.2.70

package/bin/build-bundles.mjs

@@ -18,11 +18,52 @@
  */
 import * as esbuild from "esbuild";
 import path from "node:path";
+import fs from "node:fs";
+import crypto from "node:crypto";
 import { fileURLToPath } from "node:url";
 
 const root = path.resolve(fileURLToPath(import.meta.url), "..", "..");
 const watch = process.argv.includes("--watch");
 
+/** Cache-bust the bundle references in the HTML entry points with a content
+ *  hash. The msger custom protocol serves bundles with no cache headers, so
+ *  WebView2 caches `app.bundle.js` and keeps serving the OLD bundle across
+ *  daemon relaunches — every client-side fix silently failed to reach the user
+ *  until the cache happened to evict (Bob 2026-06-26: flag/Ctrl+A fixes "still
+ *  happening" while the daemon was already on the new version). Stamping a
+ *  per-build `?v=<hash>` makes the URL change whenever the bundle changes, so
+ *  the WebView is forced to fetch the new one. */
+function shortHash(file) {
+    try { return crypto.createHash("sha1").update(fs.readFileSync(file)).digest("hex").slice(0, 10); }
+    catch { return String(Date.now()); }
+}
+function stampHtml(htmlFile, refs) {
+    let html;
+    try { html = fs.readFileSync(htmlFile, "utf8"); } catch { return; }
+    let changed = false;
+    for (const { name, file } of refs) {
+        const v = shortHash(file);
+        // Match the bundle name + optional existing ?v=… up to the closing
+        // quote, so re-runs replace the prior hash instead of stacking.
+        const re = new RegExp(`(${name.replace(/[.\\/]/g, m => "\\" + m)})(\\?v=[a-z0-9]+)?(")`, "g");
+        const next = html.replace(re, `$1?v=${v}$3`);
+        if (next !== html) { html = next; changed = true; }
+    }
+    if (changed) {
+        fs.writeFileSync(htmlFile, html);
+        console.log(`  stamped ${path.relative(root, htmlFile)}`);
+    }
+}
+function stampAll() {
+    stampHtml(path.join(root, "client", "index.html"), [
+        { name: "./app.bundle.js", file: path.join(root, "client", "app.bundle.js") },
+        { name: "./android-bootstrap.bundle.js", file: path.join(root, "client", "android-bootstrap.bundle.js") },
+    ]);
+    stampHtml(path.join(root, "client", "compose", "compose.html"), [
+        { name: "compose.bundle.js", file: path.join(root, "client", "compose", "compose.bundle.js") },
+    ]);
+}
+
 // Each entry has its own external list because the Android bootstrap bundle
 // needs to INCLUDE @bobfrankston/mailx-store-web (entire purpose of the
 // bundle), while app.bundle.js externalizes it so the desktop build doesn't
@@ -132,6 +173,7 @@ async function buildAll() {
     }
     const failed = results.filter(r => !r.ok).length;
     if (failed) process.exit(1);
+    stampAll();
     console.log(`build-bundles: done in ${Date.now() - t0} ms`);
 }
 

package/client/app.bundle.js

@@ -6240,7 +6240,12 @@ function initTabs(strip, apply) {
     if (raw) {
       const parsed = JSON.parse(raw);
       if (Array.isArray(parsed?.tabs) && parsed.tabs.length) {
-        tabs = parsed.tabs;
+        tabs = parsed.tabs.map((t) => {
+          if (t.view?.kind !== "search")
+            return t;
+          const v = t.view;
+          return v.folderId ? { id: t.id, title: "Mail", view: { kind: "folder", accountId: v.accountId, folderId: v.folderId, specialUse: "" } } : { id: t.id, title: "All Inboxes", view: { kind: "unified" } };
+        });
         activeId = parsed.activeId || tabs[0].id;
         for (const t of tabs) {
           const n = Number(String(t.id).replace(/^t/, ""));
@@ -11694,12 +11699,13 @@ function saveBootSnapshot() {
     const messageList2 = document.getElementById("ml-body");
     const folderTitle = document.getElementById("ml-folder-title");
     const ftHtml = folderTree2?.innerHTML?.trim() || "";
-    const mlHtml = messageList2?.innerHTML?.trim() || "";
+    const searching = (searchInput?.value.trim() || "") !== "";
+    const mlHtml = searching ? "" : messageList2?.innerHTML?.trim() || "";
     if (!ftHtml && !mlHtml) return;
     const snap = {
       folderTree: ftHtml,
       messageList: mlHtml,
-      folderTitle: folderTitle?.innerHTML?.trim() || "",
+      folderTitle: searching ? "" : folderTitle?.innerHTML?.trim() || "",
       savedAt: Date.now()
     };
     localStorage.setItem("mailx-boot-snapshot", JSON.stringify(snap));