@bobfrankston/rmfmail 1.2.96 → 1.2.98

package/client/components/message-viewer.ts

@@ -9,7 +9,7 @@
  * drift impossible: there is exactly one path into this pane.
  */
 
-import { getMessage, updateFlags, allowRemoteContent, flagSenderOrDomain, getAttachment, openAttachment, addContact, listContacts, upsertContact, unsubscribeOneClick, addPreferredContact, onEvent, subscribeStore } from "../lib/api-client.js";
+import { getMessage, updateFlags, allowRemoteContent, flagSenderOrDomain, getAttachment, openAttachment, getMessageSource, addContact, listContacts, upsertContact, unsubscribeOneClick, addPreferredContact, onEvent, subscribeStore } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 import type { MenuItem } from "./context-menu.js";
 import type { ListMessage } from "../lib/message-state.js";
@@ -20,6 +20,9 @@ import { setSeen, seenOf } from "@bobfrankston/mailx-types";
 /** Currently displayed message (for reply/forward) */
 let currentMessage: any = null;
 let currentAccountId: string = "";
+// Blob URLs created for attachment drag-out (revoked when the next message's
+// chips render, so they don't accumulate across the session).
+const dragOutUrls: string[] = [];
 let showMessageGeneration = 0; // Cancel stale fetches
 let retryCount = 0;
 /** Last envelope handed in by the list — used for envelope-first paint
@@ -220,6 +223,8 @@ export function showPreviewBodyMenu(absX: number, absY: number, selectedText: st
         { label: "Zoom out (−)", action: () => { for (const f of Array.from(document.querySelectorAll("iframe"))) { const d = (f as HTMLIFrameElement).contentDocument; if (d) { setZoom(previewZoom - ZOOM_STEP, d); break; } } } },
         { label: "", action: () => {}, separator: true },
         { label: "Print… (Ctrl+P)", action: () => printCurrentMessage() },
+        { label: "Save message (.eml)…", action: () => { void saveCurrentMessageAsEml(); } },
+        { label: "Save message as HTML…", action: () => { void saveCurrentMessageAsHtml(); } },
     );
     showContextMenu(absX, absY, items);
 }
@@ -1260,6 +1265,30 @@ export async function showMessage(accountId: string, uid: number, folderId?: num
         attEl.hidden = true;
         if (msg.attachments?.length) {
             attEl.hidden = false;
+            // ── Drag-out prefetch cache ──
+            // dataTransfer.setData ONLY works synchronously inside dragstart —
+            // the drag data store closes at the first `await` — so the old
+            // handler that fetched the attachment inside dragstart silently
+            // set nothing, and drag-to-Explorer never worked (Bob 2026-07-02).
+            // Prefetch every attachment's bytes in the background right after
+            // the chips render; dragstart reads this cache synchronously.
+            // Blob URLs from the previous message are revoked first.
+            for (const u of dragOutUrls) { try { URL.revokeObjectURL(u); } catch { /* */ } }
+            dragOutUrls.length = 0;
+            const dragCache = new Map<number, { url: string; contentType: string }>();
+            void (async () => {
+                for (const a1 of msg.attachments) {
+                    if ((a1.size || 0) > 50 * 1024 * 1024) continue; // don't buffer >50MB for a maybe-drag
+                    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 { /* drag-out just won't arm for this attachment */ }
+                }
+            })();
             // Save (download to disk) one attachment by index — distinct from
             // the click handler's "open with the OS app". Desktop (WebView2 =
             // Chromium) gets a real Save-As dialog via showSaveFilePicker;
@@ -1378,26 +1407,27 @@ export async function showMessage(accountId: string, uid: number, folderId?: num
                         restoreChip();
                     }
                 });
-                // Drag the chip to an external target (Explorer / Finder / Files app)
-                // to drop the file there. Uses the Chromium `DownloadURL` dataTransfer
-                // format: "mime:filename:blob-url". We fetch the attachment first so
-                // the blob URL is valid by the time the drop lands.
+                // Drag the chip to an external target (Explorer / Finder) to
+                // drop the file there. Chromium `DownloadURL` dataTransfer
+                // format: "mime:filename:blob-url". MUST be synchronous — the
+                // content comes from the prefetch cache above; Chromium stamps
+                // the dropped file with the Mark-of-the-Web like any download.
                 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);
-                        // Sanitize filename: no path separators, no newlines.
-                        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: any) {
-                        console.error(`Attachment drag-out failed: ${err.message || err}`);
+                    const cached = dragCache.get(att.id);
+                    if (!cached) {
+                        // Prefetch still in flight (or >50MB skip). Cancel the
+                        // drag rather than start one that can't carry data.
+                        e.preventDefault();
+                        const statusEl = document.getElementById("status-sync");
+                        if (statusEl) statusEl.textContent = "Attachment still loading — try dragging again in a moment.";
+                        return;
                     }
+                    // Sanitize filename: no path separators, no newlines.
+                    const safeName = (att.filename || "attachment").replace(/[\r\n"\/\\]/g, "_");
+                    e.dataTransfer.setData("DownloadURL", `${cached.contentType}:${safeName}:${cached.url}`);
+                    e.dataTransfer.effectAllowed = "copy";
                 });
                 // Right-click → Open / Save / Save all. Click still opens; this
                 // adds explicit save (download to disk) which the click path
@@ -1862,7 +1892,12 @@ ${csp}
         var k = (e.key || "").toLowerCase();
         var isShortcut = e.ctrlKey && !e.altKey && !e.metaKey && (
             k === "r" || k === "f" || k === "n" || k === "a" || k === "d" ||
-            k === "z" || k === "y" || k === "k"
+            k === "z" || k === "y" || k === "k" ||
+            // Ctrl+P: without this suppress, WebView2's native print fires on
+            // the iframe's default and prints the WHOLE APP window instead of
+            // the letter (Bob 2026-07-02). The forwarded event reaches app.ts,
+            // which runs printCurrentMessage (letter + header block).
+            k === "p"
         );
         if (isShortcut) e.preventDefault();
         window.parent.postMessage({
@@ -1971,9 +2006,11 @@ export function popOutToWindow(): void {
  *  document — a header block (From/To/Cc/Subject/Date) plus the message body
  *  — renders it in an off-screen iframe, and fires the print dialog. There
  *  was no way to print a letter before (Bob 2026-05-21). */
-export function printCurrentMessage(): void {
-    if (!currentMessage) return;
-    const m = currentMessage;
+/** Full standalone HTML document for a message: printed-letter header block
+ *  (From/To/Cc/Subject/Date) + body. Shared by Print and Save-as-HTML so the
+ *  saved file reads exactly like the printout. */
+function buildPrintableDoc(m: any): string | null {
+    if (!m) return null;
     const fmt = (a: { name?: string; address?: string }): string =>
         a?.name ? `${a.name} <${a.address || ""}>` : (a?.address || "");
     const esc = escapeHtmlLocal;
@@ -1991,11 +2028,16 @@ export function printCurrentMessage(): void {
     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">` +
+    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>`;
+}
+
+export function printCurrentMessage(): void {
+    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;";
@@ -2016,6 +2058,62 @@ export function printCurrentMessage(): void {
     document.body.appendChild(iframe);
 }
 
+/** Save a Blob to disk. Native Save-As dialog where the File System Access
+ *  API exists (WebView2/Chromium — which also stamps the file with the
+ *  Mark-of-the-Web, so Office/SmartScreen treat it as untrusted); falls back
+ *  to a programmatic <a download> elsewhere. */
+async function saveBlobAs(suggestedName: string, blob: Blob): Promise<void> {
+    const picker = (window as any).showSaveFilePicker;
+    if (typeof picker === "function") {
+        let handle: any;
+        try {
+            handle = await picker({ suggestedName });
+        } catch (e: any) {
+            if (e?.name === "AbortError") return; // user cancelled
+            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); }, 5000);
+}
+
+/** Save the open message's raw RFC 822 source as a .eml file — the portable
+ *  mail format Outlook / Thunderbird / other clients open directly (an .eml
+ *  with multipart/related content is what .mht wraps; .eml additionally keeps
+ *  the real headers and attachments). */
+export async function saveCurrentMessageAsEml(): Promise<void> {
+    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: any) {
+        window.dispatchEvent(new CustomEvent("mailx-alert", { detail: { message: `Couldn't save message: ${e?.message || e}`, key: "message-save" } }));
+    }
+}
+
+/** Save the open message as a standalone HTML file — the same header block +
+ *  body document the Print path renders, so the saved file reads like the
+ *  printed letter. */
+export async function saveCurrentMessageAsHtml(): Promise<void> {
+    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: any) {
+        window.dispatchEvent(new CustomEvent("mailx-alert", { detail: { message: `Couldn't save message: ${e?.message || e}`, key: "message-save" } }));
+    }
+}
+
 /** Build a floating overlay carrying a snapshot of the message: header
  *  (subject, from, to, date) + sandboxed body iframe + attachment chips.
  *  Reuses the compose-overlay drag/resize/close pattern. Independent of the

package/client/compose/compose.bundle.js

@@ -1052,6 +1052,7 @@ __export(api_client_exports, {
   getDiagnostics: () => getDiagnostics,
   getFolders: () => getFolders,
   getMessage: () => getMessage,
+  getMessageSource: () => getMessageSource,
   getMessages: () => getMessages,
   getOutboxStatus: () => getOutboxStatus,
   getPrimaryAccount: () => getPrimaryAccount,
@@ -1614,6 +1615,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?.() ?? [];
 }