@bobfrankston/rmfmail 1.1.141 → 1.1.142

package/client/app.js

@@ -994,18 +994,43 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     catch (e) {
         console.error("[compose] sessionStorage.setItem failed:", e?.message || e);
     }
+    // Stash on the parent window so a same-origin iframe can pull it via
+    // window.parent (most reliable handoff under WebView2 custom-protocol —
+    // sessionStorage and postMessage both fail intermittently). Keyed by
+    // a unique token in the iframe URL so concurrent composes don't crosswire.
+    const composeKey = "init-" + Math.random().toString(36).slice(2, 10);
+    window.__mailxComposeInits = window.__mailxComposeInits || {};
+    window.__mailxComposeInits[composeKey] = init;
+    // Expose the key on the iframe so its IIFE can fetch the right blob.
+    try {
+        frame.dataset.composeKey = composeKey;
+    }
+    catch { /* */ }
     const post = () => {
         try {
-            frame?.contentWindow?.postMessage({ type: "compose-init", init }, "*");
+            frame?.contentWindow?.postMessage({ type: "compose-init", init, composeKey }, "*");
+        }
+        catch (e) {
+            logClientEvent("compose-post-failed", { err: e?.message || String(e) });
         }
-        catch { /* */ }
     };
+    logClientEvent("compose-handoff", { hasFrame: !!frame, hasContentWindow: !!frame?.contentWindow, composeKey, bodyBytes: initJson.length });
     post();
     // Iframe may not be loaded yet — re-post on load so the listener exists.
     try {
-        frame?.addEventListener("load", post, { once: true });
+        frame?.addEventListener("load", () => { logClientEvent("compose-iframe-loaded", { composeKey }); post(); });
     }
     catch { /* */ }
+    // And keep posting every 100ms for up to 3s as a defense-in-depth — if
+    // both load and the initial post race the wrong way, the iframe's IIFE
+    // will see the payload on its next tick.
+    let attempts = 0;
+    const heartbeat = setInterval(() => {
+        attempts++;
+        post();
+        if (attempts >= 30)
+            clearInterval(heartbeat);
+    }, 100);
 }
 function showComposeOverlay(title = "Compose") {
     const wrapper = document.createElement("div");