@bobfrankston/mailx 1.0.241 → 1.0.243

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":524,"y":191}
+{"height":1344,"width":2151,"x":419,"y":152}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.241",
+  "version": "1.0.243",
   "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.11",
+    "@bobfrankston/iflow-direct": "^0.1.12",
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.303",
+    "@bobfrankston/msger": "^0.1.305",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -74,11 +74,11 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.11",
+      "@bobfrankston/iflow-direct": "^0.1.12",
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.303",
+      "@bobfrankston/msger": "^0.1.305",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -788,15 +788,21 @@ export class ImapManager extends EventEmitter {
     }
     async _syncAll() {
         const priorityOrder = ["sent", "drafts", "archive", "junk", "trash"];
-        // 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()) {
+        // Sync all accounts in parallel — each manages its own connection.
+        // Prefetch runs per-account immediately after that account's sync
+        // completes, NOT after all accounts finish. This way a slow account
+        // (bobma with 300s timeouts) doesn't block prefetch for a fast account
+        // (Gmail). The old code put prefetch after `allSettled`, but syncAll
+        // has a 10-minute wall-clock timeout that killed it first — so
+        // prefetch never ran.
+        const syncAndPrefetch = async (accountId) => {
+            await this.syncAccount(accountId, priorityOrder);
+            if (getPrefetch()) {
                 this.prefetchBodies(accountId).catch(e => console.error(`  [prefetch] ${accountId}: ${e.message}`));
             }
-        }
+        };
+        const syncPromises = [...this.configs.keys()].map(syncAndPrefetch);
+        await Promise.allSettled(syncPromises);
     }
     /** Sync a single account — manages its own connection lifecycle */
     async syncAccount(accountId, priorityOrder) {
@@ -1424,7 +1430,13 @@ export class ImapManager extends EventEmitter {
         let totalFetched = 0;
         let deleted = 0;
         let errors = 0;
+        let rateLimited = false;
         const ERROR_BUDGET = 20;
+        // Pace body fetches to avoid slamming Gmail's rate limit. Without a
+        // delay, 500+ body-fetch API calls fire in a burst, every one hits 429,
+        // and the error budget drains before any bodies land.
+        const FETCH_DELAY_MS = this.isGmailAccount(accountId) ? 1000 : 200;
+        const RATE_LIMIT_PAUSE_MS = 30000;
         while (true) {
             const missing = this.db.getMessagesWithoutBody(accountId, 100);
             if (missing.length === 0)
@@ -1433,6 +1445,15 @@ export class ImapManager extends EventEmitter {
                 console.log(`  [prefetch] ${accountId}: ${missing.length}+ bodies to fetch`);
             let madeProgress = false;
             for (const msg of missing) {
+                // If we hit a rate limit, pause before the next fetch
+                if (rateLimited) {
+                    console.log(`  [prefetch] ${accountId}: rate-limited — pausing ${RATE_LIMIT_PAUSE_MS / 1000}s`);
+                    await new Promise(r => setTimeout(r, RATE_LIMIT_PAUSE_MS));
+                    rateLimited = false;
+                }
+                else if (FETCH_DELAY_MS > 0) {
+                    await new Promise(r => setTimeout(r, FETCH_DELAY_MS));
+                }
                 try {
                     const result = await this.fetchMessageBody(accountId, msg.folderId, msg.uid);
                     if (result) {
@@ -1454,7 +1475,15 @@ export class ImapManager extends EventEmitter {
                         catch { /* ignore */ }
                         continue;
                     }
-                    errors++;
+                    // If the error is a rate limit (429), don't count against
+                    // the budget — just slow down. The API will accept requests
+                    // again after a brief pause.
+                    if (/429|rate|too many/i.test(String(e?.message || ""))) {
+                        rateLimited = true;
+                    }
+                    else {
+                        errors++;
+                    }
                     if (errors >= ERROR_BUDGET) {
                         console.error(`  [prefetch] ${accountId}: stopping after ${errors} errors (${totalFetched} cached, ${deleted} pruned)`);
                         return;