@bobfrankston/rmfmail 1.2.240 → 1.2.242

package/bin/build-bundles.mjs

@@ -23,6 +23,20 @@ import crypto from "node:crypto";
 import { fileURLToPath } from "node:url";
 
 const root = path.resolve(fileURLToPath(import.meta.url), "..", "..");
+
+// A client call the bridge does not carry is a silent no-op, not an error —
+// so it ships. Check before every bundle (this script runs on the way to
+// every publish). See bin/check-bridge-contract.mjs for the case that
+// motivated it.
+{
+    const { execFileSync } = await import("node:child_process");
+    try {
+        execFileSync(process.execPath, [path.join(path.dirname(fileURLToPath(import.meta.url)), "check-bridge-contract.mjs")], { stdio: "inherit" });
+    } catch {
+        console.error("  [build-bundles] aborting: bridge contract check failed");
+        process.exit(1);
+    }
+}
 const watch = process.argv.includes("--watch");
 
 /** Cache-bust the bundle references in the HTML entry points with a content

package/bin/check-bridge-contract.mjs

@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+/**
+ * Fail the build when a client API call can never reach the daemon.
+ *
+ * `api-client.ts` invokes the host bridge as `ipc().foo?.(…)`. If the bridge
+ * has no `foo`, optional chaining makes that expression evaluate to
+ * `undefined` — no request, no error, no log line. The UI carries on and
+ * reports success. That is how right-drag **Copy** was a silent no-op for its
+ * entire life: `copyMessages` existed in api-client, in jsonrpc, and in the
+ * service — but never in `mailxapi.js`, so every copy quietly did nothing
+ * while the status bar said "Copying 3 to Drafts…" (Bob 2026-08-09: "when I
+ * used right mouse copy it didn't copy to drafts"). The same audit found
+ * `autocomplete` and `cancelServerSearch` dead the same way.
+ *
+ * The rule this enforces: if the DAEMON can handle it and the CLIENT calls
+ * it, the BRIDGE must carry it. A method missing from all three is fine
+ * (Android-only surface); a method the client calls with no handler anywhere
+ * is a warning, not an error, since some are deliberately optional.
+ */
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const root = path.resolve(fileURLToPath(import.meta.url), "..", "..");
+const read = (p) => fs.readFileSync(path.join(root, p), "utf8");
+
+const api = read("client/lib/api-client.ts");
+const bridge = read("client/lib/mailxapi.js");
+const rpc = read("packages/mailx-service/jsonrpc.ts");
+
+const called = new Set();
+for (const m of api.matchAll(/ipc\(\)\.(\w+)\s*\??\.?\s*\(/g)) called.add(m[1]);
+
+const inBridge = new Set();
+for (const m of bridge.matchAll(/^\s+(\w+)\s*:\s*(?:async\s+)?function/gm)) inBridge.add(m[1]);
+
+const handled = new Set();
+for (const m of rpc.matchAll(/case\s+"(\w+)"\s*:/g)) handled.add(m[1]);
+
+const broken = [];    // client calls it, daemon handles it, bridge doesn't carry it
+const orphan = [];    // client calls it, nothing handles it anywhere
+for (const name of [...called].sort()) {
+    if (inBridge.has(name)) continue;
+    (handled.has(name) ? broken : orphan).push(name);
+}
+
+if (orphan.length) {
+    console.log(`  [bridge-contract] ${orphan.length} client call(s) with no bridge and no daemon handler (optional surface): ${orphan.join(", ")}`);
+}
+
+if (broken.length) {
+    console.error(`\n  [bridge-contract] FAIL — these have a daemon handler but no entry in client/lib/mailxapi.js,`);
+    console.error(`  so every call silently evaluates to undefined and the feature does nothing:\n`);
+    for (const n of broken) console.error(`      ${n}`);
+    console.error(`\n  Add each to mailxapi.js as:  ${broken[0]}: function(...) { return callNode("${broken[0]}", { ... }); },\n`);
+    process.exit(1);
+}
+
+console.log(`  [bridge-contract] ok — ${called.size} client calls, all daemon-handled ones present in the bridge`);

package/client/app.bundle.js

@@ -1848,6 +1848,23 @@ function showPreviewBodyMenu(absX, absY, selectedText, sourceWindow, linkUrl, li
   );
   showContextMenu(absX, absY, items);
 }
+function renderBodyFetchGaveUp(bodyEl, accountId, uid, folderId, secs, previewText, specialUse, envelope) {
+  const looksImapUidOnApiAccount = uid > 0 && uid < 1e9;
+  const why = looksImapUidOnApiAccount ? `This message was indexed over IMAP, but its account fetches bodies through the Gmail API, which addresses messages by a different id. The body can't be requested for this row.` : `The server accepted the request but never returned the body.`;
+  const snippet = previewText ? `<div class="mv-preview-placeholder">${escapeHtml3(previewText)}<div class="mv-tear-line"><span>\u2702 snippet \u2014 this is all that arrived \u2702</span></div></div>` : "";
+  bodyEl.innerHTML = `${snippet}<div class="mv-system-message mv-system-error">
+        <div class="mv-system-tag">rmfmail</div>
+        <div class="mv-system-title">Body didn't arrive after ${secs}s \u2014 not still loading</div>
+        <div class="mv-system-body">${escapeHtml3(why)}
+        <div style="margin-top:8px;display:flex;gap:8px;flex-wrap:wrap">
+            <button id="mv-body-retry" class="tb-btn">Try again</button>
+        </div></div></div>`;
+  bodyEl.querySelector("#mv-body-retry")?.addEventListener("click", () => {
+    invalidateParsedCache(accountId, folderId, uid);
+    showMessage(accountId, uid, folderId, specialUse, true, envelope).catch(() => {
+    });
+  });
+}
 function toggleFullscreenPreview() {
   const body = document.body;
   const on = !body.classList.contains("fullscreen-preview");
@@ -2205,8 +2222,14 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         span.textContent = secs >= 60 ? `(${Math.floor(secs / 60)}m ${secs % 60}s)` : `(${secs}s)`;
         if (secs === 30)
           span.classList.add("mv-wait-slow");
+        if (secs >= WAIT_GIVE_UP_SECS) {
+          clearInterval(tick);
+          off?.();
+          renderBodyFetchGaveUp(bodyEl, accountId, uid, folderId, secs, previewText, specialUse, envelope || cached || void 0);
+        }
       }, 1e3);
-      const off = subscribeStore("*", (ev) => {
+      let off;
+      off = subscribeStore("*", (ev) => {
         if (ev.kind !== "bodyAvailable")
           return;
         if (ev.accountId !== accountId || ev.uid !== uid)
@@ -3679,7 +3702,7 @@ function spawnDesktopPopout(msg, accountId) {
 function escapeHtmlLocal(s) {
   return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
+var currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, WAIT_GIVE_UP_SECS, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -3698,6 +3721,7 @@ var init_message_viewer = __esm({
     parsedCache = /* @__PURE__ */ new Map();
     sessionAllowedRemote = /* @__PURE__ */ new Set();
     recentFetchErrors = /* @__PURE__ */ new Map();
+    WAIT_GIVE_UP_SECS = 45;
     ZOOM_KEY = "mailx-preview-zoom";
     ZOOM_MIN = 0.5;
     ZOOM_MAX = 3;
@@ -9910,8 +9934,14 @@ document.addEventListener("mailx-flagged-batch", (e) => {
     const n = msgs.length;
     const label = n === 1 ? "message" : `${n} messages`;
     showContextMenu2(x, y, [
-      { label: `Move ${label} here`, emphasized: true, action: () => void runRightDragOp(msgs, targetAccount, targetFolderId, targetName, "move") },
-      { label: `Copy ${label} here`, action: () => void runRightDragOp(msgs, targetAccount, targetFolderId, targetName, "copy") }
+      // Name the destination, never say "here". A menu that appears
+      // under the pointer still has to read correctly on its own: by the
+      // time the user is reading the menu, the folder they were dragging
+      // over may not be what they think it is, and "here" gives them
+      // nothing to check against (Bob 2026-08-09: "using HERE in a
+      // message is very very bad — give the folder name").
+      { label: `Move ${label} to ${targetName}`, emphasized: true, action: () => void runRightDragOp(msgs, targetAccount, targetFolderId, targetName, "move") },
+      { label: `Copy ${label} to ${targetName}`, action: () => void runRightDragOp(msgs, targetAccount, targetFolderId, targetName, "copy") }
     ]);
   }
   async function runRightDragOp(msgs, targetAccount, targetFolderId, targetName, op) {