@periskope/baileys 7.0.0-alpha-8 → 7.0.0-alpha-10

package/lib/Socket/messages-send.js

@@ -18,6 +18,10 @@ export const makeMessagesSocket = (config) => {
             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
@@ -113,33 +117,28 @@ export const makeMessagesSocket = (config) => {
         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 (jid.includes('@lid')) {
-                const user = jidDecode(jid)?.user;
-                if (user)
-                    lidUsers.add(user);
-            }
+    const resolveSessionJids = async (jids) => {
+        const uniquePnJids = Array.from(new Set(jids.filter(isPnUser)));
+        if (!uniquePnJids.length) {
+            return new Map();
         }
-        // Filter out PN versions when LID exists
-        for (const jid of jids) {
-            if (jid.includes('@s.whatsapp.net')) {
-                const user = jidDecode(jid)?.user;
-                if (user && lidUsers.has(user)) {
-                    logger.debug({ jid }, 'Skipping PN - LID version exists');
-                    continue;
-                }
+        const lookups = await Promise.all(uniquePnJids.map(async (pnJid) => {
+            try {
+                const resolved = await signalRepository.lidMapping.getLIDForPN(pnJid);
+                return resolved ? [pnJid, resolved] : [pnJid, pnJid];
+            }
+            catch (error) {
+                logger.warn({ pnJid, error }, 'Failed to resolve LID mapping for PN JID');
+                return [pnJid, pnJid];
+            }
+        }));
+        const sessionMap = new Map();
+        for (const entry of lookups) {
+            if (entry) {
+                sessionMap.set(entry[0], entry[1]);
             }
-            filteredJids.push(jid);
         }
-        return filteredJids;
+        return sessionMap;
     };
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
@@ -148,7 +147,6 @@ export const makeMessagesSocket = (config) => {
             logger.debug('not using cache for devices');
         }
         const toFetch = [];
-        jids = deduplicateLidPnJids(Array.from(new Set(jids)));
         const jidsWithUser = jids
             .map(jid => {
             const decoded = jidDecode(jid);
@@ -246,139 +244,49 @@ export const makeMessagesSocket = (config) => {
                         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;
+        const uniqueJids = [...new Set(jids)]; // Deduplicate JIDs
         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);
-            // Simplified: Check session existence directly
-            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);
-                }
-            };
-            // 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 = jidNormalizedUser(jid);
-                if (!userGroups.has(user)) {
-                    userGroups.set(user, []);
+        // Check peerSessionsCache and authState.keys
+        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
                 }
-                userGroups.get(user).push(jid);
             }
-            // Helper to check LID mapping for a user
-            const checkUserLidMapping = async (user, userJids) => {
-                if (!userJids.some(jid => jid.includes('@s.whatsapp.net'))) {
-                    return { shouldMigrate: false, lidForPN: undefined };
-                }
-                try {
-                    // Convert user to proper PN JID format for getLIDForPN
-                    const pnJid = `${user}@s.whatsapp.net`;
-                    const mapping = await signalRepository.lidMapping.getLIDForPN(pnJid);
-                    if (mapping?.includes('@lid')) {
-                        logger.debug({ user, lidForPN: mapping, deviceCount: userJids.length }, 'User has LID mapping - preparing bulk migration');
-                        return { shouldMigrate: true, lidForPN: mapping };
-                    }
-                }
-                catch (error) {
-                    logger.debug({ user, error }, 'Failed to check LID mapping for user');
-                }
-                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');
-                    }
+            else {
+                const sessions = await authState.keys.get('session', [signalId]);
+                const hasSession = !!sessions[signalId];
+                peerSessionsCache.set(signalId, hasSession);
+                if (hasSession) {
+                    continue;
                 }
-                // 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 = jidDecode(jid);
-                        const lidDeviceJid = decoded.device !== undefined ? `${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');
-                    }
-                };
-                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 = jidDecode(jid)?.user;
-                if (user) {
-                    if (jid.includes('@lid')) {
-                        lidUsersBeingFetched.add(user);
-                    }
-                    else if (jid.includes('@s.whatsapp.net')) {
-                        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');
-            }
             const result = await query({
                 tag: 'iq',
                 attrs: {
@@ -399,6 +307,11 @@ export const makeMessagesSocket = (config) => {
             });
             await parseAndInjectE2ESessions(result, signalRepository);
             didFetchNewSession = true;
+            // Cache fetched sessions
+            for (const jid of jidsRequiringFetch) {
+                const signalId = signalRepository.jidToSignalProtocolAddress(jid);
+                peerSessionsCache.set(signalId, true);
+            }
         }
         return didFetchNewSession;
     };
@@ -422,107 +335,47 @@ export const makeMessagesSocket = (config) => {
         });
         return msgId;
     };
-    const createParticipantNodes = async (jids, message, extraAttrs, dsmMessage) => {
-        let patched = await patchMessageBeforeSending(message, jids);
-        if (!Array.isArray(patched)) {
-            patched = jids ? jids.map(jid => ({ recipientJid: jid, ...patched })) : [patched];
-        }
+    const createParticipantNodesWithSessionMap = async (recipientWireJids, sessionMap, message, extraAttrs, dsmMessage) => {
+        if (!recipientWireJids.length) {
+            return { nodes: [], shouldIncludeDeviceIdentity: false };
+        }
+        const patched = await patchMessageBeforeSending(message, recipientWireJids);
+        const patchedMessages = Array.isArray(patched)
+            ? patched
+            : recipientWireJids.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 devicesByUser = new Map();
-        for (const patchedMessageWithJid of patched) {
-            const { recipientJid: wireJid, ...patchedMessage } = patchedMessageWithJid;
+        const encryptionPromises = patchedMessages.map(async ({ recipientJid: wireJid, message: patchedMessage }) => {
             if (!wireJid)
-                continue;
-            // Extract user from JID for grouping
-            const decoded = 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 (!wireJid.includes('@s.whatsapp.net'))
-                    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 = jidDecode(wireJid);
-                    const deviceId = wireDecoded?.device || 0;
-                    const lidDecoded = jidDecode(lidForPN);
-                    const lidWithDevice = jidEncode(lidDecoded?.user, 'lid', deviceId);
-                    // Migrate session to LID for unified encryption layer
-                    try {
-                        const migrationResult = await signalRepository.migrateSession([wireJid], lidWithDevice);
-                        const recipientUser = jidNormalizedUser(wireJid);
-                        const ownPnUser = 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 } = jidDecode(wireJid);
-                    const { user: ownPnUser } = jidDecode(meId);
-                    const ownLidUser = meLidUser;
-                    // Check if this is our device (same user, different device)
-                    const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser);
-                    // Exclude exact sender device (whatsmeow: if jid == ownJID || jid == ownLID { continue })
-                    const isExactSenderDevice = wireJid === meId || (authState.creds.me?.lid && wireJid === authState.creds.me.lid);
-                    if (isOwnUser && !isExactSenderDevice) {
-                        messageToEncrypt = dsmMessage;
-                        logger.debug({ wireJid, targetUser }, 'Using DSM for own device');
-                    }
-                }
-                const bytes = encodeWAMessage(messageToEncrypt);
-                // Get encryption JID with LID migration
-                const encryptionJid = await getEncryptionJid(wireJid);
-                // ENCRYPT: Use the determined encryption identity (prefers migrated LID)
+                return null;
+            wireJid = sessionMap.get(wireJid) ?? wireJid;
+            let msgToEncrypt = patchedMessage;
+            if (dsmMessage) {
+                const { user: targetUser } = jidDecode(wireJid);
+                const { user: ownPnUser } = jidDecode(meId);
+                const ownLidUser = meLidUser;
+                const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser);
+                const isExactSenderDevice = wireJid === meId || (meLid && wireJid === meLid);
+                if (isOwnUser && !isExactSenderDevice) {
+                    msgToEncrypt = dsmMessage;
+                    logger.debug({ wireJid, targetUser }, 'Using DSM for own device');
+                }
+            }
+            const bytes = encodeWAMessage(msgToEncrypt);
+            const mutexKey = wireJid;
+            const node = await encryptionMutex.mutex(mutexKey, async () => {
                 const { type, ciphertext } = await signalRepository.encryptMessage({
-                    jid: encryptionJid, // Unified encryption layer (LID when available)
+                    jid: wireJid,
                     data: bytes
                 });
                 if (type === 'pkmsg') {
                     shouldIncludeDeviceIdentity = true;
                 }
-                const node = {
+                return {
                     tag: 'to',
-                    attrs: { jid: wireJid }, // Always use original wire identity in envelope
+                    attrs: { jid: wireJid },
                     content: [
                         {
                             tag: 'enc',
@@ -535,28 +388,27 @@ export const makeMessagesSocket = (config) => {
                         }
                     ]
                 };
-                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 node;
+        });
+        const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null);
         return { nodes, shouldIncludeDeviceIdentity };
     };
+    const createParticipantNodes = async (recipientWireJids, message, extraAttrs, dsmMessage) => {
+        const sessionMap = await resolveSessionJids(recipientWireJids);
+        return createParticipantNodesWithSessionMap(recipientWireJids, sessionMap, message, extraAttrs, dsmMessage);
+    };
     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;
-        // ADDRESSING CONSISTENCY: Keep envelope addressing as user provided, handle LID migration in encryption
-        let shouldIncludeDeviceIdentity = false;
-        const { user, server } = jidDecode(jid);
+        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';
-        // Keep user's original JID choice for envelope addressing
         const finalJid = jid;
         // ADDRESSING CONSISTENCY: Match own identity to conversation context
         // TODO: investigate if this is true
@@ -584,17 +436,14 @@ 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); // rajeh: how does this even make sense TODO check out
+            const { user, device } = jidDecode(participant.jid);
             devices.push({
                 user,
                 device,
-                wireJid: participant.jid // Use the participant JID as wire JID
+                wireJid: participant.jid
             });
         }
         await authState.keys.transaction(async () => {
@@ -603,7 +452,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({
@@ -663,12 +511,17 @@ export const makeMessagesSocket = (config) => {
                     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);
-                // 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 { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
@@ -676,39 +529,53 @@ export const makeMessagesSocket = (config) => {
                     data: bytes,
                     meId: groupSenderIdentity
                 });
-                const senderKeyJids = [];
-                // ensure a connection is established with every device
+                const deviceSessionMap = await resolveSessionJids(devices.map(d => d.wireJid));
+                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
+                    if (!hasKey && !isRetryResend) {
+                        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.map(jid => deviceSessionMap.get(jid) ?? jid);
+                    await assertSessions(senderKeySessionTargets);
+                    const result = await createParticipantNodesWithSessionMap(senderKeyRecipients, deviceSessionMap, 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: ownUser } = jidDecode(ownId);
@@ -737,7 +604,7 @@ export const makeMessagesSocket = (config) => {
                             ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
                             : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined);
                         // Enumerate devices for sender and target with consistent addressing
-                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], false, false);
+                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false);
                         devices.push(...sessionDevices);
                         logger.debug({
                             deviceCount: devices.length,
@@ -745,9 +612,9 @@ export const makeMessagesSocket = (config) => {
                         }, 'Device enumeration complete with unified addressing');
                     }
                 }
-                const allJids = [];
-                const meJids = [];
-                const otherJids = [];
+                const allRecipients = [];
+                const meRecipients = [];
+                const otherRecipients = [];
                 const { user: mePnUser } = jidDecode(meId);
                 const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null };
                 for (const { user, wireJid } of devices) {
@@ -758,25 +625,26 @@ export const makeMessagesSocket = (config) => {
                     }
                     // 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);
+                        meRecipients.push(wireJid);
                     }
                     else {
-                        otherJids.push(jid);
+                        otherRecipients.push(wireJid);
                     }
-                    allJids.push(jid);
+                    allRecipients.push(wireJid);
                 }
-                await assertSessions([...otherJids, ...meJids], false);
+                const deviceSessionMap = await resolveSessionJids(devices.map(d => d.wireJid));
+                const sessionTargets = allRecipients.map(jid => deviceSessionMap.get(jid) ?? jid);
+                await assertSessions(sessionTargets);
                 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)
+                    createParticipantNodesWithSessionMap(meRecipients, deviceSessionMap, meMsg || message, extraAttrs),
+                    createParticipantNodesWithSessionMap(otherRecipients, deviceSessionMap, message, extraAttrs, meMsg)
                 ]);
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
-                if (meJids.length > 0 || otherJids.length > 0) {
-                    extraAttrs['phash'] = generateParticipantHashV2([...meJids, ...otherJids]);
+                if (meRecipients.length > 0 || otherRecipients.length > 0) {
+                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
                 }
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
@@ -853,6 +721,9 @@ export const makeMessagesSocket = (config) => {
         if (message.eventMessage) {
             return 'event';
         }
+        if (getMediaType(message) !== '') {
+            return 'media';
+        }
         return 'text';
     };
     const getMediaType = (message) => {
@@ -901,6 +772,7 @@ export const makeMessagesSocket = (config) => {
         else if (message.groupInviteMessage) {
             return 'url';
         }
+        return '';
     };
     const getPrivacyTokens = async (jids) => {
         const t = unixTimestampSeconds().toString();
@@ -1062,9 +934,6 @@ export const makeMessagesSocket = (config) => {
                         }
                     });
                 }
-                if ('cachedGroupMetadata' in options) {
-                    console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.');
-                }
                 await relayMessage(jid, fullMsg.message, {
                     messageId: fullMsg.key.id,
                     useCachedGroupMetadata: options.useCachedGroupMetadata,