@hansaka02/baileys 7.3.4 → 7.3.6

package/lib/Utils/noise-handler.js

@@ -25,35 +25,44 @@ const generateIV = (counter) => {
 
 const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' })
+    
     const authenticate = (data) => {
         if (!isFinished) {
             hash = sha256(Buffer.concat([hash, data]))
         }
     }
+    
     const encrypt = (plaintext) => {
         const result = aesEncryptGCM(plaintext, encKey, generateIV(writeCounter), hash)
         writeCounter += 1
         authenticate(result)
         return result
     }
+    
     const decrypt = (ciphertext) => {
         // before the handshake is finished, we use the same counter
         // after handshake, the counters are different
         const iv = generateIV(isFinished ? readCounter : writeCounter)
         const result = aesDecryptGCM(ciphertext, decKey, iv, hash)
+        
         if (isFinished) {
             readCounter += 1
         }
+        
         else {
             writeCounter += 1
         }
+        
         authenticate(ciphertext)
+        
         return result
     }
+    
     const localHKDF = async (data) => {
         const key = await hkdf(Buffer.from(data), 64, { salt, info: '' })
         return [key.slice(0, 32), key.slice(32)]
     }
+    
     const mixIntoKey = async (data) => {
         const [write, read] = await localHKDF(data)
         salt = write
@@ -62,6 +71,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         readCounter = 0
         writeCounter = 0
     }
+    
     const finishInit = async () => {
         const [write, read] = await localHKDF(new Uint8Array(0))
         encKey = write
@@ -71,7 +81,9 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         writeCounter = 0
         isFinished = true
     }
+    
     const data = Buffer.from(NOISE_MODE)
+    
     let hash = data.byteLength === 32 ? data : sha256(data)
     let salt = hash
     let encKey = hash
@@ -81,8 +93,10 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
     let isFinished = false
     let sentIntro = false
     let inBytes = Buffer.alloc(0)
+    
     authenticate(NOISE_HEADER)
     authenticate(publicKey)
+    
     return {
         encrypt,
         decrypt,
@@ -95,20 +109,27 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             const decStaticContent = decrypt(serverHello.static)
             await mixIntoKey(Curve.sharedKey(privateKey, decStaticContent))
             const certDecoded = decrypt(serverHello.payload)
-            const { intermediate: certIntermediate } = proto.CertChain.decode(certDecoded)
+            const { intermediate: certIntermediate /*leaf*/ } = proto.CertChain.decode(certDecoded)
+            // TODO: handle this leaf stuff
             const { issuerSerial } = proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details)
+            
             if (issuerSerial !== WA_CERT_DETAILS.SERIAL) {
                 throw new Boom('certification match failed', { statusCode: 400 })
             }
+            
             const keyEnc = encrypt(noiseKey.public)
+            
             await mixIntoKey(Curve.sharedKey(noiseKey.private, serverHello.ephemeral))
+            
             return keyEnc
         },
         encodeFrame: (data) => {
             if (isFinished) {
                 data = encrypt(data)
             }
+            
             let header
+            
             if (routingInfo) {
                 header = Buffer.alloc(7)
                 header.write('ED', 0, 'utf8')
@@ -121,12 +142,15 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             else {
                 header = Buffer.from(NOISE_HEADER)
             }
+            
             const introSize = sentIntro ? 0 : header.length
             const frame = Buffer.alloc(introSize + 3 + data.byteLength)
+            
             if (!sentIntro) {
                 frame.set(header)
                 sentIntro = true
             }
+            
             frame.writeUInt8(data.byteLength >> 16, introSize)
             frame.writeUInt16BE(65535 & data.byteLength, introSize + 1)
             frame.set(data, introSize + 3)
@@ -141,18 +165,25 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
                     return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1)
                 }
             }
+            
             inBytes = Buffer.concat([inBytes, newData])
             logger.trace(`recv ${newData.length} bytes, total recv ${inBytes.length} bytes`)
+            
             let size = getBytesSize()
             while (size && inBytes.length >= size + 3) {
                 let frame = inBytes.slice(3, size + 3)
-                inBytes = inBytes.slice(size + 3)
+                
+                inBytes = inBytes.slice(size + 3) 
+                
                 if (isFinished) {
                     const result = decrypt(frame)
                     frame = await decodeBinaryNode(result)
                 }
+                
                 logger.trace({ msg: frame?.attrs?.id }, 'recv frame')
+                
                 onFrame(frame)
+                
                 size = getBytesSize()
             }
         }

package/lib/Utils/pre-key-manager.js

@@ -0,0 +1,126 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { default: PQueue } = require("p-queue") 
+
+/**
+ * Manages pre-key operations with proper concurrency control
+ */
+class PreKeyManager {
+    constructor(store, logger) {
+        this.store = store
+        this.logger = logger
+        this.queues = new Map()
+    }
+    
+    /**
+     * Get or create a queue for a specific key type
+     */
+    getQueue(keyType) {
+        if (!this.queues.has(keyType)) {
+            this.queues.set(keyType, new PQueue({ concurrency: 1 }))
+        }
+        return this.queues.get(keyType)
+    }
+    
+    /**
+     * Process pre-key operations (updates and deletions)
+     */
+    async processOperations(data, keyType, transactionCache, mutations, isInTransaction) {
+        const keyData = data[keyType]
+        
+        if (!keyData) return
+        
+        return this.getQueue(keyType).add(async () => {
+            // Ensure structures exist
+            transactionCache[keyType] = transactionCache[keyType] || {}
+            mutations[keyType] = mutations[keyType] || {}
+            
+            // Separate deletions from updates
+            const deletions = []
+            const updates = {}
+            
+            for (const keyId in keyData) {
+                if (keyData[keyId] === null) {
+                    deletions.push(keyId)
+                }
+                else {
+                    updates[keyId] = keyData[keyId]
+                }
+            }
+            
+            // Process updates (no validation needed)
+            if (Object.keys(updates).length > 0) {
+                Object.assign(transactionCache[keyType], updates)
+                Object.assign(mutations[keyType], updates)
+            }
+            
+            // Process deletions with validation
+            if (deletions.length > 0) {
+                await this.processDeletions(keyType, deletions, transactionCache, mutations, isInTransaction)
+            }
+        })
+    }
+    
+    /**
+     * Process deletions with validation
+     */
+    async processDeletions(keyType, ids, transactionCache, mutations, isInTransaction) {
+        if (isInTransaction) {
+            // In transaction, only allow deletion if key exists in cache
+            for (const keyId of ids) {
+                if (transactionCache[keyType]?.[keyId]) {
+                    transactionCache[keyType][keyId] = null
+                    mutations[keyType][keyId] = null
+                }
+                else {
+                    this.logger.warn(`Skipping deletion of non-existent ${keyType} in transaction: ${keyId}`)
+                }
+            }
+        }
+        else {
+            // Outside transaction, validate against store
+            const existingKeys = await this.store.get(keyType, ids)
+            for (const keyId of ids) {
+                if (existingKeys[keyId]) {
+                    transactionCache[keyType][keyId] = null
+                    mutations[keyType][keyId] = null
+                }
+                else {
+                    this.logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`)
+                }
+            }
+        }
+    }
+    
+    /**
+     * Validate and process pre-key deletions outside transactions
+     */
+    async validateDeletions(data, keyType) {
+        const keyData = data[keyType]
+        
+        if (!keyData) return
+        
+        return this.getQueue(keyType).add(async () => {
+            // Find all deletion requests
+            const deletionIds = Object.keys(keyData).filter(id => keyData[id] === null)
+            
+            if (deletionIds.length === 0) return
+            
+            // Validate deletions
+            const existingKeys = await this.store.get(keyType, deletionIds)
+            
+            for (const keyId of deletionIds) {
+                if (!existingKeys[keyId]) {
+                    this.logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`)
+                    delete data[keyType][keyId]
+                }
+            }
+        })
+    }
+}
+
+module.exports = {
+  PreKeyManager
+}

package/lib/Utils/process-message.js

@@ -11,8 +11,13 @@ const {
 } = require("../Utils")
 const {
   areJidsSameUser,
+  isHostedLidUser, 
+  isHostedPnUser, 
   isJidBroadcast,
-  isJidStatusBroadcast,
+  isJidStatusBroadcast, 
+  isLidUser, 
+  jidDecode, 
+  jidEncode, 
   jidNormalizedUser 
 } = require("../WABinary")
 const { 
@@ -37,18 +42,32 @@ const REAL_MSG_REQ_ME_STUB_TYPES = new Set([
 ])
 
 /** Cleans a received message to further processing */
-const cleanMessage = (message, meId) => {
+const cleanMessage = (message, meId, meLid) => {
     // ensure remoteJid and participant doesn't have device or agent in it
-    message.key.remoteJid = jidNormalizedUser(message.key.remoteJid)
-    message.key.participant = message.key.participant ? jidNormalizedUser(message.key.participant) : undefined
+    if (isHostedPnUser(message.key.remoteJid) || isHostedLidUser(message.key.remoteJid)) {
+        message.key.remoteJid = jidEncode(jidDecode(message.key?.remoteJid)?.user, isHostedPnUser(message.key.remoteJid) ? 's.whatsapp.net' : 'lid')
+    }
+    else {
+        message.key.remoteJid = jidNormalizedUser(message.key.remoteJid)
+    }
+    
+    if (isHostedPnUser(message.key.participant) || isHostedLidUser(message.key.participant)) {
+        message.key.participant = jidEncode(jidDecode(message.key.participant)?.user, isHostedPnUser(message.key.participant) ? 's.whatsapp.net' : 'lid')
+    }
+    else {
+        message.key.participant = jidNormalizedUser(message.key.participant)
+    }
     const content = normalizeMessageContent(message.message)
+    
     // if the message has a reaction, ensure fromMe & remoteJid are from our perspective
     if (content?.reactionMessage) {
         normaliseKey(content.reactionMessage.key)
     }
+    
     if (content?.pollUpdateMessage) {
         normaliseKey(content.pollUpdateMessage.pollCreationMessageKey)
     }
+    
     function normaliseKey(msgKey) {
         // if the reaction is from another user
         // we've to correctly map the key to this user's perspective
@@ -56,11 +75,13 @@ const cleanMessage = (message, meId) => {
             // if the sender believed the message being reacted to is not from them
             // we've to correct the key to be from them, or some other participant
             msgKey.fromMe = !msgKey.fromMe
-                ? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId)
-                // if the message being reacted to, was from them
-                // fromMe automatically becomes false
-                : false
+                ? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId) ||
+                    areJidsSameUser(msgKey.participant || msgKey.remoteJid, meLid)
+                : // if the message being reacted to, was from them
+                    // fromMe automatically becomes false
+                    false
             // set the remoteJid to being the same as the chat the message came from
+            // TODO: investigate inconsistencies
             msgKey.remoteJid = message.key.remoteJid
             // set participant of the message
             msgKey.participant = msgKey.participant || message.key.participant
@@ -68,24 +89,20 @@ const cleanMessage = (message, meId) => {
     }
 }
 
-const isRealMessage = (message, meId) => {
+// TODO: target:audit AUDIT THIS FUNCTION AGAIN
+const isRealMessage = (message) => {
     const normalizedContent = normalizeMessageContent(message.message)
     const hasSomeContent = !!getContentType(normalizedContent)
-    return (
-        !!normalizedContent ||
+    return ((!!normalizedContent ||
         REAL_MSG_STUB_TYPES.has(message.messageStubType) ||
-        (
-            REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType) &&
-            message.messageStubParameters?.some(p => areJidsSameUser(meId, p))
-        )
-    ) &&
-    hasSomeContent &&
-    !normalizedContent?.protocolMessage &&
-    !normalizedContent?.reactionMessage &&
-    !normalizedContent?.pollUpdateMessage
+        REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType)) &&
+        hasSomeContent &&
+        !normalizedContent?.protocolMessage &&
+        !normalizedContent?.reactionMessage &&
+        !normalizedContent?.pollUpdateMessage)
 }
 
-const shouldIncrementChatUnread = (message) => (!message.key.fromMe && !message.messageStubType)
+const shouldIncrementChatUnread = (message) => !message.key.fromMe && !message.messageStubType
 
 /**
  * Get the ID of the chat from the given key.
@@ -233,7 +250,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     const meLid = creds.me.lid
     const { accountSettings } = creds
     const chat = { id: jidNormalizedUser(getChatId(message.key)) }
-    const isRealMsg = isRealMessage(message, meId)
+    const isRealMsg = isRealMessage(message)
     if (isRealMsg) {
         chat.messages = [{ message }]
         chat.conversationTimestamp = toNumber(message.messageTimestamp)
@@ -257,13 +274,16 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 const histNotification = protocolMsg.historySyncNotification
                 const process = shouldProcessHistoryMsg
                 const isLatest = !creds.processedHistoryMessages?.length
+                
                 logger?.info({
                     histNotification,
                     process,
                     id: message.key.id,
-                    isLatest,
+                    isLatest
                 }, 'got history notification')
+                
                 if (process) {
+                    // TODO: investigate
                     if (histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND) {
                         ev.emit('creds.update', {
                             processedHistoryMessages: [
@@ -272,32 +292,39 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                             ]
                         })
                     }
+                    
                     const data = await downloadAndProcessHistorySyncNotification(histNotification, options)
                     ev.emit('messaging-history.set', {
                         ...data,
-                        isLatest: histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND
-                            ? isLatest
-                            : undefined,
+                        isLatest: histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND ? isLatest : undefined,
                         peerDataRequestSessionId: histNotification.peerDataRequestSessionId
                     })
                 }
                 break
             case proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
                 const keys = protocolMsg.appStateSyncKeyShare.keys
+                
                 if (keys?.length) {
                     let newAppStateSyncKeyId = ''
+                    
                     await keyStore.transaction(async () => {
                         const newKeys = []
+                        
                         for (const { keyData, keyId } of keys) {
                             const strKeyId = Buffer.from(keyId.keyId).toString('base64')
+                            
                             newKeys.push(strKeyId)
+                            
                             await keyStore.set({ 'app-state-sync-key': { [strKeyId]: keyData } })
+                            
                             newAppStateSyncKeyId = strKeyId
                         }
+                        
                         logger?.info({ newAppStateSyncKeyId, newKeys }, 'injecting new app state sync keys')
                     }, meId)
                     ev.emit('creds.update', { myAppStateKeyId: newAppStateSyncKeyId })
                 }
+                
                 else {
                     logger?.info({ protocolMsg }, 'recv app state sync with 0 keys')
                 }
@@ -321,16 +348,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 break
             case proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
                 const response = protocolMsg.peerDataOperationRequestResponseMessage
+                
                 if (response) {
-                    await laceholderResendCache?.del(response.stanzaId)
+                    await placeholderResendCache?.del(response.stanzaId)
+                    
                     // TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
                     const { peerDataOperationResult } = response
+                    
                     for (const result of peerDataOperationResult) {
                         const { placeholderMessageResendResponse: retryResponse } = result
+                        
                         //eslint-disable-next-line max-depth
                         if (retryResponse) {
                             const webMessageInfo = proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes)
                             // wait till another upsert event is available, don't want it to be part of the PDO response message
+                            // TODO: parse through proper message handling utilities (to add relevant key fields)
                             setTimeout(() => {
                                 ev.emit('messages.upsert', {
                                     messages: [webMessageInfo],
@@ -360,8 +392,22 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     }
                 ])
                 break
+            case proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE:
+                const labelAssociationMsg = protocolMsg.memberLabel
+                
+                if (labelAssociationMsg?.label) {
+                	ev.emit('group.member-tag.update', {
+                		groupId: chat.id, 
+                		label: labelAssociationMsg.label,
+                		participant: message.key.participant, 
+                		participantAlt: message.key.participantAlt, 
+                		messageTimestamp: Number(message.messageTimestamp)
+                	}) 
+                }
+                break
             case proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
                 const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload
+                
                 const { pnToLidMappings, chatDbMigrationTimestamp } = proto.LIDMigrationMappingSyncPayload.decode(encodedPayload)
                 
                 logger?.debug({ pnToLidMappings, chatDbMigrationTimestamp }, 'got lid mappings and chat db migration timestamp')
@@ -374,6 +420,12 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 }
                 
                 await signalRepository.lidMapping.storeLIDPNMappings(pairs)
+                
+                if (pairs.length) {
+                    for (const { pn, lid } of pairs) {
+                        await signalRepository.migrateSession(pn, lid)
+                    }
+                }
                 break
             case proto.Message.ProtocolMessage.Type.LIMIT_SHARING:
                 ev.emit('limit-sharing.update', {
@@ -398,32 +450,46 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     }
     else if (message.messageStubType) {
         const jid = message.key?.remoteJid
-        //let actor = whatsappID (message.participant)
+        
         let participants
-        const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }))
+        
+        const emitParticipantsUpdate = (action) => ev.emit('group-participants.update', {
+            id: jid,
+            author: message.key.participant,
+            authorPn: message.key.participantAlt,
+            participants,
+            action
+        })
+        
         const emitGroupUpdate = (update) => {
-            ev.emit('groups.update', [{ id: jid, ...update, author: message.participant ? message.participant : undefined }])
+            ev.emit('groups.update', [
+                { id: jid, ...update, author: message.key.participant ?? undefined, authorPn: message.key.participantAlt }
+            ])
         }
+        
         const emitGroupRequestJoin = (participant, action, method) => {
-            ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method })
+            ev.emit('group.join-request', {
+                id: jid,
+                author: message.key.participant,
+                authorPn: message.key.participantAlt,
+                participant: participant.lid,
+                participantPn: participant.pn,
+                action,
+                method: method
+            })
         }
-        const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid))
+        
+        const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid.phoneNumber)) // ADD SUPPORT FOR LID
         switch (message.messageStubType) {
             case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
-                participants = message.messageStubParameters || []
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('modify')
                 break
             case WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
-              participants = message.messageStubParameters || [];
-              emitParticipantsUpdate('leave');
-              // mark the chat read only if you left the group
-              if (participantsIncludesMe()) {
-                chat.readOnly = true;
-              }
-              break;
             case WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
-                participants = message.messageStubParameters || []
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('remove')
+                
                 // mark the chat read only if you left the group
                 if (participantsIncludesMe()) {
                     chat.readOnly = true
@@ -431,27 +497,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 break
             case WAMessageStubType.GROUP_PARTICIPANT_ADD:
             case WAMessageStubType.GROUP_PARTICIPANT_INVITE:
-              let actionGp = 'invite'
-              participants = message.messageStubParameters || []
-              if (participantsIncludesMe()) chat.readOnly = false;
-              if (message?.key?.participant && !participants.includes(message?.key?.participant)) {
-                actionGp = 'approval-invite'
-              }
             case WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
-                participants = message.messageStubParameters || []
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
+                
                 if (participantsIncludesMe()) {
                     chat.readOnly = false
                 }
+                
                 emitParticipantsUpdate('add')
                 break
             case WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
-            case WAMessageStubType.COMMUNITY_PARTICIPANT_DEMOTE:
-                participants = message.messageStubParameters || []
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('demote')
                 break
             case WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
-            case WAMessageStubType.COMMUNITY_PARTICIPANT_PROMOTE:
-                participants = message.messageStubParameters || []
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || []
                 emitParticipantsUpdate('promote')
                 break
             case WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
@@ -484,8 +544,8 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 const approvalMode = message.messageStubParameters?.[0]
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' })
                 break
-            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
-                const participant = message.messageStubParameters?.[0]
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD: // TODO: Add other events
+                const participant = JSON.parse(message.messageStubParameters?.[0])
                 const action = message.messageStubParameters?.[1]
                 const method = message.messageStubParameters?.[2]
                 emitGroupRequestJoin(participant, action, method)
@@ -650,7 +710,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const encComment = content.encCommentMessage
         const creationMsgKey = encComment.targetMessageKey
 
-        // we need to fetch the message to get the reaction enc key
+        // we need to fetch the message to get the comment enc key
         const commentMsg = await getMessage(creationMsgKey)
         if (commentMsg) {
             try {