@bobfrankston/mailx 1.0.223 → 1.0.224

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.223",
+  "version": "1.0.224",
   "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.9",
+    "@bobfrankston/iflow-direct": "^0.1.10",
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.285",
+    "@bobfrankston/msger": "^0.1.286",
     "@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.9",
+      "@bobfrankston/iflow-direct": "^0.1.10",
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.285",
+      "@bobfrankston/msger": "^0.1.286",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -371,24 +371,35 @@ export class ImapManager extends EventEmitter {
             }
             const tokenDir = path.join(getConfigDir(), "tokens", account.imap.user.replace(/[@.]/g, "_"));
             tokenProvider = async () => {
-                const result = await authenticateOAuth(credPath, {
+                // Wrap authenticateOAuth with a 30s wall-clock timeout. Without this,
+                // a hung OAuth server could block the entire sync thread indefinitely.
+                const TOKEN_FETCH_TIMEOUT_MS = 30000;
+                const authPromise = authenticateOAuth(credPath, {
                     scope: "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/calendar",
                     tokenDirectory: tokenDir,
                     credentialsKey: "installed",
                     loginHint: account.imap.user,
                 });
+                const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`OAuth token fetch timeout (${TOKEN_FETCH_TIMEOUT_MS / 1000}s)`)), TOKEN_FETCH_TIMEOUT_MS));
+                const result = await Promise.race([authPromise, timeoutPromise]);
                 return result?.access_token || "";
             };
         }
+        // Non-Gmail accounts (typically Dovecot / generic IMAP) get a smaller
+        // fetch chunk size (10 vs 25) and longer inactivity timeout (300s) so
+        // multi-body FETCH batches don't trip the connection-dead detector on
+        // slow servers. Gmail stays at the defaults since it's fast and has
+        // its own rate limits to respect.
+        const isGmail = account.imap.host?.includes("gmail") || account.email.endsWith("@gmail.com");
         const config = createAutoImapConfig({
             server: account.imap.host,
             port: account.imap.port,
             username: account.imap.user,
             password: account.imap.password,
             tokenProvider,
-            // Slow Dovecot servers (e.g. iecc.com) can stall >60s during multi-body FETCH.
-            // Raise the inactivity timeout so the connection isn't dropped mid-stream.
-            inactivityTimeout: 180000,
+            inactivityTimeout: isGmail ? 60000 : 300000,
+            fetchChunkSize: isGmail ? 25 : 10,
+            fetchChunkSizeMax: isGmail ? 500 : 100,
         });
         this.configs.set(account.id, config);
         // Register account in DB