@bobfrankston/rmfmail 1.1.141 → 1.1.142

package/client/app.ts

@@ -949,12 +949,32 @@ async function openCompose(mode: ComposeMode, overrideMsg?: any, overrideAccount
     const initJson = JSON.stringify(init);
     try { sessionStorage.setItem("composeInit", initJson); }
     catch (e: any) { 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 as any).__mailxComposeInits = (window as any).__mailxComposeInits || {};
+    (window as any).__mailxComposeInits[composeKey] = init;
+    // Expose the key on the iframe so its IIFE can fetch the right blob.
+    try { (frame as any).dataset.composeKey = composeKey; } catch { /* */ }
     const post = (): void => {
-        try { frame?.contentWindow?.postMessage({ type: "compose-init", init }, "*"); } catch { /* */ }
+        try { frame?.contentWindow?.postMessage({ type: "compose-init", init, composeKey }, "*"); }
+        catch (e: any) { logClientEvent("compose-post-failed", { err: e?.message || String(e) }); }
     };
+    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 }); } catch { /* */ }
+    try { 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"): HTMLIFrameElement {

package/client/compose/compose.bundle.js

@@ -4167,16 +4167,46 @@ function scheduleDraftSave() {
 var _postedInit = null;
 var _parentInitReady = !!sessionStorage.getItem("composeInit");
 var _parentInitListeners = [];
+var _msgEventCount = 0;
 window.addEventListener("message", (e) => {
+  _msgEventCount++;
   if (e.data?.type === "compose-init-ready") {
     _parentInitReady = true;
     for (const fn of _parentInitListeners.splice(0)) fn();
   } else if (e.data?.type === "compose-init" && e.data.init) {
+    if (!_postedInit) {
+      try {
+        logClientEvent("compose-init-received", { src: "postMessage" });
+      } catch {
+      }
+    }
     _postedInit = e.data.init;
     _parentInitReady = true;
     for (const fn of _parentInitListeners.splice(0)) fn();
   }
 });
+function pullInitFromParent() {
+  try {
+    const myFrame = window.frameElement;
+    const key = myFrame?.dataset?.composeKey;
+    if (!key) return null;
+    const stash = window.parent?.__mailxComposeInits;
+    const init = stash?.[key];
+    if (init) {
+      try {
+        logClientEvent("compose-init-received", { src: "parent-stash", key });
+      } catch {
+      }
+      return init;
+    }
+  } catch (e) {
+    try {
+      logClientEvent("compose-init-pull-failed", { err: e?.message || String(e) });
+    } catch {
+    }
+  }
+  return null;
+}
 function waitForParentInit(maxMs) {
   if (_parentInitReady) return Promise.resolve();
   return new Promise((resolve) => {
@@ -4192,17 +4222,20 @@ function waitForParentInit(maxMs) {
 }
 (async () => {
   _ctick("init IIFE start");
-  if (!sessionStorage.getItem("composeInit") && !_postedInit) {
+  let parentInit = pullInitFromParent();
+  if (!parentInit && !sessionStorage.getItem("composeInit") && !_postedInit) {
     _ctick("waiting for parent init");
     await waitForParentInit(1500);
-    _ctick("parent init received");
+    _ctick(`parent init received (msgEvents=${_msgEventCount})`);
+    if (!_postedInit) parentInit = pullInitFromParent();
   }
   const stored = sessionStorage.getItem("composeInit");
-  const initRaw = _postedInit || (stored ? JSON.parse(stored) : null);
+  const initRaw = parentInit || _postedInit || (stored ? JSON.parse(stored) : null);
   if (initRaw) {
     sessionStorage.removeItem("composeInit");
     const init = initRaw;
-    _ctick(`init parsed (mode=${init.mode}, bodyHtml=${init.bodyHtml?.length || 0} bytes, src=${_postedInit ? "postMessage" : "sessionStorage"})`);
+    const src = parentInit ? "parent-stash" : _postedInit ? "postMessage" : "sessionStorage";
+    _ctick(`init parsed (mode=${init.mode}, bodyHtml=${init.bodyHtml?.length || 0} bytes, src=${src})`);
     if (init.accounts && init.accounts.length > 0) {
       applyInit(init);
       _ctick("applyInit done \u2014 compose visible");