@bobfrankston/rmfmail 1.2.95 → 1.2.97

package/client/app.bundle.js

@@ -55,6 +55,7 @@ __export(api_client_exports, {
   getDiagnostics: () => getDiagnostics,
   getFolders: () => getFolders,
   getMessage: () => getMessage,
+  getMessageSource: () => getMessageSource,
   getMessages: () => getMessages,
   getOutboxStatus: () => getOutboxStatus,
   getPrimaryAccount: () => getPrimaryAccount,
@@ -617,6 +618,9 @@ async function openAttachment(accountId, uid, attachmentId, folderId, filename)
   const fn = ipc().openAttachment;
   return fn ? fn(accountId, uid, attachmentId, folderId, filename) : void 0;
 }
+async function getMessageSource(accountId, uid, folderId) {
+  return ipc().getMessageSource(accountId, uid, folderId);
+}
 async function getDeviceAccounts() {
   return ipc().getDeviceAccounts?.() ?? [];
 }
@@ -1311,7 +1315,13 @@ function showPreviewBodyMenu(absX, absY, selectedText, sourceWindow, linkUrl, li
     } },
     { label: "", action: () => {
     }, separator: true },
-    { label: "Print\u2026 (Ctrl+P)", action: () => printCurrentMessage() }
+    { label: "Print\u2026 (Ctrl+P)", action: () => printCurrentMessage() },
+    { label: "Save message (.eml)\u2026", action: () => {
+      void saveCurrentMessageAsEml();
+    } },
+    { label: "Save message as HTML\u2026", action: () => {
+      void saveCurrentMessageAsHtml();
+    } }
   );
   showContextMenu(absX, absY, items);
 }
@@ -2060,6 +2070,29 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
     attEl.hidden = true;
     if (msg.attachments?.length) {
       attEl.hidden = false;
+      for (const u of dragOutUrls) {
+        try {
+          URL.revokeObjectURL(u);
+        } catch {
+        }
+      }
+      dragOutUrls.length = 0;
+      const dragCache = /* @__PURE__ */ new Map();
+      void (async () => {
+        for (const a1 of msg.attachments) {
+          if ((a1.size || 0) > 50 * 1024 * 1024)
+            continue;
+          try {
+            const data = await getAttachment(accountId, uid, a1.id, msg.folderId);
+            const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
+            const blob = new Blob([bytes], { type: data.contentType || "application/octet-stream" });
+            const url = URL.createObjectURL(blob);
+            dragOutUrls.push(url);
+            dragCache.set(a1.id, { url, contentType: data.contentType || "application/octet-stream" });
+          } catch {
+          }
+        }
+      })();
       const saveAttachmentAt = async (idx) => {
         const a0 = msg.attachments[idx];
         const name = a0.filename || "attachment";
@@ -2158,21 +2191,20 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           }
         });
         chip.draggable = true;
-        chip.addEventListener("dragstart", async (e) => {
+        chip.addEventListener("dragstart", (e) => {
           if (!e.dataTransfer)
             return;
-          try {
-            const data = await getAttachment(accountId, uid, att.id, msg.folderId);
-            const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
-            const blob = new Blob([bytes], { type: data.contentType || "application/octet-stream" });
-            const url = URL.createObjectURL(blob);
-            const safeName = (att.filename || "attachment").replace(/[\r\n"\/\\]/g, "_");
-            const downloadUrl = `${data.contentType || "application/octet-stream"}:${safeName}:${url}`;
-            e.dataTransfer.setData("DownloadURL", downloadUrl);
-            e.dataTransfer.effectAllowed = "copy";
-          } catch (err) {
-            console.error(`Attachment drag-out failed: ${err.message || err}`);
+          const cached2 = dragCache.get(att.id);
+          if (!cached2) {
+            e.preventDefault();
+            const statusEl = document.getElementById("status-sync");
+            if (statusEl)
+              statusEl.textContent = "Attachment still loading \u2014 try dragging again in a moment.";
+            return;
           }
+          const safeName = (att.filename || "attachment").replace(/[\r\n"\/\\]/g, "_");
+          e.dataTransfer.setData("DownloadURL", `${cached2.contentType}:${safeName}:${cached2.url}`);
+          e.dataTransfer.effectAllowed = "copy";
         });
         chip.addEventListener("contextmenu", (e) => {
           e.preventDefault();
@@ -2663,16 +2695,22 @@ function popOutToWindow() {
     }
   }, 600);
 }
-function printCurrentMessage() {
-  if (!currentMessage)
-    return;
-  const m = currentMessage;
+function buildPrintableDoc(m) {
+  if (!m)
+    return null;
   const fmt = (a) => a?.name ? `${a.name} <${a.address || ""}>` : a?.address || "";
   const esc = escapeHtmlLocal;
   const row = (label, value) => value ? `<div><strong>${label}:</strong> ${esc(value)}</div>` : "";
   const headerHtml = `<div style="font-family:system-ui,Segoe UI,sans-serif;font-size:11pt;border-bottom:1px solid #999;padding-bottom:8px;margin-bottom:14px;line-height:1.5;">` + row("From", fmt(m.from || {})) + row("To", (m.to || []).map(fmt).join(", ")) + (m.cc?.length ? row("Cc", m.cc.map(fmt).join(", ")) : "") + row("Subject", m.subject || "") + row("Date", m.date ? new Date(m.date).toLocaleString() : "") + `</div>`;
   const bodyHtml = m.bodyHtml ? m.bodyHtml : `<pre style="white-space:pre-wrap;word-break:break-word;font-family:system-ui,sans-serif;">${esc(m.bodyText || "")}</pre>`;
-  const doc = `<!DOCTYPE html><html><head><meta charset="utf-8"><title>${esc(m.subject || "Message")}</title><style>@media print{body{margin:0;}}body{margin:16px;}img{max-width:100%;}</style></head><body>${headerHtml}${bodyHtml}</body></html>`;
+  return `<!DOCTYPE html><html><head><meta charset="utf-8"><title>${esc(m.subject || "Message")}</title><style>@media print{body{margin:0;}}body{margin:16px;}img{max-width:100%;}</style></head><body>${headerHtml}${bodyHtml}</body></html>`;
+}
+function printCurrentMessage() {
+  if (!currentMessage)
+    return;
+  const doc = buildPrintableDoc(currentMessage);
+  if (!doc)
+    return;
   const iframe = document.createElement("iframe");
   iframe.style.cssText = "position:fixed;left:-9999px;width:1px;height:1px;border:0;";
   iframe.srcdoc = doc;
@@ -2701,6 +2739,58 @@ function printCurrentMessage() {
   }, { once: true });
   document.body.appendChild(iframe);
 }
+async function saveBlobAs(suggestedName, blob) {
+  const picker = window.showSaveFilePicker;
+  if (typeof picker === "function") {
+    let handle;
+    try {
+      handle = await picker({ suggestedName });
+    } catch (e) {
+      if (e?.name === "AbortError")
+        return;
+      throw e;
+    }
+    const writable = await handle.createWritable();
+    await writable.write(blob);
+    await writable.close();
+    return;
+  }
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = suggestedName;
+  a.style.display = "none";
+  document.body.appendChild(a);
+  a.click();
+  setTimeout(() => {
+    a.remove();
+    URL.revokeObjectURL(url);
+  }, 5e3);
+}
+async function saveCurrentMessageAsEml() {
+  if (!currentMessage)
+    return;
+  try {
+    const src = await getMessageSource(currentAccountId, currentMessage.uid, currentMessage.folderId);
+    const bytes = Uint8Array.from(atob(src.dataBase64), (c) => c.charCodeAt(0));
+    await saveBlobAs(src.filename || "message.eml", new Blob([bytes], { type: "message/rfc822" }));
+  } catch (e) {
+    window.dispatchEvent(new CustomEvent("mailx-alert", { detail: { message: `Couldn't save message: ${e?.message || e}`, key: "message-save" } }));
+  }
+}
+async function saveCurrentMessageAsHtml() {
+  if (!currentMessage)
+    return;
+  const doc = buildPrintableDoc(currentMessage);
+  if (!doc)
+    return;
+  const base = (currentMessage.subject || "message").replace(/[<>:"/\\|?*\r\n]/g, "_").slice(0, 80).trim() || "message";
+  try {
+    await saveBlobAs(`${base}.html`, new Blob([doc], { type: "text/html" }));
+  } catch (e) {
+    window.dispatchEvent(new CustomEvent("mailx-alert", { detail: { message: `Couldn't save message: ${e?.message || e}`, key: "message-save" } }));
+  }
+}
 function spawnDesktopPopout(msg, accountId) {
   const wrapper = document.createElement("div");
   wrapper.className = "compose-overlay viewer-popout";
@@ -2817,7 +2907,7 @@ function spawnDesktopPopout(msg, accountId) {
 function escapeHtmlLocal(s) {
   return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-var currentMessage, currentAccountId, 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;
 var init_message_viewer = __esm({
   "client/components/message-viewer.js"() {
     "use strict";
@@ -2828,6 +2918,7 @@ var init_message_viewer = __esm({
     init_mailx_types();
     currentMessage = null;
     currentAccountId = "";
+    dragOutUrls = [];
     showMessageGeneration = 0;
     retryCount = 0;
     lastEnvelope = null;
@@ -6434,6 +6525,14 @@ var refreshDebounceTimer = null;
 var DRAG_HOVER_EXPAND_MS = 600;
 var dragAutoExpanded = /* @__PURE__ */ new Set();
 var dragInFlight = false;
+function collapseDragExpanded() {
+  if (dragAutoExpanded.size === 0)
+    return false;
+  for (const key of dragAutoExpanded)
+    delete expandState[key];
+  dragAutoExpanded.clear();
+  return true;
+}
 var expandState = JSON.parse(localStorage.getItem("mailx-folders-expanded") || "{}");
 function saveExpandState() {
   localStorage.setItem("mailx-folders-expanded", JSON.stringify(expandState));
@@ -6812,6 +6911,14 @@ function renderNode(node, container, depth) {
         clearTimeout(dragExpandTimer);
         dragExpandTimer = null;
       }
+      const springCollapsed = collapseDragExpanded();
+      const rerenderTree = () => {
+        const tc = document.getElementById("folder-tree");
+        if (tc)
+          loadFolderTree(tc);
+      };
+      if (springCollapsed)
+        rerenderTree();
       const folderData = e.dataTransfer.getData("application/x-mailx-folder");
       if (folderData) {
         let src;
@@ -6920,11 +7027,8 @@ document.addEventListener("dragend", () => {
   if (!dragInFlight)
     return;
   dragInFlight = false;
-  if (dragAutoExpanded.size === 0)
+  if (!collapseDragExpanded())
     return;
-  for (const key of dragAutoExpanded)
-    delete expandState[key];
-  dragAutoExpanded.clear();
   const treeContainer = document.getElementById("folder-tree");
   if (treeContainer)
     loadFolderTree(treeContainer);