@bobfrankston/rmfmail 1.2.10 → 1.2.12

package/packages/mailx-imap/index.ts

@@ -3392,12 +3392,27 @@ export class ImapManager extends EventEmitter {
                                                 madeProgress = true;
                                             }
                                         } catch (e: any) {
-                                            console.error(`  [prefetch] ${accountId}/${uid}: store write failed: ${e.message}`);
-                                            // putMessage / extractPreview failure (e.g. a
-                                            // corrupt body — an IMAP command leaked into the
-                                            // FETCH response). Genuine poison: back off
-                                            // 5m→30m→2h→12h so it isn't re-fetched on a loop
-                                            // (Bob 2026-05-28, UID 59686).
+                                            const emsg = String(e?.message || e);
+                                            // "IMAP command leaked into response stream" /
+                                            // "corrupt body" means the byte-buffer parser lost
+                                            // sync — a partial/flaky read shifted a literal
+                                            // boundary so this FETCH body captured a later
+                                            // command's bytes. The MESSAGE is probably fine; the
+                                            // CONNECTION is poisoned (every subsequent read on
+                                            // it is now garbage). Re-throw so withConnection
+                                            // discards this client and the next chunk reconnects
+                                            // clean — instead of marking a good message as poison
+                                            // and limping on a dead socket until the 300s timeout,
+                                            // which left bobma INBOX stuck and "no new mail"
+                                            // (Bob 2026-06-15). Do NOT back the UID off; it
+                                            // retries next tick on a clean connection.
+                                            if (/command leaked|corrupt body|desync/i.test(emsg)) {
+                                                console.error(`  [prefetch] ${accountId}/${uid}: connection desync — discarding socket to resync: ${emsg.slice(0, 90)}`);
+                                                throw new Error(`imap-desync: ${emsg.slice(0, 80)}`);
+                                            }
+                                            console.error(`  [prefetch] ${accountId}/${uid}: store write failed: ${emsg}`);
+                                            // Genuine poison body (not a desync): back off
+                                            // 5m→30m→2h→12h so it isn't re-fetched on a loop.
                                             this.markPrefetchEmpty(accountId, folderId, uid);
                                         }
                                     })());
@@ -3438,9 +3453,9 @@ export class ImapManager extends EventEmitter {
                             // (markPrefetchEmpty is per-message poison only) —
                             // they retry next tick. Genuine per-body errors are
                             // handled per-UID above and never reach here.
-                            const dead = /not connected|ETIMEDOUT|ECONNRESET|ECONNREFUSED|EPIPE|socket|connection (closed|reset|lost)|disconnect/i.test(msg);
+                            const dead = /not connected|ETIMEDOUT|ECONNRESET|ECONNREFUSED|EPIPE|socket|connection (closed|reset|lost)|disconnect|imap-desync/i.test(msg);
                             if (dead) {
-                                console.log(`  [prefetch] ${accountId}/${folder.path}: connection down — deferring rest to next tick`);
+                                console.log(`  [prefetch] ${accountId}/${folder.path}: connection down/desync — deferring rest to next tick (fresh socket)`);
                                 break;
                             }
                             if (counters.errors >= ERROR_BUDGET) break;

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

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.95",
+  "version": "0.1.96",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.95",
+      "version": "0.1.96",
       "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.95",
+  "version": "0.1.96",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/mailx-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.50",
+  "version": "0.1.51",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",