@bobfrankston/iflow 1.0.38 → 1.0.40

package/imaplib/ImapClient.js

@@ -93,7 +93,12 @@ export class ImapClient {
                 }
                 catch (err) {
                     console.error(`${new Date().toISOString()} Reconnection failed: ${imapError(err)}`);
-                    // Will trigger another reconnection attempt via error handler
+                    // Stop reconnecting if server says too many connections — let it cool down
+                    const errMsg = imapError(err);
+                    if (errMsg.includes("max_userip_connections") || errMsg.includes("Too many simultaneous")) {
+                        console.error(`${new Date().toISOString()} Connection limit reached — stopping reconnection`);
+                        this.isDestroying = true; // Prevent further reconnect attempts
+                    }
                 }
             }
             catch (err) {

package/imaplib/imap-native.d.ts

@@ -112,6 +112,8 @@ export declare class NativeImapClient {
     appendMessage(mailbox: string, message: string | Uint8Array, flags?: string[]): Promise<number | null>;
     startIdle(onNewMail: (count: number) => void): Promise<() => Promise<void>>;
     getMessageCount(mailbox: string): Promise<number>;
+    /** Default timeout for IMAP commands (30s). Prevents hanging connections. */
+    private commandTimeout;
     private sendCommand;
     private waitForContinuation;
     private waitForTagged;

package/imaplib/imap-native.js

@@ -31,10 +31,24 @@ export class NativeImapClient {
     async connect() {
         const useTls = this.config.port === 993;
         this.transport.onData((data) => this.handleData(data));
-        this.transport.onClose(() => { this._connected = false; });
+        this.transport.onClose(() => {
+            this._connected = false;
+            // Reject any pending command so it doesn't hang forever
+            if (this.pendingCommand) {
+                const { reject } = this.pendingCommand;
+                this.pendingCommand = null;
+                reject(new Error("Connection closed"));
+            }
+        });
         this.transport.onError((err) => {
             if (this.verbose)
                 console.error(`  [imap] Transport error: ${err.message}`);
+            // Reject any pending command on transport error
+            if (this.pendingCommand) {
+                const { reject } = this.pendingCommand;
+                this.pendingCommand = null;
+                reject(err);
+            }
         });
         await this.transport.connect(this.config.server, this.config.port, useTls, this.config.server);
         // Read server greeting
@@ -133,10 +147,15 @@ export class NativeImapClient {
         try {
             if (this._connected) {
                 const tag = proto.nextTag();
-                await this.sendCommand(tag, proto.logoutCommand(tag));
+                // Timeout the LOGOUT command — don't let it hang forever
+                await Promise.race([
+                    this.sendCommand(tag, proto.logoutCommand(tag)),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error("LOGOUT timeout")), 5000))
+                ]);
             }
         }
-        catch { /* ignore */ }
+        catch { /* ignore — always close transport below */ }
+        this.pendingCommand = null; // clear any hanging promise
         this.transport.close();
         this._connected = false;
     }
@@ -399,13 +418,23 @@ export class NativeImapClient {
         return status.messages || 0;
     }
     // ── Low-level command handling ──
+    /** Default timeout for IMAP commands (30s). Prevents hanging connections. */
+    commandTimeout = 30000;
     sendCommand(tag, command) {
         return new Promise((resolve, reject) => {
             if (this.verbose && !command.includes("LOGIN") && !command.includes("AUTHENTICATE")) {
                 console.log(`  [imap] > ${command.trimEnd()}`);
             }
-            this.pendingCommand = { tag, resolve, reject, responses: [] };
-            this.transport.write(command).catch(reject);
+            const timer = setTimeout(() => {
+                this.pendingCommand = null;
+                reject(new Error(`IMAP command timeout (${this.commandTimeout / 1000}s): ${command.split("\r")[0].substring(0, 50)}`));
+            }, this.commandTimeout);
+            this.pendingCommand = {
+                tag, responses: [],
+                resolve: (responses) => { clearTimeout(timer); resolve(responses); },
+                reject: (err) => { clearTimeout(timer); reject(err); },
+            };
+            this.transport.write(command).catch((err) => { clearTimeout(timer); reject(err); });
         });
     }
     waitForContinuation(tag) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/iflow",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "IMAP client wrapper library",
   "main": "index.js",
   "types": "index.ts",
@@ -23,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/oauthsupport": "^1.0.19",
+    "@bobfrankston/oauthsupport": "^1.0.20",
     "imapflow": "^1.0.187"
   },
   "exports": {