@bobfrankston/mailx 1.0.169 → 1.0.171

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.169",
+  "version": "1.0.171",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.219",
+    "@bobfrankston/msger": "^0.1.220",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -6,7 +6,7 @@
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
 import { FileMessageStore } from "@bobfrankston/mailx-store";
-import { loadSettings, getStorePath, getConfigDir, getHistoryDays } from "@bobfrankston/mailx-settings";
+import { loadSettings, getStorePath, getConfigDir, getHistoryDays, getPrefetch } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -412,7 +412,7 @@ export class ImapManager extends EventEmitter {
         return dbFolders;
     }
     /** Store a batch of messages to DB immediately — used by onChunk for incremental sync */
-    storeMessages(accountId, folderId, folder, msgs, highestUid) {
+    async storeMessages(accountId, folderId, folder, msgs, highestUid) {
         let stored = 0;
         this.db.beginTransaction();
         try {
@@ -426,7 +426,14 @@ export class ImapManager extends EventEmitter {
                     continue; // already have it
                 const source = msg.source || "";
                 let bodyPath = "";
-                // Skip body storage during sync — bodies fetched on demand
+                let preview = "";
+                let hasAttachments = false;
+                if (source) {
+                    bodyPath = await this.bodyStore.putMessage(accountId, folderId, msg.uid, Buffer.from(source, "utf-8"));
+                    const parsed = await extractPreview(source);
+                    preview = parsed.preview;
+                    hasAttachments = parsed.hasAttachments;
+                }
                 const flags = [];
                 if (msg.seen)
                     flags.push("\\Seen");
@@ -444,7 +451,7 @@ export class ImapManager extends EventEmitter {
                     from: toEmailAddress(msg.from?.[0] || {}),
                     to: toEmailAddresses(msg.to || []),
                     cc: toEmailAddresses(msg.cc || []),
-                    flags, size: msg.size || 0, hasAttachments: false, preview: "", bodyPath
+                    flags, size: msg.size || 0, hasAttachments, preview, bodyPath
                 });
                 stored++;
             }
@@ -460,6 +467,7 @@ export class ImapManager extends EventEmitter {
     async syncFolder(accountId, folderId, client) {
         if (!client)
             client = this.createClient(accountId);
+        const prefetch = getPrefetch();
         const folders = this.db.getFolders(accountId);
         const folder = folders.find(f => f.id === folderId);
         if (!folder)
@@ -477,8 +485,8 @@ export class ImapManager extends EventEmitter {
             ? new Date(Date.now() - effectiveDays * 86400000)
             : new Date(0);
         if (highestUid > 0) {
-            // Incremental: fetch new messages — metadata only for speed, bodies on demand
-            const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: false });
+            // Incremental: fetch new messages — prefetch bodies for offline access
+            const fetched = await client.fetchMessagesSinceUid(folder.path, highestUid, { source: prefetch });
             // Filter out the last known message (IMAP * always returns at least one)
             messages = fetched.filter((m) => m.uid > highestUid);
             // Gap detection: check for missing UIDs within the range we've already synced
@@ -499,7 +507,7 @@ export class ImapManager extends EventEmitter {
                         for (let i = 0; i < missingUids.length; i += chunkSize) {
                             const chunk = missingUids.slice(i, i + chunkSize);
                             const range = chunk.join(",");
-                            const recovered = await client.fetchMessages(folder.path, range, { source: false });
+                            const recovered = await client.fetchMessages(folder.path, range, { source: prefetch });
                             messages.push(...recovered);
                         }
                     }
@@ -515,7 +523,7 @@ export class ImapManager extends EventEmitter {
             const oldestDate = this.db.getOldestDate(accountId, folderId);
             if (oldestDate > 0 && startDate.getTime() < oldestDate) {
                 const existingUids = new Set(this.db.getUidsForFolder(accountId, folderId));
-                const backfill = await client.fetchMessageByDate(folder.path, startDate, new Date(oldestDate), { source: false });
+                const backfill = await client.fetchMessageByDate(folder.path, startDate, new Date(oldestDate), { source: prefetch });
                 const newBackfill = backfill.filter((m) => !existingUids.has(m.uid));
                 if (newBackfill.length > 0) {
                     console.log(`  ${folder.path}: backfilling ${newBackfill.length} older messages`);
@@ -526,8 +534,8 @@ export class ImapManager extends EventEmitter {
         else {
             // First sync: fetch in chunks, store each chunk immediately for instant UI
             let totalStored = 0;
-            const onChunk = (chunk) => {
-                const stored = this.storeMessages(accountId, folderId, folder, chunk, highestUid);
+            const onChunk = async (chunk) => {
+                const stored = await this.storeMessages(accountId, folderId, folder, chunk, highestUid);
                 totalStored += stored;
                 if (stored > 0) {
                     this.db.recalcFolderCounts(folderId);
@@ -535,7 +543,7 @@ export class ImapManager extends EventEmitter {
                 }
             };
             const tomorrow = new Date(Date.now() + 86400000); // IMAP BEFORE is exclusive
-            messages = await client.fetchMessageByDate(folder.path, startDate, tomorrow, { source: false }, onChunk);
+            messages = await client.fetchMessageByDate(folder.path, startDate, tomorrow, { source: prefetch }, onChunk);
             if (totalStored > 0) {
                 console.log(`  ${folder.path}: ${totalStored} messages (streamed)`);
                 this.db.recalcFolderCounts(folderId);
@@ -695,19 +703,34 @@ export class ImapManager extends EventEmitter {
             const t0 = Date.now();
             const folders = await this.syncFolders(accountId, client);
             console.log(`  [timing] ${accountId}: folder list ${Date.now() - t0}ms (${folders.length} folders)`);
-            // Step 2: Sync INBOX first
+            // Step 2: Sync INBOX first — keep retrying on failure (most important folder)
             const inbox = folders.find(f => f.specialUse === "inbox");
             if (inbox) {
                 console.log(`  [sync] ${accountId}: starting INBOX sync (folder ${inbox.id})`);
-                try {
-                    client = await this.getOpsClient(accountId);
-                    console.log(`  [sync] ${accountId}: got client, calling syncFolder for INBOX`);
-                    await this.syncFolder(accountId, inbox.id, client);
-                    console.log(`  [sync] ${accountId}: INBOX sync complete`);
+                const maxAttempts = 5;
+                let inboxDone = false;
+                for (let attempt = 1; attempt <= maxAttempts && !inboxDone; attempt++) {
+                    try {
+                        client = await this.getOpsClient(accountId);
+                        if (attempt > 1)
+                            console.log(`  [sync] ${accountId}: INBOX retry #${attempt}`);
+                        await this.syncFolder(accountId, inbox.id, client);
+                        console.log(`  [sync] ${accountId}: INBOX sync complete`);
+                        inboxDone = true;
+                    }
+                    catch (e) {
+                        console.error(`  Inbox sync error for ${accountId} (attempt ${attempt}/${maxAttempts}): ${e.message}`);
+                        await this.reconnectOps(accountId);
+                        if (attempt < maxAttempts) {
+                            const delay = Math.min(attempt * 5000, 15000);
+                            console.log(`  [sync] ${accountId}: waiting ${delay / 1000}s before INBOX retry`);
+                            await new Promise(r => setTimeout(r, delay));
+                        }
+                    }
                 }
-                catch (e) {
-                    console.error(`  Inbox sync error for ${accountId}: ${e.message}`);
-                    await this.reconnectOps(accountId);
+                if (!inboxDone) {
+                    console.error(`  [sync] ${accountId}: INBOX failed after ${maxAttempts} attempts — will retry next sync cycle`);
+                    this.emit("syncError", accountId, `INBOX sync failed after ${maxAttempts} attempts`);
                 }
             }
             else {

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

@@ -42,6 +42,7 @@ declare const DEFAULT_PREFERENCES: {
     sync: {
         intervalMinutes: number;
         historyDays: number;
+        prefetch: boolean;
     };
     autocomplete: {
         enabled: boolean;
@@ -99,5 +100,7 @@ export declare function initCloudConfig(provider?: "gdrive"): Promise<void>;
 declare const DEFAULT_SETTINGS: MailxSettings;
 /** Get historyDays for an account: per-account override > system override > shared default */
 export declare function getHistoryDays(accountId?: string): number;
+/** Get prefetch setting: download bodies during sync (default true) */
+export declare function getPrefetch(): boolean;
 export { DEFAULT_SETTINGS, DEFAULT_ALLOWLIST, DEFAULT_PREFERENCES, DEFAULT_AUTOCOMPLETE, LOCAL_DIR };
 //# sourceMappingURL=index.d.ts.map

package/packages/mailx-settings/index.js

@@ -338,6 +338,7 @@ const DEFAULT_PREFERENCES = {
     sync: {
         intervalMinutes: 5,
         historyDays: 30,
+        prefetch: true,
     },
     autocomplete: {
         enabled: false,
@@ -633,5 +634,10 @@ export function getHistoryDays(accountId) {
     const prefs = loadPreferences();
     return prefs.sync.historyDays || 0;
 }
+/** Get prefetch setting: download bodies during sync (default true) */
+export function getPrefetch() {
+    const prefs = loadPreferences();
+    return prefs.sync.prefetch !== false;
+}
 export { DEFAULT_SETTINGS, DEFAULT_ALLOWLIST, DEFAULT_PREFERENCES, DEFAULT_AUTOCOMPLETE, LOCAL_DIR };
 //# sourceMappingURL=index.js.map

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

@@ -191,6 +191,7 @@ export interface MailxSettings {
     sync: {
         intervalMinutes: number;
         historyDays: number; /** 0 = all history */
+        prefetch: boolean; /** Download message bodies during sync (default true) */
     };
     store: {
         basePath: string; /** Where message bodies are stored */