@bobfrankston/rmfmail 1.2.226 → 1.2.228

package/client/app.bundle.js

@@ -1795,6 +1795,18 @@ function confirmDeleteAttachments(msg, accountId, uid, ids, question) {
   backdrop.append(panel);
   document.body.append(backdrop);
 }
+function markRenderStart(accountId, uid) {
+  try {
+    sessionStorage.setItem(RENDER_MARK_KEY, JSON.stringify({ key: renderKey(accountId, uid), at: Date.now() }));
+  } catch {
+  }
+}
+function markRenderDone() {
+  try {
+    sessionStorage.removeItem(RENDER_MARK_KEY);
+  } catch {
+  }
+}
 async function showMessage(accountId, uid, folderId, specialUse, isRetry = false, envelope) {
   const gen = ++showMessageGeneration;
   if (!isRetry)
@@ -1850,11 +1862,28 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
     headerEl.hidden = true;
   }
   attEl.hidden = true;
+  if (poisonedMessages.has(renderKey(accountId, uid)) && !isRetry) {
+    const emlHint = envelope?.emlPath || "";
+    bodyEl.innerHTML = `<div class="mv-system-message mv-system-error">
+            <div class="mv-system-tag">mailx</div>
+            <div class="mv-system-title">Render failed for this message</div>
+            <div class="mv-system-body">The display engine stopped while drawing this message last time, so it hasn't been drawn again automatically.
+            Usually this means an unusually large body.${emlHint ? `<br><code style="user-select:all;font-size:0.9em">${escapeHtml2(emlHint)}</code>` : ""}
+            <br><br><button type="button" id="mv-render-anyway" class="mailx-modal-btn">Try anyway</button></div>
+        </div>`;
+    document.getElementById("mv-render-anyway")?.addEventListener("click", () => {
+      poisonedMessages.delete(renderKey(accountId, uid));
+      void showMessage(accountId, uid, folderId, specialUse, true, envelope);
+    });
+    attEl.hidden = true;
+    return;
+  }
   try {
     if (cachedMsg)
       _ptick("parsedCache HIT \u2014 sync render");
     else
       _ptick("parsedCache MISS \u2014 IPC begin");
+    markRenderStart(accountId, uid);
     const msg = cachedMsg ? cachedMsg : await getMessage(accountId, uid, false, folderId);
     if (!cachedMsg)
       _ptick(`IPC done (cached=${msg.cached !== false}, ${msg.bodyHtml?.length || 0} bytes html)`);
@@ -2387,6 +2416,19 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       const pre = document.createElement("pre");
       pre.style.cssText = "padding: 1rem; white-space: pre-wrap; word-break: break-word; font-family: system-ui, sans-serif; font-size: 17.5px; line-height: 1.5; color: #1a1a2e; background: #fff; margin: 0; height: 100%; overflow: auto;";
       pre.innerHTML = linkifyText(msg.bodyText);
+      const trunc = msg.bodyTruncated;
+      if (trunc) {
+        const mb = (n) => `${(n / 1048576).toFixed(1)} MB`;
+        const note = document.createElement("div");
+        note.className = "mv-system-message mv-system-error";
+        note.style.cssText = "margin: 0 0 12px 0;";
+        note.innerHTML = `<div class="mv-system-tag">mailx</div>
+                    <div class="mv-system-title">Showing the first ${mb(trunc.sentBytes)} of a ${mb(trunc.totalBytes)} message</div>
+                    <div class="mv-system-body">This message has no MIME structure, so its entire payload is one plain-text part; the remainder is almost always the base64 of a returned attachment.
+                    The complete message is on disk:<br>
+                    <code style="user-select:all;font-size:0.9em">${escapeHtml2(trunc.emlPath || "(path unavailable)")}</code></div>`;
+        bodyEl.appendChild(note);
+      }
       bodyEl.appendChild(pre);
     } else {
       const fetchErr = recentFetchErrors.get(`${accountId}:${uid}`);
@@ -2408,6 +2450,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
                 </div>`;
       }
     }
+    markRenderDone();
     attEl.innerHTML = "";
     attEl.hidden = true;
     if (msg.attachments?.length) {
@@ -3275,7 +3318,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;
+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;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -3324,6 +3367,24 @@ var init_message_viewer = __esm({
         clearViewer();
       }
     });
+    RENDER_MARK_KEY = "mailx-rendering";
+    RENDER_MARK_MAX_AGE_MS = 6e4;
+    poisonedMessages = /* @__PURE__ */ new Set();
+    renderKey = (a, u) => `${a}:${u}`;
+    (() => {
+      try {
+        const raw = sessionStorage.getItem(RENDER_MARK_KEY);
+        if (!raw)
+          return;
+        sessionStorage.removeItem(RENDER_MARK_KEY);
+        const mark = JSON.parse(raw);
+        if (!mark?.key || Date.now() - (mark.at || 0) > RENDER_MARK_MAX_AGE_MS)
+          return;
+        poisonedMessages.add(mark.key);
+        console.error(`[viewer] previous render of ${mark.key} did not complete \u2014 the WebView probably died on it; not auto-rendering again`);
+      } catch {
+      }
+    })();
     subscribeStore("*", (ev) => {
       if (ev.kind !== "bodyFetchError")
         return;