@bobfrankston/rmfmail 1.2.241 → 1.2.243

package/client/app.bundle.js

@@ -1848,6 +1848,23 @@ function showPreviewBodyMenu(absX, absY, selectedText, sourceWindow, linkUrl, li
   );
   showContextMenu(absX, absY, items);
 }
+function renderBodyFetchGaveUp(bodyEl, accountId, uid, folderId, secs, previewText, specialUse, envelope) {
+  const looksImapUidOnApiAccount = uid > 0 && uid < 1e9;
+  const why = looksImapUidOnApiAccount ? `This message was indexed over IMAP, but its account fetches bodies through the Gmail API, which addresses messages by a different id. The body can't be requested for this row.` : `The server accepted the request but never returned the body.`;
+  const snippet = previewText ? `<div class="mv-preview-placeholder">${escapeHtml3(previewText)}<div class="mv-tear-line"><span>\u2702 snippet \u2014 this is all that arrived \u2702</span></div></div>` : "";
+  bodyEl.innerHTML = `${snippet}<div class="mv-system-message mv-system-error">
+        <div class="mv-system-tag">rmfmail</div>
+        <div class="mv-system-title">Body didn't arrive after ${secs}s \u2014 not still loading</div>
+        <div class="mv-system-body">${escapeHtml3(why)}
+        <div style="margin-top:8px;display:flex;gap:8px;flex-wrap:wrap">
+            <button id="mv-body-retry" class="tb-btn">Try again</button>
+        </div></div></div>`;
+  bodyEl.querySelector("#mv-body-retry")?.addEventListener("click", () => {
+    invalidateParsedCache(accountId, folderId, uid);
+    showMessage(accountId, uid, folderId, specialUse, true, envelope).catch(() => {
+    });
+  });
+}
 function toggleFullscreenPreview() {
   const body = document.body;
   const on = !body.classList.contains("fullscreen-preview");
@@ -2205,8 +2222,14 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         span.textContent = secs >= 60 ? `(${Math.floor(secs / 60)}m ${secs % 60}s)` : `(${secs}s)`;
         if (secs === 30)
           span.classList.add("mv-wait-slow");
+        if (secs >= WAIT_GIVE_UP_SECS) {
+          clearInterval(tick);
+          off?.();
+          renderBodyFetchGaveUp(bodyEl, accountId, uid, folderId, secs, previewText, specialUse, envelope || cached || void 0);
+        }
       }, 1e3);
-      const off = subscribeStore("*", (ev) => {
+      let off;
+      off = subscribeStore("*", (ev) => {
         if (ev.kind !== "bodyAvailable")
           return;
         if (ev.accountId !== accountId || ev.uid !== uid)
@@ -3480,7 +3503,10 @@ function buildPrintableDoc(m) {
 function printCurrentMessage() {
   if (!currentMessage)
     return;
-  const doc = buildPrintableDoc(currentMessage);
+  printMessage(currentMessage);
+}
+function printMessage(msg) {
+  const doc = buildPrintableDoc(msg);
   if (!doc)
     return;
   const iframe = document.createElement("iframe");
@@ -3581,6 +3607,30 @@ function spawnDesktopPopout(msg, accountId) {
   closeBtn.addEventListener("mouseleave", () => closeBtn.style.color = "#666");
   closeBtn.addEventListener("click", () => wrapper.remove());
   titleBar.appendChild(closeBtn);
+  const actions = document.createElement("div");
+  actions.style.cssText = "display:flex;gap:4px;padding:6px 10px;border-bottom:1px solid var(--color-border, #ddd);flex-shrink:0;flex-wrap:wrap;";
+  const compose = (mode) => {
+    document.dispatchEvent(new CustomEvent("mailx-compose", {
+      detail: { mode, message: msg, accountId }
+    }));
+  };
+  const mkBtn = (label, title, onClick) => {
+    const b = document.createElement("button");
+    b.className = "tb-btn";
+    b.textContent = label;
+    b.title = title;
+    b.style.cssText = "padding:3px 10px;font-size:13px;cursor:pointer;";
+    b.addEventListener("click", onClick);
+    return b;
+  };
+  actions.appendChild(mkBtn("\u21A9 Reply", "Reply to the sender of this message", () => compose("reply")));
+  actions.appendChild(mkBtn("\u21A9\u21A9 Reply All", "Reply to everyone on this message", () => compose("replyAll")));
+  actions.appendChild(mkBtn("\u2192 Forward", "Forward this message", () => compose("forward")));
+  actions.appendChild(mkBtn("\u270E Edit as new", "Open a copy of this message in compose \u2014 the way to rework and resend one you sent", () => compose("editAsNew")));
+  const spacer = document.createElement("span");
+  spacer.style.cssText = "flex:1;";
+  actions.appendChild(spacer);
+  actions.appendChild(mkBtn("\u{1F5A8}", "Print this message", () => printMessage(msg)));
   const headerInfo = document.createElement("div");
   headerInfo.style.cssText = "padding:8px 12px;border-bottom:1px solid var(--color-border, #ddd);font-size:13px;line-height:1.4;flex-shrink:0;";
   const formatAddrLocal = (a) => a.name ? `${a.name} <${a.address}>` : a.address;
@@ -3671,6 +3721,7 @@ function spawnDesktopPopout(msg, accountId) {
     wrapper.remove();
   }));
   wrapper.appendChild(titleBar);
+  wrapper.appendChild(actions);
   wrapper.appendChild(headerInfo);
   wrapper.appendChild(toolbar);
   wrapper.appendChild(bodyContainer);
@@ -3679,7 +3730,7 @@ function spawnDesktopPopout(msg, accountId) {
 function escapeHtmlLocal(s) {
   return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
+var currentMessage, currentAccountId, dragOutUrls, showMessageGeneration, retryCount, lastEnvelope, PARSED_CACHE_LIMIT, parsedCache, sessionAllowedRemote, recentFetchErrors, WAIT_GIVE_UP_SECS, ZOOM_KEY, ZOOM_MIN, ZOOM_MAX, ZOOM_STEP, previewZoom, RENDER_MARK_KEY, RENDER_MARK_MAX_AGE_MS, poisonedMessages, renderKey, PROGRESSIVE_TEXT_THRESHOLD, TEXT_CHUNK_BYTES;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -3698,6 +3749,7 @@ var init_message_viewer = __esm({
     parsedCache = /* @__PURE__ */ new Map();
     sessionAllowedRemote = /* @__PURE__ */ new Set();
     recentFetchErrors = /* @__PURE__ */ new Map();
+    WAIT_GIVE_UP_SECS = 45;
     ZOOM_KEY = "mailx-preview-zoom";
     ZOOM_MIN = 0.5;
     ZOOM_MAX = 3;
@@ -4667,7 +4719,9 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
     const partial = !!result.partial;
     const foldersFailed = result.foldersFailed || 0;
     const foldersSearched = result.foldersSearched || 0;
-    const partialNote = partial ? `<div class="ml-search-warning">\u26A0 Searched ${foldersSearched} folder(s); ${foldersFailed} could not be searched (timeout / connection). Results may be incomplete \u2014 retry to search them again.</div>` : "";
+    const foldersGone = result.foldersGone || 0;
+    const goneNote = foldersGone > 0 ? `<div class="ml-search-warning">Removed ${foldersGone} stale folder(s) that no longer exist on the server \u2014 they won't be searched again.</div>` : "";
+    const partialNote = (partial && foldersFailed > 0 ? `<div class="ml-search-warning">\u26A0 Searched ${foldersSearched} folder(s); ${foldersFailed} timed out. Results may be incomplete \u2014 search again to retry those.</div>` : "") + goneNote;
     if (result.items.length === 0) {
       setMessages([]);
       body.innerHTML = partialNote + `<div class="ml-empty">No messages found by "${escapeHtmlText(query)}"${partial ? " in the folders that responded" : ""}</div>`;
@@ -10312,7 +10366,7 @@ document.addEventListener("mailx-compose", ((e) => {
   if (e.detail.mode === "draft" && sessionStorage.getItem("composeInit")) {
     showComposeOverlay();
   } else {
-    openCompose(e.detail.mode);
+    openCompose(e.detail.mode, e.detail.message, e.detail.accountId);
   }
 }));
 document.addEventListener("mailx-delete", () => deleteSelection());