@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Utils/event-buffer.js

@@ -1,16 +1,15 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const events_1 = __importDefault(require("events"))
-const Types_1 = require("../Types")
-const generics_1 = require("./generics")
-const messages_1 = require("./messages")
-const process_message_1 = require("./process-message")
+const EventEmitter = require("events")
+const { WAMessageStatus } = require("../Types")
+const { trimUndefined } = require("./generics")
+const {
+  updateMessageWithReceipt, 
+  updateMessageWithReaction
+} = require("./messages")
+const { isRealMessage } = require("./process-message")
 
 const BUFFERABLE_EVENT = [
     'messaging-history.set',
@@ -35,7 +34,7 @@ const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT)
  * making the data processing more efficient.
  */
 const makeEventBuffer = (logger) => {
-    const ev = new events_1.default()
+    const ev = new EventEmitter()
     const historyCache = new Set()
     let data = makeBufferData()
     let isBuffering = false
@@ -122,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() {
@@ -193,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, generics_1.trimUndefined(contact))
+                    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
@@ -237,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
@@ -313,14 +354,14 @@ function append(data, historyCache, event, eventData, logger) {
                     }
                 }
                 if (upsert) {
-                    upsert = Object.assign(upsert, generics_1.trimUndefined(contact))
+                    upsert = Object.assign(upsert, trimUndefined(contact))
                 }
                 else {
                     upsert = contact
                     data.contactUpserts[contact.id] = upsert
                 }
                 if (data.contactUpdates[contact.id]) {
-                    upsert = Object.assign(data.contactUpdates[contact.id], generics_1.trimUndefined(contact))
+                    upsert = Object.assign(data.contactUpdates[contact.id], trimUndefined(contact))
                     delete data.contactUpdates[contact.id]
                 }
             }
@@ -343,47 +384,55 @@ 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
-                    if (update.status === Types_1.WAMessageStatus.READ && !key.fromMe) {
+                    if (update.status === WAMessageStatus.READ && !key.fromMe) {
                         decrementChatReadCounterIfMsgDidUnread(existing)
                     }
                 }
@@ -421,11 +470,11 @@ function append(data, historyCache, event, eventData, logger) {
 	    //      const keyStr = stringifyMessageKey(pollUpdateMessageKey) 
 		//      const existing = data.messagePollings[keyStr]
 		//      if(existing) {
-		//          messages_1.updateMessageWithPollUpdate(existing.message, pollUpdates) 
+		//          updateMessageWithPollUpdate(existing.message, pollUpdates) 
 	    //	  } else {
 		//          data.messagePollings[keyStr] = data.messagePollings[keyStr]
 		//	    	  || { pollUpdateMessageKey, pollUpdates: [] }
-		//    	  messages_1.updateMessageWithPollUpdate(data.messagePollings[keyStr], vote) 
+		//    	  updateMessageWithPollUpdate(data.messagePollings[keyStr], vote) 
 	    // 	  }
 	    //  }		
 		//  break
@@ -435,12 +484,12 @@ function append(data, historyCache, event, eventData, logger) {
                 const keyStr = stringifyMessageKey(key)
                 const existing = data.messageUpserts[keyStr]
                 if (existing) {
-                    messages_1.updateMessageWithReaction(existing.message, reaction)
+                    updateMessageWithReaction(existing.message, reaction)
                 }
                 else {
                     data.messageReactions[keyStr] = data.messageReactions[keyStr]
                         || { key, reactions: [] }
-                    messages_1.updateMessageWithReaction(data.messageReactions[keyStr], reaction)
+                    updateMessageWithReaction(data.messageReactions[keyStr], reaction)
                 }
             }
             break
@@ -450,12 +499,12 @@ function append(data, historyCache, event, eventData, logger) {
                 const keyStr = stringifyMessageKey(key)
                 const existing = data.messageUpserts[keyStr]
                 if (existing) {
-                    messages_1.updateMessageWithReceipt(existing.message, receipt)
+                    updateMessageWithReceipt(existing.message, receipt)
                 }
                 else {
                     data.messageReceipts[keyStr] = data.messageReceipts[keyStr]
                         || { key, userReceipt: [] }
-                    messages_1.updateMessageWithReceipt(data.messageReceipts[keyStr], receipt)
+                    updateMessageWithReceipt(data.messageReceipts[keyStr], receipt)
                 }
             }
             break
@@ -472,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')
@@ -489,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 (process_message_1.isRealMessage(message, '')
-            && process_message_1.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
             }