@bobfrankston/rmfmail 1.2.182 → 1.2.184

package/bin/mailx.ts

@@ -2131,19 +2131,33 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
             }
         }, 5000);
     }
+    // Open reminder popups by occurrence key, so a dismiss/snooze made on
+    // ANOTHER machine (seen via the reminders.jsonc state sync) can retract
+    // a popup that's already on this machine's screen. `popupKey` is
+    // supplied by alarms.ts and stripped before the opts reach msger.
+    const reminderPopups = new Map<string, { close: () => void }>();
     svc.setPopupFn(async (opts: any) => {
         // Own WebView2 profile so a reminder popup can never share (and
         // crash) the main window's browser process — see S67 note on the
         // popout windows below. Service-supplied opts may override.
-        const h = showMessageBoxEx({ profile: "popout", ...opts });
+        const { popupKey, ...boxOpts } = opts || {};
+        const h = showMessageBoxEx({ profile: "popout", ...boxOpts });
         if (typeof h.pid === "number") addChildPid(h.pid);
+        if (popupKey) reminderPopups.set(popupKey, { close: () => { try { h.close(); } catch { /* already gone */ } } });
         try {
             const r = await h.result;
             return { button: r.button, closed: r.closed, dismissed: r.dismissed, form: (r as any).form };
         } finally {
             if (typeof h.pid === "number") removeChildPid(h.pid);
+            if (popupKey) reminderPopups.delete(popupKey);
         }
     });
+    svc.setPopupCloserFn((key: string) => {
+        const p = reminderPopups.get(key);
+        if (!p) return false;
+        p.close();
+        return true;
+    });
 
     // Optional debug HTTP server ALONGSIDE the GUI. `--server` mode replaces
     // the WebView with Express; `--debug-server` instead runs a loopback

package/client/app.bundle.js

@@ -29,6 +29,7 @@ __export(api_client_exports, {
   cancelServerSearch: () => cancelServerSearch,
   checkDraftNewer: () => checkDraftNewer,
   closeComposePopout: () => closeComposePopout,
+  closeReminderPopup: () => closeReminderPopup,
   closeWordEdit: () => closeWordEdit,
   connectEvents: () => connectEvents,
   connectWebSocket: () => connectWebSocket,
@@ -621,6 +622,9 @@ function closeWordEdit(editId) {
 function showReminderPopup(opts) {
   return ipc().showReminderPopup?.(opts) ?? Promise.resolve({ button: "", reason: "no host" });
 }
+function closeReminderPopup(key) {
+  return ipc().closeReminderPopup?.(key) ?? Promise.resolve({ ok: false });
+}
 function mergeReminderState(patch) {
   return ipc().mergeReminderState?.(patch) ?? Promise.resolve(null);
 }
@@ -1595,6 +1599,19 @@ function clearViewer() {
     headerEl.hidden = true;
   if (attEl)
     attEl.hidden = true;
+  setTimeout(() => {
+    try {
+      const stillPlaceholder = !!document.querySelector("#mv-body .mv-empty");
+      if (!stillPlaceholder)
+        return;
+      const sel = document.querySelectorAll(".ml-row.selected");
+      if (sel.length === 0)
+        return;
+      const uids = Array.from(sel).slice(0, 5).map((r) => `${r.dataset.accountId}/${r.dataset.uid}`);
+      window.mailxapi?.logClientEvent?.("[fate-share] viewer empty but rows still highlighted", { rows: uids });
+    } catch {
+    }
+  }, 1e3);
 }
 function confirmDeleteAttachments(msg, accountId, uid, ids, question) {
   const backdrop = document.createElement("div");
@@ -3109,8 +3126,23 @@ var init_message_viewer = __esm({
         return;
       if (!currentMessage)
         return;
+      const evUuid = ev.msgUuid || ev.uuid;
+      if (evUuid && currentMessage.uuid) {
+        if (ev.accountId === currentAccountId && evUuid === currentMessage.uuid) {
+          try {
+            window.mailxapi?.logClientEvent?.("[fate-share] viewed message removed (uuid) \u2014 clearing viewer", { uuid: evUuid });
+          } catch {
+          }
+          clearViewer();
+        }
+        return;
+      }
       const folderMatches = ev.folderId == null || currentMessage.folderId == null || ev.folderId === currentMessage.folderId;
       if (ev.accountId === currentAccountId && ev.uid === currentMessage.uid && folderMatches) {
+        try {
+          window.mailxapi?.logClientEvent?.("[fate-share] viewed message removed (uid) \u2014 clearing viewer", { uid: ev.uid, folderId: ev.folderId ?? null });
+        } catch {
+        }
         clearViewer();
       }
     });
@@ -3499,10 +3531,17 @@ function focusRow(row, opts = {}) {
   if (opts.scroll !== false) {
     row.el.scrollIntoView({ block: "nearest" });
   }
-  showMessage(row.accountId, row.msg.uid, row.msg.folderId, currentSpecialUse || void 0, false, row.msg);
-  onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
-  document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
   rememberPosition();
+  try {
+    showMessage(row.accountId, row.msg.uid, row.msg.folderId, currentSpecialUse || void 0, false, row.msg);
+    onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
+    document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
+  } catch (e) {
+    try {
+      logClientEvent("[fate-share] focusRow viewer drive threw", { uid: row.msg?.uid, accountId: row.accountId, err: e?.message || String(e), stack: e?.stack || null });
+    } catch {
+    }
+  }
 }
 function getCurrentFocused() {
   return focusedRow ? focusedRow.msg : null;
@@ -4212,8 +4251,13 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     setMessages(result.items);
     withScrollAnchor(body, () => renderMessages(body, accountId, result.items, { background: !autoSelect }));
     if (autoSelect && focusedRow) {
-      const stillThere = result.items.some((m) => m.accountId === focusedRow.accountId && m.uid === focusedRow.msg.uid);
+      const fUuid = focusedRow.msg?.uuid;
+      const stillThere = result.items.some((m) => fUuid && m.uuid ? m.uuid === fUuid : m.accountId === focusedRow.accountId && m.uid === focusedRow.msg.uid);
       if (!stillThere) {
+        try {
+          logClientEvent("[fate-share] focused row gone after foreground load \u2014 clearing viewer", { uid: focusedRow.msg?.uid, uuid: fUuid || null, accountId: focusedRow.accountId });
+        } catch {
+        }
         clearViewer();
         focusedRow = null;
       }
@@ -4309,8 +4353,13 @@ function renderMessages(body, accountId, items, opts = {}) {
   if (focusedRow && !opts.background) {
     const fAcct = focusedRow.accountId;
     const fUid = focusedRow.msg?.uid;
-    const stillThere = items.some((m) => (m.accountId || accountId) === fAcct && m.uid === fUid);
+    const fUuid = focusedRow.msg?.uuid;
+    const stillThere = items.some((m) => fUuid && m.uuid ? m.uuid === fUuid : (m.accountId || accountId) === fAcct && m.uid === fUid);
     if (!stillThere) {
+      try {
+        logClientEvent("[fate-share] focused row gone after foreground render \u2014 clearing viewer", { uid: fUid, uuid: fUuid || null, accountId: fAcct });
+      } catch {
+      }
       clearViewer();
       focusedRow = null;
     }
@@ -4335,6 +4384,12 @@ function restoreSelection(body, savedUuid) {
   const uid = Number(row.dataset.uid);
   if (accountId && Number.isFinite(uid)) {
     const switching = focusedRow?.msg?.uuid !== savedUuid;
+    if (switching) {
+      try {
+        logClientEvent("[fate-share] restoreSelection switching viewer", { toUuid: savedUuid, toUid: uid, fromUuid: focusedRow?.msg?.uuid || null });
+      } catch {
+      }
+    }
     focusByIdentity(accountId, uid, { scroll: switching });
   }
 }
@@ -6153,6 +6208,7 @@ async function syncReminderState(force = false) {
         sn[k] = v;
     }
     saveSnoozed(sn);
+    retractSuppressedPopups();
     return true;
   } catch (e) {
     alog("state sync failed", { err: e?.message || String(e) });
@@ -6249,10 +6305,28 @@ function formatWhen(ms) {
   const d = new Date(ms);
   return d.toLocaleString(void 0, { weekday: "short", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" });
 }
+function retractSuppressedPopups() {
+  if (openPopups.size === 0)
+    return;
+  const now = Date.now();
+  const dismissed = loadDismissed();
+  const snoozed = loadSnoozed();
+  for (const [key, entry] of openPopups) {
+    if (entry.retracted)
+      continue;
+    if (dismissed[key] || (snoozed[key] || 0) > now) {
+      alog("retracting popup \u2014 resolved on another machine", { key, dismissed: !!dismissed[key], snoozedUntil: snoozed[key] || 0 });
+      try {
+        entry.retract();
+      } catch {
+      }
+    }
+  }
+}
 function escapeHtml6(s) {
   return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 }
-function showInWebViewPopup(opts) {
+function showInWebViewPopup(opts, onRegisterClose) {
   return new Promise((resolve) => {
     const overlay = document.createElement("div");
     overlay.className = "alarm-overlay";
@@ -6294,12 +6368,15 @@ function showInWebViewPopup(opts) {
     panel.querySelectorAll("[data-button]").forEach((btn) => {
       btn.addEventListener("click", () => cleanup(btn.dataset.button || ""));
     });
+    onRegisterClose?.(cleanup);
   });
 }
 async function firePopupForItem(item) {
   if (openPopups.has(item.uuid))
     return;
-  openPopups.add(item.uuid);
+  const popupEntry = { retracted: false, retract: () => {
+  } };
+  openPopups.set(item.uuid, popupEntry);
   const openUrl = item.kind === "calendar" ? item.htmlLink || "https://calendar.google.com/" : "https://tasks.google.com/";
   const buttons = ["snooze", "Dismiss", "Open"];
   if (item.kind === "calendar")
@@ -6401,17 +6478,28 @@ async function firePopupForItem(item) {
   let r;
   try {
     if (hasHost) {
+      popupEntry.retract = () => {
+        popupEntry.retracted = true;
+        closeReminderPopup(item.uuid).catch(() => {
+        });
+      };
       r = await showReminderPopup({
         title,
         html,
         buttons,
+        popupKey: item.uuid,
         // Sized for the new snooze form (chips row + custom input
         // row + action buttons) plus title/when/kind. Width fits
         // "5m 15m 30m 1h 2h 1d" on one line in Segoe UI.
         size: { width: 560, height: 300 }
       });
     } else {
-      r = await showInWebViewPopup({ title, html, buttons });
+      r = await showInWebViewPopup({ title, html, buttons }, (close) => {
+        popupEntry.retract = () => {
+          popupEntry.retracted = true;
+          close("retracted");
+        };
+      });
     }
   } catch (e) {
     alog("popup IPC failed \u2014 treating as Dismiss", { key: item.uuid, err: e?.message || String(e) });
@@ -6419,6 +6507,11 @@ async function firePopupForItem(item) {
   } finally {
     openPopups.delete(item.uuid);
   }
+  if (popupEntry.retracted) {
+    alog("popup closed by retraction \u2014 skipping result handling", { key: item.uuid });
+    firedThisSession.delete(item.uuid);
+    return;
+  }
   if (!r || typeof r !== "object" || typeof r.button !== "string") {
     alog("popup returned empty / malformed \u2014 treating as Dismiss", { key: item.uuid, raw: r });
     r = { button: "Dismiss" };
@@ -6570,7 +6663,7 @@ var init_alarms = __esm({
     _lastStateSync = 0;
     STATE_SYNC_MIN_MS = 6e4;
     firedThisSession = /* @__PURE__ */ new Set();
-    openPopups = /* @__PURE__ */ new Set();
+    openPopups = /* @__PURE__ */ new Map();
   }
 });