@bobfrankston/rmfmail 1.1.187 → 1.1.189

package/packages/mailx-imap/index.ts

@@ -223,6 +223,14 @@ async function withTimeout<T>(promise: Promise<T>, ms: number, client: any, labe
 export class ImapManager extends EventEmitter {
     private configs: Map<string, ReturnType<typeof createAutoImapConfig>> = new Map();
     private watchers: Map<string, () => void> = new Map();
+    // Parallel map of the IDLE watch client per account, so runFullSync /
+    // startWatching can health-check the live socket and refresh ONLY dead
+    // watchers instead of tearing every watcher down each cycle. The blanket
+    // teardown was the IDLE-churn driver: it dropped healthy IDLE every 5 min,
+    // and re-establishing competed for the saturated 4-permit host semaphore
+    // (folder syncs holding all permits, timing out at 360s), leaving new mail
+    // on 5-min polling for minutes at a time (Bob 2026-05-28).
+    private watcherClients: Map<string, any> = new Map();
     private fetchClients: Map<string, any> = new Map();
     /** The Store is the architectural nexus — owner of MailxDB +
      *  FileMessageStore + the event bus. This package (mailx-imap) is a
@@ -357,7 +365,7 @@ export class ImapManager extends EventEmitter {
 
             // Stop IDLE watcher for this account
             const stopWatcher = this.watchers.get(accountId);
-            if (stopWatcher) { try { await stopWatcher(); } catch { /* */ } this.watchers.delete(accountId); }
+            if (stopWatcher) { try { await stopWatcher(); } catch { /* */ } this.watchers.delete(accountId); this.watcherClients.delete(accountId); }
 
             // Delete only the IMAP token (not contacts — separate scope, separate consent)
             const accountDir = tokenDirName(account.imap.user);
@@ -2513,7 +2521,12 @@ export class ImapManager extends EventEmitter {
     async runFullSync(): Promise<void> {
         console.log(`  [periodic] Full sync at ${new Date().toLocaleTimeString()}`);
         await this.syncAll();
-        await this.stopWatching();
+        // Do NOT tear down healthy IDLE here. startWatching is idempotent and
+        // now health-checks each existing watcher: alive ones are left intact,
+        // dead/missing ones are re-established. The old unconditional
+        // stopWatching()+startWatching() dropped healthy IDLE every cycle and
+        // the re-establish stalled behind the saturated host semaphore — the
+        // "still slow polling / not subscribing" gaps (Bob 2026-05-28).
         await this.startWatching();
     }
 
@@ -2537,7 +2550,22 @@ export class ImapManager extends EventEmitter {
      *  right way to make that cheap, not piling per-folder IDLE sockets). */
     async startWatching(): Promise<void> {
         for (const [accountId] of this.configs) {
-            if (this.watchers.has(accountId)) continue;
+            if (this.watchers.has(accountId)) {
+                // Already watching — but is the socket still alive? A silently
+                // dropped IDLE leaves the watcher entry in place, so without
+                // this health-check the deadman (which only checks for MISSING
+                // entries) would never refresh it. If dead, tear down just THIS
+                // one and fall through to re-establish; if alive, leave it.
+                const wc = this.watcherClients.get(accountId);
+                const sock = wc?.native?.transport?.socket;
+                const dead = !wc || sock?.destroyed || sock?.readyState === "closed" || wc?._dead;
+                if (!dead) continue;
+                console.log(`  [idle] ${accountId}: watcher socket dead — refreshing`);
+                const stop = this.watchers.get(accountId);
+                if (stop) { try { await stop(); } catch { /* */ } }
+                this.watchers.delete(accountId);
+                this.watcherClients.delete(accountId);
+            }
             try {
                 // IDLE keeps its own dedicated socket — once the connection
                 // is parked in IDLE, it's unusable for any other command, so
@@ -2602,6 +2630,7 @@ export class ImapManager extends EventEmitter {
                     await stop();
                     await watchClient.logout();
                 });
+                this.watcherClients.set(accountId, watchClient);
                 console.log(`  [idle] Watching INBOX for ${accountId}${useNotify ? " (+NOTIFY personal mailboxes)" : ""}`);
             } catch (e: any) {
                 // Defensive: same empty-message bug class as the transport
@@ -2628,6 +2657,7 @@ export class ImapManager extends EventEmitter {
             try { await stop(); } catch { /* ignore */ }
         }
         this.watchers.clear();
+        this.watcherClients.clear();
     }
 
     /** Unlink the on-disk body file for a message by reading its `body_path`
@@ -3077,6 +3107,17 @@ export class ImapManager extends EventEmitter {
                                             madeProgress = true;
                                         } catch (e: any) {
                                             console.error(`  [prefetch] ${accountId}/${uid}: store write failed: ${e.message}`);
+                                            // Back off this UID. A corrupt body (the
+                                            // putMessage guard rejecting an IMAP command
+                                            // leaked into the FETCH response — iflow
+                                            // protocol desync) was NOT marked, so the
+                                            // same poisoned UID got re-fetched every
+                                            // prefetch cycle forever, spamming the log
+                                            // and wasting fetch turns (Bob 2026-05-28
+                                            // "why is prefetching still broken" — UID
+                                            // 59686 failing on a loop). markPrefetchEmpty
+                                            // applies the 5m→30m→2h→12h backoff.
+                                            this.markPrefetchEmpty(accountId, folderId, uid);
                                         }
                                     })());
                                 });

package/packages/mailx-imap/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.70",
+      "version": "0.1.72",
       "license": "ISC",
       "dependencies": {
         "@bobfrankston/iflow-direct": "^0.1.27",

package/packages/mailx-imap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",