@hansaka02/baileys 7.3.4 → 7.3.6

package/lib/Utils/decode-wa-message.js

@@ -5,15 +5,16 @@ Object.defineProperty(exports, "__esModule", { value: true })
 const { Boom } = require("@hapi/boom")
 const { proto } = require("../../WAProto")
 const {
-  isJidUser, 
-  isLidUser, 
+  areJidsSameUser, 
+  isHostedLidUser, 
+  isHostedPnUser, 
+  isJidBroadcast, 
   isJidGroup, 
   isJidMetaAI, 
-  isJidBroadcast, 
   isJidNewsletter, 
-  transferDevice, 
-  areJidsSameUser, 
-  isJidStatusBroadcast
+  isJidStatusBroadcast, 
+  isLidUser, 
+  isPnUser 
 } = require("../WABinary")
 const { unpadRandomMax16 } = require("./generics")
 const { getDevice } = require("./messages") 
@@ -52,25 +53,23 @@ const extractAddressingContext = (stanza) => {
     const sender = stanza.attrs.participant || stanza.attrs.from
     const addressingMode = stanza.attrs.addressing_mode || (sender?.endsWith('lid') ? 'lid' : 'pn')
     
-    if (isLidUser(sender)) {
+    if (addressingMode === 'lid') {
         // Message is LID-addressed: sender is LID, extract corresponding PN
         // without device data
         senderAlt = stanza.attrs.participant_pn || stanza.attrs.sender_pn || stanza.attrs.peer_recipient_pn
         recipientAlt = stanza.attrs.recipient_pn
         // with device data
-        if (sender && senderAlt)
-            senderAlt = transferDevice(sender, senderAlt)
+        //if (sender && senderAlt) senderAlt = transferDevice(sender, senderAlt)
     }
-    
-    else if (isJidUser(sender)) { 
+    else {
         // Message is PN-addressed: sender is PN, extract corresponding LID
         // without device data
         senderAlt = stanza.attrs.participant_lid || stanza.attrs.sender_lid || stanza.attrs.peer_recipient_lid
         recipientAlt = stanza.attrs.recipient_lid
         //with device data
-        if (sender && senderAlt)
-            senderAlt = transferDevice(sender, senderAlt)
+        //if (sender && senderAlt) senderAlt = transferDevice(sender, senderAlt)
     }
+    
     return {
         addressingMode,
         senderAlt,
@@ -79,18 +78,21 @@ const extractAddressingContext = (stanza) => {
 }
 
 const getDecryptionJid = async (sender, repository) => {
-    if (!sender.includes('@s.whatsapp.net')) {
+    if (isLidUser(sender) || isHostedLidUser(sender)) {
         return sender
     }
-    return (await repository.lidMapping.getLIDForPN(sender))
+    const mapped = await repository.lidMapping.getLIDForPN(sender)
+    return mapped || sender
 }
 
-const storeMappingFromEnvelope = async (stanza, sender, decryptionJid, repository, logger) => {
+const storeMappingFromEnvelope = async (stanza, sender, repository, decryptionJid, logger) => {
+    // TODO: Handle hosted IDs
     const { senderAlt } = extractAddressingContext(stanza)
     
-    if (senderAlt && isLidUser(senderAlt) && isJidUser(sender) && decryptionJid === sender) {
+    if (senderAlt && isLidUser(senderAlt) && isPnUser(sender) && decryptionJid === sender) {
         try {
             await repository.lidMapping.storeLIDPNMappings([{ lid: senderAlt, pn: sender }])
+            await repository.migrateSession(sender, senderAlt)
             logger.debug({ sender, senderAlt }, 'Stored LID mapping from envelope')
         }
         catch (error) {
@@ -103,73 +105,90 @@ const storeMappingFromEnvelope = async (stanza, sender, decryptionJid, repositor
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
-function decodeMessageNode(stanza, meId, meLid) {
+ function decodeMessageNode(stanza, meId, meLid) {
     let msgType
     let chatId
     let author
     let fromMe = false
+    
     const msgId = stanza.attrs.id
     const from = stanza.attrs.from
     const participant = stanza.attrs.participant
     const recipient = stanza.attrs.recipient
-    const addressingContext = extractAddressingContext(stanza) 
+    const addressingContext = extractAddressingContext(stanza)
     const isMe = (jid) => areJidsSameUser(jid, meId)
     const isMeLid = (jid) => areJidsSameUser(jid, meLid)
-    if (isJidUser(from) || isLidUser(from)) {
+    
+    if (isPnUser(from) || isLidUser(from) || isHostedLidUser(from) || isHostedPnUser(from)) {
         if (recipient && !isJidMetaAI(recipient)) {
             if (!isMe(from) && !isMeLid(from)) {
                 throw new Boom('receipient present, but msg not from me', { data: stanza })
             }
+            
             if (isMe(from) || isMeLid(from)) {
                 fromMe = true
             }
+            
             chatId = recipient
         }
         else {
             chatId = from
         }
+        
         msgType = 'chat'
         author = from
     }
+    
     else if (isJidGroup(from)) {
         if (!participant) {
             throw new Boom('No participant in group message')
         }
+        
         if (isMe(participant) || isMeLid(participant)) {
-            fromMe = true;
+            fromMe = true
         }
+        
         msgType = 'group'
         author = participant
         chatId = from
     }
+    
     else if (isJidBroadcast(from)) {
         if (!participant) {
             throw new Boom('No participant in group message')
         }
+        
         const isParticipantMe = isMe(participant)
+        
         if (isJidStatusBroadcast(from)) {
             msgType = isParticipantMe ? 'direct_peer_status' : 'other_status'
         }
+        
         else {
             msgType = isParticipantMe ? 'peer_broadcast' : 'other_broadcast'
         }
+        
         fromMe = isParticipantMe
         chatId = from
         author = participant
     }
+    
     else if (isJidNewsletter(from)) {
         msgType = 'newsletter'
         chatId = from
         author = from
+        
         if (isMe(from) || isMeLid(from)) {
-            fromMe = true;
+            fromMe = true
         }
     }
+    
     else {
         throw new Boom('Unknown message type', { data: stanza })
     }
     
     const pushname = stanza?.attrs?.notify
+    
     const key = {
         remoteJid: chatId,
         remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
@@ -177,21 +196,24 @@ function decodeMessageNode(stanza, meId, meLid) {
         id: msgId,
         participant,
         participantAlt: isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
+        addressingMode: addressingContext.addressingMode,
+        ...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
     }
+    
     const fullMessage = {
         key,
+        category: stanza.attrs.category,
         messageTimestamp: +stanza.attrs.t,
         pushName: pushname,
+        platform: getDevice(key.id), 
         broadcast: isJidBroadcast(from), 
-        newsletter: isJidNewsletter(from), 
-        platform: getDevice(key.id) 
-    }
-    if (msgType === 'newsletter') {
-        fullMessage.newsletter_server_id  = +stanza.attrs?.server_id
+        newsletter: isJidNewsletter(from)
     }
+    
     if (key.fromMe) {
         fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK
     }
+    
     return {
         fullMessage,
         author,
@@ -207,30 +229,43 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
         author,
         async decrypt() {
             let decryptables = 0
+            
             if (Array.isArray(stanza.content)) {
                 for (const { tag, attrs, content } of stanza.content) {
                     if (tag === 'verified_name' && content instanceof Uint8Array) {
                         const cert = proto.VerifiedNameCertificate.decode(content)
                         const details = proto.VerifiedNameCertificate.Details.decode(cert.details)
+                        
                         fullMessage.verifiedBizName = details.verifiedName
                     }
+                    
                     if (tag === 'unavailable' && attrs.type === 'view_once') {
-                        fullMessage.key.isViewOnce = true; // TODO: remove from here and add a STUB TYPE
+                        fullMessage.key.isViewOnce = true // TODO: remove from here and add a STUB TYPE
                     }
+                    
+                    if (attrs.count && tag === 'enc') {
+                        fullMessage.retryCount = Number(attrs.count)
+                    }
+                    
                     if (tag !== 'enc' && tag !== 'plaintext') {
                         continue
                     }
+                    
                     if (!(content instanceof Uint8Array)) {
                         continue
                     }
+                    
                     decryptables += 1
+                    
                     let msgBuffer
-                    const user = isJidUser(sender) ? sender : author // TODO: flaky logic
-                    const decryptionJid = await getDecryptionJid(user, repository)
+                    
+                    const decryptionJid = await getDecryptionJid(author, repository)
                     
                     if (tag !== 'plaintext') {
-                        await storeMappingFromEnvelope(stanza, user, decryptionJid, repository, logger)
+                        // TODO: Handle hosted devices
+                        await storeMappingFromEnvelope(stanza, author, repository, decryptionJid, logger)
                     }
+                    
                     try {
                         const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type
                         switch (e2eType) {
@@ -255,27 +290,33 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                             default:
                                 throw new Error(`Unknown e2e type: ${e2eType}`)
                         }
+                        
                         let msg = proto.Message.decode(e2eType !== 'plaintext' ? unpadRandomMax16(msgBuffer) : msgBuffer)
+                        
                         msg = msg.deviceSentMessage?.message || msg
+                        
                         if (msg.senderKeyDistributionMessage) {
-                            //eslint-disable-next-line max-depth
                             try {
                                 await repository.processSenderKeyDistributionMessage({
                                     authorJid: author,
                                     item: msg.senderKeyDistributionMessage
                                 })
                             }
+                            
                             catch (err) {
-                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message')
+                                logger.error({ key: fullMessage.key, err }, 'failed to process sender key distribution message')
                             }
                         }
+                        
                         if (fullMessage.message) {
                             Object.assign(fullMessage.message, msg)
                         }
+                        
                         else {
                             fullMessage.message = msg
                         }
                     }
+                    
                     catch (err) {
                         const errorContext = {
                             key: fullMessage.key,
@@ -285,7 +326,8 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                             author,
                             isSessionRecordError: isSessionRecordError(err)
                         }
-                        logger.error(errorContext, 'failed to process sender key distribution message')
+                        
+                        logger.error(errorContext, 'failed to decrypt message')
                         fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT
                         fullMessage.messageStubParameters = [err.message.toString()]
                     }
@@ -293,7 +335,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
             }
             
             // if nothing was found to decrypt
-            if (!decryptables) {
+            if (!decryptables && !fullMessage.key?.isViewOnce) {
                 fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT
                 fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT]
             }

package/lib/Utils/event-buffer.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const Events = require("events")
+const EventEmitter = require("events")
 const { WAMessageStatus } = require("../Types")
 const { trimUndefined } = require("./generics")
 const {
@@ -34,7 +34,7 @@ const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT)
  * making the data processing more efficient.
  */
 const makeEventBuffer = (logger) => {
-    const ev = new Events()
+    const ev = new EventEmitter()
     const historyCache = new Set()
     let data = makeBufferData()
     let isBuffering = false
@@ -121,10 +121,37 @@ const makeEventBuffer = (logger) => {
             }
         },
         emit(event, evData) {
+            // Check if this is a messages.upsert with a different type than what's buffered
+            // If so, flush the buffered messages first to avoid type overshadowing
+            if (event === 'messages.upsert') {
+                const { type } = evData
+                const existingUpserts = Object.values(data.messageUpserts)
+                
+                if (existingUpserts.length > 0) {
+                    const bufferedType = existingUpserts[0].type
+                    
+                    if (bufferedType !== type) {
+                        logger.debug({ bufferedType, newType: type }, 'messages.upsert type mismatch, emitting buffered messages')
+                        
+                        // Emit the buffered messages with their correct type
+                        ev.emit('event', {
+                            'messages.upsert': {
+                                messages: existingUpserts.map(m => m.message),
+                                type: bufferedType
+                            }
+                        })
+                        
+                        // Clear the message upserts from the buffer
+                        data.messageUpserts = {}
+                    }
+                }
+            }
+            
             if (isBuffering && BUFFERABLE_EVENT_SET.has(event)) {
                 append(data, historyCache, event, evData, logger)
                 return true
             }
+            
             return ev.emit('event', { [event]: evData })
         },
         isBuffering() {
@@ -192,42 +219,50 @@ const makeBufferData = () => {
 }
 
 function append(data, historyCache, event, eventData, logger) {
-    var _a, _b, _c
     switch (event) {
         case 'messaging-history.set':
             for (const chat of eventData.chats) {
-                const existingChat = data.historySets.chats[chat.id]
+                const id = chat.id || ''
+                const existingChat = data.historySets.chats[id]
+                
                 if (existingChat) {
                     existingChat.endOfHistoryTransferType = chat.endOfHistoryTransferType
                 }
-                if (!existingChat && !historyCache.has(chat.id)) {
-                    data.historySets.chats[chat.id] = chat
-                    historyCache.add(chat.id)
+                
+                if (!existingChat && !historyCache.has(id)) {
+                    data.historySets.chats[id] = chat
+                    historyCache.add(id)
                     absorbingChatUpdate(chat)
                 }
             }
+            
             for (const contact of eventData.contacts) {
                 const existingContact = data.historySets.contacts[contact.id]
+                
                 if (existingContact) {
                     Object.assign(existingContact, trimUndefined(contact))
                 }
                 else {
                     const historyContactId = `c:${contact.id}`
                     const hasAnyName = contact.notify || contact.name || contact.verifiedName
+                    
                     if (!historyCache.has(historyContactId) || hasAnyName) {
                         data.historySets.contacts[contact.id] = contact
                         historyCache.add(historyContactId)
                     }
                 }
             }
+            
             for (const message of eventData.messages) {
                 const key = stringifyMessageKey(message.key)
                 const existingMsg = data.historySets.messages[key]
+                
                 if (!existingMsg && !historyCache.has(key)) {
                     data.historySets.messages[key] = message
                     historyCache.add(key)
                 }
             }
+            
             data.historySets.empty = false
             data.historySets.syncType = eventData.syncType
             data.historySets.progress = eventData.progress
@@ -236,23 +271,30 @@ function append(data, historyCache, event, eventData, logger) {
             break
         case 'chats.upsert':
             for (const chat of eventData) {
-                let upsert = data.chatUpserts[chat.id]
-                if (!upsert) {
-                    upsert = data.historySets[chat.id]
+                const id = chat.id || ''
+                
+                let upsert = data.chatUpserts[id]
+                
+                if (id && !upsert) {
+                    upsert = data.historySets.chats[id]
+                    
                     if (upsert) {
-                        logger.debug({ chatId: chat.id }, 'absorbed chat upsert in chat set')
+                        logger.debug({ chatId: id }, 'absorbed chat upsert in chat set')
                     }
                 }
+                
                 if (upsert) {
                     upsert = concatChats(upsert, chat)
                 }
                 else {
                     upsert = chat
-                    data.chatUpserts[chat.id] = upsert
+                    data.chatUpserts[id] = upsert
                 }
+                
                 absorbingChatUpdate(upsert)
-                if (data.chatDeletes.has(chat.id)) {
-                    data.chatDeletes.delete(chat.id)
+                
+                if (data.chatDeletes.has(id)) {
+                    data.chatDeletes.delete(id)
                 }
             }
             break
@@ -342,43 +384,51 @@ function append(data, historyCache, event, eventData, logger) {
             break
         case 'messages.upsert':
             const { messages, type } = eventData
+            
             for (const message of messages) {
                 const key = stringifyMessageKey(message.key)
-                let existing = (_a = data.messageUpserts[key]) === null || _a === void 0 ? void 0 : _a.message
+                
+                let existing = data.messageUpserts[key]?.message
+                
                 if (!existing) {
                     existing = data.historySets.messages[key]
+                    
                     if (existing) {
                         logger.debug({ messageId: key }, 'absorbed message upsert in message set')
                     }
                 }
+                
                 if (existing) {
                     message.messageTimestamp = existing.messageTimestamp
                 }
+                
                 if (data.messageUpdates[key]) {
                     logger.debug('absorbed prior message update in message upsert')
                     Object.assign(message, data.messageUpdates[key].update)
                     delete data.messageUpdates[key]
                 }
+                
                 if (data.historySets.messages[key]) {
                     data.historySets.messages[key] = message
                 }
                 else {
                     data.messageUpserts[key] = {
                         message,
-                        type: type === 'notify' || ((_b = data.messageUpserts[key]) === null || _b === void 0 ? void 0 : _b.type) === 'notify'
-                            ? 'notify'
-                            : type
+                        type: type === 'notify' || data.messageUpserts[key]?.type === 'notify' ? 'notify' : type
                     }
                 }
             }
             break
         case 'messages.update':
             const msgUpdates = eventData
+            
             for (const { key, update } of msgUpdates) {
                 const keyStr = stringifyMessageKey(key)
-                const existing = data.historySets.messages[keyStr] || ((_c = data.messageUpserts[keyStr]) === null || _c === void 0 ? void 0 : _c.message)
+                const existing = data.historySets.messages[keyStr] || data.messageUpserts[keyStr]?.message
+                
                 if (existing) {
                     Object.assign(existing, update)
+                    
                     // if the message was received & read by us
                     // the chat counter must have been incremented
                     // so we need to decrement it
@@ -471,11 +521,14 @@ function append(data, historyCache, event, eventData, logger) {
         default:
             throw new Error(`"${event}" cannot be buffered`)
     }
+    
     function absorbingChatUpdate(existing) {
-        const chatId = existing.id
+        const chatId = existing.id || ''
         const update = data.chatUpdates[chatId]
+        
         if (update) {
             const conditionMatches = update.conditional ? update.conditional(data) : true
+            
             if (conditionMatches) {
                 delete update.conditional
                 logger.debug({ chatId }, 'absorbed chat update in existing chat')
@@ -488,17 +541,20 @@ function append(data, historyCache, event, eventData, logger) {
             }
         }
     }
+    
     function decrementChatReadCounterIfMsgDidUnread(message) {
         // decrement chat unread counter
         // if the message has already been marked read by us
         const chatId = message.key.remoteJid
         const chat = data.chatUpdates[chatId] || data.chatUpserts[chatId]
-        if (isRealMessage(message, '')
-            && shouldIncrementChatUnread(message)
-            && typeof (chat?.unreadCount) === 'number'
-            && chat.unreadCount > 0) {
+        
+        if (isRealMessage(message) &&
+            shouldIncrementChatUnread(message) &&
+            typeof chat?.unreadCount === 'number' &&
+            chat.unreadCount > 0) {
             logger.debug({ chatId: chat.id }, 'decrementing chat counter')
             chat.unreadCount -= 1
+            
             if (chat.unreadCount === 0) {
                 delete chat.unreadCount
             }