@d0v3riz/baileys 6.7.25 → 7.0.0-rc.6

package/lib/Socket/messages-send.js

@@ -2,21 +2,29 @@ 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, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/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 { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, isJidUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.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 { makeGroupsSocket } from './groups.js';
 import { makeNewsletterSocket } from './newsletter.js';
 export const makeMessagesSocket = (config) => {
-    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata } = config;
-    const sock = makeNewsletterSocket(makeGroupsSocket(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 MessageRetryManager(logger, maxMsgRetryCount) : null;
+    // Prevent race conditions in Signal session encryption by user
+    const encryptionMutex = makeKeyedMutex();
     let mediaConn;
     const refreshMediaConn = async (forceGet = false) => {
         const media = await mediaConn;
@@ -32,6 +40,7 @@ export const makeMessagesSocket = (config) => {
                     content: [{ tag: 'media_conn', attrs: {} }]
                 });
                 const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
+                // TODO: explore full length of data that whatsapp provides
                 const node = {
                     hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
@@ -65,7 +74,7 @@ export const makeMessagesSocket = (config) => {
         if (isReadReceipt) {
             node.attrs.t = unixTimestampSeconds().toString();
         }
-        if (type === 'sender' && isJidUser(jid)) {
+        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
             node.attrs.recipient = jid;
             node.attrs.to = participant;
         }
@@ -115,14 +124,39 @@ export const makeMessagesSocket = (config) => {
             logger.debug('not using cache for devices');
         }
         const toFetch = [];
-        jids = Array.from(new Set(jids));
-        for (let jid of jids) {
-            const user = jidDecode(jid)?.user;
+        const jidsWithUser = jids
+            .map(jid => {
+            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,
+                    jid
+                });
+                return null;
+            }
             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);
+        }
+        for (const { jid, user } of jidsWithUser) {
             if (useCache) {
-                const devices = userDevicesCache.get(user);
+                const devices = mgetDevices?.[user] ||
+                    (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)));
                 if (devices) {
-                    deviceResults.push(...devices);
+                    const devicesWithJid = devices.map(d => ({
+                        ...d,
+                        jid: jidEncode(d.user, d.server, d.device)
+                    }));
+                    deviceResults.push(...devicesWithJid);
                     logger.trace({ user }, 'using cache for devices');
                 }
                 else {
@@ -136,43 +170,111 @@ export const makeMessagesSocket = (config) => {
         if (!toFetch.length) {
             return deviceResults;
         }
-        const query = new USyncQuery().withContext('message').withDeviceProtocol();
+        const requestedLidUsers = new Set();
+        for (const jid of toFetch) {
+            if (isLidUser(jid) || isHostedLidUser(jid)) {
+                const user = jidDecode(jid)?.user;
+                if (user)
+                    requestedLidUsers.add(user);
+            }
+        }
+        const query = new USyncQuery().withContext('message').withDeviceProtocol().withLIDProtocol();
         for (const jid of toFetch) {
-            query.withUser(new 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 sock.executeUSyncQuery(query);
         if (result) {
-            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices);
+            // TODO: LID MAP this stuff (lid protocol will now return lid with devices)
+            const lidResults = result.list.filter(a => !!a.lid);
+            if (lidResults.length > 0) {
+                logger.trace('Storing LID maps from device call');
+                await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id })));
+            }
+            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);
-                deviceResults.push(item);
             }
-            for (const key in deviceMap) {
-                userDevicesCache.set(key, deviceMap[key]);
+            // 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);
+                // Process all devices for this user
+                for (const item of userDevices) {
+                    const finalJid = isLidUser
+                        ? jidEncode(user, item.server, item.device)
+                        : jidEncode(item.user, item.server, item.device);
+                    deviceResults.push({
+                        ...item,
+                        jid: finalJid
+                    });
+                    logger.debug({
+                        user: item.user,
+                        device: item.device,
+                        finalJid,
+                        usedLid: isLidUser
+                    }, '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 })));
+            }
+            else {
+                for (const key in deviceMap) {
+                    if (deviceMap[key])
+                        await userDevicesCache.set(key, deviceMap[key]);
+                }
+            }
+            const userDeviceUpdates = {};
+            for (const [userId, devices] of Object.entries(deviceMap)) {
+                if (devices && devices.length > 0) {
+                    userDeviceUpdates[userId] = devices.map(d => d.device?.toString() || '0');
+                }
+            }
+            if (Object.keys(userDeviceUpdates).length > 0) {
+                try {
+                    await authState.keys.set({ 'device-list': userDeviceUpdates });
+                    logger.debug({ userCount: Object.keys(userDeviceUpdates).length }, 'stored user device lists for bulk migration');
+                }
+                catch (error) {
+                    logger.warn({ error }, 'failed to store user device lists');
+                }
             }
         }
         return deviceResults;
     };
-    const assertSessions = async (jids, force) => {
+    const assertSessions = async (jids) => {
         let didFetchNewSession = false;
-        let jidsRequiringFetch = [];
-        if (force) {
-            jidsRequiringFetch = jids;
-        }
-        else {
-            const addrs = jids.map(jid => signalRepository.jidToSignalProtocolAddress(jid));
-            const sessions = await authState.keys.get('session', addrs);
-            for (const jid of jids) {
-                const signalId = signalRepository.jidToSignalProtocolAddress(jid);
-                if (!sessions[signalId]) {
-                    jidsRequiringFetch.push(jid);
+        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
                 }
             }
+            else {
+                const sessionValidation = await signalRepository.validateSession(jid);
+                const hasSession = sessionValidation.exists;
+                peerSessionsCache.set(signalId, hasSession);
+                if (hasSession) {
+                    continue;
+                }
+            }
+            jidsRequiringFetch.push(jid);
         }
         if (jidsRequiringFetch.length) {
-            logger.debug({ jidsRequiringFetch }, 'fetching sessions');
+            // 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: {
@@ -184,7 +286,7 @@ export const makeMessagesSocket = (config) => {
                     {
                         tag: 'key',
                         attrs: {},
-                        content: jidsRequiringFetch.map(jid => ({
+                        content: wireJids.map(jid => ({
                             tag: 'user',
                             attrs: { jid }
                         }))
@@ -193,6 +295,11 @@ export const makeMessagesSocket = (config) => {
             });
             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;
     };
@@ -212,59 +319,91 @@ export const makeMessagesSocket = (config) => {
             additionalAttributes: {
                 category: 'peer',
                 push_priority: 'high_force'
-            }
+            },
+            additionalNodes: [
+                {
+                    tag: 'meta',
+                    attrs: { appdata: 'default' }
+                }
+            ]
         });
         return msgId;
     };
-    const createParticipantNodes = async (jids, message, extraAttrs) => {
-        let patched = await patchMessageBeforeSending(message, jids);
-        if (!Array.isArray(patched)) {
-            patched = jids ? jids.map(jid => ({ recipientJid: jid, ...patched })) : [patched];
-        }
+    const createParticipantNodes = async (recipientJids, message, extraAttrs, dsmMessage) => {
+        if (!recipientJids.length) {
+            return { nodes: [], shouldIncludeDeviceIdentity: false };
+        }
+        const patched = await patchMessageBeforeSending(message, recipientJids);
+        const patchedMessages = Array.isArray(patched)
+            ? patched
+            : recipientJids.map(jid => ({ recipientJid: jid, message: patched }));
         let shouldIncludeDeviceIdentity = false;
-        const nodes = await Promise.all(patched.map(async (patchedMessageWithJid) => {
-            const { recipientJid: jid, ...patchedMessage } = patchedMessageWithJid;
-            if (!jid) {
-                return {};
-            }
-            const bytes = encodeWAMessage(patchedMessage);
-            const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes });
-            if (type === 'pkmsg') {
-                shouldIncludeDeviceIdentity = true;
-            }
-            const node = {
-                tag: 'to',
-                attrs: { jid },
-                content: [
-                    {
-                        tag: 'enc',
-                        attrs: {
-                            v: '2',
-                            type,
-                            ...(extraAttrs || {})
-                        },
-                        content: ciphertext
-                    }
-                ]
-            };
+        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,
+                    data: bytes
+                });
+                if (type === 'pkmsg') {
+                    shouldIncludeDeviceIdentity = true;
+                }
+                return {
+                    tag: 'to',
+                    attrs: { jid },
+                    content: [
+                        {
+                            tag: 'enc',
+                            attrs: {
+                                v: '2',
+                                type,
+                                ...(extraAttrs || {})
+                            },
+                            content: ciphertext
+                        }
+                    ]
+                };
+            });
             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;
-        let shouldIncludeDeviceIdentity = false;
-        const { user, server } = jidDecode(jid);
+        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';
-        msgId = msgId || generateMessageIDV2(sock.user?.id);
+        const finalJid = jid;
+        msgId = msgId || generateMessageIDV2(meId);
         useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
-        const destinationJid = !isStatus ? jidEncode(user, isLid ? 'lid' : isGroup ? 'g.us' : 's.whatsapp.net') : statusJid;
+        const destinationJid = !isStatus ? finalJid : statusJid;
         const binaryNodeContent = [];
         const devices = [];
         const meMsg = {
@@ -276,14 +415,15 @@ export const makeMessagesSocket = (config) => {
         };
         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' };
             }
             const { user, device } = jidDecode(participant.jid);
-            devices.push({ user, device });
+            devices.push({
+                user,
+                device,
+                jid: participant.jid
+            });
         }
         await authState.keys.transaction(async () => {
             const mediaType = getMediaType(message);
@@ -291,7 +431,6 @@ export const makeMessagesSocket = (config) => {
                 extraAttrs['mediatype'] = mediaType;
             }
             if (isNewsletter) {
-                // Patch message if needed, then encode as plaintext
                 const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message;
                 const bytes = encodeNewsletterMessage(patched);
                 binaryNodeContent.push({
@@ -314,117 +453,198 @@ export const makeMessagesSocket = (config) => {
                 return;
             }
             if (normalizeMessageContent(message)?.pinInChatMessage) {
-                extraAttrs['decrypt-fail'] = 'hide';
+                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');
                         }
                         else if (!isStatus) {
-                            groupData = await groupMetadata(jid);
+                            groupData = await groupMetadata(jid); // TODO: start storing group participant list + addr mode in Signal & stop relying on this
                         }
                         return groupData;
                     })(),
                     (async () => {
                         if (!participant && !isStatus) {
-                            const result = await authState.keys.get('sender-key-memory', [jid]);
+                            // what if sender memory is less accurate than the cached metadata
+                            // on participant change in group, we should do sender memory manipulation
+                            const result = await authState.keys.get('sender-key-memory', [jid]); // TODO: check out what if the sender key memory doesn't include the LID stuff now?
                             return result[jid] || {};
                         }
                         return {};
                     })()
                 ]);
                 if (!participant) {
-                    const participantsList = groupData && !isStatus ? groupData.participants.map(p => p.id) : [];
-                    if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList);
+                    const participantsList = [];
+                    if (isStatus) {
+                        if (statusJidList?.length)
+                            participantsList.push(...statusJidList);
                     }
-                    if (!isStatus) {
+                    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: groupData?.addressingMode || 'pn'
+                            addressing_mode: groupAddressingMode
                         };
                     }
                     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
+                    meId: groupSenderIdentity
                 });
-                const senderKeyJids = [];
-                // ensure a connection is established with every device
-                for (const { user, device } of devices) {
-                    const jid = jidEncode(user, groupData?.addressingMode === 'lid' ? 'lid' : 's.whatsapp.net', device);
-                    if (!senderKeyMap[jid] || !!participant) {
-                        senderKeyJids.push(jid);
-                        // store that this person has had the sender keys sent to them
-                        senderKeyMap[jid] = true;
+                const senderKeyRecipients = [];
+                for (const device of devices) {
+                    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);
+                    const senderKeySessionTargets = senderKeyRecipients;
+                    await assertSessions(senderKeySessionTargets);
+                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
                 }
-                binaryNodeContent.push({
-                    tag: 'enc',
-                    attrs: { v: '2', type: 'skmsg' },
-                    content: ciphertext
-                });
-                await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
+                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
+                    });
+                }
+                else {
+                    binaryNodeContent.push({
+                        tag: 'enc',
+                        attrs: { v: '2', type: 'skmsg', ...extraAttrs },
+                        content: ciphertext
+                    });
+                    await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
+                }
             }
             else {
-                const { user: meUser } = jidDecode(meId);
+                // 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) {
-                    devices.push({ user });
-                    if (user !== meUser) {
-                        devices.push({ user: meUser });
+                    const targetUserServer = isLid ? 'lid' : 's.whatsapp.net';
+                    devices.push({
+                        user,
+                        device: 0,
+                        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 ? jidDecode(meLid).user : jidDecode(meId).user;
+                        devices.push({
+                            user: ownUserForAddressing,
+                            device: 0,
+                            jid: jidEncode(ownUserForAddressing, ownUserServer, 0)
+                        });
                     }
                     if (additionalAttributes?.['category'] !== 'peer') {
-                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
-                        devices.push(...additionalDevices);
+                        // Clear placeholders and enumerate actual devices
+                        devices.length = 0;
+                        // Use conversation-appropriate sender identity
+                        const senderIdentity = isLid && meLid
+                            ? 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], true, false);
+                        devices.push(...sessionDevices);
+                        logger.debug({
+                            deviceCount: devices.length,
+                            devices: devices.map(d => `${d.user}:${d.device}@${jidDecode(d.jid)?.server}`)
+                        }, 'Device enumeration complete with unified addressing');
                     }
                 }
-                const allJids = [];
-                const meJids = [];
-                const otherJids = [];
-                for (const { user, device } of devices) {
-                    const isMe = user === meUser;
-                    const jid = jidEncode(isMe && isLid ? authState.creds?.me?.lid.split(':')[0] || user : user, isLid ? 'lid' : 's.whatsapp.net', device);
+                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({ 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 || user === meLidUser;
                     if (isMe) {
-                        meJids.push(jid);
+                        meRecipients.push(jid);
                     }
                     else {
-                        otherJids.push(jid);
+                        otherRecipients.push(jid);
                     }
-                    allJids.push(jid);
+                    allRecipients.push(jid);
                 }
-                await assertSessions(allJids, false);
+                await assertSessions(allRecipients);
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
-                    createParticipantNodes(meJids, meMsg, extraAttrs),
-                    createParticipantNodes(otherJids, message, extraAttrs)
+                    // For own devices: use DSM if available (1:1 chats only)
+                    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;
             }
             if (participants.length) {
@@ -446,6 +666,7 @@ export const makeMessagesSocket = (config) => {
                 tag: 'message',
                 attrs: {
                     id: msgId,
+                    to: destinationJid,
                     type: getMessageType(message),
                     ...(additionalAttributes || {})
                 },
@@ -485,13 +706,23 @@ export const makeMessagesSocket = (config) => {
             }
             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);
+            }
+        }, meId);
         return msgId;
     };
     const getMessageType = (message) => {
         if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
             return 'poll';
         }
+        if (message.eventMessage) {
+            return 'event';
+        }
+        if (getMediaType(message) !== '') {
+            return 'media';
+        }
         return 'text';
     };
     const getMediaType = (message) => {
@@ -540,6 +771,7 @@ export const makeMessagesSocket = (config) => {
         else if (message.groupInviteMessage) {
             return 'url';
         }
+        return '';
     };
     const getPrivacyTokens = async (jids) => {
         const t = unixTimestampSeconds().toString();
@@ -583,6 +815,7 @@ export const makeMessagesSocket = (config) => {
         sendPeerDataOperationMessage,
         createParticipantNodes,
         getUSyncDevices,
+        messageRetryManager,
         updateMediaMessage: async (message) => {
             const content = assertMediaContent(message.message);
             const mediaKey = content.mediaKey;
@@ -647,19 +880,21 @@ export const makeMessagesSocket = (config) => {
                         thumbnailWidth: linkPreviewImageThumbnailWidth,
                         fetchOpts: {
                             timeout: 3000,
-                            ...(axiosOptions || {})
+                            ...(httpRequestOptions || {})
                         },
                         logger,
                         uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
                     }),
                     //TODO: CACHE
                     getProfilePicUrl: sock.profilePictureUrl,
+                    getCallLink: sock.createCallLink,
                     upload: waUploadToServer,
                     mediaCache: config.mediaCache,
                     options: config.options,
                     messageId: options.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;
@@ -690,8 +925,13 @@ export const makeMessagesSocket = (config) => {
                         }
                     });
                 }
-                if ('cachedGroupMetadata' in options) {
-                    console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.');
+                else if (isEventMsg) {
+                    additionalNodes.push({
+                        tag: 'meta',
+                        attrs: {
+                            event_type: 'creation'
+                        }
+                    });
                 }
                 await relayMessage(jid, fullMsg.message, {
                     messageId: fullMsg.key.id,