@bobfrankston/rmfmail 1.2.241 → 1.2.242

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)
@@ -3679,7 +3702,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 +3721,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;