whatsapp-pi 1.0.44 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-pi",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "type": "module",
   "description": "WhatsApp integration extension for Pi",
   "main": "whatsapp-pi.ts",

package/src/services/session.manager.ts

@@ -136,10 +136,11 @@ export class SessionManager {
     public async saveConfig() {
         const tempPath = `${this.configPath}.${process.pid}.${Date.now()}.tmp`;
         try {
+            this.hasAuthState = this.hasAuthState || await this.hasCredentialsFile();
             const config = {
                 allowList: this.allowList,
-                blockList: this.blockList,
-                ignoredNumbers: this.ignoredNumbers,
+                blockList: this.blockList,
+                ignoredNumbers: this.ignoredNumbers,
                 status: this.status,
                 hasAuthState: this.hasAuthState,
                 openaiKey: this.openaiKey,

package/src/services/whatsapp.service.ts

@@ -71,12 +71,16 @@ interface BoomLikeError {
     message?: string;
 }
 
-export class WhatsAppService {
-    private socket?: WhatsAppSocketLike;
-    private sessionManager: SessionManager;
-    private messageSender: MessageSender;
-    private isReconnecting = false;
-    private verboseMode = false;
+export class WhatsAppService {
+    private static readonly INITIAL_RECONNECT_DELAY_MS = 5_000;
+    private static readonly MAX_RECONNECT_DELAY_MS = 120_000;
+
+    private socket?: WhatsAppSocketLike;
+    private sessionManager: SessionManager;
+    private messageSender: MessageSender;
+    private isReconnecting = false;
+    private reconnectAttempts = 0;
+    private verboseMode = false;
     private onIncomingMessageRecorded?: (message: IncomingMessage) => void | Promise<void>;
     private saveCreds?: () => Promise<void>;
     private restoreBaileysConsoleFilter?: () => void;
@@ -164,12 +168,17 @@ export class WhatsAppService {
         return '';
     }
 
-    private clearReconnectTimeout() {
-        if (this.reconnectTimeout) {
-            clearTimeout(this.reconnectTimeout);
-            this.reconnectTimeout = undefined;
-        }
-    }
+    private clearReconnectTimeout() {
+        if (this.reconnectTimeout) {
+            clearTimeout(this.reconnectTimeout);
+            this.reconnectTimeout = undefined;
+        }
+    }
+
+    private getReconnectDelayMs(): number {
+        const delay = WhatsAppService.INITIAL_RECONNECT_DELAY_MS * (2 ** Math.max(0, this.reconnectAttempts - 1));
+        return Math.min(delay, WhatsAppService.MAX_RECONNECT_DELAY_MS);
+    }
 
     private cleanupSocket() {
         this.clearReconnectTimeout();
@@ -303,10 +312,11 @@ export class WhatsAppService {
             console.log('WhatsApp connection successfully opened');
         }
 
-        this.isReconnecting = false;
-        this.clearReconnectTimeout();
-        await this.saveCreds?.();
-        await this.sessionManager.markAuthStateAvailable();
+        this.isReconnecting = false;
+        this.reconnectAttempts = 0;
+        this.clearReconnectTimeout();
+        await this.saveCreds?.();
+        await this.sessionManager.markAuthStateAvailable();
         this.sessionManager.setStatus('connected');
         this.onStatusUpdate?.('| WhatsApp: Connected');
     }
@@ -354,6 +364,7 @@ export class WhatsAppService {
             }
             this.cleanupSocket();
             this.isReconnecting = false;
+            this.reconnectAttempts = 0;
             await this.sessionManager.setStatus('disconnected');
             if (!isBadMac) {
                 this.onStatusUpdate?.('| WhatsApp: Disconnected');
@@ -361,26 +372,35 @@ export class WhatsAppService {
             return;
         }
 
-        if (statusCode === DisconnectReason.connectionReplaced) {
-            if (this.verboseMode) {
-                console.error('Connection replaced - another instance connected');
-            }
-            this.onStatusUpdate?.('| WhatsApp: Conflict (Another Instance)');
-            return;
-        }
-
-        if (shouldReconnect && !this.isReconnecting) {
-            this.isReconnecting = true;
-            this.onStatusUpdate?.('| WhatsApp: Reconnecting...');
-            this.clearReconnectTimeout();
-            this.reconnectTimeout = setTimeout(() => {
-                this.isReconnecting = false;
-                void this.start(options);
-            }, 3000);
-        } else if (!shouldReconnect) {
-            this.sessionManager.setStatus('logged-out');
-            this.onStatusUpdate?.('| WhatsApp: Disconnected');
-        }
+        if (statusCode === DisconnectReason.connectionReplaced) {
+            if (this.verboseMode) {
+                console.error('Connection replaced - another instance connected');
+            }
+            this.cleanupSocket();
+            this.isReconnecting = false;
+            this.reconnectAttempts = 0;
+            await this.sessionManager.setStatus('disconnected');
+            this.onStatusUpdate?.('| WhatsApp: Conflict (Another Instance)');
+            return;
+        }
+
+        if (shouldReconnect && !this.isReconnecting) {
+            this.isReconnecting = true;
+            this.reconnectAttempts++;
+            const reconnectDelayMs = this.getReconnectDelayMs();
+            this.onStatusUpdate?.('| WhatsApp: Reconnecting...');
+            this.clearReconnectTimeout();
+            await this.saveCreds?.();
+            this.cleanupSocket();
+            this.reconnectTimeout = setTimeout(() => {
+                this.isReconnecting = false;
+                void this.start(options);
+            }, reconnectDelayMs);
+        } else if (!shouldReconnect) {
+            this.reconnectAttempts = 0;
+            this.sessionManager.setStatus('logged-out');
+            this.onStatusUpdate?.('| WhatsApp: Disconnected');
+        }
     }
 
     private extractText(message: IncomingMessageContent | undefined): string {

package/whatsapp-pi.ts

@@ -60,7 +60,7 @@ export default function (pi: ExtensionAPI) {
     };
 
     // Initial status setup
-    pi.on("session_start", async (_event, ctx) => {
+    pi.on("session_start", async (_event, ctx) => {
         _ctx = ctx;
         // Check verbose mode
         const isVerboseFlagSet = process.argv.includes("--verbose");
@@ -86,10 +86,10 @@ export default function (pi: ExtensionAPI) {
                 await whatsappService.stop();
             }
         };
-        whatsappService.setIncomingMessageRecorder(async (message) => {
-            await recentsService.recordMessage({
-                messageId: message.id,
-                senderNumber: `+${message.remoteJid.split('@')[0]}`,
+        whatsappService.setIncomingMessageRecorder(async (message) => {
+            await recentsService.recordMessage({
+                messageId: message.id,
+                senderNumber: `+${message.remoteJid.split('@')[0]}`,
                 senderName: message.pushName,
                 text: message.text || '',
                 direction: 'incoming',
@@ -97,20 +97,20 @@ export default function (pi: ExtensionAPI) {
             });
         });
 
-        const savedStateEntry = [...ctx.sessionManager.getEntries()]
-            .reverse()
-            .find(entry => entry.type === "custom" && entry.customType === "whatsapp-state");
-        const isWhatsappPiOn = pi.getFlag("whatsapp-pi-online") === true;
-        const registered = await sessionManager.isRegistered();
-
-        if (savedStateEntry) {
-            const data = (savedStateEntry as { data?: any }).data;
-            if (data.status) {
-                const restoredStatus = data.status === 'connected' && !(isWhatsappPiOn && registered)
-                    ? 'disconnected'
-                    : data.status;
-                await sessionManager.setStatus(restoredStatus);
-            }
+        const savedStateEntry = [...ctx.sessionManager.getEntries()]
+            .reverse()
+            .find(entry => entry.type === "custom" && entry.customType === "whatsapp-state");
+        const isWhatsappPiOn = pi.getFlag("whatsapp-pi-online") === true;
+        const registered = await sessionManager.isRegistered();
+
+        if (savedStateEntry) {
+            const data = (savedStateEntry as { data?: any }).data;
+            if (data.status) {
+                const restoredStatus = data.status === 'connected' && !(isWhatsappPiOn && registered)
+                    ? 'disconnected'
+                    : data.status;
+                await sessionManager.setStatus(restoredStatus);
+            }
             if (Array.isArray(data.allowList)) {
                 for (const n of data.allowList) {
                     const num = typeof n === "string" ? n : n.number;
@@ -118,10 +118,10 @@ export default function (pi: ExtensionAPI) {
                     await sessionManager.addNumber(num, name);
                 }
             }
-        }
-
-        if (isWhatsappPiOn && registered) {
-            ctx.ui.setStatus('whatsapp', '| WhatsApp: Auto-connecting...');
+        }
+
+        if (isWhatsappPiOn && registered) {
+            ctx.ui.setStatus('whatsapp', '| WhatsApp: Auto-connecting...');
 
             // Retry logic (max 3 attempts, 3s delay)
             let attempts = 0;
@@ -131,7 +131,7 @@ export default function (pi: ExtensionAPI) {
                 attempts++;
                 try {
                     await whatsappService.start({ allowPairingOnAuthFailure: false });
-                } catch {
+                } catch {
                     if (attempts < maxAttempts) {
                         ctx.ui.notify(`WhatsApp: Connection attempt ${attempts} failed. Retrying...`, 'warning');
                         setTimeout(tryConnect, 3000);
@@ -143,11 +143,11 @@ export default function (pi: ExtensionAPI) {
             };
 
             await tryConnect();
-        } else if (isWhatsappPiOn) {
-            ctx.ui.notify('WhatsApp: Auto-connect requested, but no saved WhatsApp credentials were found. Use Connect WhatsApp once to scan the QR code.', 'warning');
-        } else {
-            ctx.ui.notify('WhatsApp: Use Connect / Reconnect WhatsApp. QR code will appear only if pairing is needed.', 'info');
-        }
+        } else if (isWhatsappPiOn) {
+            ctx.ui.notify('WhatsApp: Auto-connect requested, but no saved WhatsApp credentials were found. Use Connect WhatsApp once to scan the QR code.', 'warning');
+        } else {
+            ctx.ui.notify('WhatsApp: Use Connect / Reconnect WhatsApp. QR code will appear only if pairing is needed.', 'info');
+        }
 
         ctx.ui.notify('WhatsApp: Session reset via /new is now fully supported.', 'info');
 
@@ -157,7 +157,7 @@ export default function (pi: ExtensionAPI) {
             if (code !== 0 && code !== 99) { // 99 is a common exit code for -v in some versions
                 throw new Error(`pdftotext returned code ${code}`);
             }
-        } catch {
+        } catch {
             ctx.ui.notify('WhatsApp: pdftotext not found. PDF document support will be limited to storage only.', 'warning');
             logger.warn('[WhatsApp-Pi] Warning: pdftotext not found in system PATH.');
         }
@@ -333,7 +333,7 @@ export default function (pi: ExtensionAPI) {
                     } else {
                         ctx.ui.notify(`Failed to send WhatsApp reply`, 'error');
                     }
-                } catch {
+                } catch {
                     ctx.ui.notify(`Failed to send WhatsApp reply`, 'error');
                 }
             }