@nexustechpro/baileys 2.0.6 → 2.1.2

package/lib/Store/make-in-memory-store.js

@@ -1,21 +1,21 @@
 import WAProto from '../../WAProto/index.js';
 import * as Defaults from '../Defaults/index.js';
 import { LabelAssociationType } from '../Types/LabelAssociation.js';
-import { md5, toNumber } from '../Utils/index.js';
-import { jidDecode, jidNormalizedUser } from '../WABinary/index.js';
+import * as Utils_1 from '../Utils/index.js';
+import * as WABinary_1 from '../WABinary/index.js';
 import { makeOrderedDictionary } from './make-ordered-dictionary.js';
 import { ObjectRepository } from './object-repository.js';
 
 const waChatKey = (pin) => ({
-  key: (c) => (pin ? (c.pinned ? '1' : '0') : '') + (c.archived ? '0' : '1') + (c.conversationTimestamp ? c.conversationTimestamp.toString(16).padStart(8, '0') : '') + c.id,
-  compare: (k1, k2) => k2.localeCompare(k1)
+    key: (c) => (pin ? (c.pinned ? '1' : '0') : '') + (c.archived ? '0' : '1') + (c.conversationTimestamp ? c.conversationTimestamp.toString(16).padStart(8, '0') : '') + c.id,
+    compare: (k1, k2) => k2.localeCompare(k1)
 });
 
 const waMessageID = (m) => m.key.id || '';
 
 const waLabelAssociationKey = {
-  key: (la) => (la.type === LabelAssociationType.Chat ? la.chatId + la.labelId : la.chatId + la.messageId + la.labelId),
-  compare: (k1, k2) => k2.localeCompare(k1)
+    key: (la) => (la.type === LabelAssociationType.Chat ? la.chatId + la.labelId : la.chatId + la.messageId + la.labelId),
+    compare: (k1, k2) => k2.localeCompare(k1)
 };
 
 const makeMessagesDictionary = () => makeOrderedDictionary(waMessageID);
@@ -24,7 +24,7 @@ const makeInMemoryStore = (config) => {
     const socket = config.socket
     const chatKey = config.chatKey || waChatKey(true)
     const labelAssociationKey = config.labelAssociationKey || waLabelAssociationKey
-    const logger = config.logger || Defaults_1.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' })
+    const logger = config.logger || Defaults.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' })
     const KeyedDB = require('@adiwajshing/keyed-db').default
     const chats = new KeyedDB(chatKey, c => c.id)
     const messages = {}
@@ -32,7 +32,7 @@ const makeInMemoryStore = (config) => {
     const groupMetadata = {}
     const presences = {}
     const state = { connection: 'close' }
-    const labels = new object_repository_1.ObjectRepository()
+    const labels = new ObjectRepository()
     const labelAssociations = new KeyedDB(labelAssociationKey, labelAssociationKey.key)
     const assertMessageList = (jid) => {
         if (!messages[jid]) {
@@ -64,7 +64,7 @@ const makeInMemoryStore = (config) => {
             Object.assign(state, update)
         })
         ev.on('messaging-history.set', ({ chats: newChats, contacts: newContacts, messages: newMessages, isLatest, syncType }) => {
-            if (syncType === WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+            if (syncType === WAProto.proto.HistorySync.HistorySyncType.ON_DEMAND) {
                 return // FOR NOW,
                 //TODO: HANDLE
             }
@@ -102,21 +102,30 @@ const makeInMemoryStore = (config) => {
                 else {
                     const contactHashes = await Promise.all(Object.keys(contacts).map(async (contactId) => {
                         const { user } = WABinary_1.jidDecode(contactId)
-                        return [contactId, (await Utils_1.md5(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)]
+                        return [contactId, (Utils_1.md5(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)]
                     }))
                     contact = contacts[contactHashes.find(([, b]) => b === update.id?.[0]) || ''] // find contact by attrs.hash, when user is not saved as a contact
                 }
-                if (contact) {
-                    if (update.imgUrl === 'changed') {
-                        contact.imgUrl = socket ? await socket.profilePictureUrl(contact.id) : undefined
-                    }
-                    else if (update.imgUrl === 'removed') {
-                        delete contact.imgUrl
+                if (!contact) {
+                    // Create new contact entry if the update has meaningful data
+                    if (update.notify || update.verifiedName || update.name) {
+                        contacts[update.id] = { id: update.id }
+                        contact = contacts[update.id]
+                    } else {
+                        logger.debug({ update }, 'got update for non-existant contact')
+                        continue
                     }
                 }
-                else {
-                    return logger.debug({ update }, 'got update for non-existant contact')
+                if (update.imgUrl === 'changed') {
+                    contact.imgUrl = socket ? await socket.profilePictureUrl(contact.id) : undefined
+                }
+                else if (update.imgUrl === 'removed') {
+                    delete contact.imgUrl
                 }
+                // Persist pushName, verifiedName, and name from the update
+                if (update.notify) contact.notify = update.notify
+                if (update.verifiedName) contact.verifiedName = update.verifiedName
+                if (update.name) contact.name = update.name
                 Object.assign(contacts[contact.id], contact)
             }
         })
@@ -288,7 +297,7 @@ const makeInMemoryStore = (config) => {
         for (const jid in json.messages) {
             const list = assertMessageList(jid)
             for (const msg of json.messages[jid]) {
-                list.upsert(WAProto_1.proto.WebMessageInfo.fromObject(msg), 'append')
+                list.upsert(WAProto.proto.WebMessageInfo.fromObject(msg), 'append')
             }
         }
     }
@@ -355,7 +364,7 @@ const makeInMemoryStore = (config) => {
                 .all()
             return associations.map(({ labelId }) => labelId)
         },
-        loadMessage: async (jid, id) => messages[jid]?.get(id), 
+        loadMessage: async (jid, id) => messages[jid]?.get(id),
         mostRecentMessage: async (jid) => {
             const message = messages[jid]?.array.slice(-1)[0]
             return message

package/lib/Utils/auth-utils.js

@@ -128,7 +128,7 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
             }
             catch (error) {
                 const msg = error?.message || (typeof error === 'string' ? error : '') || ''
-                const isExpected = msg.includes('InvalidPreKeyId') || msg.includes('SessionNotFound') || msg.includes('InvalidMessage') || msg.includes('no sender key state') || msg.includes('invalid sender key session') || msg.includes('memory access out of bounds') || msg.includes('old counter') || msg.includes('DuplicatedMessage') || msg.includes('BadMac') || msg.includes('Connection Closed')
+                const isExpected = msg.includes('InvalidPreKeyId') || msg.includes('SessionNotFound') || msg.includes('InvalidMessage') || msg.includes('no sender key state') || msg.includes('memory access out of bounds') || msg.includes('old counter') || msg.includes('DuplicatedMessage') || msg.includes('BadMac') || msg.includes('Connection Closed')
                 if (isExpected) { logger?.debug?.({ error: msg }, 'transaction skipped — expected decrypt error, message dropped silently'); return undefined } // skip, no retry
                 logger?.error?.({ error: msg || error }, 'transaction failed, rolling back')
                 throw error
@@ -225,7 +225,7 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
                 }
                 catch (error) {
                     const msg = error?.message || (typeof error === 'string' ? error : '') || ''
-                    const isExpected = msg.includes('InvalidPreKeyId') || msg.includes('SessionNotFound') || msg.includes('InvalidMessage') || msg.includes('no sender key state') || msg.includes('invalid sender key session') || msg.includes('memory access out of bounds') || msg.includes('old counter') || msg.includes('DuplicatedMessage') || msg.includes('BadMac')
+                    const isExpected = msg.includes('InvalidPreKeyId') || msg.includes('SessionNotFound') || msg.includes('InvalidMessage') || msg.includes('no sender key state') || msg.includes('memory access out of bounds') || msg.includes('old counter') || msg.includes('DuplicatedMessage') || msg.includes('BadMac')
                         ; (isExpected ? logger?.debug?.bind(logger) : logger?.error?.bind(logger))?.({ error: msg || error }, 'transaction failed, rolling back')
                     throw error
                 }