whatsapp-pi 1.0.45 → 1.0.46

package/README.md

@@ -46,10 +46,10 @@ pi install npm:whatsapp-pi
 pi
 ```
 
-To automatically connect to WhatsApp on startup (if you are already authenticated):
-```bash
-pi --whatsapp-pi-online
-```
+After connecting WhatsApp once from the menu and scanning the QR code, you can start Pi with auto-connect enabled:
+```bash
+pi --whatsapp-pi-online
+```
 
 3. Use the menu to connect WhatsApp and manage allowed/blocked numbers
 
@@ -69,10 +69,15 @@ npm install
 pi -e whatsapp-pi.ts
 ```
 
-For verbose mode (shows Baileys trace logs for debugging):
-```bash
-pi -e whatsapp-pi.ts --verbose
-```
+For verbose mode (shows Baileys trace logs for debugging):
+```bash
+pi -e whatsapp-pi.ts --verbose
+```
+
+To test startup auto-connect locally after you have already paired WhatsApp:
+```bash
+pi -e whatsapp-pi.ts --whatsapp-pi-online
+```
 
 ## Commands
 

package/package.json

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

package/src/models/whatsapp.types.ts

@@ -18,9 +18,12 @@ export interface IncomingMessage {
     timestamp: number;
 }
 
+export type MessageOrigin = 'agent' | 'menu';
+
 export interface MessageRequest {
     recipientJid: string;
     text: string;
+    origin?: MessageOrigin;
     options?: {
         maxRetries?: number;
         priority?: 'high' | 'normal';

package/src/services/message.sender.ts

@@ -54,9 +54,9 @@ export class MessageSender {
                 }
 
                 // 3. Send the message
-                // Note: Branding π is applied here to ensure consistency
-                const response = await socket.sendMessage(request.recipientJid, { 
-                    text: `${request.text} π` 
+                const shouldAppendPi = request.origin !== 'menu';
+                const response = await socket.sendMessage(request.recipientJid, {
+                    text: shouldAppendPi ? `${request.text} π` : request.text
                 });
 
                 return {

package/src/services/whatsapp.service.ts

@@ -71,16 +71,16 @@ interface BoomLikeError {
     message?: string;
 }
 
-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;
+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;
@@ -168,17 +168,17 @@ export class WhatsAppService {
         return '';
     }
 
-    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 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();
@@ -304,7 +304,7 @@ export class WhatsAppService {
     private async handlePairingQr(qr: string) {
         this.sessionManager.setStatus('pairing');
         this.onQRCode?.(qr);
-        this.onStatusUpdate?.('| WhatsApp: Disconnected');
+        this.onStatusUpdate?.('| WhatsApp: Disconnected');
     }
 
     private async handleConnectionOpen() {
@@ -312,11 +312,11 @@ export class WhatsAppService {
             console.log('WhatsApp connection successfully opened');
         }
 
-        this.isReconnecting = false;
-        this.reconnectAttempts = 0;
-        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');
     }
@@ -349,58 +349,58 @@ export class WhatsAppService {
             console.error(`Connection closed [${statusCode}]. Reconnecting: ${shouldReconnect}`);
         }
 
-        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');
-        }
+        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 {
@@ -497,13 +497,14 @@ export class WhatsAppService {
         return this.socket;
     }
 
-    async sendMessage(jid: string, text: string) {
+    async sendMessage(jid: string, text: string, origin: 'agent' | 'menu' = 'agent') {
         // Ensure we show the typing indicator before sending
         await this.sendPresence(jid, 'composing');
 
         const result = await this.messageSender.send({
             recipientJid: jid,
-            text: text
+            text,
+            origin
         });
 
         // After sending, we can stop the typing indicator
@@ -518,35 +519,7 @@ export class WhatsAppService {
 
     async sendMenuMessage(jid: string, text: string) {
         const normalizedJid = this.normalizeRecipientJid(jid);
-        const socket = this.getActiveSocket();
-
-        if (!socket) {
-            return {
-                success: false,
-                error: 'WhatsApp is not connected',
-                attempts: 0
-            };
-        }
-
-        try {
-            await this.sendPresence(normalizedJid, 'composing');
-            const response = await socket.sendMessage(normalizedJid, { text });
-            await this.sendPresence(normalizedJid, 'paused');
-
-            return {
-                success: true,
-                messageId: response?.key?.id,
-                attempts: 1
-            };
-        } catch (error: unknown) {
-            await this.sendPresence(normalizedJid, 'paused');
-            console.error(`Failed to send menu message to ${normalizedJid}:`, error);
-            return {
-                success: false,
-                error: error instanceof Error ? error.message : 'Unknown error',
-                attempts: 1
-            };
-        }
+        return this.sendMessage(normalizedJid, text, 'menu');
     }
 
     async sendPresence(jid: string, presence: 'composing' | 'recording' | 'paused') {

package/src/ui/menu.handler.ts

@@ -63,14 +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;
@@ -325,8 +325,7 @@ export class MenuHandler {
         await this.sendPromptedMenuMessage(ctx, {
             displayName: this.getConversationDisplayName(conversation),
             senderNumber: conversation.senderNumber,
-            senderName: conversation.senderName,
-            appendPiSuffix: false
+            senderName: conversation.senderName
         });
     }
 
@@ -334,8 +333,7 @@ export class MenuHandler {
         await this.sendPromptedMenuMessage(ctx, {
             displayName: this.formatAllowedContactOption(contact),
             senderNumber: contact.number,
-            senderName: contact.name,
-            appendPiSuffix: true
+            senderName: contact.name
         });
     }
 
@@ -345,10 +343,9 @@ export class MenuHandler {
             displayName: string;
             senderNumber: string;
             senderName?: string;
-            appendPiSuffix: boolean;
         }
     ) {
-        const { displayName, senderNumber, senderName, appendPiSuffix } = options;
+        const { displayName, senderNumber, senderName } = options;
         for (let attempt = 0; attempt < 2; attempt++) {
             const inputText = (await ctx.ui.input(`Send a message to ${displayName}:`))?.trim() || '';
 
@@ -357,14 +354,13 @@ export class MenuHandler {
                 continue;
             }
 
-            const messageText = appendPiSuffix ? `${inputText} π` : inputText;
-            const result = await this.whatsappService.sendMenuMessage(this.toJid(senderNumber), messageText);
+            const result = await this.whatsappService.sendMenuMessage(this.toJid(senderNumber), inputText);
             if (result.success) {
                 await this.recentsService.recordMessage({
                     messageId: result.messageId ?? `${Date.now()}`,
                     senderNumber,
                     senderName,
-                    text: messageText,
+                    text: inputText,
                     direction: 'outgoing',
                     timestamp: Date.now()
                 });