@bobfrankston/rmfmail 1.1.140 → 1.1.142

package/client/app.bundle.js

@@ -5260,9 +5260,18 @@ async function firePopupForItem(item) {
     } else {
       r = await showInWebViewPopup({ title, html, buttons });
     }
+  } catch (e) {
+    alog("popup IPC failed \u2014 treating as Dismiss", { key: item.uuid, err: e?.message || String(e) });
+    r = { button: "Dismiss" };
   } finally {
     openPopups.delete(item.uuid);
   }
+  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" };
+  } else {
+    alog("popup result", { key: item.uuid, button: r.button, form: r.form });
+  }
   const api = window.mailxapi;
   const openLink = () => {
     if (!item.htmlLink)
@@ -5272,67 +5281,77 @@ async function firePopupForItem(item) {
     else
       window.open(item.htmlLink, "_blank");
   };
-  switch (r.button) {
-    case "Open":
-      openLink();
-      {
-        const dm = loadDismissed();
-        delete dm[item.uuid];
-        saveDismissed(dm);
+  try {
+    switch (r.button) {
+      case "Open":
+        openLink();
+        {
+          const dm = loadDismissed();
+          delete dm[item.uuid];
+          saveDismissed(dm);
+        }
+        firedThisSession.delete(item.uuid);
+        snoozeItem(item, 2);
+        break;
+      case "snooze": {
+        const m = Math.max(1, Math.floor(r.form?.minutes ?? 15));
+        snoozeItem(item, m);
+        break;
       }
-      firedThisSession.delete(item.uuid);
-      snoozeItem(item, 2);
-      break;
-    case "snooze": {
-      const m = Math.max(1, Math.floor(r.form?.minutes ?? 15));
-      snoozeItem(item, m);
-      break;
+      // Legacy literal labels — retained so a pre-upgrade popup whose
+      // bundle still says "Snooze 15m" / "Snooze 1h" continues to work
+      // through a daemon-side rebuild without a UI restart.
+      case "Snooze 15m":
+        snoozeItem(item, 15);
+        break;
+      case "Snooze 1h":
+        snoozeItem(item, 60);
+        break;
+      case "Dismiss":
+      case "dismissed":
+      // msger reports window-close as r.dismissed=true → daemon
+      // wrapper lowercases to "dismissed". Treat the same as
+      // explicit Dismiss-button: the popup HAD a clear button
+      // for that action, so any close that lands here is the
+      // user's "I'm done with this reminder" — not a 15-min
+      // snooze. Bob 2026-05-14: "I keep dismissing the
+      // reminder but it keeps coming back" — the lowercase
+      // path was hitting the snooze-15-min default, so the
+      // popup re-fired every 15 min indefinitely.
+      case "closed":
+        {
+          const m = loadDismissed();
+          m[item.uuid] = true;
+          saveDismissed(m);
+          alog("dismiss saved", { key: item.uuid, via: r.button });
+        }
+        break;
+      case "Delete":
+        {
+          const m = loadDismissed();
+          m[item.uuid] = true;
+          saveDismissed(m);
+        }
+        firedThisSession.delete(item.uuid);
+        deleteCalendarEvent(item.uuid).catch((e) => console.error(`  [alarm] delete failed for ${item.uuid}: ${e?.message || e}`));
+        break;
+      default:
+        alog("unknown popup result", { button: r.button, form: r.form });
+        {
+          const m = loadDismissed();
+          m[item.uuid] = true;
+          saveDismissed(m);
+        }
+        break;
+    }
+  } catch (e) {
+    alog("action handler threw \u2014 forcing Dismiss", { key: item.uuid, err: e?.message || String(e) });
+    try {
+      const m = loadDismissed();
+      m[item.uuid] = true;
+      saveDismissed(m);
+    } catch {
     }
-    // Legacy literal labels — retained so a pre-upgrade popup whose
-    // bundle still says "Snooze 15m" / "Snooze 1h" continues to work
-    // through a daemon-side rebuild without a UI restart.
-    case "Snooze 15m":
-      snoozeItem(item, 15);
-      break;
-    case "Snooze 1h":
-      snoozeItem(item, 60);
-      break;
-    case "Dismiss":
-    case "dismissed":
-    // msger reports window-close as r.dismissed=true → daemon
-    // wrapper lowercases to "dismissed". Treat the same as
-    // explicit Dismiss-button: the popup HAD a clear button
-    // for that action, so any close that lands here is the
-    // user's "I'm done with this reminder" — not a 15-min
-    // snooze. Bob 2026-05-14: "I keep dismissing the
-    // reminder but it keeps coming back" — the lowercase
-    // path was hitting the snooze-15-min default, so the
-    // popup re-fired every 15 min indefinitely.
-    case "closed":
-      {
-        const m = loadDismissed();
-        m[item.uuid] = true;
-        saveDismissed(m);
-        alog("dismiss saved", { key: item.uuid, via: r.button });
-      }
-      break;
-    case "Delete":
-      {
-        const m = loadDismissed();
-        m[item.uuid] = true;
-        saveDismissed(m);
-      }
-      firedThisSession.delete(item.uuid);
-      deleteCalendarEvent(item.uuid).catch((e) => console.error(`  [alarm] delete failed for ${item.uuid}: ${e?.message || e}`));
-      break;
-    default:
-      alog("unknown popup result", { button: r.button, form: r.form });
-      {
-        const m = loadDismissed();
-        m[item.uuid] = true;
-        saveDismissed(m);
-      }
-      break;
   }
 }
 function snoozeItem(item, minutes) {
@@ -7298,17 +7317,35 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
   } catch (e) {
     console.error("[compose] sessionStorage.setItem failed:", e?.message || e);
   }
+  const composeKey = "init-" + Math.random().toString(36).slice(2, 10);
+  window.__mailxComposeInits = window.__mailxComposeInits || {};
+  window.__mailxComposeInits[composeKey] = init;
+  try {
+    frame.dataset.composeKey = composeKey;
+  } catch {
+  }
   const post = () => {
     try {
-      frame?.contentWindow?.postMessage({ type: "compose-init", init }, "*");
-    } catch {
+      frame?.contentWindow?.postMessage({ type: "compose-init", init, composeKey }, "*");
+    } catch (e) {
+      logClientEvent("compose-post-failed", { err: e?.message || String(e) });
     }
   };
+  logClientEvent("compose-handoff", { hasFrame: !!frame, hasContentWindow: !!frame?.contentWindow, composeKey, bodyBytes: initJson.length });
   post();
   try {
-    frame?.addEventListener("load", post, { once: true });
+    frame?.addEventListener("load", () => {
+      logClientEvent("compose-iframe-loaded", { composeKey });
+      post();
+    });
   } catch {
   }
+  let attempts = 0;
+  const heartbeat = setInterval(() => {
+    attempts++;
+    post();
+    if (attempts >= 30) clearInterval(heartbeat);
+  }, 100);
 }
 function showComposeOverlay(title = "Compose") {
   const wrapper = document.createElement("div");