@bobfrankston/iflow-direct 0.1.32 → 0.1.33

package/imap-native.d.ts

@@ -173,6 +173,11 @@ export declare class NativeImapClient {
      *  60s accommodates Gmail which is slow on SEARCH for large folders.
      *  Overridable via ImapClientConfig.inactivityTimeout — slow Dovecot servers need 180s+. */
     private inactivityTimeout;
+    /** Hard wall-clock cap per command (independent of inactivityTimeout).
+     *  A pathological server that returns one byte every (inactivityTimeout-1)
+     *  seconds would otherwise defer the inactivity timer forever; this is
+     *  the absolute deadline that always fires. Default 5 minutes. */
+    private commandWallClockTimeout;
     /** Server-greeting timeout in ms — how long to wait for the server's
      *  initial banner after TCP/TLS connects. Default 10s; bumped to 30s
      *  for slow shared-hosting Dovecot in mailx-imap. */

package/imap-native.js

@@ -32,6 +32,10 @@ export class NativeImapClient {
         this.transport = transportFactory();
         this.verbose = config.verbose || false;
         this.inactivityTimeout = config.inactivityTimeout ?? 60000;
+        // Hard wall-clock deadline per command (default 5 min). Distinct
+        // from inactivityTimeout — that one resets on each data chunk and
+        // can be deferred indefinitely by a slow-trickling server.
+        this.commandWallClockTimeout = config.commandWallClockTimeout ?? 300_000;
         this.fetchChunkSize = config.fetchChunkSize ?? 25;
         this.fetchChunkSizeMax = config.fetchChunkSizeMax ?? 500;
         this.greetingTimeout = config.greetingTimeout ?? 10000;
@@ -729,6 +733,11 @@ export class NativeImapClient {
      *  60s accommodates Gmail which is slow on SEARCH for large folders.
      *  Overridable via ImapClientConfig.inactivityTimeout — slow Dovecot servers need 180s+. */
     inactivityTimeout;
+    /** Hard wall-clock cap per command (independent of inactivityTimeout).
+     *  A pathological server that returns one byte every (inactivityTimeout-1)
+     *  seconds would otherwise defer the inactivity timer forever; this is
+     *  the absolute deadline that always fires. Default 5 minutes. */
+    commandWallClockTimeout;
     /** Server-greeting timeout in ms — how long to wait for the server's
      *  initial banner after TCP/TLS connects. Default 10s; bumped to 30s
      *  for slow shared-hosting Dovecot in mailx-imap. */
@@ -796,21 +805,39 @@ export class NativeImapClient {
                 const waited = Date.now() - cmdStart;
                 console.log(`  [imap] still waiting for tag ${tag} after ${(waited / 1000).toFixed(1)}s — ${cmdSummary}${transportDiag()}`);
             }, HEARTBEAT_INTERVAL_MS);
-            const onTimeout = () => {
+            const onTimeout = (kind) => {
                 this.commandTimer = null;
                 this.pendingCommand = null;
                 if (heartbeatTimer) {
                     clearInterval(heartbeatTimer);
                     heartbeatTimer = null;
                 }
+                if (wallClockTimer) {
+                    clearTimeout(wallClockTimer);
+                    wallClockTimer = null;
+                }
                 // Kill the connection — a timed-out connection has stale data in the pipe.
                 // Mark disconnected so ensureConnected() reconnects on the next call —
                 // transport.close() may or may not fire onClose synchronously.
                 this._connected = false;
                 this.transport.close?.();
-                reject(new Error(`IMAP inactivity timeout (${this.inactivityTimeout / 1000}s): ${cmdSummary}${transportDiag()}`));
+                reject(new Error(`${kind}: ${cmdSummary}${transportDiag()}`));
             };
-            this.commandTimer = setTimeout(onTimeout, this.inactivityTimeout);
+            // Two timers, two responsibilities:
+            //   commandTimer = "no bytes for N seconds" — handleData resets it
+            //                  on every chunk so a steadily-streaming FETCH
+            //                  doesn't get killed mid-flight.
+            //   wallClockTimer = "this command has been pending too long
+            //                  total" — fires regardless of trickling bytes.
+            //                  Catches the pathological case where a server
+            //                  drips one byte every <inactivityTimeout> seconds
+            //                  for hours (real bobma bug we hit overnight:
+            //                  3 connections wedged 2-3 hours each because
+            //                  the inactivity reset kept deferring the only
+            //                  timer in play).
+            this.commandTimer = setTimeout(() => onTimeout(`IMAP inactivity timeout (${this.inactivityTimeout / 1000}s)`), this.inactivityTimeout);
+            const COMMAND_WALL_CLOCK_TIMEOUT_MS = this.commandWallClockTimeout;
+            let wallClockTimer = setTimeout(() => onTimeout(`IMAP command wall-clock timeout (${COMMAND_WALL_CLOCK_TIMEOUT_MS / 1000}s)`), COMMAND_WALL_CLOCK_TIMEOUT_MS);
             const clearTimers = () => {
                 if (this.commandTimer) {
                     clearTimeout(this.commandTimer);
@@ -820,6 +847,10 @@ export class NativeImapClient {
                     clearInterval(heartbeatTimer);
                     heartbeatTimer = null;
                 }
+                if (wallClockTimer) {
+                    clearTimeout(wallClockTimer);
+                    wallClockTimer = null;
+                }
             };
             this.pendingCommand = {
                 tag, responses: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/iflow-direct",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "Direct IMAP client — transport-agnostic, no Node.js dependencies, browser-ready",
   "main": "index.js",
   "types": "index.ts",

package/types.d.ts

@@ -11,6 +11,7 @@ export interface ImapClientConfig {
     verbose?: boolean;
     rejectUnauthorized?: boolean;
     inactivityTimeout?: number;
+    commandWallClockTimeout?: number;
     fetchChunkSize?: number;
     fetchChunkSizeMax?: number;
     greetingTimeout?: number;