@bobfrankston/rmfmail 1.0.567 → 1.0.589

package/bin/rmfmailto-src/Cargo.lock

@@ -0,0 +1,92 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rmfmailto"
+version = "1.0.0"
+dependencies = [
+ "winres",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "winres"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
+dependencies = [
+ "toml",
+]

package/bin/rmfmailto-src/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "rmfmailto"
+version = "1.0.0"
+edition = "2021"
+description = "rmfmail mailto: handler launcher"
+authors = ["Bob Frankston"]
+
+[[bin]]
+name = "rmfmailto"
+path = "src/main.rs"
+
+[build-dependencies]
+winres = "0.1"
+
+[profile.release]
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "abort"
+strip = true

package/bin/rmfmailto-src/build.rs

@@ -0,0 +1,27 @@
+// Embed Win32 VERSIONINFO so the Win11 "Select an app" picker shows the
+// app as "rmfmail" instead of falling through to the host EXE's PE
+// FileDescription. Keys here populate the picker's display.
+
+#[cfg(windows)]
+fn main() {
+    let mut res = winres::WindowsResource::new();
+    res.set("ProductName", "rmfmail");
+    res.set("FileDescription", "rmfmail");
+    res.set("CompanyName", "Bob Frankston");
+    res.set("LegalCopyright", "MIT");
+    res.set("OriginalFilename", "rmfmailto.exe");
+    res.set("InternalName", "rmfmailto");
+    // ICO can be picked up at registration time via DefaultIcon — embedding
+    // here gets it on the picker tile too. The path resolves relative to
+    // the crate root at build time.
+    let ico = std::path::Path::new("../../client/icon.ico");
+    if ico.exists() {
+        res.set_icon(ico.to_str().unwrap());
+    }
+    if let Err(e) = res.compile() {
+        eprintln!("winres compile failed: {e}");
+    }
+}
+
+#[cfg(not(windows))]
+fn main() {}

package/bin/rmfmailto-src/src/main.rs

@@ -0,0 +1,143 @@
+// rmfmailto — Win32 launcher for the OS-level mailto: handler (P115).
+//
+// Exists for ONE reason: Win11's "Select an app to open this mailto" picker
+// reads the EXE's PE FileDescription as the display name. If we register
+// `node.exe ... mailx.js --mailto "%1"` the picker shows "Node.js
+// JavaScript Runtime" — confusing. With this binary registered instead,
+// the picker shows "rmfmail" (set in build.rs's VERSIONINFO).
+//
+// The runtime job is trivial: receive argv (the mailto URL), find node + the
+// installed mailx.js, spawn `node mailx.js --mailto <url>`, exit. Detached
+// so we don't hold a handle on a console window.
+//
+// Lookup order for node + mailx.js:
+//   1. NODE_EXE / RMFMAIL_JS env vars (test override / unusual installs).
+//   2. %APPDATA%\npm\node_modules\@bobfrankston\rmfmail\bin\mailx.js
+//      (standard `npm install -g @bobfrankston/rmfmail` location).
+//   3. PATH lookup for `node.exe`.
+// Failing any of those, surface a single MessageBox so the user gets a
+// readable error instead of a silent dead click.
+
+#![windows_subsystem = "windows"]
+
+use std::env;
+use std::path::PathBuf;
+use std::process::Command;
+
+#[cfg(windows)]
+fn show_error(msg: &str) {
+    use std::ffi::OsStr;
+    use std::iter::once;
+    use std::os::windows::ffi::OsStrExt;
+    #[link(name = "user32")]
+    extern "system" {
+        fn MessageBoxW(hwnd: usize, text: *const u16, caption: *const u16, ty: u32) -> i32;
+    }
+    let to_wide = |s: &str| -> Vec<u16> {
+        OsStr::new(s).encode_wide().chain(once(0)).collect()
+    };
+    let text = to_wide(msg);
+    let caption = to_wide("rmfmail mailto handler");
+    unsafe { MessageBoxW(0, text.as_ptr(), caption.as_ptr(), 0x10); }
+}
+
+#[cfg(not(windows))]
+fn show_error(msg: &str) { eprintln!("{msg}"); }
+
+fn find_node() -> Option<PathBuf> {
+    if let Ok(p) = env::var("NODE_EXE") {
+        let pb = PathBuf::from(p);
+        if pb.is_file() { return Some(pb); }
+    }
+    // Look up node on PATH. Windows's where.exe finds it but isn't always
+    // available; instead walk PATH manually.
+    let path = env::var_os("PATH")?;
+    for dir in env::split_paths(&path) {
+        for name in &["node.exe", "node"] {
+            let candidate = dir.join(name);
+            if candidate.is_file() { return Some(candidate); }
+        }
+    }
+    None
+}
+
+fn find_mailx_js() -> Option<PathBuf> {
+    if let Ok(p) = env::var("RMFMAIL_JS") {
+        let pb = PathBuf::from(p);
+        if pb.is_file() { return Some(pb); }
+    }
+    // Standard global-install location.
+    if let Ok(appdata) = env::var("APPDATA") {
+        let pb = PathBuf::from(appdata)
+            .join("npm").join("node_modules")
+            .join("@bobfrankston").join("rmfmail")
+            .join("bin").join("mailx.js");
+        if pb.is_file() { return Some(pb); }
+    }
+    // Fallback: relative to this binary, walking up to find `bin/mailx.js`.
+    // Lets a developer-mode build (rmfmailto.exe sitting next to mailx.js
+    // in `app/bin/`) work without env-var fiddling.
+    if let Ok(exe) = env::current_exe() {
+        let mut p = exe.clone();
+        for _ in 0..5 {
+            if let Some(parent) = p.parent() {
+                let candidate = parent.join("mailx.js");
+                if candidate.is_file() { return Some(candidate); }
+                let candidate = parent.join("bin").join("mailx.js");
+                if candidate.is_file() { return Some(candidate); }
+                p = parent.to_path_buf();
+            } else {
+                break;
+            }
+        }
+    }
+    None
+}
+
+fn main() {
+    // argv[0] is the exe path itself; argv[1] should be the mailto URL.
+    let mailto_url: Option<String> = env::args().nth(1);
+    let mailto_url = match mailto_url {
+        Some(u) if !u.is_empty() => u,
+        _ => {
+            show_error("rmfmailto invoked without a mailto URL.\n\nUsage: rmfmailto.exe <mailto:...>");
+            std::process::exit(1);
+        }
+    };
+
+    let node = match find_node() {
+        Some(p) => p,
+        None => {
+            show_error("Node.js was not found on PATH.\n\nrmfmail requires Node.js to be installed. See https://nodejs.org");
+            std::process::exit(2);
+        }
+    };
+    let mailx_js = match find_mailx_js() {
+        Some(p) => p,
+        None => {
+            show_error("rmfmail's mailx.js was not located.\n\nExpected at:\n  %APPDATA%\\npm\\node_modules\\@bobfrankston\\rmfmail\\bin\\mailx.js\n\nSet RMFMAIL_JS to override.");
+            std::process::exit(3);
+        }
+    };
+
+    // Spawn detached so the picker doesn't get a "is this still running?"
+    // console window. CREATE_NO_WINDOW (0x08000000) + DETACHED_PROCESS
+    // (0x00000008) on Windows; nothing special needed elsewhere.
+    let mut cmd = Command::new(&node);
+    cmd.arg(&mailx_js).arg("--mailto").arg(&mailto_url);
+    #[cfg(windows)]
+    {
+        use std::os::windows::process::CommandExt;
+        cmd.creation_flags(0x08000000 | 0x00000008);
+    }
+    match cmd.spawn() {
+        Ok(_) => {}
+        Err(e) => {
+            show_error(&format!(
+                "Failed to launch rmfmail.\n\nNode: {}\nScript: {}\nError: {e}",
+                node.display(), mailx_js.display(),
+            ));
+            std::process::exit(4);
+        }
+    }
+}

package/client/app.js

@@ -4,7 +4,7 @@
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
-import { showMessage, getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu } from "./components/message-viewer.js";
+import { getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
@@ -324,9 +324,14 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     setTitle(`${APP_NAME} - All Inboxes`);
     setNarrowFolderTitle("All Inboxes");
 });
-initMessageList((accountId, uid, folderId) => {
-    showMessage(accountId, uid, folderId, currentFolderSpecialUse);
-    // Narrow screen: show message viewer, hide list
+initMessageList((_accountId, _uid, _folderId) => {
+    // The list row's setFocus() already drove the viewer with its own
+    // envelope (header + preview paint synchronously, body fetches in
+    // background). Calling showMessage here a SECOND time without the
+    // envelope wiped the good render and forced a bare "Loading…"
+    // placeholder until the body IPC returned — making every click feel
+    // like a network round-trip. This callback now only handles the
+    // narrow-screen layout switch.
     if (window.innerWidth <= 768) {
         document.getElementById("message-viewer")?.classList.add("narrow-active");
         document.getElementById("message-list")?.classList.add("narrow-hidden");
@@ -1450,8 +1455,10 @@ function doSearch(immediate = false) {
     // "server" which spans all folders on all accounts. Local scope dropdown
     // is unchanged (all/current) for the local-only case.
     const serverCheck = document.getElementById("search-server-too");
+    const trashCheck = document.getElementById("search-include-trash");
     const localScope = searchScope?.value || "all";
     const effectiveScope = serverCheck?.checked ? "server" : localScope;
+    const includeTrash = !!trashCheck?.checked;
     // "This folder" scope: instant client-side filter on debounce, server search on Enter
     if (effectiveScope === "current" && !immediate) {
         // Client-side filter of visible rows
@@ -1465,7 +1472,7 @@ function doSearch(immediate = false) {
         }
         return;
     }
-    loadSearchResults(query, effectiveScope, currentAccountId, currentFolderId);
+    loadSearchResults(query, effectiveScope, currentAccountId, currentFolderId, includeTrash);
     setTitle(`${APP_NAME} - Search: ${query}`);
 }
 // Track current folder for scoped search
@@ -1523,6 +1530,7 @@ function rerunActiveSearch() {
 }
 searchScope?.addEventListener("change", rerunActiveSearch);
 document.getElementById("search-server-too")?.addEventListener("change", rerunActiveSearch);
+document.getElementById("search-include-trash")?.addEventListener("change", rerunActiveSearch);
 // Message state handles move/delete — no manual event listener needed
 // ── Folder filter ──
 const ftFilterInput = document.getElementById("ft-filter-input");
@@ -2286,8 +2294,51 @@ onWsEvent((event) => {
             }
             break;
         }
+        case "openMailto": {
+            // P115: OS-level mailto: handler. CLI dropped a pending file; the
+            // daemon picked it up and forwarded the parsed fields. Open compose
+            // pre-populated. Treat as a fresh New compose, not a reply — the
+            // browser doesn't know about a parent message.
+            openComposeFromMailto({
+                to: Array.isArray(event.to) ? event.to : [],
+                cc: Array.isArray(event.cc) ? event.cc : [],
+                bcc: Array.isArray(event.bcc) ? event.bcc : [],
+                subject: event.subject || "",
+                body: event.body || "",
+                inReplyTo: event.inReplyTo || "",
+            }).catch((e) => console.error("openComposeFromMailto failed:", e?.message || e));
+            break;
+        }
     }
 });
+/** Open a compose window pre-filled from a mailto: URL. Same plumbing as
+ *  openCompose("new") but the init shape comes from the parsed URL instead
+ *  of the currently-selected message. The body arrives as plain text from
+ *  the URL — we wrap it in a single <p> so Quill renders it as paragraphs
+ *  rather than a single line, escaping `<` so embedded angle brackets in a
+ *  signature/template don't get interpreted as tags. */
+async function openComposeFromMailto(m) {
+    const accounts = await getAccounts();
+    const accountId = accounts[0]?.id || "";
+    const escape = (s) => s.replace(/[&<>]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" }[c]));
+    const bodyHtml = m.body
+        ? "<p>" + escape(m.body).replace(/\r?\n/g, "</p><p>") + "</p>"
+        : "";
+    const init = {
+        mode: "new",
+        accountId,
+        to: m.to.map(addr => ({ name: "", address: addr })),
+        cc: m.cc.map(addr => ({ name: "", address: addr })),
+        bcc: m.bcc.map(addr => ({ name: "", address: addr })),
+        subject: m.subject,
+        bodyHtml,
+        inReplyTo: m.inReplyTo,
+        references: m.inReplyTo ? [m.inReplyTo] : [],
+        accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature })),
+    };
+    sessionStorage.setItem("composeInit", JSON.stringify(init));
+    showComposeOverlay(m.subject ? `Compose: ${m.subject}` : "Compose");
+}
 // ── Keyboard shortcuts ──
 // Capture-phase pre-handler: intercept WebView accelerator keys that would
 // otherwise trigger a browser action (Ctrl+R / Ctrl+Shift+R = reload). Call
@@ -2789,6 +2840,120 @@ function applyThreadFilter() {
         console.error("alarm poller init failed:", e?.message || e);
     }
 })();
+// Pull-to-refresh: touch-drag down at the top of the message list fires a
+// sync, same as F5 / btn-sync. Standard Android / Thunderbird / mobile
+// pattern. The indicator slides down with the drag and rotates the chevron
+// once the user crosses the trigger threshold; releasing past the threshold
+// fires triggerSync(). Below threshold = snap back without action.
+//
+// Touch-only by design — desktop has the F5 / sync button. Pointer events
+// would also catch mouse-drag, which is more annoying than useful (people
+// drag the scrollbar). The `e.touches.length === 1` check skips two-finger
+// gestures (pinch-zoom, two-finger scroll).
+(() => {
+    const PTR_THRESHOLD_PX = 80; // pull this far to arm the trigger
+    const PTR_MAX_PX = 120; // cap the visual translate
+    const mlBody = document.getElementById("ml-body");
+    if (!mlBody)
+        return;
+    const indicator = document.createElement("div");
+    indicator.className = "ptr-indicator";
+    indicator.innerHTML = `<span class="ptr-chev"></span><span class="ptr-label">Pull to refresh</span>`;
+    mlBody.parentElement?.insertBefore(indicator, mlBody);
+    const labelEl = indicator.querySelector(".ptr-label");
+    let startY = 0;
+    let pullY = 0;
+    let active = false;
+    let refreshing = false;
+    const setPull = (px, armed) => {
+        const clamped = Math.min(PTR_MAX_PX, Math.max(0, px));
+        indicator.classList.toggle("armed", armed);
+        indicator.style.transform = `translateY(calc(-100% + ${clamped}px))`;
+    };
+    const reset = () => {
+        indicator.classList.remove("dragging", "armed");
+        indicator.style.transform = "";
+    };
+    mlBody.addEventListener("touchstart", (e) => {
+        if (refreshing)
+            return;
+        if (e.touches.length !== 1)
+            return;
+        if (mlBody.scrollTop > 0)
+            return;
+        startY = e.touches[0].clientY;
+        pullY = 0;
+        active = true;
+        indicator.classList.add("dragging");
+        labelEl.textContent = "Pull to refresh";
+    }, { passive: true });
+    mlBody.addEventListener("touchmove", (e) => {
+        if (!active || refreshing)
+            return;
+        const dy = e.touches[0].clientY - startY;
+        if (dy <= 0) {
+            // User scrolled up past the start — abandon, let normal scroll
+            // take over without reverting (the touchend handler will reset).
+            pullY = 0;
+            setPull(0, false);
+            return;
+        }
+        // Resist past 0 — pull "stretches" rather than scrolls. preventDefault
+        // is necessary to keep the browser from interpreting the drag as
+        // overscroll / browser-level pull-to-refresh.
+        if (e.cancelable)
+            e.preventDefault();
+        pullY = dy * 0.5; // 0.5 = rubber-band damping
+        const armed = pullY >= PTR_THRESHOLD_PX;
+        labelEl.textContent = armed ? "Release to refresh" : "Pull to refresh";
+        setPull(pullY, armed);
+    }, { passive: false });
+    const finish = async () => {
+        if (!active)
+            return;
+        active = false;
+        if (pullY < PTR_THRESHOLD_PX) {
+            reset();
+            return;
+        }
+        // Armed — show spinner, fire sync, clear when complete.
+        refreshing = true;
+        indicator.classList.remove("armed", "dragging");
+        indicator.classList.add("refreshing");
+        indicator.style.transform = `translateY(calc(-100% + 60px))`;
+        labelEl.textContent = "Refreshing...";
+        try {
+            const { triggerSync } = await import("./lib/api-client.js");
+            await triggerSync();
+        }
+        catch (e) {
+            console.error("pull-to-refresh failed:", e?.message || e);
+        }
+        refreshing = false;
+        indicator.classList.remove("refreshing");
+        reset();
+    };
+    mlBody.addEventListener("touchend", () => { finish(); }, { passive: true });
+    mlBody.addEventListener("touchcancel", () => { active = false; reset(); }, { passive: true });
+})();
+// P115: pick up a pending mailto: drop file dropped by the CLI invocation
+// that spawned us (or by an earlier --mailto run that the user hasn't yet
+// acknowledged). The IPC call deletes the file as part of reading it, so a
+// race with the daemon's fs.watch is harmless — whichever fires first wins
+// and the other gets null. Subsequent live clicks during this session
+// arrive via the `openMailto` event handled in onEvent above.
+(async () => {
+    try {
+        const { consumePendingMailto } = await import("./lib/api-client.js");
+        const data = await consumePendingMailto();
+        if (data && (data.to.length || data.subject || data.body)) {
+            await openComposeFromMailto(data);
+        }
+    }
+    catch (e) {
+        console.error("pending mailto pickup failed:", e?.message || e);
+    }
+})();
 // Two-line toggle
 optTwoLine?.addEventListener("change", () => {
     const list = document.getElementById("message-list");