@bobfrankston/rmfmail 1.2.116 → 1.2.118

package/client/app.ts

@@ -5616,6 +5616,7 @@ document.addEventListener("mailx-popout-message", (async (e: any) => {
             accountId,
             to: msg.to || [],
             cc: msg.cc || [],
+            bcc: msg.bcc || [],
             subject: msg.subject || subject || "",
             bodyHtml: msg.bodyHtml || "",
             inReplyTo: msg.inReplyTo || "",

package/client/compose/compose.bundle.js

@@ -1024,10 +1024,12 @@ __export(api_client_exports, {
   autocomplete: () => autocomplete,
   cancelQueuedOutgoing: () => cancelQueuedOutgoing,
   cancelServerSearch: () => cancelServerSearch,
+  closeComposePopout: () => closeComposePopout,
   closeWordEdit: () => closeWordEdit,
   connectEvents: () => connectEvents,
   connectWebSocket: () => connectWebSocket,
   consumePendingMailto: () => consumePendingMailto,
+  consumePopoutComposeInit: () => consumePopoutComposeInit,
   copyMessages: () => copyMessages,
   createCalendarEvent: () => createCalendarEvent,
   createFolder: () => createFolder,
@@ -1082,6 +1084,7 @@ __export(api_client_exports, {
   openInTextEditor: () => openInTextEditor,
   openInWord: () => openInWord,
   openLocalPath: () => openLocalPath,
+  popoutCompose: () => popoutCompose,
   popoutWindow: () => popoutWindow,
   readConfigHelp: () => readConfigHelp,
   readJsoncFile: () => readJsoncFile,
@@ -1625,6 +1628,22 @@ async function popoutWindow(accountId, uid, folderId, subject) {
     return { ok: false, reason: "no popoutWindow bridge" };
   return fn(accountId, uid, folderId, subject);
 }
+async function popoutCompose(init) {
+  const fn = ipc().popoutCompose;
+  if (!fn)
+    return { ok: false, reason: "no popoutCompose bridge" };
+  return fn(init);
+}
+async function consumePopoutComposeInit(id) {
+  const fn = ipc().consumePopoutComposeInit;
+  if (!fn)
+    return { init: null };
+  return fn(id);
+}
+function closeComposePopout(id) {
+  const fn = ipc().closeComposePopout;
+  return fn ? fn(id) : Promise.resolve({ ok: false });
+}
 async function getDeviceAccounts() {
   return ipc().getDeviceAccounts?.() ?? [];
 }
@@ -3725,8 +3744,13 @@ function _ctick(label) {
   }
 }
 _ctick("module body executing");
+var popoutInitId = new URLSearchParams(location.search).get("pi") || "";
 function closeCompose() {
   logClientEvent("compose-close");
+  if (popoutInitId) {
+    void closeComposePopout(popoutInitId).catch(() => {
+    });
+  }
   try {
     parent.postMessage({ type: "mailx-compose-close" }, "*");
   } catch {
@@ -4497,17 +4521,26 @@ function expandGroups(raw) {
 }
 function applyInit(init) {
   populateFromOptions(init.accounts, init.accountId);
-  if (init.fromAddress) {
+  if (init.fromRaw) {
+    fromInput.value = init.fromRaw;
+  } else if (init.fromAddress) {
     const account = init.accounts.find((a) => a.id === init.accountId);
     const displayName = account?.name || "";
     fromInput.value = displayName ? `${displayName} <${init.fromAddress}>` : init.fromAddress;
   }
   toInput.value = formatAddrs(init.to);
   ccInput.value = formatAddrs(init.cc);
+  bccInput.value = formatAddrs(init.bcc || []);
   subjectInput.value = init.subject;
   autoGrowAddrInput(toInput);
   autoGrowAddrInput(ccInput);
   autoGrowAddrInput(bccInput);
+  if (bccInput.value.trim()) {
+    const bccRowEl = document.getElementById("compose-bcc-row");
+    const bccBtn = document.getElementById("btn-toggle-bcc");
+    if (bccRowEl) bccRowEl.hidden = false;
+    if (bccBtn) bccBtn.classList.add("active");
+  }
   if (ccInput.value.trim()) {
     const ccRowEl = document.getElementById("compose-cc-row");
     const ccBtn = document.getElementById("btn-toggle-cc");
@@ -4660,6 +4693,7 @@ async function saveDraft2() {
       bodyText: editor.getText(),
       to: toInput.value,
       cc: ccInput.value,
+      bcc: bccInput.value,
       previousDraftUid: draftUid,
       draftId
     });
@@ -4747,19 +4781,33 @@ function waitForParentInit(maxMs) {
 }
 (async () => {
   _ctick("init IIFE start");
-  let parentInit = pullInitFromParent();
-  if (!parentInit && !sessionStorage.getItem("composeInit") && !_postedInit) {
-    _ctick("waiting for parent init");
-    await waitForParentInit(1500);
-    _ctick(`parent init received (msgEvents=${_msgEventCount})`);
-    if (!_postedInit) parentInit = pullInitFromParent();
+  let parentInit = null;
+  if (popoutInitId) {
+    try {
+      parentInit = (await consumePopoutComposeInit(popoutInitId))?.init || null;
+    } catch (e) {
+      console.error("Failed to fetch popout compose init:", e);
+    }
+    _ctick(`popout init ${parentInit ? "received" : "MISSING"}`);
+    try {
+      document.title = parentInit?.subject ? `Compose: ${parentInit.subject}` : "Compose";
+    } catch {
+    }
+  } else {
+    parentInit = pullInitFromParent();
+    if (!parentInit && !sessionStorage.getItem("composeInit") && !_postedInit) {
+      _ctick("waiting for parent init");
+      await waitForParentInit(1500);
+      _ctick(`parent init received (msgEvents=${_msgEventCount})`);
+      if (!_postedInit) parentInit = pullInitFromParent();
+    }
   }
   const stored = sessionStorage.getItem("composeInit");
   const initRaw = parentInit || _postedInit || (stored ? JSON.parse(stored) : null);
   if (initRaw) {
     sessionStorage.removeItem("composeInit");
     const init = initRaw;
-    const src = parentInit ? "parent-stash" : _postedInit ? "postMessage" : "sessionStorage";
+    const src = parentInit ? popoutInitId ? "popout" : "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);
@@ -5044,6 +5092,50 @@ document.getElementById("btn-discard")?.addEventListener("click", async () => {
   }
   closeCompose();
 });
+var composePopoutBtn = document.getElementById("btn-compose-popout");
+if (composePopoutBtn && popoutInitId) composePopoutBtn.style.display = "none";
+composePopoutBtn?.addEventListener("click", async () => {
+  if (!draftId) draftId = `mailx-draft-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  const init = {
+    // "draft" mode so applyInit does NOT re-append the signature — the
+    // body already carries whatever the user has (sig included).
+    mode: "draft",
+    accountId: getFromAccountId(),
+    to: parseAddrs(toInput.value),
+    cc: parseAddrs(ccInput.value),
+    bcc: parseAddrs(bccInput.value),
+    subject: subjectInput.value,
+    bodyHtml: editor.getHtml(),
+    inReplyTo: replyInReplyTo,
+    references: replyReferences,
+    accounts: knownAccounts,
+    fromRaw: getFromAddress(),
+    attachments: attachments.map((a) => ({ filename: a.filename, mimeType: a.mimeType, dataBase64: a.dataBase64 })),
+    draftUid: draftUid ?? void 0,
+    draftId: draftId ?? void 0
+  };
+  composePopoutBtn.disabled = true;
+  try {
+    const r = await popoutCompose(init);
+    if (r?.ok) {
+      if (draftDebounceTimer) {
+        clearTimeout(draftDebounceTimer);
+        draftDebounceTimer = null;
+      }
+      if (draftTimer) {
+        clearInterval(draftTimer);
+        draftTimer = null;
+      }
+      closeCompose();
+    } else {
+      showDraftStatus(`Popout failed: ${r?.reason || "unknown"}`, true);
+      composePopoutBtn.disabled = false;
+    }
+  } catch (e) {
+    showDraftStatus(`Popout failed: ${e?.message || e}`, true);
+    composePopoutBtn.disabled = false;
+  }
+});
 var ccRow = document.getElementById("compose-cc-row");
 var bccRow = document.getElementById("compose-bcc-row");
 var toggleCcBtn = document.getElementById("btn-toggle-cc");