@bobfrankston/iflow 1.0.39 → 1.0.41

package/imaplib/imap-native.d.ts

@@ -57,6 +57,7 @@ export declare class NativeImapClient {
     private verbose;
     private selectedMailbox;
     private mailboxInfo;
+    private greetingResolve;
     constructor(config: ImapClientConfig, transportFactory: TransportFactory);
     get connected(): boolean;
     connect(): Promise<void>;
@@ -112,6 +113,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

@@ -20,6 +20,7 @@ export class NativeImapClient {
     verbose;
     selectedMailbox = null;
     mailboxInfo = { exists: 0, recent: 0, uidNext: 0, uidValidity: 0, flags: [], permanentFlags: [] };
+    greetingResolve = null;
     constructor(config, transportFactory) {
         this.config = config;
         this.transportFactory = transportFactory;
@@ -31,10 +32,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
@@ -57,19 +72,15 @@ export class NativeImapClient {
         await this.authenticate();
     }
     async readGreeting() {
-        return new Promise((resolve) => {
-            const check = () => {
-                const lineEnd = this.buffer.indexOf("\r\n");
-                if (lineEnd >= 0) {
-                    const line = this.buffer.substring(0, lineEnd + 2);
-                    this.buffer = this.buffer.substring(lineEnd + 2);
-                    resolve(proto.parseResponseLine(line));
-                }
-                else {
-                    setTimeout(check, 10);
-                }
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                this.greetingResolve = null;
+                reject(new Error("Greeting timeout (10s)"));
+            }, 10000);
+            this.greetingResolve = (resp) => {
+                clearTimeout(timeout);
+                resolve(resp);
             };
-            check();
         });
     }
     async authenticate() {
@@ -133,10 +144,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 +415,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) {
@@ -482,6 +508,13 @@ export class NativeImapClient {
             if (this.verbose && resp.raw.length < 200) {
                 console.log(`  [imap] < ${resp.raw}`);
             }
+            // Server greeting — resolve readGreeting() promise
+            if (this.greetingResolve && resp.tag === "*" && (resp.type === "OK" || resp.type === "PREAUTH")) {
+                const resolve = this.greetingResolve;
+                this.greetingResolve = null;
+                resolve(resp);
+                continue;
+            }
             // During IDLE, handle EXISTS notifications
             if (this.idleTag && resp.tag === "*" && resp.type === "EXISTS") {
                 const count = parseInt(resp.text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/iflow",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "IMAP client wrapper library",
   "main": "index.js",
   "types": "index.ts",