miaw-core 1.2.2 → 1.2.5

package/dist/client/MiawClient.js

@@ -1,4 +1,4 @@
-import makeWASocket, { DisconnectReason, fetchLatestBaileysVersion, makeCacheableSignalKeyStore, Browsers, downloadMediaMessage, } from "@whiskeysockets/baileys";
+import makeWASocket, { DisconnectReason, fetchLatestBaileysVersion, makeCacheableSignalKeyStore, Browsers, downloadMediaMessage, jidNormalizedUser, } from "@whiskeysockets/baileys";
 import { EventEmitter } from "node:events";
 import { createFilteredLogger } from "../utils/filtered-logger.js";
 import { enableConsoleFilter, disableConsoleFilter, } from "../utils/console-filter.js";
@@ -375,11 +375,28 @@ export class MiawClient extends EventEmitter {
                 }
                 const normalized = MessageHandler.normalize({ messages: [msg], type: "notify" }, this.logger);
                 if (normalized) {
+                    // Resolve @lid JIDs to @s.whatsapp.net for consistent display
+                    if (normalized.from) {
+                        normalized.from = this.resolveLidToJid(normalized.from);
+                    }
+                    if (normalized.participant) {
+                        normalized.participant = this.resolveLidToJid(normalized.participant);
+                    }
                     // Resolve senderPhone from LID if not available (WhatsApp privacy feature)
-                    if (normalized.isGroup && !normalized.senderPhone && normalized.participant) {
-                        const resolvedPhone = this.getPhoneFromJid(normalized.participant);
-                        if (resolvedPhone) {
-                            normalized.senderPhone = resolvedPhone;
+                    if (!normalized.senderPhone) {
+                        if (normalized.isGroup && normalized.participant) {
+                            // Group message: resolve from participant (sender's JID in group)
+                            const resolvedPhone = this.getPhoneFromJid(normalized.participant);
+                            if (resolvedPhone) {
+                                normalized.senderPhone = resolvedPhone;
+                            }
+                        }
+                        else if (!normalized.isGroup && normalized.from) {
+                            // DM message: resolve from 'from' field (remoteJid = sender's JID)
+                            const resolvedPhone = this.getPhoneFromJid(normalized.from);
+                            if (resolvedPhone) {
+                                normalized.senderPhone = resolvedPhone;
+                            }
                         }
                     }
                     // Store message in messagesStore
@@ -622,10 +639,7 @@ export class MiawClient extends EventEmitter {
      */
     getPhoneFromJid(jid) {
         const resolved = this.resolveLidToJid(jid);
-        if (resolved.endsWith("@s.whatsapp.net")) {
-            return resolved.replace("@s.whatsapp.net", "");
-        }
-        return undefined;
+        return MessageHandler.formatJidToPhone(resolved);
     }
     /**
      * Manually register a LID to phone number mapping
@@ -691,16 +705,19 @@ export class MiawClient extends EventEmitter {
             }
             if (!jid)
                 continue;
-            // Extract phone number from JID
-            const phone = jid.endsWith("@s.whatsapp.net")
-                ? jid.replace("@s.whatsapp.net", "")
-                : undefined;
+            // Extract phone number from JID (strips device suffix like :72)
+            const phone = MessageHandler.formatJidToPhone(jid);
             // Build contact info
             const contactInfo = {
                 jid,
                 phone,
                 name: contact.name || contact.notify || contact.verifiedName || undefined,
             };
+            // Preserve existing name if new entry lacks one
+            const existing = this.contactsStore.get(jid);
+            if (existing?.name && !contactInfo.name) {
+                contactInfo.name = existing.name;
+            }
             // Update store with phone JID as primary key
             this.contactsStore.set(jid, contactInfo);
             // Also store by LID for lookup if available
@@ -741,10 +758,8 @@ export class MiawClient extends EventEmitter {
                 this.addLidMapping(jid, chat.pnJid, "Chat");
                 jid = chat.pnJid;
             }
-            // Extract phone number from JID
-            const phone = jid.endsWith("@s.whatsapp.net")
-                ? jid.replace("@s.whatsapp.net", "")
-                : undefined;
+            // Extract phone number from JID (strips device suffix like :72)
+            const phone = MessageHandler.formatJidToPhone(jid);
             // Build chat info with proper field mapping for proto.IConversation
             const chatInfo = {
                 jid,
@@ -779,6 +794,13 @@ export class MiawClient extends EventEmitter {
         const normalized = MessageHandler.normalize({ messages: [msg], type: "notify" }, this.logger);
         if (!normalized)
             return;
+        // Resolve @lid JIDs to @s.whatsapp.net for consistent storage
+        if (normalized.from) {
+            normalized.from = this.resolveLidToJid(normalized.from);
+        }
+        if (normalized.participant) {
+            normalized.participant = this.resolveLidToJid(normalized.participant);
+        }
         const chatJid = normalized.from;
         if (!this.messagesStore.has(chatJid)) {
             this.messagesStore.set(chatJid, []);
@@ -1234,11 +1256,12 @@ export class MiawClient extends EventEmitter {
             if (this.connectionState !== "connected") {
                 throw new Error(`Cannot get contact info. Connection state: ${this.connectionState}`);
             }
-            const jid = MessageHandler.formatPhoneToJid(jidOrPhone);
+            const rawJid = MessageHandler.formatPhoneToJid(jidOrPhone);
+            const jid = this.resolveLidToJid(rawJid);
             // Fetch status
             let status;
             try {
-                const statusResult = await this.socket.fetchStatus(jid);
+                const statusResult = await this.socket.fetchStatus(rawJid);
                 // fetchStatus returns an array, get first result
                 const firstResult = Array.isArray(statusResult)
                     ? statusResult[0]
@@ -1251,16 +1274,14 @@ export class MiawClient extends EventEmitter {
             // Check if business account
             let isBusiness = false;
             try {
-                const businessProfile = await this.socket.getBusinessProfile(jid);
+                const businessProfile = await this.socket.getBusinessProfile(rawJid);
                 isBusiness = !!businessProfile;
             }
             catch {
                 // Not a business account or not available
             }
-            // Extract phone from JID
-            const phone = jid.endsWith("@s.whatsapp.net")
-                ? jid.replace("@s.whatsapp.net", "")
-                : undefined;
+            // Extract phone from resolved JID (strips device suffix like :72)
+            const phone = MessageHandler.formatJidToPhone(jid);
             return {
                 jid,
                 phone,
@@ -1339,7 +1360,7 @@ export class MiawClient extends EventEmitter {
                 // Not a business account or not available
             }
             return {
-                jid,
+                jid: resolvedJid,
                 phone,
                 name,
                 status,
@@ -1420,24 +1441,34 @@ export class MiawClient extends EventEmitter {
      */
     async fetchAllContacts() {
         try {
-            // Map contacts and resolve any @lid JIDs that weren't resolved earlier
-            const contacts = Array.from(this.contactsStore.values()).map(contact => {
-                // If jid is @lid and phone is missing, try to resolve using LID cache
+            // Deduplicate contacts by resolved JID, merging data (prefer entries with names)
+            const uniqueContacts = new Map();
+            for (const contact of this.contactsStore.values()) {
+                // Resolve @lid JIDs using LID cache
+                let resolved = contact;
                 if (contact.jid.endsWith("@lid") && !contact.phone) {
-                    const resolved = this.resolveLidToJid(contact.jid);
-                    if (resolved !== contact.jid && resolved.endsWith("@s.whatsapp.net")) {
-                        return {
+                    const resolvedJid = this.resolveLidToJid(contact.jid);
+                    if (resolvedJid !== contact.jid && resolvedJid.endsWith("@s.whatsapp.net")) {
+                        resolved = {
                             ...contact,
-                            jid: resolved,
-                            phone: resolved.replace("@s.whatsapp.net", ""),
+                            jid: resolvedJid,
+                            phone: MessageHandler.formatJidToPhone(resolvedJid),
                         };
                     }
                 }
-                return contact;
-            });
+                const key = resolved.jid;
+                const existing = uniqueContacts.get(key);
+                if (!existing) {
+                    uniqueContacts.set(key, resolved);
+                }
+                else if (!existing.name && resolved.name) {
+                    // Merge: prefer the entry that has a name
+                    uniqueContacts.set(key, resolved);
+                }
+            }
             return {
                 success: true,
-                contacts,
+                contacts: Array.from(uniqueContacts.values()),
             };
         }
         catch (error) {
@@ -1465,11 +1496,11 @@ export class MiawClient extends EventEmitter {
                 jid: g.id,
                 name: g.subject,
                 description: g.desc || undefined,
-                owner: g.owner || undefined,
+                owner: g.owner ? this.resolveLidToJid(g.owner) : undefined,
                 createdAt: g.creation,
                 participantCount: g.participants?.length || 0,
                 participants: g.participants?.map((p) => ({
-                    jid: p.id,
+                    jid: this.resolveLidToJid(p.id),
                     role: p.admin === "superadmin"
                         ? "superadmin"
                         : p.admin === "admin"
@@ -1504,14 +1535,14 @@ export class MiawClient extends EventEmitter {
             if (this.connectionState !== "connected") {
                 throw new Error(`Cannot get own profile. Connection state: ${this.connectionState}`);
             }
-            const jid = this.socket.user?.id;
-            if (!jid) {
+            const rawJid = this.socket.user?.id;
+            if (!rawJid) {
                 throw new Error("User ID not available");
             }
-            // Extract phone number from JID
-            const phone = jid.endsWith("@s.whatsapp.net")
-                ? jid.replace("@s.whatsapp.net", "")
-                : undefined;
+            // Normalize JID (strips device suffix like :72)
+            const jid = jidNormalizedUser(rawJid);
+            // Extract phone number from normalized JID
+            const phone = MessageHandler.formatJidToPhone(jid);
             // Get display name from socket user
             const name = this.socket.user?.name;
             // Fetch status
@@ -1651,7 +1682,7 @@ export class MiawClient extends EventEmitter {
                 // Chat not in store, create minimal info
                 chats.push({
                     jid,
-                    phone: jid.replace(/@s\.whatsapp\.net$/, ""),
+                    phone: MessageHandler.formatJidToPhone(jid),
                     isGroup: jid.endsWith("@g.us"),
                 });
             }
@@ -1758,7 +1789,14 @@ export class MiawClient extends EventEmitter {
             // Deduplicate by jid (Map may have same contact under multiple keys)
             const uniqueContacts = new Map();
             for (const contact of this.contactsStore.values()) {
-                if (contact.jid && !uniqueContacts.has(contact.jid)) {
+                if (!contact.jid)
+                    continue;
+                const existing = uniqueContacts.get(contact.jid);
+                if (!existing) {
+                    uniqueContacts.set(contact.jid, contact);
+                }
+                else if (!existing.name && contact.name) {
+                    // Prefer entries with names
                     uniqueContacts.set(contact.jid, contact);
                 }
             }
@@ -2094,24 +2132,34 @@ export class MiawClient extends EventEmitter {
      */
     async fetchAllChats() {
         try {
-            // Map chats and resolve any @lid JIDs that weren't resolved earlier
-            const chats = Array.from(this.chatsStore.values()).map(chat => {
-                // If jid is @lid and phone is missing, try to resolve using LID cache
+            // Deduplicate chats by resolved JID, merging data (prefer entries with names)
+            const uniqueChats = new Map();
+            for (const chat of this.chatsStore.values()) {
+                // Resolve @lid JIDs using LID cache
+                let resolved = chat;
                 if (chat.jid.endsWith("@lid") && !chat.phone) {
-                    const resolved = this.resolveLidToJid(chat.jid);
-                    if (resolved !== chat.jid && resolved.endsWith("@s.whatsapp.net")) {
-                        return {
+                    const resolvedJid = this.resolveLidToJid(chat.jid);
+                    if (resolvedJid !== chat.jid && resolvedJid.endsWith("@s.whatsapp.net")) {
+                        resolved = {
                             ...chat,
-                            jid: resolved,
-                            phone: resolved.replace("@s.whatsapp.net", ""),
+                            jid: resolvedJid,
+                            phone: MessageHandler.formatJidToPhone(resolvedJid),
                         };
                     }
                 }
-                return chat;
-            });
+                const key = resolved.jid;
+                const existing = uniqueChats.get(key);
+                if (!existing) {
+                    uniqueChats.set(key, resolved);
+                }
+                else if (!existing.name && resolved.name) {
+                    // Merge: prefer the entry that has a name
+                    uniqueChats.set(key, resolved);
+                }
+            }
             return {
                 success: true,
-                chats,
+                chats: Array.from(uniqueChats.values()),
             };
         }
         catch (error) {
@@ -2144,7 +2192,7 @@ export class MiawClient extends EventEmitter {
             }
             const metadata = await this.socket.groupMetadata(groupJid);
             const participants = metadata.participants.map((p) => ({
-                jid: p.id,
+                jid: this.resolveLidToJid(p.id),
                 role: p.admin === "superadmin"
                     ? "superadmin"
                     : p.admin === "admin"
@@ -2155,7 +2203,7 @@ export class MiawClient extends EventEmitter {
                 jid: metadata.id,
                 name: metadata.subject,
                 description: metadata.desc || undefined,
-                owner: metadata.owner || undefined,
+                owner: metadata.owner ? this.resolveLidToJid(metadata.owner) : undefined,
                 createdAt: metadata.creation,
                 participantCount: metadata.participants.length,
                 participants,
@@ -2549,7 +2597,7 @@ export class MiawClient extends EventEmitter {
             const formattedParticipants = participants.map((p) => MessageHandler.formatPhoneToJid(p));
             const metadata = await this.socket.groupCreate(name, formattedParticipants);
             const groupParticipants = metadata.participants.map((p) => ({
-                jid: p.id,
+                jid: this.resolveLidToJid(p.id),
                 role: p.admin === "superadmin"
                     ? "superadmin"
                     : p.admin === "admin"
@@ -2563,7 +2611,7 @@ export class MiawClient extends EventEmitter {
                     jid: metadata.id,
                     name: metadata.subject,
                     description: metadata.desc || undefined,
-                    owner: metadata.owner || undefined,
+                    owner: metadata.owner ? this.resolveLidToJid(metadata.owner) : undefined,
                     createdAt: metadata.creation,
                     participantCount: metadata.participants.length,
                     participants: groupParticipants,