@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Socket/messages-send.js

@@ -1,76 +1,149 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"))
-const boom_1 = require("@hapi/boom")
-const crypto_1 = require("crypto")
-const WAProto_1 = require("../../WAProto")
-const Defaults_1 = require("../Defaults")
-const Utils_1 = require("../Utils")
-const Types_1 = require("../Types")
-const WABinary_1 = require("../WABinary")
-const WAUSync_1 = require("../WAUSync")
-const newsletter_1 = require("./newsletter")
-const link_preview_1 = require("../Utils/link-preview")
-const make_keyed_mutex_1 = require("../Utils/make-mutex") 
+const { default: NodeCache } = require("@cacheable/node-cache")
+const { Boom } = require("@hapi/boom")
+const { randomBytes } = require("crypto")
+const { proto } = require("../../WAProto")
+const {
+  DEFAULT_CACHE_TTLS, 
+  WA_DEFAULT_EPHEMERAL
+} = require("../Defaults/constants")
+const { 
+  delay, 
+  assertMediaContent, 
+  bindWaitForEvent, 
+  decryptMediaRetryData, 
+  encodeNewsletterMessage, 
+  encodeSignedDeviceIdentity, 
+  encodeWAMessage, 
+  encryptMediaRetryRequest,
+  extractDeviceJids, 
+  generateMessageID, 
+  generateParticipantHashV2,
+  generateWAMessage, 
+  generateWAMessageFromContent, 
+  getStatusCodeForMediaRetry, 
+  getUrlFromDirectPath, 
+  getWAUploadToServer, 
+  MessageRetryManager, 
+  normalizeMessageContent, 
+  parseAndInjectE2ESessions, 
+  unixTimestampSeconds,  
+  prepareAlbumMessageContent, 
+  aggregateMessageKeysNotFromMe
+} = require("../Utils")
+const { WAMessageAddressingMode } = require("../Types")
+const { 
+  areJidsSameUser, 
+  getBinaryNodeChild, 
+  getBinaryNodeChildren, 
+  getBinaryFilteredBizBot, 
+  getBinaryFilteredButtons, 
+  isHostedLidUser, 
+  isHostedPnUser, 
+  isJidNewsletter, 
+  isJidGroup,
+  isLidUser, 
+  isPnUser, 
+  jidDecode,  
+  jidEncode, 
+  jidNormalizedUser,
+  STORIES_JID, 
+  S_WHATSAPP_NET 
+} = require("../WABinary")
+const {
+  USyncUser, 
+  USyncQuery
+} = require("../WAUSync") 
+const { makeNewsletterSocket } = require("./newsletter")
+const { getUrlInfo } = require("../Utils/link-preview")
+const { makeKeyedMutex } = require("../Utils/make-mutex") 
 
 const makeMessagesSocket = (config) => {
-    const { logger, maxMsgRetryCount, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache } = config
-    const suki = newsletter_1.makeNewsletterSocket(config)
-    const { ev, authState, processingMutex, signalRepository, upsertMessage, createCallLink, query, fetchPrivacySettings, sendNode, groupQuery, groupMetadata, groupToggleEphemeral, newsletterWMexQuery, executeUSyncQuery } = suki   
-
-    const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+    const { 
+        logger,
+        linkPreviewImageThumbnailWidth, 
+        generateHighQualityLinkPreview,
+        options: httpRequestOptions, 
+        patchMessageBeforeSending,
+        cachedGroupMetadata, 
+        enableRecentMessageCache, 
+        maxMsgRetryCount 
+    } = config
+	
+    const suki = makeNewsletterSocket(config)
+    
+    const { 
+        ev, 
+        authState, 
+        messageMutex, 
+        signalRepository, 
+        upsertMessage, 
+        createCallLink, 
+        query, 
+        fetchPrivacySettings, 
+        sendNode, 
+        groupQuery, 
+        groupMetadata, 
+        groupToggleEphemeral, 
+        executeUSyncQuery, 
+        newsletterMetadata
+    } = suki   
+
+    const userDevicesCache = config.userDevicesCache || new NodeCache({
+        stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
+        useClones: false
+    })
+    
+    const peerSessionsCache = new NodeCache({
+        stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
         useClones: false
     })
     
     // Initialize message retry manager if enabled
-    const messageRetryManager = enableRecentMessageCache ? new Utils_1.MessageRetryManager(logger, maxMsgRetryCount) : null
+    const messageRetryManager = enableRecentMessageCache ? new MessageRetryManager(logger, maxMsgRetryCount) : null
     
     // Prevent race conditions in Signal session encryption by user
-    const encryptionMutex = make_keyed_mutex_1.makeKeyedMutex()
+    const encryptionMutex = makeKeyedMutex()
 
     let mediaConn
 
     const refreshMediaConn = async (forceGet = false) => {
         const media = await mediaConn
-
-        if (!media || forceGet || (new Date().getTime() - media.fetchDate.getTime()) > media.ttl * 1000) {
+        
+        if (!media || forceGet || new Date().getTime() - media.fetchDate.getTime() > media.ttl * 1000) {
             mediaConn = (async () => {
-
                 const result = await query({
                     tag: 'iq',
                     attrs: {
                         type: 'set',
                         xmlns: 'w:m',
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET
                     },
                     content: [{ tag: 'media_conn', attrs: {} }]
                 })
-
-                const mediaConnNode = WABinary_1.getBinaryNodeChild(result, 'media_conn')
-
+                
+                const mediaConnNode = getBinaryNodeChild(result, 'media_conn')
+                
+                // TODO: explore full length of data that whatsapp provides
                 const node = {
-                    hosts: WABinary_1.getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
+                    hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
-                        maxContentLengthBytes: +attrs.maxContentLengthBytes,
+                        maxContentLengthBytes: +attrs.maxContentLengthBytes
                     })),
                     auth: mediaConnNode.attrs.auth,
                     ttl: +mediaConnNode.attrs.ttl,
                     fetchDate: new Date()
                 }
-
+                
                 logger.debug('fetched media conn')
-
+                
                 return node
             })()
         }
-
+        
         return mediaConn
     }
 
@@ -79,37 +152,42 @@ const makeMessagesSocket = (config) => {
      * used for receipts of phone call, read, delivery etc.
      * */
     const sendReceipt = async (jid, participant, messageIds, type) => {
+        if (!messageIds || messageIds.length === 0) {
+            throw new Boom('missing ids in receipt')
+        }
+        
         const node = {
             tag: 'receipt',
             attrs: {
-                id: messageIds[0],
-            },
+                id: messageIds[0]
+            }
         }
-
+        
         const isReadReceipt = type === 'read' || type === 'read-self'
-
+        
         if (isReadReceipt) {
-            node.attrs.t = Utils_1.unixTimestampSeconds().toString()
+            node.attrs.t = unixTimestampSeconds().toString()
         }
-
-        if (type === 'sender' && WABinary_1.isJidUser(jid)) {
+        
+        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
             node.attrs.recipient = jid
             node.attrs.to = participant
         }
-
+        
         else {
             node.attrs.to = jid
+            
             if (participant) {
                 node.attrs.participant = participant
             }
         }
-
+        
         if (type) {
-            node.attrs.type = WABinary_1.isJidNewsletter(jid) ? 'read-self' : type
+            node.attrs.type = type
         }
-
+        
         const remainingMessageIds = messageIds.slice(1)
-
+        
         if (remainingMessageIds.length) {
             node.content = [
                 {
@@ -122,15 +200,15 @@ const makeMessagesSocket = (config) => {
                 }
             ]
         }
-
+        
         logger.debug({ attrs: node.attrs, messageIds }, 'sending receipt for messages')
-
+        
         await sendNode(node)
     }
 
     /** Correctly bulk send receipts to multiple chats, participants */
     const sendReceipts = async (keys, type) => {
-        const recps = Utils_1.aggregateMessageKeysNotFromMe(keys)
+        const recps = aggregateMessageKeysNotFromMe(keys)
 
         for (const { jid, participant, messageIds } of recps) {
             await sendReceipt(jid, participant, messageIds, type)
@@ -147,84 +225,6 @@ const makeMessagesSocket = (config) => {
         await sendReceipts(keys, readType)
     }
     
-    /**
-     * Deduplicate JIDs when both LID and PN versions exist for same user
-     * Prefers LID over PN to maintain single encryption layer
-     */
-    const deduplicateLidPnJids = (jids) => {
-        const lidUsers = new Set()
-        const filteredJids = []
-        
-        // Collect all LID users
-        for (const jid of jids) {
-            if (WABinary_1.isLidUser(jid)) {
-                const user = WABinary_1.jidDecode(jid)?.user
-                if (user)
-                    lidUsers.add(user)
-            }
-        }
-        
-        // Filter out PN versions when LID exists
-        for (const jid of jids) {
-            if (WABinary_1.isJidUser(jid)) {
-                const user = WABinary_1.jidDecode(jid)?.user
-                if (user && lidUsers.has(user)) {
-                    logger.debug({ jid }, 'Skipping PN - LID version exists')
-                    continue
-                }
-            }
-            filteredJids.push(jid)
-        }
-        return filteredJids
-    }
-
-    /** Fetch image for groups, user, and newsletter **/
-    const profilePictureUrl = async (jid) => {
-        if (WABinary_1.isJidNewsletter(jid)) {
-
-            let node = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
-           input: {
-               key: jid, 
-               type: 'JID',
-               view_role: 'GUEST'
-              },
-              fetch_viewer_metadata: true,
-              fetch_full_image: true,
-              fetch_creation_time: true
-          })
-
-         let result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
-
-         let metadata = JSON.parse(result).data[Types_1.XWAPaths.NEWSLETTER]         
-
-         return Utils_1.getUrlFromDirectPath(metadata.thread_metadata.picture?.direct_path || '') 
-
-        } 
-
-        else {               
-            const result = await query({
-                tag: 'iq',
-                attrs: {
-                    target: WABinary_1.jidNormalizedUser(jid),
-                    to: WABinary_1.S_WHATSAPP_NET,
-                    type: 'get',
-                    xmlns: 'w:profile:picture'
-                 },
-                content: [{ 
-                      tag: 'picture', 
-                      attrs: { 
-                         type: 'image', 
-                         query: 'url' 
-                      }
-                 }]
-            })
-
-            const child = WABinary_1.getBinaryNodeChild(result, 'picture')
-
-            return child?.attrs?.url || null
-          }
-    }
-
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
         const deviceResults = []
@@ -235,10 +235,9 @@ const makeMessagesSocket = (config) => {
         
         const toFetch = []
         
-        jids = deduplicateLidPnJids(Array.from(new Set(jids)))
         const jidsWithUser = jids
             .map(jid => {
-            const decoded = WABinary_1.jidDecode(jid)
+            const decoded = jidDecode(jid)
             const user = decoded?.user
             const device = decoded?.device
             const isExplicitDevice = typeof device === 'number' && device >= 0
@@ -247,20 +246,22 @@ const makeMessagesSocket = (config) => {
                 deviceResults.push({
                     user,
                     device,
-                    wireJid: jid // again this makes no sense
-                });
+                    jid
+                })
+                
                 return null
             }
             
-            jid = WABinary_1.jidNormalizedUser(jid)
+            jid = jidNormalizedUser(jid)
+            
             return { jid, user }
-        }) 
-        .filter(jid => jid !== null)
-        
+        }).filter(jid => jid !== null)
+            
         let mgetDevices
         
         if (useCache && userDevicesCache.mget) {
             const usersToFetch = jidsWithUser.map(j => j?.user).filter(Boolean)
+            
             mgetDevices = await userDevicesCache.mget(usersToFetch)
         }
         
@@ -270,19 +271,21 @@ const makeMessagesSocket = (config) => {
                     (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)))
                     
                 if (devices) {
-                    const isLidJid = WABinary_1.isLidUser(jid) 
-                    const devicesWithWire = devices.map(d => ({
+                    const devicesWithJid = devices.map(d => ({
                         ...d,
-                        wireJid: isLidJid ? WABinary_1.jidEncode(d.user, 'lid', d.device) : WABinary_1.jidEncode(d.user, 's.whatsapp.net', d.device)
+                        jid: jidEncode(d.user, d.server, d.device)
                     }))
                     
-                    deviceResults.push(...devicesWithWire)
+                    deviceResults.push(...devicesWithJid)
+                    
                     logger.trace({ user }, 'using cache for devices')
                 }
+                
                 else {
                     toFetch.push(jid)
                 }
             }
+            
             else {
                 toFetch.push(jid)
             }
@@ -293,23 +296,49 @@ const makeMessagesSocket = (config) => {
         }
         
         const requestedLidUsers = new Set()
+        
         for (const jid of toFetch) {
-            if (WABinary_1.isLidUser(jid)) {
-                const user = WABinary_1.jidDecode(jid)?.user
+            if (isLidUser(jid) || isHostedLidUser(jid)) {
+                const user = jidDecode(jid)?.user
+                
                 if (user)
                     requestedLidUsers.add(user)
             }
         }
         
-        const query = new WAUSync_1.USyncQuery().withContext('message').withDeviceProtocol()
+        const query = new USyncQuery().withContext('message').withDeviceProtocol().withLIDProtocol()
+        
         for (const jid of toFetch) {
-            query.withUser(new WAUSync_1.USyncUser().withId(jid))
+            query.withUser(new USyncUser().withId(jid)) // todo: investigate - the idea here is that <user> should have an inline lid field with the lid being the pn equivalent
         }
         
         const result = await executeUSyncQuery(query)
         
         if (result) {
-            const extracted = Utils_1.extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
+            // TODO: LID MAP this stuff (lid protocol will now return lid with devices)
+            const lidResults = result.list.filter(a => !!a.lid)
+            
+            if (lidResults.length > 0) {
+                logger.trace('Storing LID maps from device call')
+                
+                await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id })))
+                
+                // Force-refresh sessions for newly mapped LIDs to align identity addressing
+                try {
+                    const lids = lidResults.map(a => a.lid)
+                    
+                    if (lids.length) {
+                        await assertSessions(lids, true)
+                    }
+                }
+                
+                catch (e) {
+                    logger.warn({ e, count: lidResults.length }, 'failed to assert sessions for newly mapped LIDs')
+                }
+            }
+            
+            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, authState.creds.me.lid, ignoreZeroDevices)
+            
             const deviceMap = {}
             
             for (const item of extracted) {
@@ -319,22 +348,21 @@ const makeMessagesSocket = (config) => {
             
             // Process each user's devices as a group for bulk LID migration
             for (const [user, userDevices] of Object.entries(deviceMap)) {
-                const isLidUser = requestedLidUsers.has(user)
-                
+                const isLidUser = requestedLidUsers.has(user);
                 // Process all devices for this user
                 for (const item of userDevices) {
-                    const finalWireJid = isLidUser
-                        ? WABinary_1.jidEncode(user, 'lid', item.device)
-                        : WABinary_1.jidEncode(item.user, 's.whatsapp.net', item.device)
+                    const finalJid = isLidUser
+                        ? jidEncode(user, item.server, item.device)
+                        : jidEncode(item.user, item.server, item.device)
                     deviceResults.push({
                         ...item,
-                        wireJid: finalWireJid
-                    });
+                        jid: finalJid
+                    })
                     
                     logger.debug({
                         user: item.user,
                         device: item.device,
-                        finalWireJid,
+                        finalJid,
                         usedLid: isLidUser
                     }, 'Processed device with LID priority')
                 }
@@ -352,331 +380,204 @@ const makeMessagesSocket = (config) => {
                 }
             }
             
-        }
-        return deviceResults
-    }
-
-    const assertSessions = async (jids, force) => {
-        let didFetchNewSession = false
-        const jidsRequiringFetch = []
-        
-        // Apply same deduplication as in getUSyncDevices
-        jids = deduplicateLidPnJids(jids)
-        
-        if (force) {
-            // Check which sessions are missing (with LID migration check)
-            const addrs = jids.map(jid => signalRepository.jidToSignalProtocolAddress(jid))
-            const sessions = await authState.keys.get('session', addrs)
+            const userDeviceUpdates = {}
             
-            const checkJidSession = (jid) => {
-                const signalId = signalRepository.jidToSignalProtocolAddress(jid)
-                const hasSession = !!sessions[signalId]
-                
-                // Add to fetch list if no session exists
-                // Session type selection (LID vs PN) is handled in encryptMessage
-                if (!hasSession) {
-                    if (jid.includes('@lid')) {
-                        logger.debug({ jid }, 'No LID session found, will create new LID session')
-                    }
-                    jidsRequiringFetch.push(jid)
+            for (const [userId, devices] of Object.entries(deviceMap)) {
+                if (devices && devices.length > 0) {
+                    userDeviceUpdates[userId] = devices.map(d => d.device?.toString() || '0')
                 }
             }
             
-            // Process all JIDs
-            for (const jid of jids) {
-                checkJidSession(jid)
+            if (Object.keys(userDeviceUpdates).length > 0) {
+                try {
+                    await authState.keys.set({ 'device-list': userDeviceUpdates })
+                    
+                    logger.debug({ userCount: Object.keys(userDeviceUpdates).length }, 'stored user device lists for bulk migration')
+                }
+                
+                catch (error) {
+                    logger.warn({ error }, 'failed to store user device lists')
+                }
             }
         }
-        else {
-            const addrs = jids.map(jid => signalRepository.jidToSignalProtocolAddress(jid))
-            const sessions = await authState.keys.get('session', addrs)
-            
-            // Group JIDs by user for bulk migration
-            const userGroups = new Map()
-            for (const jid of jids) {
-                const user = WABinary_1.jidNormalizedUser(jid)
-                if (!userGroups.has(user)) {
-                    userGroups.set(user, [])
+        
+        return deviceResults
+    }
+    
+    const updateMemberLabel = (jid, memberLabel) => {
+        if (!isJidGroup(jid)) {
+            throw new Error('Jid must a group!')
+        }
+        
+        const protocolMessage = {
+            protocolMessage: {
+                type: proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE,
+                memberLabel: {
+                  label: memberLabel?.slice(0, 30),
+                  labelTimestamp: unixTimestampSeconds()
                 }
-                userGroups.get(user).push(jid)
             }
-            
-            // Helper to check LID mapping for a user
-            const checkUserLidMapping = async (user, userJids) => {
-                if (!userJids.some(jid => WABinary_1.isJidUser(jid))) {
-                    return { shouldMigrate: false, lidForPN: undefined }
-                }
-                
-                try {
-                	// Convert user to proper PN JID format for getLIDForPN
-                    const pnJid = `${user}@s.whatsapp.net`
-                    const mapping = await signalRepository.lidMapping.getLIDForPN(pnJid)
-                    
-                    if (mapping?.includes('@lid')) {
-                        logger.debug({ user, lidForPN: mapping, deviceCount: userJids.length }, 'User has LID mapping - preparing bulk migration')
-                        return { shouldMigrate: true, lidForPN: mapping }
+        }
+        
+        return relayMessage(jid, protocolMessage, {
+            additionalNodes: [
+                {
+                    tag: 'meta',
+                    attrs: {
+                      tag_reason: 'user_update', 
+                      appdata: 'member_tag' 
                     }
                 }
-                catch (error) {
-                    logger.debug({ user, error }, 'Failed to check LID mapping for user')
+            ]
+        })
+    }
+    
+    const assertSessions = async (jids, force) => {
+        let didFetchNewSession = false
+        
+        const uniqueJids = [...new Set(jids)] // Deduplicate JIDs
+        const jidsRequiringFetch = []
+        
+        logger.debug({ jids }, 'assertSessions call with jids')
+        
+        // Check peerSessionsCache and validate sessions using libsignal loadSession
+        for (const jid of uniqueJids) {
+            const signalId = signalRepository.jidToSignalProtocolAddress(jid)
+            const cachedSession = peerSessionsCache.get(signalId)
+            
+            if (cachedSession !== undefined) {
+                if (cachedSession && !force) {
+                    continue // Session exists in cache
                 }
-                
-                return { shouldMigrate: false, lidForPN: undefined }
             }
             
-            // Process each user group for potential bulk LID migration
-            for (const [user, userJids] of userGroups) {
-                const mappingResult = await checkUserLidMapping(user, userJids)
-                const shouldMigrateUser = mappingResult.shouldMigrate
-                const lidForPN = mappingResult.lidForPN
+            else {
+                const sessionValidation = await signalRepository.validateSession(jid)
+                const hasSession = sessionValidation.exists
                 
-                // Migrate all devices for this user if LID mapping exists
-                if (shouldMigrateUser && lidForPN) {
-                	// Bulk migrate all user devices in single transaction
-                    const migrationResult = await signalRepository.migrateSession(userJids, lidForPN)
-                    
-                    if (migrationResult.migrated > 0) {
-                        logger.info({
-                            user,
-                            lidMapping: lidForPN,
-                            migrated: migrationResult.migrated,
-                            skipped: migrationResult.skipped,
-                            total: migrationResult.total
-                        }, 'Completed bulk migration for user devices');
-                    }
-                    else {
-                        logger.debug({
-                            user,
-                            lidMapping: lidForPN,
-                            skipped: migrationResult.skipped,
-                            total: migrationResult.total
-                        }, 'All user device sessions already migrated');
-                    }
-                }
+                peerSessionsCache.set(signalId, hasSession)
                 
-                // Direct bulk session check with LID single source of truth
-                const addMissingSessionsToFetchList = (jid) => {
-                    const signalId = signalRepository.jidToSignalProtocolAddress(jid)
-                    
-                    if (sessions[signalId]) return
-                    
-                    // Determine correct JID to fetch (LID if mapping exists, otherwise original)
-                    if (jid.includes('@s.whatsapp.net') && shouldMigrateUser && lidForPN) {
-                        const decoded = WABinary_1.jidDecode(jid)
-                        const lidDeviceJid = decoded.device !== undefined ? `${WABinary_1.jidDecode(lidForPN).user}:${decoded.device}@lid` : lidForPN
-                        
-                        jidsRequiringFetch.push(lidDeviceJid)
-                        logger.debug({ pnJid: jid, lidJid: lidDeviceJid }, 'Adding LID JID to fetch list (conversion)')
-                    }
-                    
-                    else {
-                        jidsRequiringFetch.push(jid)
-                        logger.debug({ jid }, 'Adding JID to fetch list')
-                    }
+                if (hasSession && !force) {
+                    continue
                 }
-                
-                userJids.forEach(addMissingSessionsToFetchList)
             }
+            
+            jidsRequiringFetch.push(jid)
         }
         
         if (jidsRequiringFetch.length) {
-            logger.debug({ jidsRequiringFetch }, 'fetching sessions')
-            
-            // DEBUG: Check if there are PN versions of LID users being fetched
-            const lidUsersBeingFetched = new Set()
-            const pnUsersBeingFetched = new Set()
-            
-            for (const jid of jidsRequiringFetch) {
-                const user = WABinary_1.jidDecode(jid)?.user
-                
-                if (user) {
-                    if (WABinary_1.isLidUser(jid)) {
-                        lidUsersBeingFetched.add(user)
-                    }
-                    else if (WABinary_1.isJidUser(jid)) {
-                        pnUsersBeingFetched.add(user)
-                    }
-                }
-            }
+            // LID if mapped, otherwise original
+            const wireJids = [
+                ...jidsRequiringFetch.filter(jid => !!isLidUser(jid) || !!isHostedLidUser(jid)),
+                ...((await signalRepository.lidMapping.getLIDsForPNs(jidsRequiringFetch.filter(jid => !!isPnUser(jid) || !!isHostedPnUser(jid)))) || []).map(a => a.lid)
+            ]
             
-            // Find overlaps
-            const overlapping = Array.from(pnUsersBeingFetched).filter(user => lidUsersBeingFetched.has(user))
-            if (overlapping.length > 0) {
-                logger.warn({
-                    overlapping,
-                    lidUsersBeingFetched: Array.from(lidUsersBeingFetched),
-                    pnUsersBeingFetched: Array.from(pnUsersBeingFetched)
-                }, 'Fetching both LID and PN sessions for same users')
-            }
+            logger.debug({ jidsRequiringFetch, wireJids }, 'fetching sessions')
             
             const result = await query({
                 tag: 'iq',
                 attrs: {
                     xmlns: 'encrypt',
                     type: 'get',
-                    to: WABinary_1.S_WHATSAPP_NET
+                    to: S_WHATSAPP_NET
                 },
                 content: [
                     {
                         tag: 'key',
                         attrs: {},
-                        content: jidsRequiringFetch.map(jid => ({
-                            tag: 'user',
-                            attrs: { jid }
-                        }))
+                        content: wireJids.map(jid => {
+                            const attrs = { jid }
+                            
+                            if (force) attrs.reason = 'identity'
+                            
+                            return { tag: 'user', attrs }
+                        })
                     }
                 ]
             })
             
-            await Utils_1.parseAndInjectE2ESessions(result, signalRepository)
+            await parseAndInjectE2ESessions(result, signalRepository)
+            
             didFetchNewSession = true
+            
+            // Cache fetched sessions using wire JIDs
+            for (const wireJid of wireJids) {
+                const signalId = signalRepository.jidToSignalProtocolAddress(wireJid)
+                peerSessionsCache.set(signalId, true)
+            }
         }
+        
         return didFetchNewSession
     }
-
-    /** Send Peer Operation */
+    
     const sendPeerDataOperationMessage = async (pdoMessage) => {
         //TODO: for later, abstract the logic to send a Peer Message instead of just PDO - useful for App State Key Resync with phone
         if (!authState.creds.me?.id) {
-            throw new boom_1.Boom('Not authenticated')
+            throw new Boom('Not authenticated')
         }
-
+        
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
-                type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
+                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
             }
         }
-
-        const meJid = WABinary_1.jidNormalizedUser(authState.creds.me.id)
-
+        
+        const meJid = jidNormalizedUser(authState.creds.me.id)
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
                 category: 'peer',
-                // eslint-disable-next-line camelcase
-                push_priority: 'high_force',
+                push_priority: 'high_force'
             },
+            additionalNodes: [
+                {
+                    tag: 'meta',
+                    attrs: { appdata: 'default' }
+                }
+            ]
         })
-
+        
         return msgId
     }
 
-    const createParticipantNodes = async (jids, message, extraAttrs, dsmMessage) => {
-        let patched = await patchMessageBeforeSending(message, jids)
-        
-        if (!Array.isArray(patched)) {
-            patched = jids ? jids.map(jid => ({ recipientJid: jid, ...patched })) : [patched]
+    const createParticipantNodes = async (recipientJids, message, extraAttrs, dsmMessage) => {
+        if (!recipientJids.length) {
+            return { nodes: [], shouldIncludeDeviceIdentity: false }
         }
         
+        const patched = await patchMessageBeforeSending(message, recipientJids)
+        const patchedMessages = Array.isArray(patched)
+            ? patched
+            : recipientJids.map(jid => ({ recipientJid: jid, message: patched }))
+            
         let shouldIncludeDeviceIdentity = false
         
         const meId = authState.creds.me.id
         const meLid = authState.creds.me?.lid
-        const meLidUser = meLid ? WABinary_1.jidDecode(meLid)?.user : null
-        const devicesByUser = new Map()
-        
-        for (const patchedMessageWithJid of patched) {
-            const { recipientJid: wireJid, ...patchedMessage } = patchedMessageWithJid
-            if (!wireJid)
-                continue
+        const meLidUser = meLid ? jidDecode(meLid)?.user : null
+        const encryptionPromises = patchedMessages.map(async ({ recipientJid: jid, message: patchedMessage }) => {
+            if (!jid) return null
                 
-            // Extract user from JID for grouping
-            const decoded = WABinary_1.jidDecode(wireJid)
-            const user = decoded?.user
+            let msgToEncrypt = patchedMessage
             
-            if (!user)
-                continue
+            if (dsmMessage) {
+                const { user: targetUser } = jidDecode(jid)
+                const { user: ownPnUser } = jidDecode(meId)
+                const ownLidUser = meLidUser
+                const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser)
+                const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
                 
-            if (!devicesByUser.has(user)) {
-                devicesByUser.set(user, []);
-            }
-            
-            devicesByUser.get(user).push({ recipientJid: wireJid, patchedMessage })
-        }
-        
-        // Process each user's devices sequentially, but different users in parallel
-        const userEncryptionPromises = Array.from(devicesByUser.entries()).map(([user, userDevices]) => encryptionMutex.mutex(user, async () => {
-            logger.debug({ user, deviceCount: userDevices.length }, 'Acquiring encryption lock for user devices');
-            const userNodes = []
-            
-            // Helper to get encryption JID with LID migration
-            const getEncryptionJid = async (wireJid) => {
-                if (!WABinary_1.isJidUser(wireJid))
-                    return wireJid
-                    
-                try {
-                    const lidForPN = await signalRepository.lidMapping.getLIDForPN(wireJid)
-                    
-                    if (!lidForPN?.includes('@lid'))
-                        return wireJid
-                        
-                    // Preserve device ID from original wire JID
-                    const wireDecoded = WABinary_1.jidDecode(wireJid)
-                    const deviceId = wireDecoded?.device || 0
-                    const lidDecoded = WABinary_1.jidDecode(lidForPN)
-                    const lidWithDevice = WABinary_1.jidEncode(lidDecoded?.user, 'lid', deviceId)
-                    
-                    // Migrate session to LID for unified encryption layer
-                    try {
-                        const migrationResult = await signalRepository.migrateSession([wireJid], lidWithDevice)
-                        const recipientUser = WABinary_1.jidNormalizedUser(wireJid)
-                        const ownPnUser = WABinary_1.jidNormalizedUser(meId)
-                        const isOwnDevice = recipientUser === ownPnUser
-                        logger.info({ wireJid, lidWithDevice, isOwnDevice }, 'Migrated to LID encryption')
-                        
-                        // Delete PN session after successful migration
-                        try {
-                            if (migrationResult.migrated) {
-                                await signalRepository.deleteSession([wireJid])
-                                logger.debug({ deletedPNSession: wireJid }, 'Deleted PN session')
-                            }
-                        }
-                        catch (deleteError) {
-                            logger.warn({ wireJid, error: deleteError }, 'Failed to delete PN session')
-                        }
-                        return lidWithDevice
-                    }
-                    catch (migrationError) {
-                        logger.warn({ wireJid, error: migrationError }, 'Failed to migrate session')
-                        return wireJid
-                    }
-                }
-                catch (error) {
-                    logger.debug({ wireJid, error }, 'Failed to check LID mapping')
-                    return wireJid
+                if (isOwnUser && !isExactSenderDevice) {
+                    msgToEncrypt = dsmMessage
+                    logger.debug({ jid, targetUser }, 'Using DSM for own device')
                 }
             }
             
-            // Encrypt to this user's devices sequentially to prevent session corruption
-            for (const { recipientJid: wireJid, patchedMessage } of userDevices) {
-                // DSM logic: Use DSM for own other devices (following whatsmeow implementation)
-                let messageToEncrypt = patchedMessage
-                
-                if (dsmMessage) {
-                    const { user: targetUser } = WABinary_1.jidDecode(wireJid)
-                    const { user: ownPnUser } = WABinary_1.jidDecode(meId)
-                    const ownLidUser = meLidUser
-                    
-                    // Check if this is our device (same user, different device)
-                    const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser)
-                    
-                    // Exclude exact sender device (whatsmeow: if jid == ownJID || jid == ownLID { continue })
-                    const isExactSenderDevice = wireJid === meId || (authState.creds.me?.lid && wireJid === authState.creds.me.lid)
-                    
-                    if (isOwnUser && !isExactSenderDevice) {
-                        messageToEncrypt = dsmMessage
-                        logger.debug({ wireJid, targetUser }, 'Using DSM for own device')
-                    }
-                }
-                
-                const bytes = Utils_1.encodeWAMessage(messageToEncrypt)
-                
-                // Get encryption JID with LID migration
-                const encryptionJid = await getEncryptionJid(wireJid)
-                
-                // ENCRYPT: Use the determined encryption identity (prefers migrated LID)
+            const bytes = encodeWAMessage(msgToEncrypt)
+            const mutexKey = jid
+            const node = await encryptionMutex.mutex(mutexKey, async () => {
                 const { type, ciphertext } = await signalRepository.encryptMessage({
-                    jid: encryptionJid, // Unified encryption layer (LID when available)
+                    jid,
                     data: bytes
                 })
                 
@@ -684,9 +585,9 @@ const makeMessagesSocket = (config) => {
                     shouldIncludeDeviceIdentity = true
                 }
                 
-                const node = {
+                return {
                     tag: 'to',
-                    attrs: { jid: wireJid }, // Always use original wire identity in envelope
+                    attrs: { jid },
                     content: [
                         {
                             tag: 'enc',
@@ -698,53 +599,71 @@ const makeMessagesSocket = (config) => {
                             content: ciphertext
                         }
                     ]
-                }
-                userNodes.push(node)
-            }
-            logger.debug({ user, nodesCreated: userNodes.length }, 'Releasing encryption lock for user devices');
-            return userNodes
-        }))
+                };
+            })
+            
+            return node
+        })
+        
+        const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null)
         
-        // Wait for all users to complete (users are processed in parallel)
-        const userNodesArrays = await Promise.all(userEncryptionPromises)
-        const nodes = userNodesArrays.flat()
         return { nodes, shouldIncludeDeviceIdentity }
     }
+    
+    /** Fetch image for groups, user, and newsletter **/
+    const profilePictureUrl = async (jid) => {
+        if (isJidNewsletter(jid)) {
+            const metadata = await suki.newsletterMetadata('JID', jid) 
+
+            return getUrlFromDirectPath(metadata.thread_metadata.picture?.direct_path || '') 
+
+         } 
+
+         else {               
+              const result = await query({
+                  tag: 'iq',
+                  attrs: {
+                      target: jidNormalizedUser(jid),
+                      to: S_WHATSAPP_NET,
+                      type: 'get',
+                      xmlns: 'w:profile:picture'
+                   },
+                   content: [{ 
+                        tag: 'picture', 
+                        attrs: { 
+                           type: 'image', 
+                           query: 'url' 
+                        }
+                   }]
+              })
+
+              const child = getBinaryNodeChild(result, 'picture')
+
+              return child?.attrs?.url || null
+          }
+    }
 
     const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, additionalNodes, AI = false }) => {
         const meId = authState.creds.me.id
         const meLid = authState.creds.me?.lid
-
+        const isRetryResend = Boolean(participant?.jid)
+        
+        let shouldIncludeDeviceIdentity = isRetryResend
         let didPushAdditional = false
-        let shouldIncludeDeviceIdentity = false
-
-        const { user, server } = WABinary_1.jidDecode(jid)
-
+        
         const statusJid = 'status@broadcast'
+        const { user, server } = jidDecode(jid)
         const isGroup = server === 'g.us'
-        const isPrivate = server === 's.whatsapp.net'
-        const isNewsletter = server == 'newsletter'
         const isStatus = jid === statusJid
         const isLid = server === 'lid'
-        
-        // Keep user's original JID choice for envelope addressing
+        const isNewsletter = server === 'newsletter'
+        const isGroupOrStatus = isGroup || isStatus
         const finalJid = jid
         
-        // ADDRESSING CONSISTENCY: Match own identity to conversation context
-        let ownId = meId
-        
-        if (isLid && meLid) {
-            ownId = meLid
-            logger.debug({ to: jid, ownId }, 'Using LID identity for @lid conversation')
-        }
-        else {
-            logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
-        }
-
-        msgId = msgId || Utils_1.generateMessageID(authState.creds.me.id)
-        useUserDevicesCache = useUserDevicesCache !== false
+        msgId = msgId || generateMessageID(meId)
+        useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
-
+        
         const participants = []
         const destinationJid = !isStatus ? finalJid : statusJid
         const binaryNodeContent = []
@@ -755,33 +674,30 @@ const makeMessagesSocket = (config) => {
                 destinationJid,
                 message
             }, 
-            messageContextInfo: message.messageContextInfo || {}
+            messageContextInfo: message.messageContextInfo
         }
 
         const extraAttrs = {}
 
         const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/
 
-        const messages = Utils_1.normalizeMessageContent(message)  
+        const messages = normalizeMessageContent(message)  
 
         const buttonType = getButtonType(messages)
         const pollMessage = messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3
 
 
         if (participant) {
-            // when the retry request is not for a group
-            // only send to the specific device that asked for a retry
-            // otherwise the message is sent out to every device that should be a recipient
             if (!isGroup && !isStatus) {
-                additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' }
+                additionalAttributes = { ...additionalAttributes, device_fanout: 'false' }
             }
-
-            const { user, device } = WABinary_1.jidDecode(participant.jid)
-
+            
+            const { user, device } = jidDecode(participant.jid)
+            
             devices.push({
                 user,
                 device,
-                wireJid: participant.jid // Use the participant JID as wire JID
+                jid: participant.jid
             })
         }
 
@@ -791,6 +707,34 @@ const makeMessagesSocket = (config) => {
             if (mediaType) {
                 extraAttrs['mediatype'] = mediaType
             }
+            
+            if (isNewsletter) {
+                const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message
+                const bytes = encodeNewsletterMessage(patched)
+                
+                binaryNodeContent.push({
+                    tag: 'plaintext',
+                    attrs: {},
+                    content: bytes
+                })
+                
+                const stanza = {
+                    tag: 'message',
+                    attrs: {
+                        to: jid,
+                        id: msgId,
+                        type: getTypeMessage(message),
+                        ...(additionalAttributes || {})
+                    },
+                    content: binaryNodeContent
+                }
+                
+                logger.debug({ msgId }, `sending newsletter message to ${jid}`)
+                
+                await sendNode(stanza)
+                
+                return
+            }
 
             if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) {
                 extraAttrs['decrypt-fail'] = 'hide'
@@ -800,244 +744,273 @@ const makeMessagesSocket = (config) => {
                 extraAttrs['native_flow_name'] = messages.interactiveResponseMessage.nativeFlowResponseMessage?.name || 'menu_options'
             }
 
-            if (isGroup || isStatus) {
+            if (isGroupOrStatus && !isRetryResend) {
                 const [groupData, senderKeyMap] = await Promise.all([
                     (async () => {
-                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
-
+                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined // todo: should we rely on the cache specially if the cache is outdated and the metadata has new fields?
+                        
                         if (groupData && Array.isArray(groupData?.participants)) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
                         }
-
+                        
                         else if (!isStatus) {
-                            groupData = await groupMetadata(jid)
+                            groupData = await groupMetadata(jid) // TODO: start storing group participant list + addr mode in Signal & stop relying on this
                         }
-
+                        
                         return groupData
                     })(),
-
                     (async () => {
                         if (!participant && !isStatus) {
-                            const result = await authState.keys.get('sender-key-memory', [jid])
+                            // what if sender memory is less accurate than the cached metadata
+                            // on participant change in group, we should do sender memory manipulation
+                            const result = await authState.keys.get('sender-key-memory', [jid]) // TODO: check out what if the sender key memory doesn't include the LID stuff now?
+                            
                             return result[jid] || {}
                         }
-
+                        
                         return {}
-
                     })()
                 ])
-
-                if (!participant) {
-                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
-
-                    if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList)
+                
+                const participantsList = groupData ? groupData.participants.map(p => p.id) : []
+                
+                if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
+                    additionalAttributes = {
+                        ...additionalAttributes,
+                        expiration: groupData.ephemeralDuration.toString()
                     }
-
-                    if (!isStatus) {
-                        const groupAddressingMode = groupData?.addressingMode || (isLid ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN)
-                        additionalAttributes = {
-                            ...additionalAttributes,
-                            addressing_mode: groupAddressingMode
-                        }
+                }
+                
+                if (isStatus && statusJidList) {
+                    participantsList.push(...statusJidList)
+                }
+                
+                const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
+                
+                devices.push(...additionalDevices)
+                
+                if (isGroup) {
+                    additionalAttributes = {
+                        ...additionalAttributes,
+                        addressing_mode: groupData?.addressingMode || 'lid'
                     }
-
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
-                    devices.push(...additionalDevices)
                 }
-
-                const patched = await patchMessageBeforeSending(message, devices.map(d => WABinary_1.jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)))                
-                const bytes = Utils_1.encodeWAMessage(patched)
                 
-                // This should match the group's addressing mode and conversation context
-                const groupAddressingMode = groupData?.addressingMode || (isLid ? 'lid' : 'pn')
+                const patched = await patchMessageBeforeSending(message)
+                
+                if (Array.isArray(patched)) {
+                    throw new Boom('Per-jid patching is not supported in groups')
+                }
+                
+                const bytes = encodeWAMessage(patched)
+                const groupAddressingMode = additionalAttributes?.['addressing_mode'] || groupData?.addressingMode || 'lid'
                 const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId
-
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
                     meId: groupSenderIdentity
                 })
-
-                const senderKeyJids = []
-
-                // ensure a connection is established with every device
+                
+                const senderKeyRecipients = []
+                
                 for (const device of devices) {
-                    // This preserves the LID migration results from getUSyncDevices
-                    const deviceJid = device.wireJid
+                    const deviceJid = device.jid
                     const hasKey = !!senderKeyMap[deviceJid]
-                    if (!hasKey || !!participant) {
-                        senderKeyJids.push(deviceJid)
-                        // store that this person has had the sender keys sent to them
+                    
+                    if ((!hasKey || !!participant) &&
+                        !isHostedLidUser(deviceJid) &&
+                        !isHostedPnUser(deviceJid) &&
+                        device.device !== 99) {
+                        //todo: revamp all this logic
+                        // the goal is to follow with what I said above for each group, and instead of a true false map of ids, we can set an array full of those the app has already sent pkmsgs
+                        senderKeyRecipients.push(deviceJid)
                         senderKeyMap[deviceJid] = true
                     }
                 }
-
-                // if there are some participants with whom the session has not been established
-                // if there are, we re-send the senderkey
-                if (senderKeyJids.length) {
-                    logger.debug({ senderKeyJids }, 'sending new sender key')
+                
+                if (senderKeyRecipients.length) {
+                    logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key')
+                    
                     const senderKeyMsg = {
                         senderKeyDistributionMessage: {
                             axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
                             groupId: destinationJid
                         }
                     }
-
-                    await assertSessions(senderKeyJids, false)
-
-                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, extraAttrs)
-
-                    shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity
-
+                    
+                    const senderKeySessionTargets = senderKeyRecipients
+                    
+                    await assertSessions(senderKeySessionTargets)
+                    
+                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs)
+                    
+                    shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes)
                 }
-
+                
                 binaryNodeContent.push({
                     tag: 'enc',
-                    attrs: { v: '2', type: 'skmsg', ...extraAttrs }, 
+                    attrs: { v: '2', type: 'skmsg', ...extraAttrs },
                     content: ciphertext
                 })
-
+                
                 await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } })
             }
 
-            else if (isNewsletter) {
-                // Message edit
-                if (message.protocolMessage?.editedMessage) {
-                    msgId = message.protocolMessage.key?.id
-                    message = message.protocolMessage.editedMessage
+            else {
+                // ADDRESSING CONSISTENCY: Match own identity to conversation context
+                // TODO: investigate if this is true
+                let ownId = meId
+                
+                if (isLid && meLid) {
+                    ownId = meLid;
+                    logger.debug({ to: jid, ownId }, 'Using LID identity for @lid conversation')
                 }
-
-                // Message delete
-                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = message.protocolMessage.key?.id
-                    message = {}
+                
+                else {
+                    logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
                 }
-
-                const patched = await patchMessageBeforeSending(message, [])
-                const bytes = Utils_1.encodeNewsletterMessage(patched)
-
-                binaryNodeContent.push({
-                    tag: 'plaintext',
-                    attrs: extraAttrs, 
-                    content: bytes
-                })
-            }
-
-            else {
-                const { user: ownUser } = WABinary_1.jidDecode(ownId)
-
-                if (!participant) {
+                
+                const { user: ownUser } = jidDecode(ownId)
+                
+                if (!isRetryResend) {
                     const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                    
                     devices.push({
                         user,
                         device: 0,
-                        wireJid: WABinary_1.jidEncode(user, targetUserServer, 0)
+                        jid: jidEncode(user, targetUserServer, 0) // rajeh, todo: this entire logic is convoluted and weird.
                     })
                     
-                    // Own user matches conversation addressing mode
                     if (user !== ownUser) {
-                        const ownUserServer = isLid ? 'lid' : 's.whatsapp.net';
-                        const ownUserForAddressing = isLid && meLid ? WABinary_1.jidDecode(meLid).user : WABinary_1.jidDecode(meId).user
+                        const ownUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                        const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user
+                        
                         devices.push({
                             user: ownUserForAddressing,
                             device: 0,
-                            wireJid: WABinary_1.jidEncode(ownUserForAddressing, ownUserServer, 0)
+                            jid: jidEncode(ownUserForAddressing, ownUserServer, 0)
                         })
                     }
-
+                    
                     if (additionalAttributes?.['category'] !== 'peer') {
                         // Clear placeholders and enumerate actual devices
                         devices.length = 0
                         
                         // Use conversation-appropriate sender identity
                         const senderIdentity = isLid && meLid
-                            ? WABinary_1.jidEncode(WABinary_1.jidDecode(meLid)?.user, 'lid', undefined)
-                            : WABinary_1.jidEncode(WABinary_1.jidDecode(meId)?.user, 's.whatsapp.net', undefined)
-                            
+                            ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
+                            : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined)
                         // Enumerate devices for sender and target with consistent addressing
-                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], false, false)
+                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false)
+                        
                         devices.push(...sessionDevices)
+                        
                         logger.debug({
                             deviceCount: devices.length,
-                            devices: devices.map(d => `${d.user}:${d.device}@${WABinary_1.jidDecode(d.wireJid)?.server}`)
+                            devices: devices.map(d => `${d.user}:${d.device}@${jidDecode(d.jid)?.server}`)
                         }, 'Device enumeration complete with unified addressing')
                     }
                 }
-
-                const allJids = []
-                const meJids = []
-                const otherJids = []
                 
-                const { user: mePnUser } = WABinary_1.jidDecode(meId)
-                const { user: meLidUser } = meLid ? WABinary_1.jidDecode(meLid) : { user: null }
-
-                for (const { user, wireJid } of devices) {
-                    const isExactSenderDevice = wireJid === meId || (meLid && wireJid === meLid)
+                const allRecipients = []
+                const meRecipients = []
+                const otherRecipients = []
+                
+                const { user: mePnUser } = jidDecode(meId)
+                const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null }
+                
+                for (const { user, jid } of devices) {
+                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
+                    
                     if (isExactSenderDevice) {
-                        logger.debug({ wireJid, meId, meLid }, 'Skipping exact sender device (whatsmeow pattern)')
+                        logger.debug({ jid, meId, meLid }, 'Skipping exact sender device (whatsmeow pattern)')
                         continue
                     }
                     
                     // Check if this is our device (could match either PN or LID user)
-                    const isMe = user === mePnUser || (meLidUser && user === meLidUser)
-                    const jid = wireJid
-
+                    const isMe = user === mePnUser || user === meLidUser
+                    
                     if (isMe) {
-                        meJids.push(jid)
+                        meRecipients.push(jid);
                     }
-
+                    
                     else {
-                        otherJids.push(jid)
+                        otherRecipients.push(jid)
                     }
-
-                    allJids.push(jid)
+                    
+                    allRecipients.push(jid)
                 }
-
-                await assertSessions([...otherJids, ...meJids], false)
-
+                
+                await assertSessions(allRecipients)
+                
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
                     // For own devices: use DSM if available (1:1 chats only)
-                    createParticipantNodes(meJids, meMsg || message, extraAttrs),
-                    createParticipantNodes(otherJids, message, extraAttrs, meMsg)
+                    createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
+                    createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
                 ])
-
+                
                 participants.push(...meNodes)
-
                 participants.push(...otherNodes)
                 
-                if (meJids.length > 0 || otherJids.length > 0) {
-                    extraAttrs['phash'] = Utils_1.generateParticipantHashV2([...meJids, ...otherJids])
+                if (meRecipients.length > 0 || otherRecipients.length > 0) {
+                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients])
                 }
-
+                
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
             }
-
+            
+            if (isRetryResend) {
+                const isParticipantLid = isLidUser(participant.jid)
+                const isMe = areJidsSameUser(participant.jid, isParticipantLid ? meLid : meId)
+                const encodedMessageToSend = isMe
+                    ? encodeWAMessage({
+                        deviceSentMessage: {
+                            destinationJid,
+                            message
+                        }
+                    })
+                    : encodeWAMessage(message)
+                const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
+                    data: encodedMessageToSend,
+                    jid: participant.jid
+                })
+                
+                binaryNodeContent.push({
+                    tag: 'enc',
+                    attrs: {
+                        v: '2',
+                        type,
+                        count: participant.count.toString()
+                    },
+                    content: encryptedContent
+                })
+            }
+            
             if (participants.length) {
                 if (additionalAttributes?.['category'] === 'peer') {
                     const peerNode = participants[0]?.content?.[0]
-
+                    
                     if (peerNode) {
                         binaryNodeContent.push(peerNode) // push only enc
                     }
                 }
-
+                
                 else {
                     binaryNodeContent.push({
                         tag: 'participants',
                         attrs: {},
                         content: participants
-                    })
+                    });
                 }
             }
-
+            
             const stanza = {
                 tag: 'message',
                 attrs: {
+                    id: msgId,
                     to: destinationJid,
-                    id: msgId, 
-                    type: getTypeMessage(message), 
+                    type: getTypeMessage(message),
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
@@ -1047,34 +1020,45 @@ const makeMessagesSocket = (config) => {
             // ensure the message is only sent to that person
             // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
             if (participant) {
-                if (WABinary_1.isJidGroup(destinationJid)) {
+                if (isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid
                     stanza.attrs.participant = participant.jid
                 }
-
-                else if (WABinary_1.areJidsSameUser(participant.jid, meId)) {
+                
+                else if (areJidsSameUser(participant.jid, meId)) {
                     stanza.attrs.to = participant.jid
                     stanza.attrs.recipient = destinationJid
                 }
-
+                
                 else {
                     stanza.attrs.to = participant.jid
                 }
             }
-
+            
             else {
                 stanza.attrs.to = destinationJid
             }
-
+            
             if (shouldIncludeDeviceIdentity) {
                 stanza.content.push({
                     tag: 'device-identity',
                     attrs: {},
-                    content: Utils_1.encodeSignedDeviceIdentity(authState.creds.account, true)
+                    content: encodeSignedDeviceIdentity(authState.creds.account, true)
                 })
-
+                
                 logger.debug({ jid }, 'adding device identity')
             }
+            
+            const contactTcTokenData = !isGroup && !isRetryResend && !isStatus ? await authState.keys.get('tctoken', [destinationJid]) : {}
+            const tcTokenBuffer = contactTcTokenData[destinationJid]?.token
+            
+            if (tcTokenBuffer) {
+                stanza.content.push({
+                    tag: 'tctoken',
+                    attrs: {},
+                    content: tcTokenBuffer
+                })
+            }
 
             if (isGroup && regexGroupOld.test(jid) && !message.reactionMessage) {
                 stanza.content.push({
@@ -1099,7 +1083,7 @@ const makeMessagesSocket = (config) => {
 
             if (!isNewsletter && buttonType) {
                 const buttonsNode = getButtonArgs(messages)
-                const filteredButtons = WABinary_1.getBinaryFilteredButtons(additionalNodes ? additionalNodes : [])
+                const filteredButtons = getBinaryFilteredButtons(additionalNodes ? additionalNodes : [])
 
                 if (filteredButtons) {
                    stanza.content.push(...additionalNodes)
@@ -1119,7 +1103,7 @@ const makeMessagesSocket = (config) => {
                     }
                 }
 
-                const filteredBizBot = WABinary_1.getBinaryFilteredBizBot(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = getBinaryFilteredBizBot(additionalNodes ? additionalNodes : []) 
 
                 if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
@@ -1149,7 +1133,7 @@ const makeMessagesSocket = (config) => {
     }
 
     const getTypeMessage = (msg) => {
-        const message = Utils_1.normalizeMessageContent(msg)  
+        const message = normalizeMessageContent(msg)  
         if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
             return 'poll'
         }       
@@ -1268,7 +1252,7 @@ const makeMessagesSocket = (config) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }, 
                 content: [{
                     tag: 'interactive',
@@ -1298,7 +1282,7 @@ const makeMessagesSocket = (config) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }, 
                 content: [{
                     tag: 'interactive', 
@@ -1327,7 +1311,7 @@ const makeMessagesSocket = (config) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }, 
                 content: [{
                     tag: 'list', 
@@ -1349,19 +1333,19 @@ const makeMessagesSocket = (config) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }
             }
         }
     }
 
     const getPrivacyTokens = async (jids) => {
-        const t = Utils_1.unixTimestampSeconds().toString()
+        const t = unixTimestampSeconds().toString()
 
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'privacy'
             },
@@ -1372,7 +1356,7 @@ const makeMessagesSocket = (config) => {
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: WABinary_1.jidNormalizedUser(jid),
+                            jid: jidNormalizedUser(jid),
                             t,
                             type: 'trusted_contact'
                         }
@@ -1385,7 +1369,7 @@ const makeMessagesSocket = (config) => {
     }    
     
     const getEphemeralGroup = (jid) => {
-    	if (!WABinary_1.isJidGroup(jid)) throw new TypeError("Jid should originate from a group!") 
+    	if (!isJidGroup(jid)) throw new TypeError("Jid should originate from a group!") 
     
         return groupQuery(jid, 'get', [{
         	tag: 'query',
@@ -1393,23 +1377,23 @@ const makeMessagesSocket = (config) => {
             	request: 'interactive'
             }
         }])
-        .then((groups) => WABinary_1.getBinaryNodeChild(groups, 'group'))
-        .then((metadata) => WABinary_1.getBinaryNodeChild(metadata, 'ephemeral')?.attrs?.expiration || 0) 
+        .then((groups) => getBinaryNodeChild(groups, 'group'))
+        .then((metadata) => getBinaryNodeChild(metadata, 'ephemeral')?.attrs?.expiration || 0) 
     }
 
-    const waUploadToServer = Utils_1.getWAUploadToServer(config, refreshMediaConn)
+    const waUploadToServer = getWAUploadToServer(config, refreshMediaConn)
 
-    const waitForMsgMediaUpdate = Utils_1.bindWaitForEvent(ev, 'messages.media-update')
+    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update')
     
     return {
         ...suki,
         getPrivacyTokens,
         assertSessions,
+        profilePictureUrl, 
         relayMessage,
         sendReceipt,
         sendReceipts,
         readMessages,
-        profilePictureUrl, 
         getUSyncDevices,
         refreshMediaConn,
         waUploadToServer,
@@ -1418,78 +1402,80 @@ const makeMessagesSocket = (config) => {
         messageRetryManager, 
         createParticipantNodes, 
         sendPeerDataOperationMessage, 
+        updateMemberLabel, 
         updateMediaMessage: async (message) => {
-            const content = Utils_1.assertMediaContent(message.message)
+            const content = assertMediaContent(message.message)
             const mediaKey = content.mediaKey
             const meId = authState.creds.me.id
-            const node = await Utils_1.encryptMediaRetryRequest(message.key, mediaKey, meId)
+            const node = await encryptMediaRetryRequest(message.key, mediaKey, meId)
+            
             let error = undefined
-
+            
             await Promise.all([
                 sendNode(node),
                 waitForMsgMediaUpdate(async (update) => {
                     const result = update.find(c => c.key.id === message.key.id)
+                    
                     if (result) {
                         if (result.error) {
                             error = result.error
                         }
-
+                        
                         else {
                             try {
-                                const media = await Utils_1.decryptMediaRetryData(result.media, mediaKey, result.key.id)
-
-                                if (media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
-                                    const resultStr = WAProto_1.proto.MediaRetryNotification.ResultType[media.result]
-
-                                    throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: Utils_1.getStatusCodeForMediaRetry(media.result) || 404 })
+                                const media = await decryptMediaRetryData(result.media, mediaKey, result.key.id)
+                                
+                                if (media.result !== proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                    const resultStr = proto.MediaRetryNotification.ResultType[media.result]
+                                    
+                                    throw new Boom(`Media re-upload failed by device (${resultStr})`, {
+                                        data: media,
+                                        statusCode: getStatusCodeForMediaRetry(media.result) || 404
+                                    })
                                 }
-
+                                
                                 content.directPath = media.directPath
-
-                                content.url = Utils_1.getUrlFromDirectPath(content.directPath)
-
+                                content.url = getUrlFromDirectPath(content.directPath)
                                 logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful')
                             }
-
+                            
                             catch (err) {
                                 error = err
                             }
                         }
-
+                        
                         return true
                     }
                 })
             ])
-
+            
             if (error) {
                 throw error
             }
-
-            ev.emit('messages.update', [
-                { key: message.key, update: { message: message.message } }
-            ])
-
+            
+            ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }])
+            
             return message
         },
         sendStatusMentions: async (content, jids = []) => {
-          const userJid = WABinary_1.jidNormalizedUser(authState.creds.me.id)
+          const userJid = jidNormalizedUser(authState.creds.me.id)
           let allUsers = new Set()
           allUsers.add(userJid)
 
           for (const id of jids) {
-            const isGroup = WABinary_1.isJidGroup(id) 
-            const isPrivate = WABinary_1.isJidUser(id) 
+            const isGroup = isJidGroup(id) 
+            const isPrivate = isPnUser(id) 
 
             if (isGroup) {
               try {
                 const metadata = await cachedGroupMetadata(id) || await groupMetadata(id)
-                const participants = metadata.participants.map(p => WABinary_1.jidNormalizedUser(p.id))
+                const participants = metadata.participants.map(p => jidNormalizedUser(p.id))
                 participants.forEach(jid => allUsers.add(jid))
               } catch (error) {
                 logger.error(`Error getting metadata for group ${id}: ${error}`)
               }
             } else if (isPrivate) {
-              allUsers.add(WABinary_1.jidNormalizedUser(id))
+              allUsers.add(jidNormalizedUser(id))
             }
           }
 
@@ -1529,12 +1515,15 @@ const makeMessagesSocket = (config) => {
           let msg
           let mediaHandle
           try {
-            msg = await Utils_1.generateWAMessage(WABinary_1.STORIES_JID, messageContent, {
+            msg = await generateWAMessage(STORIES_JID, messageContent, {
               logger,
               userJid,
-              getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+              getUrlInfo: text => getUrlInfo(text, {
                 thumbnailWidth: linkPreviewImageThumbnailWidth,
-                fetchOpts: { timeout: 3000, ...axiosOptions || {} },
+                fetchOpts: {
+                    timeout: 3000,
+                    ...(httpRequestOptions || {})
+                },
                 logger,
                 uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
               }),
@@ -1555,7 +1544,7 @@ const makeMessagesSocket = (config) => {
             throw error
           }
 
-          await relayMessage(WABinary_1.STORIES_JID, msg.message, {
+          await relayMessage(STORIES_JID, msg.message, {
             messageId: msg.key.id,
             statusJidList: uniqueUsers, 
             additionalNodes: [
@@ -1568,7 +1557,7 @@ const makeMessagesSocket = (config) => {
                     attrs: {},
                     content: jids.map(jid => ({
                       tag: 'to',
-                      attrs: { jid: WABinary_1.jidNormalizedUser(jid) }
+                      attrs: { jid: jidNormalizedUser(jid) }
                     }))
                   }]
               }]
@@ -1576,8 +1565,8 @@ const makeMessagesSocket = (config) => {
 
           for (const id of jids) {
             try {
-              const normalizedId = WABinary_1.jidNormalizedUser(id)
-              const isPrivate = WABinary_1.isJidUser(normalizedId) 
+              const normalizedId = jidNormalizedUser(id)
+              const isPrivate = isPnUser(normalizedId) 
               const type = isPrivate ? 'statusMentionMessage' : 'groupStatusMentionMessage'
 
               const protocolMessage = {
@@ -1590,11 +1579,11 @@ const makeMessagesSocket = (config) => {
                   }
                 },
                 messageContextInfo: {
-                  messageSecret: crypto_1.randomBytes(32)
+                  messageSecret: randomBytes(32)
                 }
               }
 
-              const statusMsg = await Utils_1.generateWAMessageFromContent(normalizedId,
+              const statusMsg = await generateWAMessageFromContent(normalizedId,
                 protocolMessage,
                 {}
               )
@@ -1612,7 +1601,7 @@ const makeMessagesSocket = (config) => {
                 }
               )
 
-              await Utils_1.delay(2000)
+              await delay(2000)
             } catch (error) {
               logger.error(`Error sending to ${id}: ${error}`)
             }
@@ -1625,7 +1614,7 @@ const makeMessagesSocket = (config) => {
             const additionalAttributes = {}
 
             if (!options.ephemeralExpiration) {
-                if (WABinary_1.isJidGroup(jid)) {
+                if (isJidGroup(jid)) {
                     const expiration = await getEphemeralGroup(jid) 
                     options.ephemeralExpiration = expiration
                  }
@@ -1634,19 +1623,19 @@ const makeMessagesSocket = (config) => {
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                WABinary_1.isJidGroup(jid)) {
+                isJidGroup(jid)) {
 
                 const { disappearingMessagesInChat } = content
 
                 const value = typeof disappearingMessagesInChat === 'boolean' ?
-                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
+                    (disappearingMessagesInChat ? WA_DEFAULT_EPHEMERAL : 0) :
                     disappearingMessagesInChat
 
                 await groupToggleEphemeral(jid, value)
             }
             
             else if (typeof content === 'object' && 'album' in content && content.album) {
-            	const albumMsg = await Utils_1.prepareAlbumMessageContent(jid, content.album, {
+            	const albumMsg = await prepareAlbumMessageContent(jid, content.album, {
             		suki: {
             			relayMessage, 
             			waUploadToServer
@@ -1656,7 +1645,7 @@ const makeMessagesSocket = (config) => {
             	}) 
             
             	for (const media of albumMsg) {
-            		await Utils_1.delay(options.delay || 500) 
+            		await delay(options.delay || 500) 
             		await relayMessage(jid, media.message, { messageId: media.key.id, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, statusJidList: options.statusJidList, additionalNodes: options.additionalNodes, AI: options.ai })
             	}
             
@@ -1666,14 +1655,14 @@ const makeMessagesSocket = (config) => {
             else {
                 let mediaHandle
 
-                const fullMsg = await Utils_1.generateWAMessage(jid, content, {
+                const fullMsg = await generateWAMessage(jid, content, {
                     logger,
                     userJid,
-                    getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+                    getUrlInfo: text => getUrlInfo(text, {
                         thumbnailWidth: linkPreviewImageThumbnailWidth,
                         fetchOpts: {
-                            timeout: 3000,
-                            ...axiosOptions || {}
+                    	    timeout: 3000,
+                            ...(httpRequestOptions || {})
                         },
                         logger,
                         uploadImage: generateHighQualityLinkPreview
@@ -1683,13 +1672,13 @@ const makeMessagesSocket = (config) => {
                     getProfilePicUrl: profilePictureUrl,
                     getCallLink: createCallLink, 
                     upload: async (encFilePath, opts) => {
-                        const up = await waUploadToServer(encFilePath, { ...opts, newsletter: WABinary_1.isJidNewsletter(jid) })
+                        const up = await waUploadToServer(encFilePath, { ...opts, newsletter: isJidNewsletter(jid) })
                         mediaHandle = up.handle
                         return up
                     },
                     mediaCache: config.mediaCache,
                     options: config.options,
-                    messageId: Utils_1.generateMessageID(userJid), 
+                    messageId: generateMessageID(userJid), 
                     ...options,
                 })
 
@@ -1700,7 +1689,7 @@ const makeMessagesSocket = (config) => {
 
                 if (isDelete || isKeep) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if (WABinary_1.isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe || WABinary_1.isJidNewsletter(jid)) {
+                    if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe || isJidNewsletter(jid)) {
                         additionalAttributes.edit = '8'
                     }
 
@@ -1710,7 +1699,7 @@ const makeMessagesSocket = (config) => {
                 }
 
                 else if (isEdit) {
-                    additionalAttributes.edit = WABinary_1.isJidNewsletter(jid) ? '3' : '1'
+                    additionalAttributes.edit = isJidNewsletter(jid) ? '3' : '1'
                 }
 
                 else if (isPin) {
@@ -1728,8 +1717,8 @@ const makeMessagesSocket = (config) => {
                 await relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, statusJidList: options.statusJidList, additionalNodes: options.additionalNodes, AI: options.ai })
 
                 if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')))
+                    process.nextTick(async () => {
+                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'))
                     })
                 }