whatsapp-pi 1.0.41 → 1.0.43

package/package.json

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

package/src/services/recents.service.ts

@@ -93,24 +93,38 @@ export class RecentsService {
         const summaries = new Map<string, RecentConversationSummary>();
 
         for (const [senderNumber, messages] of Object.entries(this.store.messagesBySender)) {
-            if (messages.length === 0) continue;
-            const lastMessage = messages[messages.length - 1];
+            const latestMessage = this.getLatestConversationMessage(messages);
+            if (!latestMessage) continue;
+
             summaries.set(senderNumber, {
                 senderNumber,
                 senderName: previousNames.get(senderNumber),
-                lastMessagePreview: this.buildPreview(lastMessage.text),
-                lastMessageTime: lastMessage.timestamp,
-                lastMessageDirection: lastMessage.direction,
+                lastMessagePreview: this.buildPreview(latestMessage.text),
+                lastMessageTime: latestMessage.timestamp,
+                lastMessageDirection: latestMessage.direction,
                 messageCount: messages.length,
                 isAllowed: this.sessionManager.isAllowed(senderNumber)
             });
         }
 
-        this.store.conversations = Array.from(summaries.values())
-            .sort((left, right) => right.lastMessageTime - left.lastMessageTime)
+        this.store.conversations = this.sortConversationsByLatestMessage(Array.from(summaries.values()))
             .slice(0, 20);
     }
 
+    private getLatestConversationMessage(messages: RecentConversationMessage[]): RecentConversationMessage | undefined {
+        return messages[messages.length - 1];
+    }
+
+    private sortConversationsByLatestMessage(conversations: RecentConversationSummary[]): RecentConversationSummary[] {
+        return [...conversations].sort((left, right) => {
+            if (right.lastMessageTime !== left.lastMessageTime) {
+                return right.lastMessageTime - left.lastMessageTime;
+            }
+
+            return left.senderNumber.localeCompare(right.senderNumber);
+        });
+    }
+
     private buildPreview(text: string): string {
         const normalized = text.trim().replace(/\s+/g, ' ');
         if (normalized.length <= 80) return normalized;
@@ -172,12 +186,10 @@ export class RecentsService {
             isAllowed: this.sessionManager.isAllowed(senderNumber)
         };
 
-        this.store.conversations = [
+        this.store.conversations = this.sortConversationsByLatestMessage([
             summary,
             ...this.store.conversations.filter(item => item.senderNumber !== senderNumber)
-        ]
-            .sort((left, right) => right.lastMessageTime - left.lastMessageTime)
-            .slice(0, 20);
+        ]).slice(0, 20);
 
         await this.persistStore();
     }

package/src/services/whatsapp.service.ts

@@ -82,7 +82,7 @@ export class WhatsAppService {
     private restoreBaileysConsoleFilter?: () => void;
     private reconnectTimeout?: ReturnType<typeof setTimeout>;
     private onQRCode?: (qr: string) => void;
-    private onMessage?: (m: unknown) => void;
+    private onMessage?: (m: MessagesUpsertEvent) => void;
     private onStatusUpdate?: (status: string) => void;
     private lastRemoteJid: string | null = null;
 
@@ -465,7 +465,7 @@ export class WhatsAppService {
         this.onQRCode = callback;
     }
 
-    setMessageCallback(callback: (m: unknown) => void) {
+    setMessageCallback(callback: (m: MessagesUpsertEvent) => void) {
         this.onMessage = callback;
     }
 

package/whatsapp-pi.ts

@@ -165,8 +165,8 @@ export default function (pi: ExtensionAPI) {
 
     // Handle incoming messages by injecting them as user prompts
     whatsappService.setMessageCallback(async (m) => {
-        const msg = m.messages[0];
-        if (!msg.message) return;
+        const msg = m.messages?.[0];
+        if (!msg?.message) return;
 
         const sender = msg.key.remoteJid?.split('@')[0] || "unknown";
         const pushName = msg.pushName || "WhatsApp User";