@neelegirl/baileys 1.5.3 → 1.5.4

package/lib/Socket/messages-send.js

@@ -1,115 +1,93 @@
-"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 makeMessagesSocket = (config) => {
-    const { logger, maxMsgRetryCount, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache } = config
-    const baron = newsletter_1.makeNewsletterSocket(config)
-    const { ev, authState, processingMutex, signalRepository, upsertMessage, createCallLink, query, fetchPrivacySettings, sendNode, groupQuery, groupMetadata, groupToggleEphemeral, newsletterWMexQuery, executeUSyncQuery } = baron   
-
-    const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+import NodeCache from '@cacheable/node-cache';
+import { Boom } from '@hapi/boom';
+import { proto } from '../../WAProto/index.js';
+import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, decryptMediaRetryData, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/index.js';
+import { getUrlInfo } from '../Utils/link-preview.js';
+import { makeKeyedMutex } from '../Utils/make-mutex.js';
+import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidGroup, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { USyncQuery, USyncUser } from '../WAUSync/index.js';
+import { makeNewsletterSocket } from './newsletter.js';
+export const makeMessagesSocket = (config) => {
+    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount } = config;
+    const sock = makeNewsletterSocket(config);
+    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral } = sock;
+    const userDevicesCache = config.userDevicesCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
+            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()
-
-    let mediaConn
-
+    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) {
+        const media = await mediaConn;
+        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
-            })()
+                };
+                logger.debug('fetched media conn');
+                return node;
+            })();
         }
-
-        return mediaConn
-    }
-
+        return mediaConn;
+    };
     /**
      * generic send receipt function
      * 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],
-            },
-        }
-
-        const isReadReceipt = type === 'read' || type === 'read-self'
-
+                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)) {
-            node.attrs.recipient = jid
-            node.attrs.to = participant
+        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
+            node.attrs.recipient = jid;
+            node.attrs.to = participant;
         }
-
         else {
-            node.attrs.to = jid
+            node.attrs.to = jid;
             if (participant) {
-                node.attrs.participant = 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)
-
+        const remainingMessageIds = messageIds.slice(1);
         if (remainingMessageIds.length) {
             node.content = [
                 {
@@ -120,573 +98,277 @@ const makeMessagesSocket = (config) => {
                         attrs: { id }
                     }))
                 }
-            ]
+            ];
         }
-
-        logger.debug({ attrs: node.attrs, messageIds }, 'sending receipt for messages')
-
-        await sendNode(node)
-    }
-
+        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)
+            await sendReceipt(jid, participant, messageIds, type);
         }
-    }
-
+    };
     /** Bulk read messages. Keys can be from different chats & participants */
     const readMessages = async (keys) => {
-        const privacySettings = await fetchPrivacySettings()
-
+        const privacySettings = await fetchPrivacySettings();
         // based on privacy settings, we have to change the read type
-        const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self'
-
-        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
-          }
-    }
-
+        const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
+        await sendReceipts(keys, readType);
+    };
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
-        const deviceResults = []
-        
+        const deviceResults = [];
         if (!useCache) {
-            logger.debug('not using cache for devices')
+            logger.debug('not using cache for devices');
         }
-        
-        const toFetch = []
-        
-        jids = deduplicateLidPnJids(Array.from(new Set(jids)))
+        const toFetch = [];
         const jidsWithUser = jids
             .map(jid => {
-            const decoded = WABinary_1.jidDecode(jid)
-            const user = decoded?.user
-            const device = decoded?.device
-            const isExplicitDevice = typeof device === 'number' && device >= 0
-            
+            const decoded = jidDecode(jid);
+            const user = decoded?.user;
+            const device = decoded?.device;
+            const isExplicitDevice = typeof device === 'number' && device >= 0;
             if (isExplicitDevice && user) {
                 deviceResults.push({
                     user,
                     device,
-                    wireJid: jid // again this makes no sense
+                    jid
                 });
-                return null
+                return null;
             }
-            
-            jid = WABinary_1.jidNormalizedUser(jid)
-            return { jid, user }
-        }) 
-        .filter(jid => jid !== null)
-        
-        let mgetDevices
-        
+            jid = jidNormalizedUser(jid);
+            return { jid, user };
+        })
+            .filter(jid => jid !== null);
+        let mgetDevices;
         if (useCache && userDevicesCache.mget) {
-            const usersToFetch = jidsWithUser.map(j => j?.user).filter(Boolean)
-            mgetDevices = await userDevicesCache.mget(usersToFetch)
+            const usersToFetch = jidsWithUser.map(j => j?.user).filter(Boolean);
+            mgetDevices = await userDevicesCache.mget(usersToFetch);
         }
-        
         for (const { jid, user } of jidsWithUser) {
             if (useCache) {
                 const devices = mgetDevices?.[user] ||
-                    (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)))
-                    
+                    (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)
-                    }))
-                    
-                    deviceResults.push(...devicesWithWire)
-                    logger.trace({ user }, 'using cache for devices')
+                        jid: jidEncode(d.user, d.server, d.device)
+                    }));
+                    deviceResults.push(...devicesWithJid);
+                    logger.trace({ user }, 'using cache for devices');
                 }
                 else {
-                    toFetch.push(jid)
+                    toFetch.push(jid);
                 }
             }
             else {
-                toFetch.push(jid)
+                toFetch.push(jid);
             }
         }
-        
         if (!toFetch.length) {
-            return deviceResults
+            return deviceResults;
         }
-        
-        const requestedLidUsers = new Set()
+        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)
+                    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)
-        
+        const result = await sock.executeUSyncQuery(query);
         if (result) {
-            const extracted = Utils_1.extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
-            const deviceMap = {}
-            
+            // 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 })));
+            }
+            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, authState.creds.me.lid, ignoreZeroDevices);
+            const deviceMap = {};
             for (const item of extracted) {
-                deviceMap[item.user] = deviceMap[item.user] || []
-                deviceMap[item.user]?.push(item)
+                deviceMap[item.user] = deviceMap[item.user] || [];
+                deviceMap[item.user]?.push(item);
             }
-            
             // 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')
+                    }, 'Processed device with LID priority');
                 }
             }
-            
             if (userDevicesCache.mset) {
                 // if the cache supports mset, we can set all devices in one go
-                await userDevicesCache.mset(Object.entries(deviceMap).map(([key, value]) => ({ key, value })))
+                await userDevicesCache.mset(Object.entries(deviceMap).map(([key, value]) => ({ key, value })));
             }
-            
             else {
                 for (const key in deviceMap) {
                     if (deviceMap[key])
-                        await userDevicesCache.set(key, deviceMap[key])
+                        await userDevicesCache.set(key, deviceMap[key]);
                 }
             }
-            
-        }
-        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 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)
+            const userDeviceUpdates = {};
+            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)
-            }
-        }
-        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, [])
-                }
-                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 }
-                }
-                
+            if (Object.keys(userDeviceUpdates).length > 0) {
                 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 }
-                    }
+                    await authState.keys.set({ 'device-list': userDeviceUpdates });
+                    logger.debug({ userCount: Object.keys(userDeviceUpdates).length }, 'stored user device lists for bulk migration');
                 }
                 catch (error) {
-                    logger.debug({ user, error }, 'Failed to check LID mapping for user')
+                    logger.warn({ error }, 'failed to store user device lists');
                 }
-                
-                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
-                
-                // 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');
-                    }
+        }
+        return deviceResults;
+    };
+    const assertSessions = async (jids) => {
+        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) {
+                    continue; // Session exists in cache
                 }
-                
-                // 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')
-                    }
+            }
+            else {
+                const sessionValidation = await signalRepository.validateSession(jid);
+                const hasSession = sessionValidation.exists;
+                peerSessionsCache.set(signalId, hasSession);
+                if (hasSession) {
+                    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)
-                    }
-                }
-            }
-            
-            // 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')
-            }
-            
+            // 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)
+            ];
+            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 => ({
+                        content: wireJids.map(jid => ({
                             tag: 'user',
                             attrs: { jid }
                         }))
                     }
                 ]
-            })
-            
-            await Utils_1.parseAndInjectE2ESessions(result, signalRepository)
-            didFetchNewSession = true
+            });
+            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 */
+        return didFetchNewSession;
+    };
     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'
             },
-        })
-
-        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]
-        }
-        
-        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
-                
-            // Extract user from JID for grouping
-            const decoded = WABinary_1.jidDecode(wireJid)
-            const user = decoded?.user
-            
-            if (!user)
-                continue
-                
-            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
-                }
-            }
-            
-            // 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')
-                    }
+            additionalNodes: [
+                {
+                    tag: 'meta',
+                    attrs: { appdata: 'default' }
                 }
-                
-                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)
+            ]
+        });
+        return msgId;
+    };
+    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 ? jidDecode(meLid)?.user : null;
+        const encryptionPromises = patchedMessages.map(async ({ recipientJid: jid, message: patchedMessage }) => {
+            if (!jid)
+                return null;
+            let msgToEncrypt = patchedMessage;
+            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 (isOwnUser && !isExactSenderDevice) {
+                    msgToEncrypt = dsmMessage;
+                    logger.debug({ jid, targetUser }, 'Using DSM for own device');
+                }
+            }
+            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
-                })
-                
+                });
                 if (type === 'pkmsg') {
-                    shouldIncludeDeviceIdentity = true
+                    shouldIncludeDeviceIdentity = true;
                 }
-                
-                const node = {
+                return {
                     tag: 'to',
-                    attrs: { jid: wireJid }, // Always use original wire identity in envelope
+                    attrs: { jid },
                     content: [
                         {
                             tag: 'enc',
@@ -698,711 +380,405 @@ const makeMessagesSocket = (config) => {
                             content: ciphertext
                         }
                     ]
-                }
-                userNodes.push(node)
-            }
-            logger.debug({ user, nodesCreated: userNodes.length }, 'Releasing encryption lock for user devices');
-            return userNodes
-        }))
-        
-        // Wait for all users to complete (users are processed in parallel)
-        const userNodesArrays = await Promise.all(userEncryptionPromises)
-        const nodes = userNodesArrays.flat()
-        return { nodes, shouldIncludeDeviceIdentity }
-    }
-
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, additionalNodes, AI = false, isSecret = 0 }) => {
-        const meId = authState.creds.me.id
-        const meLid = authState.creds.me?.lid
-
-        let didPushAdditional = false
-        let shouldIncludeDeviceIdentity = false
-
-        const { user, server } = WABinary_1.jidDecode(jid)
-
-        const statusJid = 'status@broadcast'
-        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 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
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
-
-        const participants = []
-        const destinationJid = !isStatus ? finalJid : statusJid
-        const binaryNodeContent = []
-        const devices = []
-
+                };
+            });
+            return node;
+        });
+        const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null);
+        return { nodes, shouldIncludeDeviceIdentity };
+    };
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
+        const meId = authState.creds.me.id;
+        const meLid = authState.creds.me?.lid;
+        const isRetryResend = Boolean(participant?.jid);
+        let shouldIncludeDeviceIdentity = isRetryResend;
+        const statusJid = 'status@broadcast';
+        const { user, server } = jidDecode(jid);
+        const isGroup = server === 'g.us';
+        const isStatus = jid === statusJid;
+        const isLid = server === 'lid';
+        const isNewsletter = server === 'newsletter';
+        const finalJid = jid;
+        msgId = msgId || generateMessageIDV2(meId);
+        useUserDevicesCache = useUserDevicesCache !== false;
+        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
+        const participants = [];
+        const destinationJid = !isStatus ? finalJid : statusJid;
+        const binaryNodeContent = [];
+        const devices = [];
         const meMsg = {
             deviceSentMessage: {
                 destinationJid,
                 message
-            }, 
-            messageContextInfo: message.messageContextInfo || {}
-        }
-
-        const extraAttrs = {}
-
-        const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/
-
-        const messages = Utils_1.normalizeMessageContent(message)  
-
-        const buttonType = getButtonType(messages)
-        const pollMessage = messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3
-
-
+            },
+            messageContextInfo: message.messageContextInfo
+        };
+        const extraAttrs = {};
         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
+            });
         }
-
         await authState.keys.transaction(async () => {
-            const mediaType = getMediaType(message)
-
+            const mediaType = getMediaType(message);
             if (mediaType) {
-                extraAttrs['mediatype'] = 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: getMessageType(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'
-            } 
-
-            if (messages.interactiveResponseMessage?.nativeFlowResponseMessage) {
-                extraAttrs['native_flow_name'] = messages.interactiveResponseMessage.nativeFlowResponseMessage?.name || 'menu_options'
+            if (normalizeMessageContent(message)?.pinInChatMessage) {
+                extraAttrs['decrypt-fail'] = 'hide'; // todo: expand for reactions and other types
             }
-
             if (isGroup || isStatus) {
                 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')
+                            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
+                        return groupData;
                     })(),
-
                     (async () => {
                         if (!participant && !isStatus) {
-                            const result = await authState.keys.get('sender-key-memory', [jid])
-                            return result[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 {}
-
+                        return {};
                     })()
-                ])
-
+                ]);
                 if (!participant) {
-                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
-
-                    if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList)
+                    const participantsList = [];
+                    if (isStatus) {
+                        if (statusJidList?.length)
+                            participantsList.push(...statusJidList);
                     }
-
-                    if (!isStatus) {
-                        const groupAddressingMode = groupData?.addressingMode || (isLid ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN)
+                    else {
+                        // default to LID based groups
+                        let groupAddressingMode = 'lid';
+                        if (groupData) {
+                            participantsList.push(...groupData.participants.map(p => p.id));
+                            groupAddressingMode = groupData?.addressingMode || groupAddressingMode;
+                        }
+                        // default to lid addressing mode in a group
                         additionalAttributes = {
                             ...additionalAttributes,
                             addressing_mode: groupAddressingMode
-                        }
+                        };
                     }
-
-                    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 groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId
-
+                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
+                    devices.push(...additionalDevices);
+                }
+                if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
+                    additionalAttributes = {
+                        ...additionalAttributes,
+                        expiration: groupData.ephemeralDuration.toString()
+                    };
+                }
+                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 hasKey = !!senderKeyMap[deviceJid]
-                    if (!hasKey || !!participant) {
-                        senderKeyJids.push(deviceJid)
-                        // store that this person has had the sender keys sent to them
-                        senderKeyMap[deviceJid] = true
+                    const deviceJid = device.jid;
+                    const hasKey = !!senderKeyMap[deviceJid];
+                    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
-
-                    participants.push(...result.nodes)
-                }
-
-                binaryNodeContent.push({
-                    tag: 'enc',
-                    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
+                    };
+                    const senderKeySessionTargets = senderKeyRecipients;
+                    await assertSessions(senderKeySessionTargets);
+                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
+                    shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
+                    participants.push(...result.nodes);
+                }
+                if (isRetryResend) {
+                    const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
+                        data: bytes,
+                        jid: participant?.jid
+                    });
+                    binaryNodeContent.push({
+                        tag: 'enc',
+                        attrs: {
+                            v: '2',
+                            type,
+                            count: participant.count.toString()
+                        },
+                        content: encryptedContent
+                    });
                 }
-
-                // Message delete
-                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = message.protocolMessage.key?.id
-                    message = {}
+                else {
+                    binaryNodeContent.push({
+                        tag: 'enc',
+                        attrs: { v: '2', type: 'skmsg', ...extraAttrs },
+                        content: ciphertext
+                    });
+                    await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
                 }
-
-                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)
-
+                // 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');
+                }
+                else {
+                    logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation');
+                }
+                const { user: ownUser } = jidDecode(ownId);
                 if (!participant) {
-                    const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                    const targetUserServer = isLid ? 'lid' : 's.whatsapp.net';
                     devices.push({
                         user,
                         device: 0,
-                        wireJid: WABinary_1.jidEncode(user, targetUserServer, 0)
-                    })
-                    
-                    // Own user matches conversation addressing mode
+                        jid: jidEncode(user, targetUserServer, 0) // rajeh, todo: this entire logic is convoluted and weird.
+                    });
                     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 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
-                        
+                        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)
-                        devices.push(...sessionDevices)
+                        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}`)
-                        }, 'Device enumeration complete with unified addressing')
+                            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, device } 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)')
-                        continue
+                        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
-
-                //     if (isMe) {
-                //         meJids.push(jid)
-                //     }
-
-                //     else {
-                //         otherJids.push(jid)
-                //     }
-
-                //     allJids.push(jid)
-                // }
-
-let tatar = false;
- 
-if (!isMe) {
-    if (isSecret === 1 && device !== undefined) {
-        tatar = true;
-    } else if (isSecret === 2 && device === undefined) {
-        tatar = true;
-    } else if (isSecret === 5 && device === undefined) {
-        tatar = true
-    } else if (isSecret === 6 && device !== undefined) {
-        tatar = true
-    }
-} else {
-    if (isSecret === 3 && device !== undefined) {
-        tatar = true;
-    } else if (isSecret === 4 && device === undefined) {
-        tatar = true;
-    } else if (isSecret === 5) {
-        tatar = true
-    } else if (isSecret === 6) {
-        tatar = true
-    }
-}
-
-    if (!tatar) {
-        // const jid = (0, WABinary_1.jidEncode)(
-        //     isMe && isLid
-        //         ? (authState.creds?.me?.lid.split(':')[0]) || user
-        //         : user,
-        //     isLid ? 'lid' : 's.whatsapp.net',
-        //     device
-        // );
-
-        if (isMe) {
-            meJids.push(jid);
-        } else {
-            otherJids.push(jid);
-        }
-        allJids.push(jid);
-    }
-}
-                // await assertSessions([...otherJids, ...meJids], false)
-await assertSessions(allJids, false)
+                    const isMe = user === mePnUser || user === meLidUser;
+                    if (isMe) {
+                        meRecipients.push(jid);
+                    }
+                    else {
+                        otherRecipients.push(jid);
+                    }
+                    allRecipients.push(jid);
+                }
+                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)
-                ])
-
-                participants.push(...meNodes)
-
-                participants.push(...otherNodes)
-                
-                if (meJids.length > 0 || otherJids.length > 0) {
-                    extraAttrs['phash'] = Utils_1.generateParticipantHashV2([...meJids, ...otherJids])
+                    createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
+                    createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
+                ]);
+                participants.push(...meNodes);
+                participants.push(...otherNodes);
+                if (meRecipients.length > 0 || otherRecipients.length > 0) {
+                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
                 }
-
-                shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
+                shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
-
             if (participants.length) {
                 if (additionalAttributes?.['category'] === 'peer') {
-                    const peerNode = participants[0]?.content?.[0]
-
+                    const peerNode = participants[0]?.content?.[0];
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode) // push only enc
+                        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: getMessageType(message),
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
-            }
-
+            };
             // if the participant to send to is explicitly specified (generally retry recp)
             // 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)) {
-                    stanza.attrs.to = destinationJid
-                    stanza.attrs.participant = participant.jid
+                if (isJidGroup(destinationJid)) {
+                    stanza.attrs.to = destinationJid;
+                    stanza.attrs.participant = participant.jid;
                 }
-
-                else if (WABinary_1.areJidsSameUser(participant.jid, meId)) {
-                    stanza.attrs.to = participant.jid
-                    stanza.attrs.recipient = destinationJid
+                else if (areJidsSameUser(participant.jid, meId)) {
+                    stanza.attrs.to = participant.jid;
+                    stanza.attrs.recipient = destinationJid;
                 }
-
                 else {
-                    stanza.attrs.to = participant.jid
+                    stanza.attrs.to = participant.jid;
                 }
             }
-
             else {
-                stanza.attrs.to = destinationJid
+                stanza.attrs.to = destinationJid;
             }
-
             if (shouldIncludeDeviceIdentity) {
+                ;
                 stanza.content.push({
                     tag: 'device-identity',
                     attrs: {},
-                    content: Utils_1.encodeSignedDeviceIdentity(authState.creds.account, true)
-                })
-
-                logger.debug({ jid }, 'adding device identity')
-            }
-
-            if (isGroup && regexGroupOld.test(jid) && !message.reactionMessage) {
-                stanza.content.push({
-                    tag: 'multicast',
-                    attrs: {}
-                }) 
-           }
-
-            if (pollMessage || messages.eventMessage) {
-                stanza.content.push({
-                    tag: 'meta', 
-                    attrs: messages.eventMessage ? {
-                        event_type: 'creation'
-                    } : isNewsletter ? {
-                        polltype: 'creation', 
-                        contenttype: pollMessage?.pollContentType === 2 ? 'image' : 'text'
-                    } : {
-                        polltype: 'creation'
-                    }
-                }) 
-            }
-
-            if (!isNewsletter && buttonType) {
-                const buttonsNode = getButtonArgs(messages)
-                const filteredButtons = WABinary_1.getBinaryFilteredButtons(additionalNodes ? additionalNodes : [])
-
-                if (filteredButtons) {
-                   stanza.content.push(...additionalNodes)
-                   didPushAdditional = true
-                }
-
-                else {
-                    stanza.content.push(buttonsNode)
-                }
+                    content: encodeSignedDeviceIdentity(authState.creds.account, true)
+                });
+                logger.debug({ jid }, 'adding device identity');
             }
-
-            if (AI && isPrivate) {
-                const botNode = {
-                    tag: 'bot', 
-                    attrs: {
-                        biz_bot: '1'
-                    }
-                }
-
-                const filteredBizBot = WABinary_1.getBinaryFilteredBizBot(additionalNodes ? additionalNodes : []) 
-
-                if (filteredBizBot) {
-                    stanza.content.push(...additionalNodes) 
-                    didPushAdditional = true
-                }
-
-                else {
-                    stanza.content.push(botNode) 
-                }
+            if (additionalNodes && additionalNodes.length > 0) {
+                ;
+                stanza.content.push(...additionalNodes);
             }
-
-            if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
-                stanza.content.push(...additionalNodes)
-            }  
-
-            logger.debug({ msgId }, `sending message to ${participants.length} devices`)
-
-            await sendNode(stanza)
-            
+            logger.debug({ msgId }, `sending message to ${participants.length} devices`);
+            await sendNode(stanza);
             // Add message to retry cache if enabled
             if (messageRetryManager && !participant) {
-                messageRetryManager.addRecentMessage(destinationJid, msgId, message)
+                messageRetryManager.addRecentMessage(destinationJid, msgId, message);
             }
-        }, meId)
-
-        return msgId
-    }
-
-    const getTypeMessage = (msg) => {
-        const message = Utils_1.normalizeMessageContent(msg)  
+        }, meId);
+        return msgId;
+    };
+    const getMessageType = (message) => {
         if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
-            return 'poll'
-        }       
-        else if (message.reactionMessage) {
-            return 'reaction'
-        }       
-        else if (message.eventMessage) {
-            return 'event'
-        }        
-        else if (getMediaType(message)) {
-            return 'media'
-        }        
-        else {
-            return 'text'
+            return 'poll';
         }
-    }
-
-    const getMediaType = (message) => {
-      if (message.imageMessage) {
-            return 'image'
+        if (message.eventMessage) {
+            return 'event';
         }
-        else if (message.stickerMessage) {
-            return message.stickerMessage.isLottie ? '1p_sticker' : message.stickerMessage.isAvatar ? 'avatar_sticker' : 'sticker'
+        if (getMediaType(message) !== '') {
+            return 'media';
+        }
+        return 'text';
+    };
+    const getMediaType = (message) => {
+        if (message.imageMessage) {
+            return 'image';
         }
         else if (message.videoMessage) {
-            return message.videoMessage.gifPlayback ? 'gif' : 'video'
+            return message.videoMessage.gifPlayback ? 'gif' : 'video';
         }
         else if (message.audioMessage) {
-            return message.audioMessage.ptt ? 'ptt' : 'audio'
-        }
-        else if (message.ptvMessage) {
-            return 'ptv'
-        }
-        else if (message.albumMessage) {
-            return 'collection'
+            return message.audioMessage.ptt ? 'ptt' : 'audio';
         }
         else if (message.contactMessage) {
-            return 'vcard'
+            return 'vcard';
         }
         else if (message.documentMessage) {
-            return 'document'
-        }
-        else if (message.stickerPackMessage) {
-            return 'sticker_pack'
+            return 'document';
         }
         else if (message.contactsArrayMessage) {
-            return 'contact_array'
-        }
-        else if (message.locationMessage) {
-            return 'location'
+            return 'contact_array';
         }
         else if (message.liveLocationMessage) {
-            return 'livelocation'
+            return 'livelocation';
+        }
+        else if (message.stickerMessage) {
+            return 'sticker';
         }
         else if (message.listMessage) {
-            return 'list'
+            return 'list';
         }
         else if (message.listResponseMessage) {
-            return 'list_response'
+            return 'list_response';
         }
         else if (message.buttonsResponseMessage) {
-            return 'buttons_response'
+            return 'buttons_response';
         }
         else if (message.orderMessage) {
-            return 'order'
+            return 'order';
         }
         else if (message.productMessage) {
-            return 'product'
+            return 'product';
         }
         else if (message.interactiveResponseMessage) {
-            return 'native_flow_response'
-        }
-        else if (/https:\/\/wa\.me\/c\/\d+/.test(message.extendedTextMessage?.text)) {
-            return 'cataloglink'
-        }
-        else if (/https:\/\/wa\.me\/p\/\d+\/\d+/.test(message.extendedTextMessage?.text)) {
-            return 'productlink'
-        }
-        else if (message.extendedTextMessage?.matchedText || message.groupInviteMessage) {
-            return 'url'
-        }
-    }
-
-    const getButtonType = (message) => {
-        if (message.listMessage) {
-            return 'list'
-       }
-        else if (message.buttonsMessage) {
-            return 'buttons'
-        }
-        else if(message.interactiveMessage?.nativeFlowMessage) {
-            return 'native_flow'
+            return 'native_flow_response';
         }
-    }
-
-    const getButtonArgs = (message) => {
-        const nativeFlow = message.interactiveMessage?.nativeFlowMessage
-        const firstButtonName = nativeFlow?.buttons?.[0]?.name
-        const nativeFlowSpecials = [
-            'mpm', 'cta_catalog', 'send_location',
-            'call_permission_request', 'wa_payment_transaction_details',
-            'automated_greeting_message_view_catalog'
-        ]
-
-        if (nativeFlow && (firstButtonName === 'review_and_pay' || firstButtonName === 'payment_info')) {
-                return {
-                    tag: 'biz', 
-                    attrs: {
-                        native_flow_name: firstButtonName === 'review_and_pay' ? 'order_details' : firstButtonName
-                }
-            } 
-        } else if (nativeFlow && nativeFlowSpecials.includes(firstButtonName)) {
-            // Only works for WhatsApp Original, not WhatsApp Business
-            return {
-                tag: 'biz',
-                attrs: {
-                	actual_actors: '2', 
-                	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
-                }, 
-                content: [{
-                    tag: 'interactive',
-                    attrs: {
-                        type: 'native_flow',
-                        v: '1'
-                    },
-                    content: [{
-                        tag: 'native_flow',
-                        attrs: {
-                            v: '2', 
-                            name: firstButtonName
-                        }
-                    }]
-                }, 
-                {
-                	tag: 'quality_control', 
-                	attrs: {
-                		source_type: 'third_party'
-                	}
-                }]
-            }
-        } else if (nativeFlow || message.buttonsMessage) {
-            // It works for whatsapp original and whatsapp business
-            return {
-                tag: 'biz', 
-                attrs: {
-                	actual_actors: '2', 
-                	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
-                }, 
-                content: [{
-                    tag: 'interactive', 
-                    attrs: {
-                        type: 'native_flow', 
-                        v: '1'
-                    }, 
-                    content: [{
-                        tag: 'native_flow', 
-                        attrs: {
-                            v: '9', 
-                            name: 'mixed'
-                        }
-                    }]
-                }, 
-                {
-                	tag: 'quality_control', 
-                	attrs: {
-                		source_type: 'third_party'
-                	}
-                }]
-            }
-        } else if (message.listMessage) {
-            return {
-                tag: 'biz', 
-                attrs: {
-                	actual_actors: '2', 
-                	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
-                }, 
-                content: [{
-                    tag: 'list', 
-                    attrs: {
-                        v: '2', 
-                        type: 'product_list'
-                    }
-                }, 
-                {
-                	tag: 'quality_control', 
-                	attrs: {
-                		source_type: 'third_party'
-                	}
-                }]
-            }
-        } else {
-            return {
-                tag: 'biz', 
-                attrs: {
-                	actual_actors: '2', 
-                	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
-                }
-            }
+        else if (message.groupInviteMessage) {
+            return 'url';
         }
-    }
-
+        return '';
+    };
     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'
             },
@@ -1413,373 +789,165 @@ await assertSessions(allJids, false)
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: WABinary_1.jidNormalizedUser(jid),
+                            jid: jidNormalizedUser(jid),
                             t,
                             type: 'trusted_contact'
                         }
                     }))
                 }
             ]
-        })
-
-        return result
-    }    
-    
-    const getEphemeralGroup = (jid) => {
-    	if (!WABinary_1.isJidGroup(jid)) throw new TypeError("Jid should originate from a group!") 
-    
-        return groupQuery(jid, 'get', [{
-        	tag: 'query',
-            attrs: {
-            	request: 'interactive'
-            }
-        }])
-        .then((groups) => WABinary_1.getBinaryNodeChild(groups, 'group'))
-        .then((metadata) => WABinary_1.getBinaryNodeChild(metadata, 'ephemeral')?.attrs?.expiration || 0) 
-    }
-
-    const waUploadToServer = Utils_1.getWAUploadToServer(config, refreshMediaConn)
-
-    const waitForMsgMediaUpdate = Utils_1.bindWaitForEvent(ev, 'messages.media-update')
-    
+        });
+        return result;
+    };
+    const waUploadToServer = getWAUploadToServer(config, refreshMediaConn);
+    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update');
     return {
-        ...baron,
+        ...sock,
         getPrivacyTokens,
         assertSessions,
         relayMessage,
         sendReceipt,
         sendReceipts,
         readMessages,
-        profilePictureUrl, 
-        getUSyncDevices,
         refreshMediaConn,
         waUploadToServer,
-        getEphemeralGroup, 
-        fetchPrivacySettings, 
-        messageRetryManager, 
-        createParticipantNodes, 
-        sendPeerDataOperationMessage, 
+        fetchPrivacySettings,
+        sendPeerDataOperationMessage,
+        createParticipantNodes,
+        getUSyncDevices,
+        messageRetryManager,
         updateMediaMessage: async (message) => {
-            const content = Utils_1.assertMediaContent(message.message)
-            const mediaKey = content.mediaKey
-            const meId = authState.creds.me.id
-            const node = await Utils_1.encryptMediaRetryRequest(message.key, mediaKey, meId)
-            let error = undefined
-
+            const content = assertMediaContent(message.message);
+            const mediaKey = content.mediaKey;
+            const meId = authState.creds.me.id;
+            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)
+                    const result = update.find(c => c.key.id === message.key.id);
                     if (result) {
                         if (result.error) {
-                            error = 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)
-
-                                logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful')
+                                content.directPath = media.directPath;
+                                content.url = getUrlFromDirectPath(content.directPath);
+                                logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful');
                             }
-
                             catch (err) {
-                                error = err
+                                error = err;
                             }
                         }
-
-                        return true
+                        return true;
                     }
                 })
-            ])
-
+            ]);
             if (error) {
-                throw error
-            }
-
-            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)
-          let allUsers = new Set()
-          allUsers.add(userJid)
-
-          for (const id of jids) {
-            const isGroup = WABinary_1.isJidGroup(id) 
-            const isPrivate = WABinary_1.isJidUser(id) 
-
-            if (isGroup) {
-              try {
-                const metadata = await cachedGroupMetadata(id) || await groupMetadata(id)
-                const participants = metadata.participants.map(p => WABinary_1.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))
-            }
-          }
-
-          const uniqueUsers = Array.from(allUsers)
-          const getRandomHexColor = () => "#" + Math.floor(Math.random() * 16777215).toString(16).padStart(6, "0")
-
-          const isMedia = content.image || content.video || content.audio
-          const isAudio = !!content.audio
-
-          const messageContent = { ...content }
-
-          if (isMedia && !isAudio) {
-            if (messageContent.text) {
-              messageContent.caption = messageContent.text
-
-              delete messageContent.text
+                throw error;
             }
-
-            delete messageContent.ptt
-            delete messageContent.font
-            delete messageContent.backgroundColor
-            delete messageContent.textColor
-          }
-
-          if (isAudio) {
-            delete messageContent.text
-            delete messageContent.caption
-            delete messageContent.font
-            delete messageContent.textColor
-          }
-
-          const font = !isMedia ? (content.font || Math.floor(Math.random() * 9)) : undefined
-          const textColor = !isMedia ? (content.textColor || getRandomHexColor()) : undefined
-          const backgroundColor = (!isMedia || isAudio) ? (content.backgroundColor || getRandomHexColor()) : undefined
-          const ptt = isAudio ? (typeof content.ptt === 'boolean' ? content.ptt : true) : undefined
-
-          let msg
-          let mediaHandle
-          try {
-            msg = await Utils_1.generateWAMessage(WABinary_1.STORIES_JID, messageContent, {
-              logger,
-              userJid,
-              getUrlInfo: text => link_preview_1.getUrlInfo(text, {
-                thumbnailWidth: linkPreviewImageThumbnailWidth,
-                fetchOpts: { timeout: 3000, ...axiosOptions || {} },
-                logger,
-                uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-              }),
-              upload: async (encFilePath, opts) => {
-                const up = await waUploadToServer(encFilePath, { ...opts })
-                mediaHandle = up.handle
-                return up
-              },
-              mediaCache: config.mediaCache,
-              options: config.options,
-              font,
-              textColor,
-              backgroundColor,
-              ptt
-            })
-          } catch (error) {
-            logger.error(`Error generating message: ${error}`)
-            throw error
-          }
-
-          await relayMessage(WABinary_1.STORIES_JID, msg.message, {
-            messageId: msg.key.id,
-            statusJidList: uniqueUsers, 
-            additionalNodes: [
-              {
-                tag: 'meta',
-                attrs: {},
-                content: [
-                  {
-                    tag: 'mentioned_users',
-                    attrs: {},
-                    content: jids.map(jid => ({
-                      tag: 'to',
-                      attrs: { jid: WABinary_1.jidNormalizedUser(jid) }
-                    }))
-                  }]
-              }]
-          })
-
-          for (const id of jids) {
-            try {
-              const normalizedId = WABinary_1.jidNormalizedUser(id)
-              const isPrivate = WABinary_1.isJidUser(normalizedId) 
-              const type = isPrivate ? 'statusMentionMessage' : 'groupStatusMentionMessage'
-
-              const protocolMessage = {
-                [type]: {
-                  message: {
-                    protocolMessage: {
-                      key: msg.key,
-                      type: 25
-                    }
-                  }
-                },
-                messageContextInfo: {
-                  messageSecret: crypto_1.randomBytes(32)
-                }
-              }
-
-              const statusMsg = await Utils_1.generateWAMessageFromContent(normalizedId,
-                protocolMessage,
-                {}
-              )
-
-              await relayMessage(
-                normalizedId,
-                statusMsg.message,
-                {
-                  additionalNodes: [{
-                    tag: 'meta',
-                    attrs: isPrivate ?
-                    { is_status_mention: 'true' } :
-                    { is_group_status_mention: 'true' }
-                  }]
-                }
-              )
-
-              await Utils_1.delay(2000)
-            } catch (error) {
-              logger.error(`Error sending to ${id}: ${error}`)
-            }
-          }
-
-          return msg
+            ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
+            return message;
         },
         sendMessage: async (jid, content, options = {}) => {
-            const userJid = authState.creds.me.id
-            const additionalAttributes = {}
-
-            if (!options.ephemeralExpiration) {
-                if (WABinary_1.isJidGroup(jid)) {
-                    const expiration = await getEphemeralGroup(jid) 
-                    options.ephemeralExpiration = expiration
-                 }
-            }
-            
+            const userJid = authState.creds.me.id;
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                WABinary_1.isJidGroup(jid)) {
-
-                const { disappearingMessagesInChat } = content
-
-                const value = typeof disappearingMessagesInChat === 'boolean' ?
-                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-                    disappearingMessagesInChat
-
-                await groupToggleEphemeral(jid, value)
+                isJidGroup(jid)) {
+                const { disappearingMessagesInChat } = content;
+                const value = typeof disappearingMessagesInChat === 'boolean'
+                    ? 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, {
-            		baron: {
-            			relayMessage, 
-            			waUploadToServer
-            		}, 
-            		userJid: userJid, 
-            		...options
-            	}) 
-            
-            	for (const media of albumMsg) {
-            		await Utils_1.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 })
-            	}
-            
-            	return albumMsg
-            }
-
             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 || {}
+                            ...(httpRequestOptions || {})
                         },
                         logger,
-                        uploadImage: generateHighQualityLinkPreview
-                            ? waUploadToServer
-                            : undefined
+                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
                     }),
-                    getProfilePicUrl: profilePictureUrl,
-                    getCallLink: createCallLink, 
-                    upload: async (encFilePath, opts) => {
-                        const up = await waUploadToServer(encFilePath, { ...opts, newsletter: WABinary_1.isJidNewsletter(jid) })
-                        mediaHandle = up.handle
-                        return up
-                    },
+                    //TODO: CACHE
+                    getProfilePicUrl: sock.profilePictureUrl,
+                    getCallLink: sock.createCallLink,
+                    upload: waUploadToServer,
                     mediaCache: config.mediaCache,
                     options: config.options,
-                    messageId: Utils_1.generateMessageID(userJid), 
-                    ...options,
-                })
-
-                const isPin = 'pin' in content && !!content.pin
-                const isEdit = 'edit' in content && !!content.edit
-                const isDelete = 'delete' in content && !!content.delete
-                const isKeep = 'keep' in content && !!content.keep && content.keep?.type === 2
-
-                if (isDelete || isKeep) {
+                    messageId: generateMessageIDV2(sock.user?.id),
+                    ...options
+                });
+                const isEventMsg = 'event' in content && !!content.event;
+                const isDeleteMsg = 'delete' in content && !!content.delete;
+                const isEditMsg = 'edit' in content && !!content.edit;
+                const isPinMsg = 'pin' in content && !!content.pin;
+                const isPollMessage = 'poll' in content && !!content.poll;
+                const additionalAttributes = {};
+                const additionalNodes = [];
+                // required for delete
+                if (isDeleteMsg) {
                     // 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)) {
-                        additionalAttributes.edit = '8'
+                    if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) {
+                        additionalAttributes.edit = '8';
                     }
-
                     else {
-                        additionalAttributes.edit = '7'
+                        additionalAttributes.edit = '7';
                     }
                 }
-
-                else if (isEdit) {
-                    additionalAttributes.edit = WABinary_1.isJidNewsletter(jid) ? '3' : '1'
+                else if (isEditMsg) {
+                    additionalAttributes.edit = '1';
                 }
-
-                else if (isPin) {
-                    additionalAttributes.edit = '2'
-                }  
-
-                if (mediaHandle) {
-                    additionalAttributes['media_id'] = mediaHandle
+                else if (isPinMsg) {
+                    additionalAttributes.edit = '2';
                 }
-
-                if ('cachedGroupMetadata' in options) {
-                    console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.')
+                else if (isPollMessage) {
+                    additionalNodes.push({
+                        tag: 'meta',
+                        attrs: {
+                            polltype: 'creation'
+                        }
+                    });
                 }
-
-                await relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, statusJidList: options.statusJidList, additionalNodes: options.additionalNodes, AI: options.ai })
-
+                else if (isEventMsg) {
+                    additionalNodes.push({
+                        tag: 'meta',
+                        attrs: {
+                            event_type: 'creation'
+                        }
+                    });
+                }
+                await relayMessage(jid, fullMsg.message, {
+                    messageId: fullMsg.key.id,
+                    useCachedGroupMetadata: options.useCachedGroupMetadata,
+                    additionalAttributes,
+                    statusJidList: options.statusJidList,
+                    additionalNodes
+                });
                 if (config.emitOwnEvents) {
                     process.nextTick(() => {
-                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')))
-                    })
+                        processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    });
                 }
-
-                return fullMsg
+                return fullMsg;
             }
         }
-    }
-}
-
-module.exports = {
-  makeMessagesSocket
-}
+    };
+};
+//# sourceMappingURL=messages-send.js.map