@bobfrankston/mailx 1.0.265 → 1.0.283

package/client/components/message-viewer.js

@@ -189,11 +189,21 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         const fromEl = headerEl.querySelector(".mv-from");
         const toEl = headerEl.querySelector(".mv-to");
         fromEl.textContent = formatAddr(msg.from);
-        toEl.textContent = `To: ${msg.to.map(formatAddr).join(", ")}`;
-        if (msg.cc?.length) {
-            toEl.textContent += `  Cc: ${msg.cc.map(formatAddr).join(", ")}`;
+        let toLine = `To: ${msg.to.map(formatAddr).join(", ")}`;
+        if (msg.cc?.length)
+            toLine += `  Cc: ${msg.cc.map(formatAddr).join(", ")}`;
+        // Always-visible Delivered-To line — shown when present and not already
+        // covered by the To/Cc list. Critical for accounts with multiple aliases
+        // where you need to see which one received the message at a glance.
+        const toAddrs = (msg.to || []).map((a) => a.address.toLowerCase());
+        const ccAddrs = (msg.cc || []).map((a) => a.address.toLowerCase());
+        const dt = (msg.deliveredTo || "").toLowerCase();
+        if (msg.deliveredTo && !toAddrs.includes(dt) && !ccAddrs.includes(dt)) {
+            toLine += `  Delivered-To: ${msg.deliveredTo}`;
         }
+        toEl.textContent = toLine;
         headerEl.querySelector(".mv-subject").textContent = msg.subject;
+        document.dispatchEvent(new CustomEvent("mailx-message-shown", { detail: { accountId } }));
         // Right-click on email addresses in header: copy name, copy address,
         // copy both, add to contacts, plus reply actions for the whole message.
         for (const el of [fromEl, toEl]) {
@@ -431,12 +441,12 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             const err = String(msg.bodyError);
             const isTransient = !!msg.bodyErrorTransient;
             const errBanner = document.createElement("div");
-            errBanner.className = "mv-error-banner";
-            errBanner.style.cssText = "margin:1rem;padding:0.75rem 1rem;border:1px solid var(--color-border);border-left:3px solid #d33;background:var(--color-bg-surface);border-radius:4px;font-size:var(--font-size-sm)";
+            errBanner.className = "mv-system-message mv-system-error";
             errBanner.innerHTML = `
-                <div style="font-weight:600;margin-bottom:0.25rem;color:#d33">Body unavailable</div>
-                <div style="color:var(--color-text-muted);white-space:pre-wrap;word-break:break-word">${err.replace(/[&<>"]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[c] || c))}</div>
-                ${isTransient ? `<button id="btn-retry-body" style="margin-top:0.5rem;padding:0.25rem 0.75rem">Retry</button>` : ""}
+                <div class="mv-system-tag">mailx</div>
+                <div class="mv-system-title">Body unavailable</div>
+                <div class="mv-system-body">${err.replace(/[&<>"]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[c] || c))}</div>
+                ${isTransient ? `<div class="mv-system-actions"><button id="btn-retry-body" class="mv-system-btn">Retry</button></div>` : ""}
             `;
             bodyEl.appendChild(errBanner);
             if (isTransient) {
@@ -550,20 +560,22 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         // "Message was deleted from the server" — the service already dropped
         // the local row. Remove it from the list so the UI advances to the next
         // message instead of sitting on a stale error banner.
-        const isDeleted = /deleted from the server|isNotFound/.test(err);
-        if (isDeleted) {
+        const isNotFound = /deleted from the server|isNotFound|not found|Not Found|404/.test(err);
+        if (isNotFound) {
+            // Drop the stale row so the list auto-advances to the next message
+            // (or clears the viewer). Leaves the user a way back on mobile where
+            // the viewer takes the whole screen.
             state.removeMessages([{ accountId, uid }]);
             return;
         }
-        const isNotFound = err.includes("not found") || err.includes("Not Found") || err.includes("404");
-        if (!isNotFound && retryCount < 3) {
+        if (retryCount < 3) {
             retryCount++;
             bodyEl.innerHTML = `<div class="mv-empty">Loading failed: ${err} — retrying (${retryCount}/3)...</div>`;
             setTimeout(() => { if (gen === showMessageGeneration)
                 showMessage(accountId, uid, folderId, specialUse, true); }, 3000);
         }
         else {
-            bodyEl.innerHTML = `<div class="mv-empty">${isNotFound ? "Message was moved or deleted" : `Failed to load: ${err}`}</div>`;
+            bodyEl.innerHTML = `<div class="mv-empty">Failed to load: ${err}</div>`;
         }
     }
 }
@@ -658,7 +670,28 @@ ${csp}
     }, true);
     document.addEventListener("mouseover", function (e) {
         var a = e.target && e.target.closest ? e.target.closest("a[href]") : null;
-        window.parent.postMessage({ type: "linkHover", url: a ? a.href : "" }, "*");
+        if (a) {
+            var r = a.getBoundingClientRect();
+            window.parent.postMessage({ type: "linkHover", url: a.href, rect: { left: r.left, top: r.top, right: r.right, bottom: r.bottom } }, "*");
+        } else {
+            window.parent.postMessage({ type: "linkHover", url: "" }, "*");
+        }
+    });
+    // Key forwarding — Delete, Ctrl+D, arrow keys, etc. need to reach app.ts
+    // even when focus is inside the sandboxed iframe. Parent-side
+    // contentDocument listeners (see installPreviewControls) work on
+    // desktop WebView2 but not Android WebView, so we post every keydown
+    // that isn't plain typing.
+    document.addEventListener("keydown", function (e) {
+        var t = e.target;
+        if (t && (t.isContentEditable || /^(INPUT|TEXTAREA|SELECT)$/.test(t.tagName))) return;
+        // Zoom keys handled by parent-side installPreviewControls; don't double-send.
+        if (e.ctrlKey && (e.key === "=" || e.key === "+" || e.key === "-" || e.key === "0")) return;
+        window.parent.postMessage({
+            type: "previewKey",
+            key: e.key, code: e.code,
+            ctrlKey: e.ctrlKey, shiftKey: e.shiftKey, altKey: e.altKey, metaKey: e.metaKey,
+        }, "*");
     });
 })();
 </script>

package/client/index.html

@@ -108,6 +108,7 @@
                     <button class="tb-btn" id="btn-reply-all" title="Reply All (Ctrl+Shift+R)">↩↩</button>
                     <button class="tb-btn" id="btn-forward" title="Forward">→</button>
                     <button class="tb-btn" id="btn-delete" title="Delete (Del)">🗑</button>
+                    <button class="tb-btn" id="btn-spam" title="Mark as spam — move to configured spam folder" hidden>⚠</button>
                     <button class="tb-btn" id="btn-flag" title="Flag">⚑</button>
                     <span style="flex:1"></span>
                     <button class="mv-action mv-action-primary" id="mv-edit-draft" hidden>Edit & Send</button>

package/client/lib/api-client.js

@@ -33,9 +33,9 @@ export function getAccounts() {
 export function getFolders(accountId) {
     return ipc().getFolders(accountId);
 }
-export function getMessages(accountId, folderId, page = 1, pageSize = 50) {
+export function getMessages(accountId, folderId, page = 1, pageSize = 50, flaggedOnly = false) {
     abortMessageListRequests();
-    return ipc().getMessages(accountId, folderId, page, pageSize);
+    return ipc().getMessages(accountId, folderId, page, pageSize, undefined, undefined, undefined, flaggedOnly);
 }
 export function getUnifiedInbox(page = 1, pageSize = 50) {
     abortMessageListRequests();
@@ -81,6 +81,9 @@ export function moveMessages(accountId, uids, targetFolderId, targetAccountId) {
         return moveMessage(accountId, uids[0], targetFolderId, targetAccountId);
     return ipc().moveMessages?.(accountId, uids, targetFolderId, targetAccountId);
 }
+export function markAsSpamMessages(accountId, uids) {
+    return ipc().markAsSpamMessages?.(accountId, uids);
+}
 export function undeleteMessage(accountId, uid, folderId) {
     return ipc().undeleteMessage?.(accountId, uid, folderId);
 }

package/client/lib/mailxapi.js

@@ -65,8 +65,8 @@
         getFolders: function(accountId) { return callNode("getFolders", { accountId: accountId }); },
 
         // Messages
-        getMessages: function(accountId, folderId, page, pageSize) {
-            return callNode("getMessages", { accountId: accountId, folderId: folderId, page: page, pageSize: pageSize });
+        getMessages: function(accountId, folderId, page, pageSize, sort, sortDir, search, flaggedOnly) {
+            return callNode("getMessages", { accountId: accountId, folderId: folderId, page: page, pageSize: pageSize, sort: sort, sortDir: sortDir, search: search, flaggedOnly: flaggedOnly });
         },
         getUnifiedInbox: function(page, pageSize) {
             return callNode("getUnifiedInbox", { page: page, pageSize: pageSize });
@@ -129,6 +129,9 @@
         moveMessages: function(accountId, uids, targetFolderId) {
             return callNode("moveMessages", { accountId: accountId, uids: uids, targetFolderId: targetFolderId });
         },
+        markAsSpamMessages: function(accountId, uids) {
+            return callNode("markAsSpamMessages", { accountId: accountId, uids: uids });
+        },
         markFolderRead: function(accountId, folderId) {
             return callNode("markFolderRead", { folderId: folderId });
         },

package/client/styles/components.css

@@ -637,6 +637,71 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
     font-size: var(--font-size-base);
 }
 
+/* ── System-generated message plaque ──
+ * Visually distinguished from email content so the user knows the message is
+ * from mailx itself (errors, status notices), not part of the rendered email.
+ * Inset card with a "mailx" tag chip in the corner. */
+.mv-system-message {
+    position: relative;
+    margin: var(--gap-lg);
+    padding: var(--gap-lg) var(--gap-lg) var(--gap-md);
+    background: var(--color-bg-surface);
+    border: 1px dashed var(--color-border);
+    border-radius: var(--radius-md);
+    font-family: var(--font-family-base);
+    font-size: var(--font-size-sm);
+    color: var(--color-text);
+    max-width: 640px;
+    box-shadow: 0 1px 2px rgba(0,0,0,0.04);
+
+    .mv-system-tag {
+        position: absolute;
+        top: -0.6em;
+        left: var(--gap-md);
+        padding: 0.1em 0.6em;
+        background: var(--color-bg);
+        border: 1px solid var(--color-border);
+        border-radius: var(--radius-sm);
+        font-size: 0.7rem;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.06em;
+        color: var(--color-text-muted);
+    }
+    .mv-system-title {
+        font-weight: 600;
+        margin-bottom: var(--gap-xs);
+        color: var(--color-text);
+    }
+    .mv-system-body {
+        color: var(--color-text-muted);
+        white-space: pre-wrap;
+        word-break: break-word;
+        line-height: 1.4;
+    }
+    .mv-system-actions {
+        margin-top: var(--gap-sm);
+        display: flex;
+        gap: var(--gap-sm);
+    }
+    .mv-system-btn {
+        padding: 0.3em 0.9em;
+        border: 1px solid var(--color-border);
+        border-radius: var(--radius-sm);
+        background: var(--color-bg);
+        color: var(--color-text);
+        cursor: pointer;
+        font-size: var(--font-size-sm);
+        &:hover { background: var(--color-bg-hover); }
+    }
+    /* Error variant — red accent on tag, title, and left edge */
+    &.mv-system-error {
+        border-left: 3px solid oklch(0.55 0.22 25);
+        .mv-system-tag { color: oklch(0.55 0.22 25); border-color: oklch(0.55 0.22 25); }
+        .mv-system-title { color: oklch(0.55 0.22 25); }
+    }
+}
+
 /* ── Message Viewer ── */
 
 .message-viewer {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.265",
+  "version": "1.0.283",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.20",
-    "@bobfrankston/iflow-node": "^0.1.5",
+    "@bobfrankston/iflow-direct": "^0.1.23",
+    "@bobfrankston/iflow-node": "^0.1.7",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.24",
-    "@bobfrankston/msger": "^0.1.318",
+    "@bobfrankston/msger": "^0.1.320",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -35,10 +35,10 @@
     "quill": "^2.0.3",
     "ws": "^8.18.0",
     "sql.js": "^1.14.1",
-    "@bobfrankston/tcp-transport": "^0.1.3",
-    "@bobfrankston/node-tcp-transport": "^0.1.1",
-    "@bobfrankston/smtp-direct": "^0.1.2",
-    "@bobfrankston/mailx-sync": "^0.1.4"
+    "@bobfrankston/tcp-transport": "^0.1.4",
+    "@bobfrankston/node-tcp-transport": "^0.1.4",
+    "@bobfrankston/smtp-direct": "^0.1.3",
+    "@bobfrankston/mailx-sync": "^0.1.6"
   },
   "devDependencies": {
     "@types/mailparser": "^3.4.6"
@@ -82,11 +82,11 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.20",
-      "@bobfrankston/iflow-node": "^0.1.5",
+      "@bobfrankston/iflow-direct": "^0.1.23",
+      "@bobfrankston/iflow-node": "^0.1.7",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.24",
-      "@bobfrankston/msger": "^0.1.318",
+      "@bobfrankston/msger": "^0.1.320",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",
@@ -97,10 +97,10 @@
       "quill": "^2.0.3",
       "ws": "^8.18.0",
       "sql.js": "^1.14.1",
-      "@bobfrankston/tcp-transport": "^0.1.3",
-      "@bobfrankston/node-tcp-transport": "^0.1.1",
-      "@bobfrankston/smtp-direct": "^0.1.2",
-      "@bobfrankston/mailx-sync": "^0.1.4"
+      "@bobfrankston/tcp-transport": "^0.1.4",
+      "@bobfrankston/node-tcp-transport": "^0.1.4",
+      "@bobfrankston/smtp-direct": "^0.1.3",
+      "@bobfrankston/mailx-sync": "^0.1.6"
     }
   }
 }

package/packages/mailx-api/index.js

@@ -168,6 +168,16 @@ export function createApiRouter(db, imapManager) {
             res.status(500).json({ error: e.message });
         }
     });
+    router.post("/messages/spam", async (req, res) => {
+        try {
+            const { accountId, uids } = req.body;
+            const result = await svc.markAsSpamMessages(accountId, uids);
+            res.json({ ok: true, ...result });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
     // ── Delete (single — kept for backward compat) ──
     router.delete("/message/:accountId/:uid", async (req, res) => {
         try {

package/packages/mailx-core/index.d.ts

@@ -28,6 +28,7 @@ export declare function getMessages(params: {
     sort?: string;
     sortDir?: string;
     search?: string;
+    flaggedOnly?: boolean;
 }): import("@bobfrankston/mailx-types").PagedResult<import("@bobfrankston/mailx-types").MessageEnvelope>;
 export declare function getUnifiedInbox(params: {
     page?: number;
@@ -67,6 +68,7 @@ export declare function getMessage(params: {
     hasAttachments: boolean;
     preview: string;
     bodyPath?: string;
+    providerId?: string;
 }>;
 export declare function updateFlags(params: {
     accountId: string;

package/packages/mailx-core/index.js

@@ -122,6 +122,7 @@ export function getMessages(params) {
         sort: params.sort || "date",
         sortDir: params.sortDir || "desc",
         search: params.search,
+        flaggedOnly: params.flaggedOnly,
     });
 }
 export function getUnifiedInbox(params) {

package/packages/mailx-imap/index.d.ts

@@ -19,6 +19,9 @@ export interface ImapManagerEvents {
     }>) => void;
     accountError: (accountId: string, error: string, hint: string, isOAuth: boolean) => void;
     configChanged: (filename: string) => void;
+    /** Fired after a message body has been written to the local store — lets
+     *  the UI flip a row's "not-downloaded" indicator without re-rendering. */
+    bodyCached: (accountId: string, uid: number) => void;
 }
 export declare class ImapManager extends EventEmitter {
     private configs;
@@ -55,13 +58,31 @@ export declare class ImapManager extends EventEmitter {
     private opsClients;
     /** Operation queues — ensures sequential access per account */
     private opsQueues;
+    /** Persistent body-fetch connections — separate from ops so on-demand
+     *  body reads never queue behind a slow sync operation (bobma's IMAP
+     *  SEARCH can sit idle for 300s during backfill). */
+    private bodyClients;
+    /** Per-account backoff after the IMAP server rejected a connection with
+     *  the per-user+IP cap (Dovecot mail_max_userip_connections). Subsequent
+     *  body fetches short-circuit until the timestamp passes. */
+    private bodyBackoff;
     /** Get (or create) the persistent operational connection for an account.
      *  logout() is wrapped as a no-op so legacy callers don't close it. */
     private getOpsClient;
     /** Run an operation on the account's connection — queued, sequential, no concurrency */
     withConnection<T>(accountId: string, fn: (client: any) => Promise<T>): Promise<T>;
-    /** Create a new IMAP client (internal — callers use getOpsClient or withConnection) */
+    /** Open IMAP clients per account, used to trace who's opening sockets
+     *  when we hit the Dovecot per-user+IP connection cap. */
+    private openClients;
+    /** Create a new IMAP client (internal — callers use getOpsClient or withConnection).
+     *  `purpose` is a short tag printed alongside the `[conn+]` log so we can tell
+     *  which code path (sync/idle/body/outbox/move/…) opened each connection. */
     private newClient;
+    /** Get (or lazily create) the persistent body-fetch client. Separate from
+     *  the ops client so body reads never wait on a slow sync command. */
+    private getBodyClient;
+    /** Drop the body-fetch connection (e.g. after a socket error). */
+    private dropBodyClient;
     /** Disconnect the persistent operational connection for an account */
     disconnectOps(accountId: string): Promise<void>;
     /** Legacy API — callers that still create/destroy connections.