@bobfrankston/rmfmail 1.2.69 → 1.2.71

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

@@ -2749,6 +2749,7 @@ var init_folder_picker = __esm({
 var message_list_exports = {};
 __export(message_list_exports, {
   clearSearchMode: () => clearSearchMode,
+  exitMultiSelect: () => exitMultiSelect,
   getCurrentFocused: () => getCurrentFocused,
   getSelectedMessages: () => getSelectedMessages,
   initMessageList: () => initMessageList,
@@ -3891,7 +3892,7 @@ function escapeHtml2(s) {
   div.textContent = s;
   return div.innerHTML;
 }
-var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, unifiedMode, searchMode, liveFilterText, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, currentSort, currentSortDir, loadGen, listCache, CACHE_KEY_UNIFIED, positionMemory, POSITION_STORAGE_KEY, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
+var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, unifiedMode, searchMode, liveFilterText, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, lastPointerWasTouch, currentSort, currentSortDir, loadGen, listCache, CACHE_KEY_UNIFIED, positionMemory, POSITION_STORAGE_KEY, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
 var init_message_list = __esm({
   "client/components/message-list.js"() {
     "use strict";
@@ -3911,6 +3912,12 @@ var init_message_list = __esm({
     wasUnifiedBeforeSearch = false;
     showToInsteadOfFrom = false;
     touchWasScroll = false;
+    lastPointerWasTouch = false;
+    if (typeof document !== "undefined") {
+      document.addEventListener("pointerdown", (e) => {
+        lastPointerWasTouch = e.pointerType === "touch";
+      }, true);
+    }
     currentSort = "date";
     currentSortDir = "desc";
     loadGen = 0;
@@ -4239,8 +4246,7 @@ var init_message_list = __esm({
           return;
         }
         if (body?.classList.contains("multi-select-on")) {
-          const isTouch = !!window.matchMedia?.("(pointer: coarse)")?.matches;
-          if (!isTouch && !e.ctrlKey && !e.metaKey) {
+          if (!lastPointerWasTouch && !e.ctrlKey && !e.metaKey) {
             exitMultiSelect();
             focusRow(this);
             lastClickedRow = this.el;
@@ -8798,11 +8804,6 @@ document.getElementById("btn-spam-report")?.addEventListener("click", async () =
   }
 });
 document.getElementById("btn-compose")?.addEventListener("click", () => openCompose("new"));
-document.getElementById("btn-selection")?.addEventListener("click", (e) => {
-  e.stopPropagation();
-  const r = e.currentTarget.getBoundingClientRect();
-  void showSelectionMenu(r.left, r.bottom + 2);
-});
 document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
   const sel = getCurrentFocused();
   if (!sel) return;
@@ -9930,6 +9931,15 @@ document.addEventListener("keydown", (e) => {
     e.preventDefault();
     applyFontSize(next);
   }
+  if (e.key === "Escape" && document.getElementById("ml-body")?.classList.contains("multi-select-on")) {
+    const t = e.target;
+    const tag = t?.tagName;
+    if (tag !== "INPUT" && tag !== "TEXTAREA" && tag !== "SELECT" && !t?.isContentEditable) {
+      e.preventDefault();
+      exitMultiSelect();
+      return;
+    }
+  }
   if (e.ctrlKey && e.key === "a") {
     const t = e.target;
     const tag = t?.tagName;