whatsapp-pi 1.0.43 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-pi",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "type": "module",
   "description": "WhatsApp integration extension for Pi",
   "main": "whatsapp-pi.ts",
@@ -27,6 +27,7 @@
   "author": "Rapha",
   "license": "MIT",
   "scripts": {
+    "lint": "eslint whatsapp-pi.ts \"src/**/*.ts\" \"tests/**/*.ts\"",
     "test": "vitest run",
     "typecheck": "tsc --noEmit"
   },
@@ -36,10 +37,14 @@
     "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.4",
     "@mariozechner/pi-coding-agent": "latest",
     "@types/node": "^20.11.0",
     "@types/qrcode-terminal": "^0.12.2",
+    "@typescript-eslint/eslint-plugin": "^8.58.1",
+    "@typescript-eslint/parser": "^8.58.1",
     "@vitest/coverage-v8": "^1.6.1",
+    "eslint": "^9.39.4",
     "ts-node": "^10.9.2",
     "tsx": "^4.7.0",
     "typescript": "^5.3.0",

package/src/services/incoming-media.service.ts

@@ -102,7 +102,7 @@ export class IncomingMediaService {
     }
 
     private async saveDocument(fileName: string, buffer: Buffer): Promise<string> {
-        const sanitized = fileName.replace(/[^a-z0-9\._-]/gi, '_');
+        const sanitized = fileName.replace(/[^a-z0-9._-]/gi, '_');
         const savedFileName = `${Date.now()}_${sanitized}`;
         const documentDir = join(process.cwd(), '.pi-data', 'whatsapp', 'documents');
         const absolutePath = join(documentDir, savedFileName);

package/src/services/session.manager.ts

@@ -1,27 +1,33 @@
-import { useMultiFileAuthState } from '@whiskeysockets/baileys';
-import { join } from 'path';
-import { readFile, writeFile, mkdir, rm, readdir } from 'fs/promises';
+import { useMultiFileAuthState } from '@whiskeysockets/baileys';
+import { join } from 'path';
+import { readFile, writeFile, mkdir, rm, rename } from 'fs/promises';
 import { homedir } from 'os';
 import { SessionStatus } from '../models/whatsapp.types.js';
 
-export interface Contact {
-    number: string;
-    name?: string;
-}
-
-export class SessionManager {
-    // Data is stored in the user's home directory to persist across updates
-    private readonly baseDir = join(homedir(), '.pi', 'whatsapp-pi');
-    private readonly authStateDir = join(this.baseDir, 'auth');
-    private readonly configPath = join(this.baseDir, 'config.json');
+export interface Contact {
+    number: string;
+    name?: string;
+}
+
+export class SessionManager {
+    // Data is stored in the user's home directory to persist across updates
+    private readonly baseDir: string;
+    private readonly authStateDir: string;
+    private readonly configPath: string;
 
     private status: SessionStatus = 'logged-out';
     private allowList: Contact[] = [];
     private blockList: Contact[] = [];
     private ignoredNumbers: Contact[] = [];
     private hasAuthState = false;
-    private openaiKey: string = '';
-    private visionModel: string = 'gpt-4o';
+    private openaiKey: string = '';
+    private visionModel: string = 'gpt-4o';
+
+    constructor(baseDir = join(homedir(), '.pi', 'whatsapp-pi')) {
+        this.baseDir = baseDir;
+        this.authStateDir = join(this.baseDir, 'auth');
+        this.configPath = join(this.baseDir, 'config.json');
+    }
 
     private async ensureStorageDirectories() {
         await mkdir(this.baseDir, { recursive: true });
@@ -33,15 +39,17 @@ export class SessionManager {
             await this.ensureStorageDirectories();
             await this.loadConfig();
             await this.syncAuthStateFromDisk();
-        } catch (error) {}
+        } catch {
+            // Initialization is best-effort; callers can continue with defaults.
+        }
     }
 
-    private async loadConfig() {
-        try {
-            const data = await readFile(this.configPath, 'utf-8');
-            const config = JSON.parse(data);
-            
-            const cleanContact = (item: any): Contact | null => {
+    private async loadConfig() {
+        try {
+            const data = await readFile(this.configPath, 'utf-8');
+            const { config, recovered } = this.parseConfig(data);
+            
+            const cleanContact = (item: any): Contact | null => {
                 if (typeof item === 'string') return { number: item };
                 if (item && typeof item === 'object') {
                     let num = item.number;
@@ -60,30 +68,92 @@ export class SessionManager {
             this.blockList = (config.blockList || []).map(cleanContact).filter(Boolean) as Contact[];
             this.ignoredNumbers = (config.ignoredNumbers || []).map(cleanContact).filter(Boolean) as Contact[];
             this.status = config.status || 'logged-out';
-            this.hasAuthState = Boolean(config.hasAuthState);
-            this.openaiKey = config.openaiKey || '';
-            this.visionModel = config.visionModel || 'gpt-4o';
-        } catch (error) {
-            // File not found is fine
-        }
-    }
-
-    public async saveConfig() {
-        try {
-            const config = {
-                allowList: this.allowList,
-                blockList: this.blockList,
-                ignoredNumbers: this.ignoredNumbers,
+            this.hasAuthState = Boolean(config.hasAuthState);
+            this.openaiKey = config.openaiKey || '';
+            this.visionModel = config.visionModel || 'gpt-4o';
+
+            if (recovered) {
+                await this.saveConfig();
+            }
+        } catch {
+            // File not found is fine
+        }
+    }
+
+    private parseConfig(data: string): { config: any; recovered: boolean } {
+        try {
+            return { config: JSON.parse(data), recovered: false };
+        } catch (error) {
+            const objectEnd = this.findFirstJsonObjectEnd(data);
+            if (objectEnd < 0) {
+                throw error;
+            }
+
+            return {
+                config: JSON.parse(data.slice(0, objectEnd + 1)),
+                recovered: true
+            };
+        }
+    }
+
+    private findFirstJsonObjectEnd(data: string): number {
+        let depth = 0;
+        let inString = false;
+        let escaped = false;
+
+        for (let i = 0; i < data.length; i++) {
+            const char = data[i];
+
+            if (inString) {
+                if (escaped) {
+                    escaped = false;
+                } else if (char === '\\') {
+                    escaped = true;
+                } else if (char === '"') {
+                    inString = false;
+                }
+                continue;
+            }
+
+            if (char === '"') {
+                inString = true;
+                continue;
+            }
+
+            if (char === '{') {
+                depth++;
+            } else if (char === '}') {
+                depth--;
+                if (depth === 0) {
+                    return i;
+                }
+            }
+        }
+
+        return -1;
+    }
+
+    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,
                 status: this.status,
                 hasAuthState: this.hasAuthState,
-                openaiKey: this.openaiKey,
-                visionModel: this.visionModel
-            };
-            await writeFile(this.configPath, JSON.stringify(config, null, 2));
-        } catch (error) {
-            console.error('Failed to save config:', error);
-        }
-    }
+                openaiKey: this.openaiKey,
+                visionModel: this.visionModel
+            };
+            await mkdir(this.baseDir, { recursive: true });
+            await writeFile(tempPath, JSON.stringify(config, null, 2));
+            await rename(tempPath, this.configPath);
+        } catch (error) {
+            await rm(tempPath, { force: true }).catch(() => {});
+            console.error('Failed to save config:', error);
+        }
+    }
 
     getAllowList(): Contact[] {
         return this.allowList;
@@ -205,17 +275,10 @@ export class SessionManager {
         }
     }
 
-    public async isRegistered(): Promise<boolean> {
-        try {
-            const credsPah = join(this.authStateDir, 'creds.json');
-            await readFile(credsPah);
-            this.hasAuthState = true;
-            return true;
-        } catch {
-            await this.syncAuthStateFromDisk();
-            return this.hasAuthState;
-        }
-    }
+    public async isRegistered(): Promise<boolean> {
+        await this.syncAuthStateFromDisk();
+        return this.hasAuthState;
+    }
 
     async markAuthStateAvailable() {
         if (!this.hasAuthState) {
@@ -229,19 +292,27 @@ export class SessionManager {
         return await useMultiFileAuthState(this.authStateDir);
     }
 
-    private async syncAuthStateFromDisk() {
-        try {
-            const entries = await readdir(this.authStateDir);
-            if (entries.length > 0) {
-                if (!this.hasAuthState) {
-                    this.hasAuthState = true;
-                    await this.saveConfig();
-                }
-            }
-        } catch {
-            // Ignore missing directory / empty auth state
-        }
-    }
+    private async syncAuthStateFromDisk() {
+        const nextHasAuthState = await this.hasCredentialsFile();
+        const nextStatus = nextHasAuthState || this.status !== 'connected'
+            ? this.status
+            : 'disconnected';
+
+        if (nextHasAuthState !== this.hasAuthState || nextStatus !== this.status) {
+            this.hasAuthState = nextHasAuthState;
+            this.status = nextStatus;
+            await this.saveConfig();
+        }
+    }
+
+    private async hasCredentialsFile(): Promise<boolean> {
+        try {
+            await readFile(join(this.authStateDir, 'creds.json'));
+            return true;
+        } catch {
+            return false;
+        }
+    }
 
     async deleteAuthState() {
         try {

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();
@@ -295,7 +304,7 @@ export class WhatsAppService {
     private async handlePairingQr(qr: string) {
         this.sessionManager.setStatus('pairing');
         this.onQRCode?.(qr);
-        this.onStatusUpdate?.('| WhatsApp: type /whatsapp to connect');
+        this.onStatusUpdate?.('| WhatsApp: Disconnected');
     }
 
     private async handleConnectionOpen() {
@@ -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');
     }
@@ -339,56 +349,58 @@ export class WhatsAppService {
             console.error(`Connection closed [${statusCode}]. Reconnecting: ${shouldReconnect}`);
         }
 
-        if (shouldTreatAsLoggedOut) {
-            if (isAuthRejected && !isBadMac && allowPairingOnAuthFailure) {
-                if (this.verboseMode) {
-                    console.error(`Session rejected [${statusCode}] - clearing auth state and starting pairing`);
-                }
-                await this.sessionManager.deleteAuthState();
-                this.cleanupSocket();
-                this.socket = undefined;
-                this.isReconnecting = false;
-                await this.start({ allowPairingOnAuthFailure: false });
-                return;
-            }
-
-            if (this.verboseMode) {
-                console.error(`Session invalid or logged out [${statusCode}] - preserving auth state and requiring re-auth`);
-            }
-            if (isBadMac) {
-                if (this.verboseMode) {
-                    console.error('[WhatsApp-Pi] Bad MAC error detected. Your session keys are corrupted.');
-                    console.error('[WhatsApp-Pi] Run /whatsapp-logout to clear auth state, then reconnect with /whatsapp-connect');
-                }
-                this.onStatusUpdate?.('| WhatsApp: Session Error (Bad MAC)');
-            }
-            this.sessionManager.setStatus('logged-out');
-            if (!isBadMac) {
-                this.onStatusUpdate?.('| WhatsApp: Logged out');
-            }
-            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 (shouldTreatAsLoggedOut) {
+            if (this.verboseMode) {
+                console.error(`Session rejected [${statusCode}] - preserving auth state`);
+            }
+            if (isBadMac) {
+                if (this.verboseMode) {
+                    console.error('[WhatsApp-Pi] Bad MAC error detected. Your session keys are corrupted.');
+                    console.error('[WhatsApp-Pi] Use Logoff (Delete Session) only if reconnect keeps failing.');
+                }
+                this.onStatusUpdate?.('| WhatsApp: Session Error (Bad MAC)');
+            } else if (isAuthRejected && allowPairingOnAuthFailure) {
+                this.onStatusUpdate?.('| WhatsApp: Session Preserved (Reconnect Failed)');
+            }
+            this.cleanupSocket();
+            this.isReconnecting = false;
+            this.reconnectAttempts = 0;
+            await this.sessionManager.setStatus('disconnected');
+            if (!isBadMac) {
+                this.onStatusUpdate?.('| WhatsApp: Disconnected');
+            }
+            return;
+        }
+
+        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/src/ui/menu.handler.ts

@@ -63,13 +63,14 @@ export class MenuHandler {
                 await this.whatsappService.stop();
                 ctx.ui.notify('WhatsApp Agent Disconnected', 'warning');
                 break;
-            case 'Logoff (Delete Session)':
-                const confirmLogoff = await ctx.ui.confirm('Logoff', 'Delete all credentials?');
-                if (confirmLogoff) {
-                    await this.whatsappService.logout();
-                    ctx.ui.notify('Logged off and credentials deleted', 'info');
-                }
-                break;
+            case 'Logoff (Delete Session)': {
+                const confirmLogoff = await ctx.ui.confirm('Logoff', 'Delete all credentials?');
+                if (confirmLogoff) {
+                    await this.whatsappService.logout();
+                    ctx.ui.notify('Logged off and credentials deleted', 'info');
+                }
+                break;
+            }
             case 'Allowed Numbers':
                 await this.manageAllowList(ctx);
                 break;

package/src/ui/message-detail.view.ts

@@ -29,11 +29,10 @@ export class MessageDetailView {
         ) {
             this.props.onClose();
         }
-    }
-
-    render(width: number): string[] {
-        const title = this.props.title.trim() || 'Message Details';
-        const bodyText = this.props.text.length > 0 ? this.props.text : '[No readable text available]';
+    }
+
+    render(width: number): string[] {
+        const bodyText = this.props.text.length > 0 ? this.props.text : '[No readable text available]';
 
         const availableWidth = Math.max(20, width - 4);
         const rawHeaderLines = [

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");
@@ -100,12 +100,13 @@ export default function (pi: ExtensionAPI) {
         const savedStateEntry = [...ctx.sessionManager.getEntries()]
             .reverse()
             .find(entry => entry.type === "custom" && entry.customType === "whatsapp-state");
-        const isWhatsappPiOn = event.reason === "startup" && pi.getFlag("whatsapp-pi-online") === true;
+        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
+                const restoredStatus = data.status === 'connected' && !(isWhatsappPiOn && registered)
                     ? 'disconnected'
                     : data.status;
                 await sessionManager.setStatus(restoredStatus);
@@ -119,9 +120,6 @@ export default function (pi: ExtensionAPI) {
             }
         }
 
-        // Check whatsapp flag — only auto-connect on initial startup, not reloads/new sessions
-        const registered = await sessionManager.isRegistered();
-
         if (isWhatsappPiOn && registered) {
             ctx.ui.setStatus('whatsapp', '| WhatsApp: Auto-connecting...');
 
@@ -133,7 +131,7 @@ export default function (pi: ExtensionAPI) {
                 attempts++;
                 try {
                     await whatsappService.start({ allowPairingOnAuthFailure: false });
-                } catch (error) {
+                } catch {
                     if (attempts < maxAttempts) {
                         ctx.ui.notify(`WhatsApp: Connection attempt ${attempts} failed. Retrying...`, 'warning');
                         setTimeout(tryConnect, 3000);
@@ -145,6 +143,8 @@ 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');
         }
@@ -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 (e) {
+        } 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 (error) {
+                } catch {
                     ctx.ui.notify(`Failed to send WhatsApp reply`, 'error');
                 }
             }