@bobfrankston/rmfmail 1.0.680 → 1.0.686

package/client/app.js

@@ -174,9 +174,13 @@ function updateBadge(count) {
 async function updateNewMessageCount() {
     try {
         const accounts = await getAccounts();
+        // Fan out folder queries in parallel — earlier code awaited each
+        // account's `getFolders` in series, so an N-account setup paid N
+        // back-to-back IPC round-trips on every count refresh (folderCountsChanged,
+        // sync events, IDLE updates).
+        const folderLists = await Promise.all(accounts.map((acct) => getFolders(acct.id).catch(() => [])));
         let totalUnread = 0;
-        for (const acct of accounts) {
-            const folders = await getFolders(acct.id);
+        for (const folders of folderLists) {
             const inbox = folders.find((f) => f.specialUse === "inbox");
             if (inbox)
                 totalUnread += inbox.unreadCount || 0;
@@ -252,9 +256,10 @@ window.addEventListener("focus", stopTitleFlash);
 /** Call when user actively views messages — resets the badge */
 function markAsSeen() {
     getAccounts().then(async (accounts) => {
+        // Parallel folder fetch — see updateNewMessageCount for rationale.
+        const folderLists = await Promise.all(accounts.map((acct) => getFolders(acct.id).catch(() => [])));
         let total = 0;
-        for (const acct of accounts) {
-            const folders = await getFolders(acct.id);
+        for (const folders of folderLists) {
             const inbox = folders.find((f) => f.specialUse === "inbox");
             if (inbox)
                 total += inbox.unreadCount || 0;
@@ -750,9 +755,29 @@ async function openCompose(mode) {
         console.warn(`[compose] ${mode} — no message selected`);
         return;
     }
-    const accounts = await getAccounts();
-    const accountId = current?.accountId || accounts[0]?.id || "";
+    // Parallel-load: kick off getAccounts AND open the iframe in the same
+    // tick. The iframe doesn't need the account list until after its editor
+    // bootstraps (200-500 ms for TinyMCE, less for Quill); by then the IPC
+    // round-trip has resolved. Earlier code awaited getAccounts FIRST,
+    // adding the IPC latency to the perceived Ctrl+N → editor-visible time.
+    // We post `compose-init-ready` to the iframe once init is in
+    // sessionStorage so compose.ts's IIFE can read synchronously without
+    // polling.
+    const accountsP = getAccounts();
     const msg = current?.message;
+    // Title bar text needs the subject from msg (no IPC dependency) — build
+    // it now so the iframe can be opened with the final title and avoid a
+    // flash of placeholder text.
+    const titlePrefix = mode === "reply" ? "Reply" :
+        mode === "replyAll" ? "Reply All" :
+            mode === "forward" ? "Forward" :
+                "Compose";
+    const titleSubject = mode === "new" ? "" : (msg?.subject || "");
+    const frame = showComposeOverlay(titleSubject ? `${titlePrefix}: ${titleSubject}` : titlePrefix);
+    // Now finish initialisation off the critical path — editor bootstrap
+    // inside the iframe runs concurrently with this await.
+    const accounts = await accountsP;
+    const accountId = current?.accountId || accounts[0]?.id || "";
     const rePrefix = /^(re|fwd?):\s*/i;
     const cleanSubject = msg ? msg.subject.replace(rePrefix, "") : "";
     const init = {
@@ -764,7 +789,7 @@ async function openCompose(mode) {
         bodyHtml: "",
         inReplyTo: "",
         references: [],
-        accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature })),
+        accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
     };
     // Auto-detect reply From: if the message was delivered to an identity address
     // (an alias on the account's domain, or the explicit `identityDomains` list
@@ -838,19 +863,16 @@ async function openCompose(mode) {
         init.bodyHtml = forwardBody(msg);
         init.fromAddress = detectReplyFrom();
     }
-    // Store init data for compose window to pick up
+    // Store init data for compose window to pick up. sessionStorage is the
+    // canonical handoff path — same origin between parent and iframe; the
+    // compose IIFE reads it after the editor finishes booting. We also
+    // postMessage the iframe so it can short-circuit the listen-for-message
+    // wait if it's already past editor init.
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // Inline compose: load compose.html in an overlay iframe (same origin, same IPC)
-    // Popup windows don't work in IPC mode (custom protocol doesn't propagate to child windows)
-    // Title reflects mode + subject so the user can see what they're replying to
-    // ("Re: Stars of STEM 2026" instead of just "Compose"). Forward shows the
-    // forward target subject; new compose stays generic.
-    const titlePrefix = mode === "reply" ? "Reply" :
-        mode === "replyAll" ? "Reply All" :
-            mode === "forward" ? "Forward" :
-                "Compose";
-    const titleSubject = mode === "new" ? "" : (msg?.subject || init.subject || "");
-    showComposeOverlay(titleSubject ? `${titlePrefix}: ${titleSubject}` : titlePrefix);
+    try {
+        frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*");
+    }
+    catch { /* */ }
 }
 function showComposeOverlay(title = "Compose") {
     const wrapper = document.createElement("div");
@@ -1000,6 +1022,7 @@ function showComposeOverlay(title = "Compose") {
     if (!isSmall)
         addComposeResizeHandles(wrapper, frame);
     document.body.appendChild(wrapper);
+    return frame;
 }
 /** Drop a transparent full-viewport shield in front of every other element
  *  so mousemove events stay in the document during a drag. Setting
@@ -1110,8 +1133,19 @@ function sanitizeQuotedBody(msg) {
         // like `<!--` / `-->` / `<!` in plain-text bodies can be misread
         // by the parser. Per Bob 2026-05-12: "not just ugly, it breaks
         // the HTML." Trivial source-clutter is the lesser evil.
+        //
+        // CRLF → <br>. `white-space:pre-wrap` alone is not enough: TinyMCE
+        // (and other HTML editors) normalize text-node whitespace when
+        // setContent ingests the HTML, collapsing `\n` to spaces BEFORE
+        // CSS runs. The literal `<br>` survives the normalization, so we
+        // get one line break per source line whether the editor preserves
+        // raw whitespace or not. pre-wrap stays as belt-and-braces and to
+        // keep multi-space runs (alignment, indented quote-markers like
+        // `> > >`) visible.
         const escaped = String(msg.bodyText || "")
-            .replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            .replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+            .replace(/\r\n?/g, "\n")
+            .replace(/\n/g, "<br>");
         return `<div style="white-space:pre-wrap;font-family:inherit;margin:0">${escaped}</div>`;
     }
     let body = msg.bodyHtml;
@@ -2646,7 +2680,12 @@ onWsEvent((event) => {
  *  rather than a single line, escaping `<` so embedded angle brackets in a
  *  signature/template don't get interpreted as tags. */
 async function openComposeFromMailto(m) {
-    const accounts = await getAccounts();
+    // Open the iframe immediately and load accounts in parallel — same
+    // pattern as openCompose. The mailto handler should never feel like
+    // "waiting for the system" to a user who clicked a link.
+    const accountsP = getAccounts();
+    const frame = showComposeOverlay(m.subject ? `Compose: ${m.subject}` : "Compose");
+    const accounts = await accountsP;
     const accountId = accounts[0]?.id || "";
     const escape = (s) => s.replace(/[&<>]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" }[c]));
     const bodyHtml = m.body
@@ -2662,10 +2701,13 @@ async function openComposeFromMailto(m) {
         bodyHtml,
         inReplyTo: m.inReplyTo,
         references: m.inReplyTo ? [m.inReplyTo] : [],
-        accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature })),
+        accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
     };
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    showComposeOverlay(m.subject ? `Compose: ${m.subject}` : "Compose");
+    try {
+        frame?.contentWindow?.postMessage({ type: "compose-init-ready" }, "*");
+    }
+    catch { /* */ }
 }
 // ── Keyboard shortcuts ──
 // Capture-phase pre-handler: intercept WebView accelerator keys that would
@@ -4395,8 +4437,11 @@ function renderOutboxStatus(s) {
 setInterval(async () => {
     try {
         const { getOutboxStatus, getDiagnostics } = await import("./lib/api-client.js");
-        renderOutboxStatus(await getOutboxStatus());
-        renderDiagnosticsBadge(await getDiagnostics());
+        // Run in parallel — neither call depends on the other and each is a
+        // separate IPC round-trip. Earlier code awaited them serially.
+        const [outbox, diag] = await Promise.all([getOutboxStatus(), getDiagnostics()]);
+        renderOutboxStatus(outbox);
+        renderDiagnosticsBadge(diag);
     }
     catch { /* service unreachable */ }
 }, 15000);
@@ -4404,8 +4449,9 @@ setInterval(async () => {
 (async () => {
     try {
         const { getOutboxStatus, getDiagnostics } = await import("./lib/api-client.js");
-        renderOutboxStatus(await getOutboxStatus());
-        renderDiagnosticsBadge(await getDiagnostics());
+        const [outbox, diag] = await Promise.all([getOutboxStatus(), getDiagnostics()]);
+        renderOutboxStatus(outbox);
+        renderDiagnosticsBadge(diag);
     }
     catch { /* */ }
 })();