@bobfrankston/rmfmail 1.0.592 → 1.0.597

package/client/components/message-list.ts

@@ -39,6 +39,17 @@ let touchWasScroll = false;
 let currentSort = "date";
 let currentSortDir: "asc" | "desc" = "desc";
 
+/** Generation counter — incremented on every load* call (loadMessages,
+ *  loadUnifiedInbox, loadSearchResults). Each load captures the current
+ *  value at the top, then checks before rendering — if the captured gen
+ *  no longer matches `loadGen`, the user has switched to a different
+ *  view in the meantime and this stale response should be silently
+ *  dropped instead of overwriting the new view. Bob 2026-05-08:
+ *  rapid-fire folder clicks were producing "list shows folder X but
+ *  preview shows folder Y" because folder X's getMessages eventually
+ *  resolved AFTER folder Y's render and clobbered it. */
+let loadGen = 0;
+
 /** Single source of truth for "which row is focused" in the list.
  *
  *  Each rendered row is a `MessageRow` instance owning its DOM element,
@@ -482,6 +493,7 @@ export function clearSearchMode(): void {
 
 /** Load unified inbox (all accounts) */
 export async function loadUnifiedInbox(autoSelect = true): Promise<void> {
+    const myGen = ++loadGen;
     unifiedMode = true;
     searchMode = false;
     currentSpecialUse = "";
@@ -503,6 +515,7 @@ export async function loadUnifiedInbox(autoSelect = true): Promise<void> {
 
     try {
         const result = await apiGetUnifiedInbox(1);
+        if (myGen !== loadGen) return;       // user moved on; drop stale response
         totalMessages = result.total;
 
         if (result.items.length === 0) {
@@ -522,6 +535,7 @@ export async function loadUnifiedInbox(autoSelect = true): Promise<void> {
         }
     } catch (e: any) {
         if (e.name === "AbortError") return;
+        if (myGen !== loadGen) return;
         body.innerHTML = `<div class="ml-empty">Error: ${e.message}</div>`;
     }
 }
@@ -531,6 +545,7 @@ export async function loadUnifiedInbox(autoSelect = true): Promise<void> {
  *  per-folder search ALWAYS returns matches in that folder, including when
  *  the folder itself is trash/junk. */
 export async function loadSearchResults(query: string, scope = "all", accountId = "", folderId = 0, includeTrashSpam = false): Promise<void> {
+    const myGen = ++loadGen;
     // Capture the pre-search mode on the first transition only — repeated
     // searches (typing more characters) shouldn't overwrite it with the
     // intermediate `unifiedMode = false` state.
@@ -562,6 +577,7 @@ export async function loadSearchResults(query: string, scope = "all", accountId
             const source = scope === "current" && accountId
                 ? await apiGetMessages(accountId, folderId, 1, 10000)
                 : await apiGetUnifiedInbox(1, 10000);
+            if (myGen !== loadGen) return;
             const matches = source.items.filter((m: any) =>
                 regex.test(m.subject || "") || regex.test(m.from?.name || "") || regex.test(m.from?.address || "") || regex.test(m.preview || "")
             );
@@ -575,6 +591,7 @@ export async function loadSearchResults(query: string, scope = "all", accountId
         }
 
         const result = await searchMessages(query, 1, 50, scope, accountId, folderId, includeTrashSpam);
+        if (myGen !== loadGen) return;
         totalMessages = result.total;
 
         if (result.items.length === 0) {
@@ -595,6 +612,7 @@ export async function loadSearchResults(query: string, scope = "all", accountId
 }
 
 export async function loadMessages(accountId: string, folderId: number, page = 1, specialUse = "", autoSelect = true): Promise<void> {
+    const myGen = ++loadGen;
     searchMode = false;
     unifiedMode = false;
     // Folder switch clears any in-progress multi-select — carrying a "3
@@ -634,6 +652,10 @@ export async function loadMessages(accountId: string, folderId: number, page = 1
     try {
         const flaggedOnly = document.getElementById("ml-body")?.classList.contains("flagged-only") || false;
         const result = await apiGetMessages(accountId, folderId, 1, 50, flaggedOnly, currentSort, currentSortDir);
+        // Stale-response guard: a newer load* fired while we were
+        // awaiting; the new view already painted. Drop this result
+        // silently rather than overwriting.
+        if (myGen !== loadGen) return;
         totalMessages = result.total;
         updateSortIndicators();
 
@@ -650,12 +672,14 @@ export async function loadMessages(accountId: string, folderId: number, page = 1
             selectFirst(body);
         } else {
             requestAnimationFrame(() => {
+                if (myGen !== loadGen) return;
                 body.scrollTop = savedScroll;
                 restoreSelection(body, savedUid);
             });
         }
     } catch (e: any) {
         if (e.name === "AbortError") return;
+        if (myGen !== loadGen) return;       // user moved on; suppress the error message
         body.innerHTML = `<div class="ml-empty">Error: ${e.message}</div>`;
     }
 }

package/client/components/outbox-view.js

@@ -34,13 +34,36 @@ export async function openOutboxView() {
             return;
         }
         const fmtDate = (ms) => new Date(ms).toLocaleString();
-        listEl.innerHTML = items.map((m, i) => `
+        const ageStr = (ms) => {
+            const sec = Math.max(0, Math.round((Date.now() - ms) / 1000));
+            if (sec < 60)
+                return `${sec}s`;
+            if (sec < 3600)
+                return `${Math.round(sec / 60)}m`;
+            return `${Math.round(sec / 3600)}h`;
+        };
+        listEl.innerHTML = items.map((m, i) => {
+            // A claim that's "young" (under 60 s) is presumed actively
+            // sending. Older claims are stuck — server hung mid-SMTP,
+            // worker crashed, PID recycled. Cancel must always be
+            // available either way: the user knows their intent. A
+            // brief in-flight cancel may cross the SMTP-send window
+            // (rare; <60s of risk), in which case the X-Mailx-Retry +
+            // Message-ID dedup on the receiving end catches the dup.
+            const claimAge = m.claimed ? ageStr(m.createdAt) : "";
+            const stuckClaim = m.claimed && (Date.now() - m.createdAt) > 60_000;
+            const claimBadge = !m.claimed
+                ? ""
+                : stuckClaim
+                    ? `<span class="ob-badge ob-stuck" title="Claim is older than 60 s — likely stuck. Cancel will drop it.">stuck (${claimAge})</span>`
+                    : `<span class="ob-badge ob-claimed" title="Sending now on this host">sending… (${claimAge})</span>`;
+            return `
             <div class="ob-row ob-pink" data-idx="${i}">
                 <div class="ob-row-hdr">
                     <span class="ob-acct">${escapeHtml(m.accountId)}</span>
                     <span class="ob-subject">${escapeHtml(m.subject || "(no subject)")}</span>
                     <span class="ob-created">${fmtDate(m.createdAt)}</span>
-                    ${m.claimed ? `<span class="ob-badge ob-claimed" title="Sending now on this host">sending…</span>` : ""}
+                    ${claimBadge}
                     ${m.attempts > 0 ? `<span class="ob-badge ob-retry" title="Retry attempts made so far">retry ×${m.attempts}</span>` : ""}
                 </div>
                 <div class="ob-row-meta">
@@ -51,13 +74,17 @@ export async function openOutboxView() {
                 </div>
                 <div class="ob-row-path">${escapeHtml(m.path)}</div>
                 <div class="ob-row-actions">
-                    <button type="button" class="ob-cancel" ${m.claimed ? "disabled title='Cannot cancel while in flight'" : ""}>Cancel</button>
+                    <button type="button" class="ob-cancel">Cancel</button>
                 </div>
-            </div>`).join("");
+            </div>`;
+        }).join("");
         listEl.querySelectorAll(".ob-row").forEach((row, idx) => {
             row.querySelector(".ob-cancel").addEventListener("click", async () => {
                 const m = items[idx];
-                if (!confirm(`Drop this queued message?\n\nTo: ${m.to}\nSubject: ${m.subject}`))
+                const warning = m.claimed
+                    ? `This message is currently in flight to the SMTP server.\nIf SMTP already finished, the recipient may have received it.\nMessage-ID dedup catches the duplicate side; cancel is still safe.\n\nDrop anyway?\n\nTo: ${m.to}\nSubject: ${m.subject}`
+                    : `Drop this queued message?\n\nTo: ${m.to}\nSubject: ${m.subject}`;
+                if (!confirm(warning))
                     return;
                 try {
                     await cancelQueuedOutgoing(m.path);

package/client/components/outbox-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbox-view.js","sourceRoot":"","sources":["outbox-view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"outbox-view.js","sourceRoot":"","sources":["outbox-view.ts"],"names":[],"mappings":"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"}

package/client/components/outbox-view.ts

@@ -37,13 +37,34 @@ export async function openOutboxView(): Promise<void> {
             return;
         }
         const fmtDate = (ms: number) => new Date(ms).toLocaleString();
-        listEl.innerHTML = items.map((m, i) => `
+        const ageStr = (ms: number): string => {
+            const sec = Math.max(0, Math.round((Date.now() - ms) / 1000));
+            if (sec < 60) return `${sec}s`;
+            if (sec < 3600) return `${Math.round(sec / 60)}m`;
+            return `${Math.round(sec / 3600)}h`;
+        };
+        listEl.innerHTML = items.map((m, i) => {
+            // A claim that's "young" (under 60 s) is presumed actively
+            // sending. Older claims are stuck — server hung mid-SMTP,
+            // worker crashed, PID recycled. Cancel must always be
+            // available either way: the user knows their intent. A
+            // brief in-flight cancel may cross the SMTP-send window
+            // (rare; <60s of risk), in which case the X-Mailx-Retry +
+            // Message-ID dedup on the receiving end catches the dup.
+            const claimAge = m.claimed ? ageStr(m.createdAt) : "";
+            const stuckClaim = m.claimed && (Date.now() - m.createdAt) > 60_000;
+            const claimBadge = !m.claimed
+                ? ""
+                : stuckClaim
+                    ? `<span class="ob-badge ob-stuck" title="Claim is older than 60 s — likely stuck. Cancel will drop it.">stuck (${claimAge})</span>`
+                    : `<span class="ob-badge ob-claimed" title="Sending now on this host">sending… (${claimAge})</span>`;
+            return `
             <div class="ob-row ob-pink" data-idx="${i}">
                 <div class="ob-row-hdr">
                     <span class="ob-acct">${escapeHtml(m.accountId)}</span>
                     <span class="ob-subject">${escapeHtml(m.subject || "(no subject)")}</span>
                     <span class="ob-created">${fmtDate(m.createdAt)}</span>
-                    ${m.claimed ? `<span class="ob-badge ob-claimed" title="Sending now on this host">sending…</span>` : ""}
+                    ${claimBadge}
                     ${m.attempts > 0 ? `<span class="ob-badge ob-retry" title="Retry attempts made so far">retry ×${m.attempts}</span>` : ""}
                 </div>
                 <div class="ob-row-meta">
@@ -54,13 +75,17 @@ export async function openOutboxView(): Promise<void> {
                 </div>
                 <div class="ob-row-path">${escapeHtml(m.path)}</div>
                 <div class="ob-row-actions">
-                    <button type="button" class="ob-cancel" ${m.claimed ? "disabled title='Cannot cancel while in flight'" : ""}>Cancel</button>
+                    <button type="button" class="ob-cancel">Cancel</button>
                 </div>
-            </div>`).join("");
+            </div>`;
+        }).join("");
         listEl.querySelectorAll<HTMLElement>(".ob-row").forEach((row, idx) => {
             row.querySelector<HTMLButtonElement>(".ob-cancel")!.addEventListener("click", async () => {
                 const m = items[idx];
-                if (!confirm(`Drop this queued message?\n\nTo: ${m.to}\nSubject: ${m.subject}`)) return;
+                const warning = m.claimed
+                    ? `This message is currently in flight to the SMTP server.\nIf SMTP already finished, the recipient may have received it.\nMessage-ID dedup catches the duplicate side; cancel is still safe.\n\nDrop anyway?\n\nTo: ${m.to}\nSubject: ${m.subject}`
+                    : `Drop this queued message?\n\nTo: ${m.to}\nSubject: ${m.subject}`;
+                if (!confirm(warning)) return;
                 try {
                     await cancelQueuedOutgoing(m.path);
                     await reload();

package/client/compose/compose.js

@@ -983,103 +983,122 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
         alert("Please add at least one To recipient.");
         return;
     }
+    // Local-first send: validate fast in the client, then fire-and-forget
+    // the IPC and close compose IMMEDIATELY. The body is already snapshotted
+    // into `body` above; nothing the user types after this point can affect
+    // what gets sent.
+    //
+    // Earlier "wait for IPC ack before closing" version produced a real,
+    // user-reported bug: clicking Send → typing for a few hundred ms while
+    // the IPC was in flight → IPC returns → compose closes mid-keystroke
+    // and the user's last edits go nowhere. The fix is structural: send
+    // is committed by the client validation + the snapshot, NOT by the
+    // server's reply. The server-side write is synchronous-on-disk inside
+    // service.send() (queueOutgoingLocal), and any failure surfaces as a
+    // top-level banner via the parent's `mailx-send-error` postMessage.
+    //
+    // Client-side regex validation up front so a typo'd address bounces
+    // back inline (compose stays open) instead of disappearing into a
+    // toast after compose has closed. Same pattern Outlook/Thunderbird use.
+    const emailRe = /^[^\s<>@]+@[^\s<>@]+\.[^\s<>@]+$/;
+    const badAddress = (list) => {
+        if (!list)
+            return null;
+        for (const a of list) {
+            const addr = (a?.address || "").trim();
+            if (!addr)
+                continue; // empty fragments are dropped
+            if (!emailRe.test(addr))
+                return addr;
+        }
+        return null;
+    };
+    const bad = badAddress(body.to) || badAddress(body.cc) || badAddress(body.bcc);
+    if (bad) {
+        logClientEvent("compose-send-rejected-bad-addr", { addr: bad });
+        const statusEl = document.getElementById("compose-status");
+        if (statusEl)
+            statusEl.textContent = `Invalid address: "${bad}"`;
+        else
+            alert(`Invalid address: "${bad}"`);
+        return;
+    }
     console.log(`[compose] Send clicked: from=${body.from} to=${JSON.stringify(body.to)} subject="${body.subject}" attachments=${body.attachments.length}`);
-    // Wait for the IPC round-trip before closing compose. The IPC is supposed
-    // to be <100ms (Node validates + disk-writes synchronously inside send()
-    // then returns). If it throws OR takes too long, the user keeps their
-    // typed message and sees the error inline instead of losing it to a
-    // fire-and-forget that never landed. Earlier fire-and-forget version lost
-    // messages silently when anything upstream of disk write broke.
-    const sendBtn = document.getElementById("btn-send");
-    if (sendBtn) {
-        sendBtn.disabled = true;
-        sendBtn.textContent = "Sending…";
-    }
-    const statusEl = document.getElementById("compose-status");
-    if (statusEl)
-        statusEl.textContent = "";
+    // Stop autosave NOW — the body we're sending is the body we're sending,
+    // and we don't want a stray autosave to write a stale "still typing"
+    // copy back to the Drafts folder while SMTP is in flight.
+    if (draftTimer) {
+        clearInterval(draftTimer);
+        draftTimer = null;
+    }
+    // Record From-address history before close. Only manual values worth
+    // keeping — skip anything that exactly matches a known account.
+    try {
+        const raw = fromInput.value.trim();
+        const known = knownAccounts.some(a => formatAccountFrom(a) === raw);
+        if (raw && !known && /@.+\./.test(raw))
+            recordFromHistory(raw);
+    }
+    catch { /* */ }
+    if (draftUid || draftId) {
+        deleteDraft(getFromAccountId(), draftUid || 0, draftId || "").catch(() => { });
+    }
     const sendStart = Date.now();
     logClientEvent("compose-send-pre-ipc");
-    // Parent-window relay for send. Empirical observation: Android (direct
-    // in-process SMTP) sends reliably; desktop (iframe → parent.mailxapi →
-    // msger → Node → service) has sendMessage IPCs failing to reach Node
-    // for reasons still unknown (iframe bridge behaves differently from the
-    // top frame in msger's WebView2 for this specific call). Meanwhile the
-    // parent window's bridge is proven — getAccounts / getOutboxStatus run
-    // through it every few seconds with no failures.
-    //
-    // Fix: the iframe doesn't touch the bridge at all for send. It posts
-    // a request to the parent, and the parent calls the real sendMessage
-    // from its own frame. Parent posts the result back. This bypasses
-    // whatever is wrong with iframe-scoped IPC.
-    const ipcPromise = new Promise((resolve, reject) => {
+    // Fire the parent-relay IPC and don't await it. Parent will postMessage
+    // a `mailx-send-error` to the parent window on failure; the app handles
+    // that with a top-level banner. On success the outbox-status pill picks
+    // up the queued message via the daemon's outboxStatus event.
+    try {
         const reqId = `send-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const timer = setTimeout(() => {
-            window.removeEventListener("message", onMsg);
-            reject(new Error("parent-relay send timeout (120s)"));
-        }, 120000);
+        // Result listener: log only. Compose is already closed by the time
+        // any of these fire.
         const onMsg = (ev) => {
             if (!ev.data || ev.data.type !== "mailx-compose-send-result" || ev.data.id !== reqId)
                 return;
-            clearTimeout(timer);
             window.removeEventListener("message", onMsg);
-            if (ev.data.ok)
-                resolve();
-            else
-                reject(new Error(ev.data.error || "unknown"));
+            if (ev.data.ok) {
+                logClientEvent("compose-send-ipc-resolved", { ms: Date.now() - sendStart });
+            }
+            else {
+                const msg = ev.data.error || "unknown";
+                logClientEvent("compose-send-ipc-rejected", { error: msg, ms: Date.now() - sendStart });
+                // Bubble the error up so the parent can show a banner. The
+                // dropped-into-outbox path (queueOutgoingLocal) catches most
+                // failures locally, so this branch fires only when the
+                // *queue write itself* failed — rare, but the user must see
+                // it because the message would otherwise be lost silently.
+                try {
+                    parent.postMessage({ type: "mailx-send-error", message: msg, accountId: body.from }, "*");
+                }
+                catch { /* */ }
+            }
         };
         window.addEventListener("message", onMsg);
-        try {
-            parent.postMessage({ type: "mailx-compose-send", id: reqId, body }, "*");
-            logClientEvent("compose-send-ipc-invoked", { via: "parent-relay", reqId });
-        }
-        catch (e) {
-            clearTimeout(timer);
-            window.removeEventListener("message", onMsg);
-            reject(e);
-        }
-    });
-    Promise.resolve(ipcPromise)
-        .then(() => {
-        logClientEvent("compose-send-ipc-resolved", { ms: Date.now() - sendStart });
-        console.log(`[compose] Send IPC returned OK in ${Date.now() - sendStart}ms`);
-        // Record From-address history on successful send. Only manual
-        // values worth keeping — skip anything that exactly matches a
-        // known account (already in the dropdown), and skip obviously
-        // invalid inputs. Populated dropdown surfaces this next time.
-        try {
-            const raw = fromInput.value.trim();
-            const known = knownAccounts.some(a => formatAccountFrom(a) === raw);
-            if (raw && !known && /@.+\./.test(raw))
-                recordFromHistory(raw);
-        }
-        catch { /* */ }
-        // Stop autosave only after ACK — if send threw we want the draft
-        // autosave to keep the message safe.
-        if (draftTimer) {
-            clearInterval(draftTimer);
-            draftTimer = null;
-        }
-        if (draftUid || draftId) {
-            deleteDraft(getFromAccountId(), draftUid || 0, draftId || "").catch(() => { });
-        }
-        closeCompose();
-    })
-        .catch((e) => {
+        // Safety: if parent never replies (msger pipe broken), prune the
+        // listener after 120s so we don't leak it. No retry here — the
+        // daemon's outbox worker is the retry path.
+        setTimeout(() => window.removeEventListener("message", onMsg), 120000);
+        parent.postMessage({ type: "mailx-compose-send", id: reqId, body }, "*");
+        logClientEvent("compose-send-ipc-invoked", { via: "parent-relay", reqId });
+    }
+    catch (e) {
+        // postMessage itself threw — bridge totally dead. This is the only
+        // path where we keep compose open, since we couldn't even hand the
+        // body off.
         const msg = e?.message || String(e);
-        logClientEvent("compose-send-ipc-rejected", { error: msg, ms: Date.now() - sendStart });
-        console.error(`[compose] Send IPC failed after ${Date.now() - sendStart}ms: ${msg}`);
+        logClientEvent("compose-send-ipc-throw", { error: msg });
+        const sendBtn = document.getElementById("btn-send");
         if (sendBtn) {
             sendBtn.disabled = false;
             sendBtn.textContent = "Send";
         }
+        const statusEl = document.getElementById("compose-status");
         if (statusEl)
-            statusEl.textContent = `Send failed: ${msg}`;
-        try {
-            parent.postMessage({ type: "mailx-send-error", message: msg, accountId: body.from }, "*");
-        }
-        catch { /* */ }
-    });
+            statusEl.textContent = `Bridge error: ${msg}`;
+        return;
+    }
+    closeCompose();
 });
 // ── Close handling ──
 /** True if the compose has anything worth asking about. */