@bobfrankston/mailx 1.0.172 → 1.0.174

package/bin/mailx.js

@@ -740,10 +740,13 @@ async function main() {
         console.log(`${reason} — shutting down`);
         imapManager.stopPeriodicSync();
         imapManager.stopOutboxWorker();
+        // 3s hard timeout — don't hang on broken IMAP connections
+        const forceExit = setTimeout(() => { console.log("Forced exit"); process.exit(0); }, 3000);
         try {
             await imapManager.shutdown();
         }
         catch { /* proceed */ }
+        clearTimeout(forceExit);
         db.close();
         process.exit(0);
     }

package/client/app.js

@@ -286,8 +286,14 @@ async function openCompose(mode) {
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // Use relative URL so it works with both HTTP and custom protocol (msger://)
-    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+    // IPC mode: navigate in same window (popups don't have custom protocol)
+    // HTTP mode: open as popup window
+    if (typeof mailxapi !== "undefined") {
+        window.location.href = "compose/compose.html";
+    }
+    else {
+        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+    }
 }
 function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();

package/client/components/message-viewer.js

@@ -82,6 +82,8 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             if (unsubUrl) {
                 unsubBtn.hidden = false;
                 unsubBtn.href = unsubUrl;
+                unsubBtn.textContent = "Unsubscribe";
+                unsubBtn.title = unsubUrl;
                 unsubBtn.target = "_blank";
                 unsubBtn.rel = "noopener noreferrer";
             }
@@ -133,7 +135,12 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                         draftFolderId: msg.folderId,
                     };
                     sessionStorage.setItem("composeInit", JSON.stringify(init));
-                    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+                    if (typeof window.mailxapi !== "undefined") {
+                        window.location.href = "compose/compose.html";
+                    }
+                    else {
+                        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+                    }
                 };
             }
             else {

package/client/compose/compose.js

@@ -5,6 +5,15 @@
  */
 import { createEditor } from "./editor.js";
 import { getVersion, getSettings, getAccounts, searchContacts, sendMessage, saveDraft as apiSaveDraft, deleteDraft } from "../lib/api-client.js";
+/** Close compose — navigate back in IPC mode, window.close() in HTTP mode */
+function closeCompose() {
+    if (typeof window.mailxapi !== "undefined") {
+        window.location.href = "../index.html";
+    }
+    else {
+        closeCompose();
+    }
+}
 // ── Load editor scripts dynamically ──
 function loadScript(src) {
     return new Promise((resolve, reject) => {
@@ -349,7 +358,7 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
         if (draftUid) {
             deleteDraft(getFromAccountId(), draftUid).catch(() => { });
         }
-        window.close();
+        closeCompose();
     }
     catch (e) {
         btn.disabled = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.172",
+  "version": "1.0.174",
   "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.4",
+    "@bobfrankston/iflow-direct": "^0.1.5",
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.221",
+    "@bobfrankston/msger": "^0.1.223",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -129,6 +129,8 @@ export declare class ImapManager extends EventEmitter {
     fetchMessageBody(accountId: string, folderId: number, uid: number): Promise<Buffer | null>;
     /** Fetch message body via Gmail/Outlook API */
     private fetchMessageBodyViaApi;
+    /** Background body prefetch — download bodies for messages that don't have them */
+    private prefetchBodies;
     /** Get the body store for direct access */
     getBodyStore(): FileMessageStore;
     /** Bulk trash messages — local-first, single IMAP connection for all */

package/packages/mailx-imap/index.js

@@ -291,8 +291,15 @@ export class ImapManager extends EventEmitter {
         const client = this.opsClients.get(accountId);
         this.opsClients.delete(accountId);
         if (client) {
+            // Force-close: don't wait for LOGOUT on a possibly dead socket
             try {
-                await (client._realLogout || client.logout)();
+                const timeout = new Promise(r => setTimeout(r, 2000));
+                await Promise.race([(client._realLogout || client.logout)(), timeout]);
+            }
+            catch { /* */ }
+            // Destroy underlying socket if still open
+            try {
+                client.destroy?.();
             }
             catch { /* */ }
             console.log(`  [conn] ${accountId}: disconnected`);
@@ -731,6 +738,12 @@ export class ImapManager extends EventEmitter {
         // Sync all accounts in parallel — each manages its own connection
         const syncPromises = [...this.configs.keys()].map(accountId => this.syncAccount(accountId, priorityOrder));
         await Promise.allSettled(syncPromises);
+        // Background body prefetch — after sync, fetch bodies for messages that don't have them
+        if (getPrefetch()) {
+            for (const accountId of this.configs.keys()) {
+                this.prefetchBodies(accountId).catch(e => console.error(`  [prefetch] ${accountId}: ${e.message}`));
+            }
+        }
     }
     /** Sync a single account — manages its own connection lifecycle */
     async syncAccount(accountId, priorityOrder) {
@@ -1230,6 +1243,27 @@ export class ImapManager extends EventEmitter {
             return null;
         }
     }
+    /** Background body prefetch — download bodies for messages that don't have them */
+    async prefetchBodies(accountId) {
+        const missing = this.db.getMessagesWithoutBody(accountId, 25);
+        if (missing.length === 0)
+            return;
+        console.log(`  [prefetch] ${accountId}: ${missing.length} bodies to fetch`);
+        let fetched = 0;
+        for (const msg of missing) {
+            try {
+                const result = await this.fetchMessageBody(accountId, msg.folderId, msg.uid);
+                if (result)
+                    fetched++;
+            }
+            catch (e) {
+                console.error(`  [prefetch] ${accountId}/${msg.uid}: ${e.message}`);
+                break; // Stop on error — don't hammer a broken connection
+            }
+        }
+        if (fetched > 0)
+            console.log(`  [prefetch] ${accountId}: ${fetched} bodies cached`);
+    }
     /** Get the body store for direct access */
     getBodyStore() {
         return this.bodyStore;

package/packages/mailx-imap/providers/gmail-api.js

@@ -45,19 +45,29 @@ export class GmailApiProvider {
     }
     async fetch(path, options = {}) {
         const token = await this.tokenProvider();
-        const res = await globalThis.fetch(`${API}${path}`, {
-            ...options,
-            headers: {
-                "Authorization": `Bearer ${token}`,
-                "Content-Type": "application/json",
-                ...options.headers,
-            },
-        });
-        if (!res.ok) {
-            const err = await res.text().catch(() => "");
-            throw new Error(`Gmail API ${res.status}: ${err.substring(0, 200)}`);
+        for (let attempt = 0; attempt < 3; attempt++) {
+            const res = await globalThis.fetch(`${API}${path}`, {
+                ...options,
+                headers: {
+                    "Authorization": `Bearer ${token}`,
+                    "Content-Type": "application/json",
+                    ...options.headers,
+                },
+            });
+            if (res.status === 429) {
+                // Rate limited — back off and retry
+                const delay = (attempt + 1) * 2000;
+                console.log(`  [gmail] Rate limited, waiting ${delay / 1000}s...`);
+                await new Promise(r => setTimeout(r, delay));
+                continue;
+            }
+            if (!res.ok) {
+                const err = await res.text().catch(() => "");
+                throw new Error(`Gmail API ${res.status}: ${err.substring(0, 200)}`);
+            }
+            return res.json();
         }
-        return res.json();
+        throw new Error("Gmail API: rate limited after 3 retries");
     }
     async listFolders() {
         const data = await this.fetch("/labels");
@@ -106,15 +116,19 @@ export class GmailApiProvider {
         const all = [];
         const chunkSize = options.source ? 10 : 50; // Smaller chunks for full bodies
         const format = options.source ? "raw" : "metadata";
-        const metadataHeaders = "From,To,Cc,Subject,Message-ID,Date";
         for (let i = 0; i < ids.length; i += chunkSize) {
             const chunk = ids.slice(i, i + chunkSize);
-            const messages = await Promise.all(chunk.map(id => {
+            // Sequential fetches to avoid Gmail 429 rate limits
+            const messages = [];
+            for (const id of chunk) {
                 const params = new URLSearchParams({ format });
-                if (format === "metadata")
-                    params.set("metadataHeaders", metadataHeaders);
-                return this.fetch(`/messages/${id}?${params}`);
-            }));
+                if (format === "metadata") {
+                    for (const h of ["From", "To", "Cc", "Subject", "Message-ID", "Date"]) {
+                        params.append("metadataHeaders", h);
+                    }
+                }
+                messages.push(await this.fetch(`/messages/${id}?${params}`));
+            }
             const parsed = messages.map(msg => this.parseMessage(msg, options));
             all.push(...parsed);
             if (onChunk)
@@ -188,8 +202,11 @@ export class GmailApiProvider {
             return null;
         const format = options.source ? "raw" : "metadata";
         const params = new URLSearchParams({ format });
-        if (format === "metadata")
-            params.set("metadataHeaders", "From,To,Cc,Subject,Message-ID,Date");
+        if (format === "metadata") {
+            for (const h of ["From", "To", "Cc", "Subject", "Message-ID", "Date"]) {
+                params.append("metadataHeaders", h);
+            }
+        }
         const msg = await this.fetch(`/messages/${id}?${params}`);
         return this.parseMessage(msg, options);
     }

package/packages/mailx-store/db.d.ts

@@ -58,6 +58,11 @@ export declare class MailxDB {
     getMessageBodyPath(accountId: string, uid: number): string;
     updateMessageFlags(accountId: string, uid: number, flags: string[]): void;
     updateBodyPath(accountId: string, uid: number, bodyPath: string): void;
+    /** Get messages without cached bodies (for background prefetch) */
+    getMessagesWithoutBody(accountId: string, limit?: number): {
+        uid: number;
+        folderId: number;
+    }[];
     getHighestUid(accountId: string, folderId: number): number;
     getOldestDate(accountId: string, folderId: number): number;
     getMessageCount(accountId: string, folderId: number): number;

package/packages/mailx-store/db.js

@@ -320,6 +320,10 @@ export class MailxDB {
     updateBodyPath(accountId, uid, bodyPath) {
         this.db.prepare("UPDATE messages SET body_path = ? WHERE account_id = ? AND uid = ?").run(bodyPath, accountId, uid);
     }
+    /** Get messages without cached bodies (for background prefetch) */
+    getMessagesWithoutBody(accountId, limit = 50) {
+        return this.db.prepare("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path = '') ORDER BY date DESC LIMIT ?").all(accountId, limit);
+    }
     getHighestUid(accountId, folderId) {
         const r = this.db.prepare("SELECT MAX(uid) as maxUid FROM messages WHERE account_id = ? AND folder_id = ?").get(accountId, folderId);
         return r?.maxUid || 0;