@badzz88/baileys 8.4.7 → 8.5.0

package/lib/Socket/messages-send.js

@@ -1,1006 +1,1224 @@
-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, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateIOSMessageID, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds, setBotMessageSecret } from '../Utils/index.js';
-import { getUrlInfo } from '../Utils/link-preview.js';
-import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
-import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/reporting-utils.js';
-import { buildMergedTcTokenIndexWrite, isTcTokenExpired, resolveIssuanceJid, resolveTcTokenJid, shouldSendNewTcToken, storeTcTokensFromIqResult } from '../Utils/tc-token-utils.js';
-import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET, getAdditionalNode, getBinaryNodeFilter, getBinaryFilteredBizBot, isInteropUser } from '../WABinary/index.js';
-import { USyncQuery, USyncUser } from '../WAUSync/index.js';
-import { makeUsernameSocket } from './username.js';
-import imup from './luxu.js';
-import * as Utils_1 from '../Utils/index.js';
-import { randomBytes } from 'crypto';
-export const makeMessagesSocket = (config) => {
-    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount, aiLabel } = config;
-    const sock = makeUsernameSocket(config);
-    const { ev, authState, messageMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral, registerSocketEndHandler } = sock;
-    const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping);
-    /**
-     * Set of tctoken storage JIDs with a fire-and-forget `issuePrivacyTokens` IQ in flight.
-     * Prevents duplicate IQs from rapid back-to-back sends before `senderTimestamp` persists.
-     * Entries are always removed in `.finally()`, so the set is bounded by concurrency.
-     */
-    const inFlightTcTokenIssuance = new Set();
-    const userDevicesCache = config.userDevicesCache ||
-        new NodeCache({
-            stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
-            useClones: false
-        });
-    /** Serializes writes to userDevicesCache across USync refresh and device-notification handling. */
-    const devicesMutex = makeMutex();
-    // 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;
-    /** Per-socket media host; updated whenever media_conn is fetched. Defaults to the public WhatsApp host. */
-    let mediaHost = DEF_MEDIA_HOST;
-    const refreshMediaConn = async (forceGet = false) => {
-        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: S_WHATSAPP_NET
-                    },
-                    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,
-                        maxContentLengthBytes: +attrs.maxContentLengthBytes
-                    })),
-                    auth: mediaConnNode.attrs.auth,
-                    ttl: +mediaConnNode.attrs.ttl,
-                    fetchDate: new Date()
-                };
-                logger.debug('fetched media conn');
-                if (node.hosts[0]) {
-                    mediaHost = node.hosts[0].hostname;
-                }
-                return node;
-            })();
-        }
-        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';
-        if (isReadReceipt) {
-            node.attrs.t = unixTimestampSeconds().toString();
-        }
-        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
-            node.attrs.recipient = jid;
-            node.attrs.to = participant;
-        }
-        else {
-            node.attrs.to = jid;
-            if (participant) {
-                node.attrs.participant = participant;
-            }
-        }
-        if (type) {
-            node.attrs.type = type;
-        }
-        const remainingMessageIds = messageIds.slice(1);
-        if (remainingMessageIds.length) {
-            node.content = [
-                {
-                    tag: 'list',
-                    attrs: {},
-                    content: remainingMessageIds.map(id => ({
-                        tag: 'item',
-                        attrs: { id }
-                    }))
-                }
-            ];
-        }
-        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 = aggregateMessageKeysNotFromMe(keys);
-        for (const { jid, participant, messageIds } of recps) {
-            await sendReceipt(jid, participant, messageIds, type);
-        }
-    };
-    /** Bulk read messages. Keys can be from different chats & participants */
-    const readMessages = async (keys) => {
-        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);
-    };
-    /** Fetch all the devices we've to send a message to */
-    const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
-        const deviceResults = [];
-        if (!useCache) {
-            logger.debug('not using cache for devices');
-        }
-        const toFetch = [];
-        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 = mgetDevices?.[user] ||
-                    (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)));
-                if (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 {
-                    toFetch.push(jid);
-                }
-            }
-            else {
-                toFetch.push(jid);
-            }
-        }
-        if (!toFetch.length) {
-            return deviceResults;
-        }
-        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)); // 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) {
-            // TODO: LID MAP this stuff (lid protocol will now return lid with devices)
-            const lidResults = result.list.filter(a => !!a.lid);
-            if (lidResults.length > 0) {
-                logger.trace('Storing LID maps from device call');
-                await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id })));
-                // Force-refresh sessions for newly mapped LIDs to align identity addressing
-                try {
-                    const lids = lidResults.map(a => a.lid);
-                    if (lids.length) {
-                        await assertSessions(lids, true);
-                    }
-                }
-                catch (e) {
-                    logger.warn({ e, count: lidResults.length }, 'failed to assert sessions for newly mapped LIDs');
-                }
-            }
-            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, authState.creds.me.lid, ignoreZeroDevices);
-            const deviceMap = {};
-            for (const item of extracted) {
-                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);
-                // 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');
-                }
-            }
-            await devicesMutex.mutex(async () => {
-                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;
-    };
-    /**
-     * Update Member Label
-     */
-    const updateMemberLabel = (jid, memberLabel) => {
-        return relayMessage(jid, {
-            protocolMessage: {
-                type: proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE,
-                memberLabel: {
-                    label: memberLabel?.slice(0, 30),
-                    labelTimestamp: unixTimestampSeconds()
-                }
-            }
-        }, {
-            additionalNodes: [
-                {
-                    tag: 'meta',
-                    attrs: {
-                        tag_reason: 'user_update',
-                        appdata: 'member_tag'
-                    },
-                    content: undefined
-                }
-            ]
-        });
-    };
-    const assertSessions = async (jids, force) => {
-        let didFetchNewSession = false;
-        const uniqueJids = [...new Set(jids)];
-        const jidsRequiringFetch = [];
-        logger.debug({ jids }, 'assertSessions call with jids');
-        for (const jid of uniqueJids) {
-            if (!force) {
-                const sessionValidation = await signalRepository.validateSession(jid);
-                if (sessionValidation.exists) {
-                    continue;
-                }
-            }
-            jidsRequiringFetch.push(jid);
-        }
-        if (jidsRequiringFetch.length) {
-            // 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: S_WHATSAPP_NET
-                },
-                content: [
-                    {
-                        tag: 'key',
-                        attrs: {},
-                        content: wireJids.map(jid => {
-                            const attrs = { jid };
-                            if (force)
-                                attrs.reason = 'identity';
-                            return { tag: 'user', attrs };
-                        })
-                    }
-                ]
-            });
-            await parseAndInjectE2ESessions(result, signalRepository);
-            didFetchNewSession = true;
-        }
-        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('Not authenticated');
-        }
-        const protocolMessage = {
-            protocolMessage: {
-                peerDataOperationRequestMessage: pdoMessage,
-                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
-            }
-        };
-        const meJid = jidNormalizedUser(authState.creds.me.id);
-        const msgId = await relayMessage(meJid, protocolMessage, {
-            additionalAttributes: {
-                category: 'peer',
-                push_priority: 'high_force'
-            },
-            additionalNodes: [
-                {
-                    tag: 'meta',
-                    attrs: { appdata: 'default' }
-                }
-            ]
-        });
-        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 }) => {
-            try {
-                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;
-            }
-            catch (err) {
-                logger.error({ jid, err }, 'Failed to encrypt for recipient');
-                return null;
-            }
-        });
-        const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null);
-        if (recipientJids.length > 0 && nodes.length === 0) {
-            throw new Boom('All encryptions failed', { statusCode: 500 });
-        }
-        return { nodes, shouldIncludeDeviceIdentity };
-    };
-    const relayMessage = async (
-	    jid,
-	    message,
-	    {
-		    messageId: msgId,
-        	participant = false,
-		    noSelfSync = false,
-		    additionalAttributes,
-		    additionalNodes,
-	    	useUserDevicesCache,
-		    useCachedGroupMetadata,
-		    statusJidList
-	    }
+'use strict'
+var __importDefault =
+	(this && this.__importDefault) ||
+	function (mod) {
+		return mod && mod.__esModule ? mod : { default: mod }
+	}
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.makeMessagesSocket = void 0
+const node_cache_1 = __importDefault(require('@cacheable/node-cache'))
+const boom_1 = require('@hapi/boom')
+const index_js_1 = require('../../WAProto/index.js')
+const Defaults_1 = require('../Defaults')
+const Utils_1 = require('../Utils')
+const link_preview_1 = require('../Utils/link-preview')
+const make_mutex_1 = require('../Utils/make-mutex')
+const reporting_utils_1 = require('../Utils/reporting-utils')
+const tc_token_utils_1 = require('../Utils/tc-token-utils')
+const jid_display_normalization_1 = require('../Utils/jid-display-normalization')
+const WABinary_1 = require('../WABinary')
+const WAUSync_1 = require('../WAUSync')
+const message_composer_1 = require('../Utils/message-composer.js')
+const interactive_handler_1 = require('./interactive-handler.js')
+const username_1 = require('./username')
+const { setBotMessageSecret } = require('../Utils/decode-wa-message')
+const makeMessagesSocket = config => {
+	const {
+		logger,
+		linkPreviewImageThumbnailWidth,
+		generateHighQualityLinkPreview,
+		options: httpRequestOptions,
+		patchMessageBeforeSending,
+		cachedGroupMetadata,
+		enableRecentMessageCache,
+		maxMsgRetryCount
+	} = config
+	const sock = (0, username_1.makeUsernameSocket)(config)
+	const {
+		ev,
+		authState,
+		messageMutex,
+		signalRepository,
+		upsertMessage,
+		query,
+		fetchPrivacySettings,
+		sendNode,
+		groupMetadata,
+		groupToggleEphemeral,
+		trustInteropContact
+	} = sock
+	const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping)
+	/**
+	 * Set of tctoken storage JIDs with a fire-and-forget issuePrivacyTokens IQ in flight.
+	 * Prevents duplicate IQs from rapid back-to-back sends before senderTimestamp persists.
+	 */
+	const inFlightTcTokenIssuance = new Set()
+	const userDevicesCache =
+		config.userDevicesCache ||
+		new node_cache_1.default({
+			stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
+			useClones: false
+		})
+	const peerSessionsCache = new node_cache_1.default({
+		stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+		useClones: false
+	})
+	// Initialize message retry manager if enabled
+	const messageRetryManager = enableRecentMessageCache
+		? new Utils_1.MessageRetryManager(logger, maxMsgRetryCount)
+		: null
+	// Prevent race conditions in Signal session encryption by user
+	const encryptionMutex = (0, make_mutex_1.makeKeyedMutex)()
+	let mediaConn
+	const refreshMediaConn = async (forceGet = false) => {
+		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
+					},
+					content: [{ tag: 'media_conn', attrs: {} }]
+				})
+				const mediaConnNode = (0, WABinary_1.getBinaryNodeChild)(result, 'media_conn')
+				// TODO: explore full length of data that whatsapp provides
+				const node = {
+					hosts: (0, WABinary_1.getBinaryNodeChildren)(mediaConnNode, 'host').map(({ attrs }) => ({
+						hostname: attrs.hostname,
+						maxContentLengthBytes: +attrs.maxContentLengthBytes
+					})),
+					auth: mediaConnNode.attrs.auth,
+					ttl: +mediaConnNode.attrs.ttl,
+					fetchDate: new Date()
+				}
+				logger.debug('fetched media conn')
+				return node
+			})()
+		}
+		return mediaConn
+	}
+	/**
+	 * generic send receipt function
+	 * used for receipts of phone call, read, delivery etc.
+	 * */
+	const sendReceipt = async (jid, participant, messageIds, type, sts) => {
+		if (!messageIds || messageIds.length === 0) {
+			throw new boom_1.Boom('missing ids in receipt')
+		}
+		const isInterop = (0, WABinary_1.isInteropUser)(jid)
+		const node = {
+			tag: 'receipt',
+			attrs: {
+				id: messageIds[0]
+			}
+		}
+		const isReadReceipt = type === 'read' || type === 'read-self'
+		if (isReadReceipt) {
+			node.attrs.t = (0, Utils_1.unixTimestampSeconds)().toString()
+		}
+		if (type === 'sender' && ((0, WABinary_1.isPnUser)(jid) || (0, WABinary_1.isLidUser)(jid))) {
+			node.attrs.recipient = jid
+			node.attrs.to = participant
+		} else if (isInterop && !type) {
+			// Delivery receipt to interop contact: WA sends to device-qualified JID (user:0@interop)
+			const { user } = (0, WABinary_1.jidDecode)(jid)
+			node.attrs.to = `${user}:0@interop`
+		} else {
+			node.attrs.to = jid
+			if (participant) {
+				node.attrs.participant = participant
+			}
+		}
+		if (type) {
+			node.attrs.type = type
+		}
+		// Interop bridge requires sts (microsecond stanza timestamp) from the original message
+		if (isInterop && sts) {
+			node.attrs.sts = sts
+		}
+		const remainingMessageIds = messageIds.slice(1)
+		if (remainingMessageIds.length) {
+			node.content = [
+				{
+					tag: 'list',
+					attrs: {},
+					content: remainingMessageIds.map(id => ({
+						tag: 'item',
+						attrs: { id }
+					}))
+				}
+			]
+		}
+		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 = (0, Utils_1.aggregateMessageKeysNotFromMe)(keys)
+		for (const { jid, participant, messageIds, sts } of recps) {
+			await sendReceipt(jid, participant, messageIds, type, sts)
+		}
+	}
+	/** Bulk read messages. Keys can be from different chats & participants */
+	const readMessages = async keys => {
+		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)
+	}
+	/** Fetch all the devices we've to send a message to */
+	const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
+		const deviceResults = []
+		if (!useCache) {
+			logger.debug('not using cache for devices')
+		}
+		const toFetch = []
+		const jidsWithUser = jids
+			.map(jid => {
+				const decoded = (0, WABinary_1.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 = (0, WABinary_1.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 = mgetDevices?.[user] || (userDevicesCache.mget ? undefined : await userDevicesCache.get(user))
+				if (devices) {
+					const devicesWithJid = devices.map(d => ({
+						...d,
+						jid: (0, WABinary_1.jidEncode)(d.user, d.server, d.device)
+					}))
+					deviceResults.push(...devicesWithJid)
+					logger.trace({ user }, 'using cache for devices')
+				} else {
+					toFetch.push(jid)
+				}
+			} else {
+				toFetch.push(jid)
+			}
+		}
+		if (!toFetch.length) {
+			return deviceResults
+		}
+		const requestedLidUsers = new Set()
+		for (const jid of toFetch) {
+			if ((0, WABinary_1.isLidUser)(jid) || (0, WABinary_1.isHostedLidUser)(jid)) {
+				const user = (0, WABinary_1.jidDecode)(jid)?.user
+				if (user) requestedLidUsers.add(user)
+			}
+		}
+		const query = new WAUSync_1.USyncQuery().withContext('message').withDeviceProtocol().withLIDProtocol()
+		for (const jid of toFetch) {
+			query.withUser(new WAUSync_1.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) {
+			// TODO: LID MAP this stuff (lid protocol will now return lid with devices)
+			const lidResults = result.list.filter(a => !!a.lid)
+			if (lidResults.length > 0) {
+				logger.trace('Storing LID maps from device call')
+				await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id })))
+				// Force-refresh sessions for newly mapped LIDs to align identity addressing
+				try {
+					const lids = lidResults.map(a => a.lid)
+					if (lids.length) {
+						await assertSessions(lids, true)
+					}
+				} catch (e) {
+					logger.warn({ e, count: lidResults.length }, 'failed to assert sessions for newly mapped LIDs')
+				}
+			}
+			const extracted = (0, Utils_1.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)
+			}
+			// 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
+						? (0, WABinary_1.jidEncode)(user, item.server, item.device)
+						: (0, WABinary_1.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
+	}
+	/**
+	 * Update Member Label
+	 */
+	const updateMemberLabel = (jid, memberLabel) => {
+		return relayMessage(
+			jid,
+			{
+				protocolMessage: {
+					type: index_js_1.proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE,
+					memberLabel: {
+						label: memberLabel?.slice(0, 30),
+						labelTimestamp: (0, Utils_1.unixTimestampSeconds)()
+					}
+				}
+			},
+			{
+				additionalNodes: [
+					{
+						tag: 'meta',
+						attrs: {
+							tag_reason: 'user_update',
+							appdata: 'member_tag'
+						},
+						content: undefined
+					}
+				]
+			}
+		)
+	}
+	const assertSessions = async (jids, force) => {
+		let didFetchNewSession = false
+		const uniqueJids = [...new Set(jids)] // Deduplicate JIDs
+		const jidsRequiringFetch = []
+		logger.debug({ jids }, 'assertSessions call with jids')
+		// Check peerSessionsCache and validate sessions using libsignal loadSession
+		for (const jid of uniqueJids) {
+			const signalId = signalRepository.jidToSignalProtocolAddress(jid)
+			const cachedSession = peerSessionsCache.get(signalId)
+			if (cachedSession !== undefined) {
+				if (cachedSession && !force) {
+					continue // Session exists in cache
+				}
+			} else {
+				const sessionValidation = await signalRepository.validateSession(jid)
+				const hasSession = sessionValidation.exists
+				peerSessionsCache.set(signalId, hasSession)
+				if (hasSession && !force) {
+					continue
+				}
+			}
+			jidsRequiringFetch.push(jid)
+		}
+		if (jidsRequiringFetch.length) {
+			// LID if mapped, otherwise original; interop JIDs pass through as-is
+			const wireJids = [
+				...jidsRequiringFetch.filter(jid => !!(0, WABinary_1.isLidUser)(jid) || !!(0, WABinary_1.isHostedLidUser)(jid)),
+				...(
+					(await signalRepository.lidMapping.getLIDsForPNs(
+						jidsRequiringFetch.filter(jid => !!(0, WABinary_1.isPnUser)(jid) || !!(0, WABinary_1.isHostedPnUser)(jid))
+					)) || []
+				).map(a => a.lid),
+				...jidsRequiringFetch.filter(jid => (0, WABinary_1.isInteropUser)(jid))
+			]
+			const interopFetches = wireJids.filter(j => (0, WABinary_1.isInteropUser)(j))
+			if (interopFetches.length) {
+				logger.info({ interopFetches }, '[interop] fetching pre-key bundle for interop device(s)')
+			}
+			logger.debug({ jidsRequiringFetch, wireJids }, 'fetching sessions')
+			if (!wireJids.length) {
+				logger.debug({ jidsRequiringFetch }, 'assertSessions: no wire JIDs to fetch (all unsupported domain)')
+				return didFetchNewSession
+			}
+			const result = await query({
+				tag: 'iq',
+				attrs: {
+					xmlns: 'encrypt',
+					type: 'get',
+					to: WABinary_1.S_WHATSAPP_NET
+				},
+				content: [
+					{
+						tag: 'key',
+						attrs: {},
+						content: wireJids.map(jid => {
+							const attrs = { jid }
+							if (force) attrs.reason = 'identity'
+							return { tag: 'user', attrs }
+						})
+					}
+				]
+			})
+			if (interopFetches.length) {
+				logger.debug({ interopFetches }, '[interop] pre-key IQ response received')
+			}
+			await (0, Utils_1.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
+	}
+	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')
+		}
+		const protocolMessage = {
+			protocolMessage: {
+				peerDataOperationRequestMessage: pdoMessage,
+				type: index_js_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
+			}
+		}
+		const meJid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)
+		const msgId = await relayMessage(meJid, protocolMessage, {
+			additionalAttributes: {
+				category: 'peer',
+				push_priority: 'high_force'
+			},
+			additionalNodes: [
+				{
+					tag: 'meta',
+					attrs: { appdata: 'default' }
+				}
+			]
+		})
+		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 ? (0, WABinary_1.jidDecode)(meLid)?.user : null
+		const encryptionPromises = patchedMessages.map(async ({ recipientJid: jid, message: patchedMessage }) => {
+			try {
+				if (!jid) return null
+				let msgToEncrypt = patchedMessage
+				if (dsmMessage) {
+					const { user: targetUser } = (0, WABinary_1.jidDecode)(jid)
+					const { user: ownPnUser } = (0, WABinary_1.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 = (0, Utils_1.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
+			} catch (err) {
+				logger.error({ jid, err }, 'Failed to encrypt for recipient')
+				return null
+			}
+		})
+		const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null)
+		if (recipientJids.length > 0 && nodes.length === 0) {
+			throw new boom_1.Boom('All encryptions failed', { statusCode: 500 })
+		}
+		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 isInterop = isInteropUser(jid)
-    	const isGroupOrStatus = isGroup || isStatus
-    	const finalJid = jid
-    	const iosBros = config.browser[0] === "iOS" || config.browser[1] === "Safari";
-	    msgId = iosBros ? generateIOSMessageID() : msgId ?? generateMessageIDV2(meId)
-    	useUserDevicesCache = useUserDevicesCache!== false
-    	useCachedGroupMetadata = useCachedGroupMetadata!== false &&!isStatus
-	    const participants = []
-	    const destinationJid =!isStatus? finalJid : statusJid
-    	const binaryNodeContent = []
-	    const devices = []
-    	let reportingMessage
-    	const meMsg = {
-	    	deviceSentMessage: { destinationJid, message },
-	    	messageContextInfo: message.messageContextInfo
-	    }
-	    const extraAttrs = {}
-    	const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/
-	    const messages = normalizeMessageContent(message)
-	    const buttonType = getButtonType(messages)
-    	const pollMessage =
-	    	messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3
-	    await authState.keys.transaction(async () => {
-	    	const mediaType = getMediaType(message)
-	    	if (mediaType) extraAttrs.mediatype = mediaType
-	    	if (isNewsletter) {
-		    	const patched = patchMessageBeforeSending? await patchMessageBeforeSending(message, []) : message
-	    		const bytes = encodeNewsletterMessage(patched)
-		    	binaryNodeContent.push({ tag: 'plaintext', attrs: {}, content: bytes })
-		    	const stanza = {
-	    			tag: 'message',
-		    		attrs: {
-		    			to: jid,
-		    			id: msgId,
-		    			type: getMessageType(message),
-		    			...(additionalAttributes || {})
-		    		},
-		    		content: binaryNodeContent
-		    	}
-		    	logger.debug({ msgId }, `sending newsletter message to ${jid}`)
-		    	await sendNode(stanza)
-		    	return
-	        }
-	    	if (normalizeMessageContent(message)?.pinInChatMessage || normalizeMessageContent(message)?.reactionMessage) {
-		    	extraAttrs['decrypt-fail'] = 'hide'
-        	}
-		    if (isGroupOrStatus &&!isRetryResend) {
-		    	const [groupData, senderKeyMap] = await Promise.all([
-		    		(async () => {
-			    		let groupData = useCachedGroupMetadata && cachedGroupMetadata? await cachedGroupMetadata(jid) : undefined
-			    		if (groupData && Array.isArray(groupData?.participants)) {
-		    				logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
-			    		} else if (!isStatus) {
-			    			groupData = await groupMetadata(jid)
-			    		}
-			    		return groupData
-			    	})(),
-		    		(async () => {
-		    			if (!participant &&!isStatus) {
-			    			const result = await authState.keys.get('sender-key-memory', [jid])
-				    		return result[jid] || {}
-			    		}
-			    		return {}
-			    	})()
-		    	])
-		    	const participantsList = groupData? groupData.participants.map(p => p.id) : []
-		    	if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
-		    		additionalAttributes = {...additionalAttributes, expiration: groupData.ephemeralDuration.toString() }
-		    	}
-		    	if (isStatus && statusJidList) participantsList.push(...statusJidList)
-		    	const additionalDevices = await getUSyncDevices(participantsList, false, false)
-		    	devices.push(...additionalDevices)
-		    	if (isGroup) {
-		    		additionalAttributes = {
-			    		...additionalAttributes,
-			    		addressing_mode: groupData?.addressingMode || 'lid'
-			    	}
-		    	}
-		    	if (message?.groupStatusMessageV2 &&!message?.messageContextInfo?.messageSecret) {
-		    		message = {
-			    		...message,
-			    		messageContextInfo: {
-				    		...(message.messageContextInfo || {}),
-			    			messageSecret: randomBytes(32)
-				    	},
-			    		groupStatusMessageV2: {
-				    		...message.groupStatusMessageV2,
-				    		message: {
-				    			...(message.groupStatusMessageV2.message || {}),
-					    		messageContextInfo: {
-				    				...(message.groupStatusMessageV2.message?.messageContextInfo || {}),
-				    				messageSecret: message.messageContextInfo?.messageSecret || randomBytes(32)
-				    			}
-				    		}
-			    		}
-		    		}
-		    	}
-		    	// list/buttons/template -> interactiveMessage
-			    if (message.listMessage) {
-		    		const list = message.listMessage
-			    	message = {
-			    		interactiveMessage: {
-				    		nativeFlowMessage: {
-				    			buttons: [
-					    			{
-				    					name: 'single_select',
-				    					buttonParamsJson: JSON.stringify({
-				    						title: list.buttonText || 'Select',
-					    					sections: (list.sections || []).map(section => ({
-					    						title: section.title || '',
-				    							highlight_label: '',
-				    							rows: (section.rows || []).map(row => ({
-					    							header: '',
-					    							title: row.title || '',
-				    								description: row.description || '',
-					    							id: row.rowId || row.id || ''
-				    							}))
-				    						}))
-					    				})
-					    			}
-				    			],
-				    			messageParamsJson: '',
-				    			messageVersion: 1
-				    		},
-					    	body: { text: list.description || '' },
-				    		footer: list.footerText? { text: list.footerText } : undefined,
-				    		header: list.title? { title: list.title, hasMediaAttachment: false, subtitle: '' } : undefined,
-				    		contextInfo: list.contextInfo
-				    	}
-			    	}
-		    	} else if (message.buttonsMessage) {
-			    	const bMsg = message.buttonsMessage
-			    	const buttons = (bMsg.buttons || []).map(btn => ({
-				    	name: 'quick_reply',
-			    		buttonParamsJson: JSON.stringify({
-				    		display_text: btn.buttonText?.displayText || btn.buttonText || '',
-			    			id: btn.buttonId || btn.buttonText?.displayText || ''
-			    		})
-			    	}))
-		    		message = {
-			    		interactiveMessage: {
-				    		nativeFlowMessage: { buttons, messageParamsJson: '', messageVersion: 1 },
-				    		body: { text: bMsg.contentText || bMsg.text || '' },
-				    		footer: bMsg.footerText? { text: bMsg.footerText } : undefined,
-				    		header: bMsg.text
-				    			? { title: bMsg.text, hasMediaAttachment: false, subtitle: '' }
-				    			: bMsg.imageMessage || bMsg.videoMessage || bMsg.documentMessage
-				    				? { hasMediaAttachment: true,...(bMsg.imageMessage? { imageMessage: bMsg.imageMessage } : {}),...(bMsg.videoMessage? { videoMessage: bMsg.videoMessage } : {}) }
-				    				: undefined,
-			    			contextInfo: bMsg.contextInfo
-			    		}
-			    	}
-		    	} else if (message.templateMessage) {
-			    	const tmpl = message.templateMessage.hydratedTemplate || message.templateMessage.fourRowTemplate
-			    	if (tmpl) {
-			    		const buttons = (tmpl.hydratedButtons || [])
-				    		.map(hBtn => {
-				    			if (hBtn.quickReplyButton) {
-				    				return { name: 'quick_reply', buttonParamsJson: JSON.stringify({ display_text: hBtn.quickReplyButton.displayText || '', id: hBtn.quickReplyButton.id || hBtn.quickReplyButton.displayText || '' }) }
-				    			} else if (hBtn.urlButton) {
-				    				return { name: 'cta_url', buttonParamsJson: JSON.stringify({ display_text: hBtn.urlButton.displayText || '', url: hBtn.urlButton.url || '', merchant_url: hBtn.urlButton.url || '' }) }
-				    			} else if (hBtn.callButton) {
-				    				return { name: 'cta_call', buttonParamsJson: JSON.stringify({ display_text: hBtn.callButton.displayText || '', phone_number: hBtn.callButton.phoneNumber || '' }) }
-					    		}
-					    		return null
-				    		})
-				    		.filter(Boolean)
-				    	message = {
-				    		interactiveMessage: {
-					    		nativeFlowMessage: { buttons, messageParamsJson: '', messageVersion: 1 },
-					    		body: { text: tmpl.hydratedContentText || tmpl.contentText || '' },
-				    			footer: tmpl.hydratedFooterText? { text: tmpl.hydratedFooterText } : undefined,
-					    		header: tmpl.hydratedTitleText
-					    			? { title: tmpl.hydratedTitleText, hasMediaAttachment: false, subtitle: '' }
-					    			: tmpl.imageMessage || tmpl.videoMessage || tmpl.documentMessage
-					    				? { hasMediaAttachment: true,...(tmpl.imageMessage? { imageMessage: tmpl.imageMessage } : {}),...(tmpl.videoMessage? { videoMessage: tmpl.videoMessage } : {}) }
-						    			: undefined,
-					    		contextInfo: tmpl.contextInfo
-				    		}
-				    	}
-			    	}
-		    	}
+		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 } = (0, WABinary_1.jidDecode)(jid)
+		const isGroup = server === 'g.us'
+		const isStatus = jid === statusJid
+		const isLid = server === 'lid'
+		const isNewsletter = server === 'newsletter'
+		const isInterop = (0, WABinary_1.isInteropUser)(jid)
+		const isGroupOrStatus = isGroup || isStatus
+		const finalJid = jid
+		const iosBros = config.browser[0] === "iOS" || config.browser[1] === "Safari";
+	    msgId = iosBros ? Utils_1.generateIOSMessageID() : msgId ?? (0, Utils_1.generateMessageIDV2)(meId)
+		useUserDevicesCache = useUserDevicesCache !== false
+		useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
+		const participants = []
+		const destinationJid = !isStatus ? finalJid : statusJid
+		const binaryNodeContent = []
+		const devices = []
+		let reportingMessage
+		const meMsg = {
+			deviceSentMessage: {
+				destinationJid,
+				message
+			},
+			messageContextInfo: message.messageContextInfo
+		}
+		const extraAttrs = {}
 
-		    	const patched = await patchMessageBeforeSending(message)
-		    	if (Array.isArray(patched)) throw new Boom('Per-jid patching is not supported in groups')
-		    	const bytes = encodeWAMessage(patched)
-		    	reportingMessage = 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 senderKeyRecipients = []
-			    for (const device of devices) {
-		    		const deviceJid = device.jid
-		    		const hasKey =!!senderKeyMap[deviceJid]
-		    		if (!hasKey ||!!participant &&!isHostedLidUser(deviceJid) &&!isHostedPnUser(deviceJid) && device.device!== 99) {
-			    		senderKeyRecipients.push(deviceJid)
-		    			senderKeyMap[deviceJid] = true
-		    		}
-		    	}
-		    	if (senderKeyRecipients.length) {
-		    		logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key')
-		    		const senderKeyMsg = {
-		    			senderKeyDistributionMessage: {
-		    				axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
-			    			groupId: destinationJid
-		    			}
-			    	}
-		    		await assertSessions(senderKeyRecipients)
-			    	const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs)
-			    	shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity
-		    		participants.push(...result.nodes)
-		    	}
-		    	binaryNodeContent.push({ tag: 'enc', attrs: { v: '2', type: 'skmsg',...extraAttrs }, content: ciphertext })
-		    	await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } })
-    	} else {
-	    		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 patchedForReporting = await patchMessageBeforeSending(message, [jid])
-		    		reportingMessage = Array.isArray(patchedForReporting)
-		    			? patchedForReporting.find(item => item.recipientJid === jid) || patchedForReporting[0]
-		    			: patchedForReporting
-		    	}
-		    	if (!isRetryResend) {
-		    		const targetUserServer = isLid? 'lid' : isInterop? 'interop' : 's.whatsapp.net'
-		    		devices.push({ user, device: 0, jid: jidEncode(user, targetUserServer, 0) })
-		    		if (user!== ownUser &&!isInterop) {
-		    			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' &&!isInterop) {
-		    			devices.length = 0
-			    		const senderIdentity = isLid && meLid
-		    				? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
-		    				: jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined)
-		    			const sessionDevices = await getUSyncDevices([senderIdentity, jid], false, 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 allRecipients = []
-		    	const meRecipients = []
-		    	const otherRecipients = []
-	    		const { user: mePnUser } = jidDecode(meId)
-	    		const { user: meLidUser } = meLid? jidDecode(meLid) : { user: null }
-	    		for (const { user, jid } of devices) {
-	    		    /** noSelfSync: opsi untuk skip sync pesan ke device lain milik akun sendiri (private chat) */
-                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
-                    if (isExactSenderDevice) {
-                        logger.debug({ jid, meId, meLid }, 'Skipping exact sender device (whatsmeow pattern)')
-                        continue
-                    }
-                    const isMe = user === mePnUser || user === meLidUser
-                    let ptcp = false
-                    if (noSelfSync) {
-                        if (!isJidGroup(jid) && !isStatus) {
-                            if (!(!isMe)) ptcp = true
-                        } else {
-                            ptcp = false
-                        }
+		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
+		await authState.keys.transaction(async () => {
+			const mediaType = getMediaType(message)
+			if (mediaType) {
+				extraAttrs['mediatype'] = mediaType
+			}
+			if (isNewsletter) {
+				const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message
+				const bytes = (0, Utils_1.encodeNewsletterMessage)(patched)
+				binaryNodeContent.push({
+					tag: 'plaintext',
+					attrs: {},
+					content: bytes
+				})
+				const stanza = {
+					tag: 'message',
+					attrs: {
+						to: jid,
+						id: msgId,
+						type: getTypeMessage(message),
+						...(additionalAttributes || {})
+					},
+					content: binaryNodeContent
+				}
+				logger.debug({ msgId }, `sending newsletter message to ${jid}`)
+				await sendNode(stanza)
+				return
+			}
+			if (
+				(0, Utils_1.normalizeMessageContent)(message)?.pinInChatMessage ||
+				(0, Utils_1.normalizeMessageContent)(message)?.reactionMessage
+			) {
+				extraAttrs['decrypt-fail'] = 'hide' // todo: expand for reactions and other types
+			}
+			if (isGroupOrStatus && !isRetryResend) {
+				const [groupData, senderKeyMap] = await Promise.all([
+					(async () => {
+						let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
+						const looksStale =
+							groupData &&
+							typeof groupData.size === 'number' &&
+							Array.isArray(groupData.participants) &&
+							groupData.participants.length < groupData.size
+						if (groupData && Array.isArray(groupData?.participants) && !looksStale) {
+							logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
+						} else if (!isStatus) {
+							if (looksStale) {
+								logger.debug(
+									{ jid, cached: groupData.participants.length, expected: groupData.size },
+									'cached group metadata looks stale, re-fetching'
+								)
+							}
+							groupData = await groupMetadata(jid) // TODO: start storing group participant list + addr mode in Signal & stop relying on this
+						}
+						return groupData
+					})(),
+					(async () => {
+						if (!participant && !isStatus) {
+							// 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 {}
+					})()
+				])
+				const participantsList = groupData ? groupData.participants.map(p => p.id) : []
+				if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
+					additionalAttributes = {
+						...additionalAttributes,
+						expiration: groupData.ephemeralDuration.toString()
+					}
+				}
+				if (isStatus && statusJidList) {
+					participantsList.push(...statusJidList)
+				}
+				const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
+				devices.push(...additionalDevices)
+				if (isGroup) {
+					additionalAttributes = {
+						...additionalAttributes,
+						addressing_mode: groupData?.addressingMode || 'lid'
+					}
+				}
+				if (message?.groupStatusMessageV2 && !message?.messageContextInfo?.messageSecret) {
+					const { randomBytes } = require('crypto')
+					message = {
+						...message,
+						messageContextInfo: {
+							...(message.messageContextInfo || {}),
+							messageSecret: randomBytes(32)
+						},
+						groupStatusMessageV2: {
+							...message.groupStatusMessageV2,
+							message: {
+								...(message.groupStatusMessageV2.message || {}),
+								messageContextInfo: {
+									...(message.groupStatusMessageV2.message?.messageContextInfo || {}),
+									messageSecret: message.messageContextInfo?.messageSecret || randomBytes(32)
+								}
+							}
+						}
+					}
+				}
+				if (message.listMessage) {
+					const list = message.listMessage
+					const interactiveMessage = {
+						nativeFlowMessage: {
+							buttons: [
+								{
+									name: 'single_select',
+									buttonParamsJson: JSON.stringify({
+										title: list.buttonText || 'Select',
+										sections: (list.sections || []).map(section => ({
+											title: section.title || '',
+											highlight_label: '',
+											rows: (section.rows || []).map(row => ({
+												header: '',
+												title: row.title || '',
+												description: row.description || '',
+												id: row.rowId || row.id || ''
+											}))
+										}))
+									})
+								}
+							],
+							messageParamsJson: '',
+							messageVersion: 1
+						},
+						body: { text: list.description || '' },
+						footer: list.footerText ? { text: list.footerText } : undefined,
+						header: list.title ? { title: list.title, hasMediaAttachment: false, subtitle: '' } : undefined,
+						contextInfo: list.contextInfo
+					}
+					message = { interactiveMessage }
+				} else if (message.buttonsMessage) {
+					const bMsg = message.buttonsMessage
+					const buttons = (bMsg.buttons || []).map(btn => ({
+						name: 'quick_reply',
+						buttonParamsJson: JSON.stringify({
+							display_text: btn.buttonText?.displayText || btn.buttonText || '',
+							id: btn.buttonId || btn.buttonText?.displayText || ''
+						})
+					}))
+					const interactiveMessage = {
+						nativeFlowMessage: {
+							buttons,
+							messageParamsJson: '',
+							messageVersion: 1
+						},
+						body: { text: bMsg.contentText || bMsg.text || '' },
+						footer: bMsg.footerText ? { text: bMsg.footerText } : undefined,
+						header: bMsg.text
+							? { title: bMsg.text, hasMediaAttachment: false, subtitle: '' }
+							: bMsg.imageMessage || bMsg.videoMessage || bMsg.documentMessage
+								? {
+										hasMediaAttachment: true,
+										...(bMsg.imageMessage ? { imageMessage: bMsg.imageMessage } : {}),
+										...(bMsg.videoMessage ? { videoMessage: bMsg.videoMessage } : {})
+									}
+								: undefined,
+						contextInfo: bMsg.contextInfo
+					}
+					message = { interactiveMessage }
+				} else if (message.templateMessage) {
+					const tmpl = message.templateMessage.hydratedTemplate || message.templateMessage.fourRowTemplate
+					if (tmpl) {
+						const hydratedButtons = tmpl.hydratedButtons || []
+						const buttons = hydratedButtons
+							.map(hBtn => {
+								if (hBtn.quickReplyButton) {
+									return {
+										name: 'quick_reply',
+										buttonParamsJson: JSON.stringify({
+											display_text: hBtn.quickReplyButton.displayText || '',
+											id: hBtn.quickReplyButton.id || hBtn.quickReplyButton.displayText || ''
+										})
+									}
+								} else if (hBtn.urlButton) {
+									return {
+										name: 'cta_url',
+										buttonParamsJson: JSON.stringify({
+											display_text: hBtn.urlButton.displayText || '',
+											url: hBtn.urlButton.url || '',
+											merchant_url: hBtn.urlButton.url || ''
+										})
+									}
+								} else if (hBtn.callButton) {
+									return {
+										name: 'cta_call',
+										buttonParamsJson: JSON.stringify({
+											display_text: hBtn.callButton.displayText || '',
+											phone_number: hBtn.callButton.phoneNumber || ''
+										})
+									}
+								}
+								return null
+							})
+							.filter(Boolean)
+						const interactiveMessage = {
+							nativeFlowMessage: {
+								buttons,
+								messageParamsJson: '',
+								messageVersion: 1
+							},
+							body: { text: tmpl.hydratedContentText || tmpl.contentText || '' },
+							footer: tmpl.hydratedFooterText ? { text: tmpl.hydratedFooterText } : undefined,
+							header: tmpl.hydratedTitleText
+								? { title: tmpl.hydratedTitleText, hasMediaAttachment: false, subtitle: '' }
+								: tmpl.imageMessage || tmpl.videoMessage || tmpl.documentMessage
+									? {
+											hasMediaAttachment: true,
+											...(tmpl.imageMessage ? { imageMessage: tmpl.imageMessage } : {}),
+											...(tmpl.videoMessage ? { videoMessage: tmpl.videoMessage } : {})
+										}
+									: undefined,
+							contextInfo: tmpl.contextInfo
+						}
+						message = { interactiveMessage }
+					}
+				}
+				const patched = await patchMessageBeforeSending(message)
+				if (Array.isArray(patched)) {
+					throw new boom_1.Boom('Per-jid patching is not supported in groups')
+				}
+				const bytes = (0, Utils_1.encodeWAMessage)(patched)
+				reportingMessage = 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 senderKeyRecipients = []
+				for (const device of devices) {
+					const deviceJid = device.jid
+					const hasKey = !!senderKeyMap[deviceJid]
+					if (
+						(!hasKey || !!participant) &&
+						!(0, WABinary_1.isHostedLidUser)(deviceJid) &&
+						!(0, WABinary_1.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 (senderKeyRecipients.length) {
+					logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key')
+					const senderKeyMsg = {
+						senderKeyDistributionMessage: {
+							axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
+							groupId: destinationJid
+						}
+					}
+					const senderKeySessionTargets = senderKeyRecipients
+					await assertSessions(senderKeySessionTargets)
+					const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs)
+					shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity
+					participants.push(...result.nodes)
+				}
+				binaryNodeContent.push({
+					tag: 'enc',
+					attrs: { v: '2', type: 'skmsg', ...extraAttrs },
+					content: ciphertext
+				})
+				await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } })
+			} else {
+				// ADDRESSING CONSISTENCY: Match own identity to conversation context
+				// TODO: investigate if this is true
+				let ownId = meId
+				if (isLid && meLid) {
+					ownId = meLid
+					logger.debug({ to: jid, ownId }, 'Using LID identity for @lid conversation')
+				} else {
+					logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
+				}
+				const { user: ownUser } = (0, WABinary_1.jidDecode)(ownId)
+				if (!participant) {
+					const patchedForReporting = await patchMessageBeforeSending(message, [jid])
+					reportingMessage = Array.isArray(patchedForReporting)
+						? patchedForReporting.find(item => item.recipientJid === jid) || patchedForReporting[0]
+						: patchedForReporting
+				}
+				if (!isRetryResend) {
+					const targetUserServer = isLid ? 'lid' : isInterop ? 'interop' : 's.whatsapp.net'
+					devices.push({
+						user,
+						device: 0,
+						jid: (0, WABinary_1.jidEncode)(user, targetUserServer, 0) // rajeh, todo: this entire logic is convoluted and weird.
+					})
+					// Interop contacts don't receive a copy to own devices — native WA sends only one flat <enc>
+					if (user !== ownUser && !isInterop) {
+						const ownUserServer = isLid ? 'lid' : 's.whatsapp.net'
+						const ownUserForAddressing =
+							isLid && meLid ? (0, WABinary_1.jidDecode)(meLid).user : (0, WABinary_1.jidDecode)(meId).user
+						devices.push({
+							user: ownUserForAddressing,
+							device: 0,
+							jid: (0, WABinary_1.jidEncode)(ownUserForAddressing, ownUserServer, 0)
+						})
+					}
+					if (additionalAttributes?.['category'] !== 'peer' && !isInterop) {
+						// Clear placeholders and enumerate actual devices
+						devices.length = 0
+						// Use conversation-appropriate sender identity
+						const senderIdentity =
+							isLid && meLid
+								? (0, WABinary_1.jidEncode)((0, WABinary_1.jidDecode)(meLid)?.user, 'lid', undefined)
+								: (0, WABinary_1.jidEncode)((0, WABinary_1.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}@${(0, WABinary_1.jidDecode)(d.jid)?.server}`)
+							},
+							'Device enumeration complete with unified addressing'
+						)
+					}
+				}
+				const allRecipients = []
+				const meRecipients = []
+				const otherRecipients = []
+				const { user: mePnUser } = (0, WABinary_1.jidDecode)(meId)
+				const { user: meLidUser } = meLid ? (0, WABinary_1.jidDecode)(meLid) : { user: null }
+				for (const { user, jid } of devices) {
+                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid);
+                    if (isExactSenderDevice) continue;
+                    const isMe = user === mePnUser || user === meLidUser;
+                    let ptcp = false;
+                    if (participant) {
+                        if (!(!isMe)) ptcp = true;
                     }
                     if (!ptcp) {
-                        if (isMe) {
-                            meRecipients.push(jid)
-                        } else {
-                            otherRecipients.push(jid)
-                        }
-                        allRecipients.push(jid)
+                        if (isMe) meRecipients.push(jid);
+                        else otherRecipients.push(jid);
+                        allRecipients.push(jid);
                     }
                 }
-	    		// Fix: detect silent delivery failure — if the destination is genuinely
-	    		// someone else (not our own number) and device resolution produced zero
-	    		// recipient devices for them, don't proceed as if the send succeeded.
-	    		const isSelfChatDestination = user === mePnUser || user === meLidUser
-	    		if (!isRetryResend && !isSelfChatDestination && otherRecipients.length === 0) {
-	    			logger.warn({ jid, deviceCount: devices.length, noSelfSync }, 'relayMessage: no recipient devices resolved for the other party; aborting to avoid a silent no-op send')
-	    			throw new Boom('No devices resolved for recipient — message was not delivered to the other party', { statusCode: 421, data: { jid } })
-	    		}
-	    		await assertSessions(allRecipients)
-		    	const [
-		    		{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 },
-		    		{ nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }
-		    	] = await Promise.all([
-		    		createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
-		    		createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
-		    	])
-	    		participants.push(...meNodes,...otherNodes)
-		    	if (meRecipients.length > 0 || otherRecipients.length > 0) {
-		    		extraAttrs.phash = generateParticipantHashV2([...meRecipients,...otherRecipients])
-		    	}
-	    		shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
-    	}
-	  	if (isRetryResend) {
-	   		const isParticipantLid = jidDecode(participant.jid).server === 'lid'
-	    	const isMe = areJidsSameUser(participant.jid, isParticipantLid? meLid : meId)
-	   		const encodedMessageToSend = isMe
-		   		? encodeWAMessage({ deviceSentMessage: { destinationJid, message } })
-		   		: encodeWAMessage(message)
-	    	const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
-		    	data: encodedMessageToSend,
-	    		jid: participant.jid
-		   	})
-		   	binaryNodeContent.push({
-		   		tag: 'enc',
-		   		attrs: { v: '2', type, count: (participant.count?? 0).toString() },
-	    		content: encryptedContent
-	    	})
-       	}
-		if (participants.length) {
-			if (additionalAttributes?.['category'] === 'peer') {
-				const peerNode = participants[0]?.content?.[0]
-				if (peerNode) binaryNodeContent.push(peerNode)
-			} else if (isInterop) {
-				const recipientNode = participants.find(p => isInteropUser(p?.attrs?.jid))
-				const encNode = (recipientNode?? participants[0])?.content?.[0]
-				if (encNode) binaryNodeContent.push(encNode)
-			} else {
-				binaryNodeContent.push({ tag: 'participants', attrs: {}, content: participants })
+				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(meRecipients, meMsg || message, extraAttrs),
+					createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
+				])
+				participants.push(...meNodes)
+				participants.push(...otherNodes)
+				if (meRecipients.length > 0 || otherRecipients.length > 0) {
+					extraAttrs['phash'] = (0, Utils_1.generateParticipantHashV2)([...meRecipients, ...otherRecipients])
+				}
+				shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
+			}
+			if (participants.length) {
+				if (additionalAttributes?.['category'] === 'peer') {
+					const peerNode = participants[0]?.content?.[0]
+					if (peerNode) {
+						binaryNodeContent.push(peerNode) // push only enc
+					}
+				} else if (isInterop) {
+					// Flat <enc> directly on <message> — no <participants> wrapper (native WA behavior).
+					// Find the enc for the actual interop recipient, not own-device DSM copy.
+					const recipientNode = participants.find(p => (0, WABinary_1.isInteropUser)(p?.attrs?.jid))
+					const encNode = (recipientNode ?? participants[0])?.content?.[0]
+					if (encNode) {
+						binaryNodeContent.push(encNode)
+					}
+				} else {
+					binaryNodeContent.push({
+						tag: 'participants',
+						attrs: {},
+						content: participants
+					})
+				}
+			}
+			const stanza = {
+				tag: 'message',
+				attrs: {
+					id: msgId,
+					to: destinationJid,
+					type: getTypeMessage(message),
+					...(additionalAttributes || {})
+				},
+				content: binaryNodeContent
+			}
+			if (shouldIncludeDeviceIdentity) {
+				stanza.content.push({
+					tag: 'device-identity',
+					attrs: {},
+					content: (0, Utils_1.encodeSignedDeviceIdentity)(authState.creds.account, true)
+				})
+				logger.debug({ jid }, 'adding device identity')
 			}
-    	}
-		const stanza = {
-			tag: 'message',
-			attrs: { id: msgId, to: destinationJid, type: getMessageType(message),...(additionalAttributes || {}) },
-			content: binaryNodeContent
-    	}
-		if (shouldIncludeDeviceIdentity) {
-			stanza.content.push({ tag: 'device-identity', attrs: {}, content: 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 &&!isRetryResend && reportingMessage?.messageContextInfo?.messageSecret && shouldIncludeReportingToken(reportingMessage)) {
-			try {
-				const encoded = encodeWAMessage(reportingMessage)
-				const reportingKey = { id: msgId, fromMe: true, remoteJid: destinationJid, participant: participant?.jid }
-				const reportingNode = await getMessageReportingToken(encoded, reportingMessage, reportingKey)
-				if (reportingNode) {
-					stanza.content.push(reportingNode)
-					logger.trace({ jid }, 'added reporting token to message')
+			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 &&
+				!isRetryResend &&
+				reportingMessage?.messageContextInfo?.messageSecret &&
+				(0, reporting_utils_1.shouldIncludeReportingToken)(reportingMessage)
+			) {
+				try {
+					const encoded = (0, Utils_1.encodeWAMessage)(reportingMessage)
+					const reportingKey = {
+						id: msgId,
+						fromMe: true,
+						remoteJid: destinationJid,
+						participant: participant?.jid
+					}
+					const reportingNode = await (0, reporting_utils_1.getMessageReportingToken)(
+						encoded,
+						reportingMessage,
+						reportingKey
+					)
+					if (reportingNode) {
+						stanza.content.push(reportingNode)
+						logger.trace({ jid }, 'added reporting token to message')
+					}
+				} catch (error) {
+					logger.warn({ jid, trace: error?.stack }, 'failed to attach reporting token')
+				}
+			}
+
+			let didPushAdditional = false
+			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)
 				}
-			} catch (error) {
-				logger.warn({ jid, trace: error?.stack }, 'failed to attach reporting token')
 			}
-    	}
-		let didPushAdditional = false
-		if (!isNewsletter && buttonType) {
-			const buttonsNode = getButtonArgs(messages)
-			const filteredButtons = getBinaryNodeFilter(additionalNodes? additionalNodes : [])
-			if (filteredButtons) {
+			if (!config.aiLabel && (0, WABinary_1.isPnUser)(destinationJid)) {
+				const alreadyHasBizBot =
+					WABinary_1.getBinaryFilteredBizBot(additionalNodes || []) ||
+					WABinary_1.getBinaryFilteredBizBot(stanza.content)
+				if (!alreadyHasBizBot) {
+					stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
+				}
+			} else if (config.aiLabel && !isGroup && !isStatus && !isNewsletter) {
+				const existingBizBot = WABinary_1.getBinaryFilteredBizBot(additionalNodes || [])
+				if (!existingBizBot) {
+					stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
+				}
+			}
+			// WA Web never attaches tctoken to peer (AppStateSync) messages — server rejects with 479
+			const isPeerMessage = additionalAttributes?.['category'] === 'peer'
+			const is1on1Send = !isGroup && !isRetryResend && !isStatus && !isNewsletter && !isPeerMessage
+			// Resolve destination to LID for tctoken storage — matches Signal session key pattern
+			const tcTokenJid = is1on1Send
+				? await (0, tc_token_utils_1.resolveTcTokenJid)(destinationJid, getLIDForPN)
+				: destinationJid
+			const contactTcTokenData = is1on1Send ? await authState.keys.get('tctoken', [tcTokenJid]) : {}
+			const existingTokenEntry = contactTcTokenData[tcTokenJid]
+			let tcTokenBuffer = existingTokenEntry?.token
+			// Treat expired tokens the same as missing — clear from cache
+			if (tcTokenBuffer?.length && (0, tc_token_utils_1.isTcTokenExpired)(existingTokenEntry?.timestamp)) {
+				logger.debug({ jid: destinationJid, timestamp: existingTokenEntry?.timestamp }, 'tctoken expired, clearing')
+				tcTokenBuffer = undefined
+				const cleared =
+					existingTokenEntry?.senderTimestamp !== undefined
+						? { token: Buffer.alloc(0), senderTimestamp: existingTokenEntry.senderTimestamp }
+						: null
+				try {
+					await authState.keys.set({ tctoken: { [tcTokenJid]: cleared } })
+				} catch (err) {
+					logger.debug({ jid: destinationJid, err: err?.message }, 'failed to persist tctoken expiry cleanup')
+				}
+			}
+			if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
+				stanza.content.push({
+					tag: 'tctoken',
+					attrs: {},
+					content: tcTokenBuffer
+				})
+			}
+			if (additionalNodes && additionalNodes.length > 0 && !didPushAdditional) {
 				stanza.content.push(...additionalNodes)
-				didPushAdditional = true
-			} else {
-				stanza.content.push(buttonsNode)
 			}
-    	}
-		if (!aiLabel && isPnUser(destinationJid)) {
-			const alreadyHasBizBot = getBinaryFilteredBizBot(additionalNodes || []) || getBinaryFilteredBizBot(stanza.content)
-			if (!alreadyHasBizBot) stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
-	} else if (aiLabel &&!isGroup &&!isStatus &&!isNewsletter) {
-			const existingBizBot = getBinaryFilteredBizBot(additionalNodes || [])
-			if (!existingBizBot) stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
-    	}
-		const isPeerMessage = additionalAttributes?.['category'] === 'peer'
-		const is1on1Send =!isGroup &&!isRetryResend &&!isStatus &&!isNewsletter &&!isPeerMessage
-		const tcTokenJid = is1on1Send? await resolveTcTokenJid(destinationJid, getLIDForPN) : destinationJid
-		const contactTcTokenData = is1on1Send? await authState.keys.get('tctoken', [tcTokenJid]) : {}
-		const existingTokenEntry = contactTcTokenData[tcTokenJid]
-		let tcTokenBuffer = existingTokenEntry?.token
-		if (tcTokenBuffer?.length && isTcTokenExpired(existingTokenEntry?.timestamp)) {
-			logger.debug({ jid: destinationJid, timestamp: existingTokenEntry?.timestamp }, 'tctoken expired, clearing')
-			tcTokenBuffer = undefined
-			const cleared = existingTokenEntry?.senderTimestamp!== undefined? { token: Buffer.alloc(0), senderTimestamp: existingTokenEntry.senderTimestamp } : null
-			try {
-				await authState.keys.set({ tctoken: { [tcTokenJid]: cleared } })
-			} catch (err) {
-				logger.debug({ jid: destinationJid, err: err?.message }, 'failed to persist tctoken expiry cleanup')
+			logger.debug({ msgId }, `sending message to ${participants.length} devices`)
+			await sendNode(stanza)
+			// Register messageSecret immediately at send time so msmsg replies can be
+			// decrypted even if they arrive before our own message echo comes back.
+			if (message.messageContextInfo?.messageSecret) {
+				setBotMessageSecret(msgId, message.messageContextInfo.messageSecret, destinationJid)
 			}
-	    }
-		if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
-			stanza.content.push({ tag: 'tctoken', attrs: {}, content: tcTokenBuffer })
-    	}
-		if (additionalNodes && additionalNodes.length > 0 &&!didPushAdditional) {
-			stanza.content.push(...additionalNodes)
-    	}
-		logger.debug({ msgId }, `sending message to ${participants.length} devices`)
-		await sendNode(stanza)
-		if (message.messageContextInfo?.messageSecret) {
-			setBotMessageSecret(msgId, message.messageContextInfo.messageSecret, destinationJid)
-    	}
-		const isProtocolMsg =!!normalizeMessageContent(message)?.protocolMessage
-		const isBotOrPSA = destinationJid === PSA_WID || isJidBot(destinationJid) || isJidMetaAI(destinationJid)
-		if (is1on1Send &&!isProtocolMsg &&!isBotOrPSA && shouldSendNewTcToken(existingTokenEntry?.senderTimestamp) &&!inFlightTcTokenIssuance.has(tcTokenJid)) {
-			inFlightTcTokenIssuance.add(tcTokenJid)
-			const issueTimestamp = unixTimestampSeconds()
-			const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping)
-			resolveIssuanceJid(destinationJid, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID)
-				.then(issueJid => issuePrivacyTokens([issueJid], issueTimestamp))
-				.then(async result => {
-					await storeTcTokensFromIqResult({ result, fallbackJid: tcTokenJid, keys: authState.keys, getLIDForPN })
-					const currentData = await authState.keys.get('tctoken', [tcTokenJid])
-					const currentEntry = currentData[tcTokenJid]
-					const indexWrite = await buildMergedTcTokenIndexWrite(authState.keys, [tcTokenJid])
-					await authState.keys.set({
-						tctoken: {
-							[tcTokenJid]: { token: Buffer.alloc(0),...currentEntry, senderTimestamp: issueTimestamp },
-							...indexWrite
-						}
+			// Fire-and-forget: issue our token to the contact AFTER message send.
+			const isProtocolMsg = !!(0, Utils_1.normalizeMessageContent)(message)?.protocolMessage
+			const isBotOrPSA =
+				destinationJid === WABinary_1.PSA_WID ||
+				(0, WABinary_1.isJidBot)(destinationJid) ||
+				(0, WABinary_1.isJidMetaAI)(destinationJid)
+			if (
+				is1on1Send &&
+				!isProtocolMsg &&
+				!isBotOrPSA &&
+				(0, tc_token_utils_1.shouldSendNewTcToken)(existingTokenEntry?.senderTimestamp) &&
+				!inFlightTcTokenIssuance.has(tcTokenJid)
+			) {
+				inFlightTcTokenIssuance.add(tcTokenJid)
+				const issueTimestamp = (0, Utils_1.unixTimestampSeconds)()
+				const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping)
+				;(0, tc_token_utils_1.resolveIssuanceJid)(
+					destinationJid,
+					sock.serverProps.lidTrustedTokenIssueToLid,
+					getLIDForPN,
+					getPNForLID
+				)
+					.then(issueJid => issuePrivacyTokens([issueJid], issueTimestamp))
+					.then(async result => {
+						await (0, tc_token_utils_1.storeTcTokensFromIqResult)({
+							result,
+							fallbackJid: tcTokenJid,
+							keys: authState.keys,
+							getLIDForPN
+						})
+						const currentData = await authState.keys.get('tctoken', [tcTokenJid])
+						const currentEntry = currentData[tcTokenJid]
+						const indexWrite = await (0, tc_token_utils_1.buildMergedTcTokenIndexWrite)(authState.keys, [tcTokenJid])
+						await authState.keys.set({
+							tctoken: {
+								[tcTokenJid]: {
+									token: Buffer.alloc(0),
+									...currentEntry,
+									senderTimestamp: issueTimestamp
+								},
+								...indexWrite
+							}
+						})
+					})
+					.catch(err => {
+						logger.debug({ jid: destinationJid, err: err?.message }, 'fire-and-forget tctoken issuance failed')
 					})
+					.finally(() => {
+						inFlightTcTokenIssuance.delete(tcTokenJid)
+					})
+			}
+			// Add message to retry cache if enabled
+			if (messageRetryManager && !participant) {
+				messageRetryManager.addRecentMessage(destinationJid, msgId, message)
+			}
+			if (isInterop && !isRetryResend) {
+				await trustInteropContact(destinationJid).catch(err => {
+					logger.debug({ err, jid: destinationJid }, 'failed to trust interop contact')
 				})
-				.catch(err => logger.debug({ jid: destinationJid, err: err?.message }, 'fire-and-forget tctoken issuance failed'))
-				.finally(() => inFlightTcTokenIssuance.delete(tcTokenJid))
-	    }
-		if (messageRetryManager &&!participant) {
-			messageRetryManager.addRecentMessage(destinationJid, msgId, message)
-    	}
-		if (isInterop &&!isRetryResend) {
-			await trustInteropContact(destinationJid).catch(err => logger.debug({ err, jid: destinationJid }, 'failed to trust interop contact'))
-    	}
-	}, meId)
-	return msgId
-    }
-    const getMessageType = (message) => {
-        const normalizedMessage = normalizeMessageContent(message);
-        if (!normalizedMessage)
-            return 'text';
-        if (normalizedMessage.reactionMessage || normalizedMessage.encReactionMessage) {
-            return 'reaction';
-        }
-        if (normalizedMessage.pollCreationMessage ||
-            normalizedMessage.pollCreationMessageV2 ||
-                normalizedMessage.pollCreationMessageV3 ||
-                    normalizedMessage.pollCreationMessageV4 ||
-                        normalizedMessage.pollCreationMessageV5 ||
-                            normalizedMessage.pollUpdateMessage) {
-            return 'poll';
-        }
-        if (normalizedMessage.eventMessage) {
-            return 'event';
-        }
-        if (getMediaType(normalizedMessage) !== '') {
-            return 'media';
-        }
-        return 'text';
-    };
-    const getMediaType = (message) => {
-        if (message.imageMessage) {
-            return 'image';
-        }
-        else if (message.videoMessage) {
-            return message.videoMessage.gifPlayback ? 'gif' : 'video';
-        }
-        else if (message.audioMessage) {
-            return message.audioMessage.ptt ? 'ptt' : 'audio';
-        }
-        else if (message.contactMessage) {
-            return 'vcard';
-        }
-        else if (message.documentMessage) {
-            return 'document';
-        }
-        else if (message.contactsArrayMessage) {
-            return 'contact_array';
-        }
-        else if (message.liveLocationMessage) {
-            return 'livelocation';
-        }
-        else if (message.stickerMessage) {
-            return 'sticker';
-        }
-        else if (message.listMessage) {
-            return 'list';
-        }
-        else if (message.listResponseMessage) {
-            return 'list_response';
-        }
-        else if (message.buttonsResponseMessage) {
-            return 'buttons_response';
-        }
-        else if (message.orderMessage) {
-            return 'order';
-        }
-        else if (message.productMessage) {
-            return 'product';
-        }
-        else if (message.interactiveResponseMessage) {
-            return 'native_flow_response';
-        }
-        else if (message.groupInviteMessage) {
-            return 'url';
-        }
-        return '';
-    };
-    const getButtonType = (message) => {
-        if (message.listMessage) {
-            return 'list'
-        }
-        else if (message.buttonsMessage) {
-            return 'buttons'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_and_pay') {
-            return 'review_and_pay'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_order') {
-            return 'review_order'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_info') {
-            return 'payment_info'
-        } else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_key_info') {
-            return 'payment_key_info'
-        } else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_status') {
-            return 'payment_status'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
-            return 'payment_method'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'catalog_message') {
-            return 'catalog_message'
-        }
-        else if (message.interactiveMessage && message.interactiveMessage?.nativeFlowMessage) {
-            return 'interactive'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage) {
-            return 'native_flow'
-        }
-    };
-    const getButtonArgs = (message) => {
+			}
+		}, meId)
+		return msgId
+	}
+	const getTypeMessage = msg => {
+		const message = Utils_1.normalizeMessageContent(msg)
+		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'
+		}
+	}
+
+	const getMediaType = message => {
+		if (message.imageMessage) {
+			return 'image'
+		} else if (message.stickerMessage) {
+			return message.stickerMessage.isLottie
+				? '1p_sticker'
+				: message.stickerMessage.isAvatar
+					? 'avatar_sticker'
+					: 'sticker'
+		} else if (message.videoMessage) {
+			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'
+		} else if (message.contactMessage) {
+			return 'vcard'
+		} else if (message.documentMessage) {
+			return 'document'
+		} else if (message.stickerPackMessage) {
+			return 'sticker_pack'
+		} else if (message.contactsArrayMessage) {
+			return 'contact_array'
+		} else if (message.locationMessage) {
+			return 'location'
+		} else if (message.liveLocationMessage) {
+			return 'livelocation'
+		} else if (message.listMessage) {
+			return 'list'
+		} else if (message.listResponseMessage) {
+			return 'list_response'
+		} else if (message.buttonsResponseMessage) {
+			return 'buttons_response'
+		} else if (message.orderMessage) {
+			return 'order'
+		} else if (message.productMessage) {
+			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) {
+			const firstButtonName = message.interactiveMessage.nativeFlowMessage.buttons?.[0]?.name
+			if (firstButtonName === 'review_and_pay') {
+				return 'review_and_pay'
+			} else if (firstButtonName === 'review_order') {
+				return 'review_order'
+			} else if (firstButtonName === 'payment_info') {
+				return 'payment_info'
+			} else if (firstButtonName === 'payment_status') {
+				return 'payment_status'
+			} else if (firstButtonName === 'payment_method') {
+				return 'payment_method'
+			} else if (firstButtonName === 'pix') {
+				return 'pix'
+			} else if (firstButtonName === 'pay') {
+				return 'pay'
+			}
+			return 'native_flow'
+		}
+	}
+
+	const getButtonArgs = message => {
 		const nativeFlow = message.interactiveMessage?.nativeFlowMessage
 		const firstButtonName = nativeFlow?.buttons?.[0]?.name
 		const nativeFlowSpecials = [
@@ -1122,282 +1340,469 @@ export const makeMessagesSocket = (config) => {
 			}
 		}
 	}
-    const issuePrivacyTokens = async (jids, timestamp) => {
-        const t = (timestamp ?? unixTimestampSeconds()).toString();
-        const result = await query({
-            tag: 'iq',
-            attrs: {
-                to: S_WHATSAPP_NET,
-                type: 'set',
-                xmlns: 'privacy'
-            },
-            content: [
-                {
-                    tag: 'tokens',
-                    attrs: {},
-                    content: jids.map(jid => ({
-                        tag: 'token',
-                        attrs: {
-                            jid: jidNormalizedUser(jid),
-                            t,
-                            type: 'trusted_contact'
-                        }
-                    }))
-                }
-            ]
-        });
-        return result;
-    };
-    const waUploadToServer = getWAUploadToServer(config, refreshMediaConn);
-    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update');
-    registerSocketEndHandler(() => {
-        if (!config.userDevicesCache && userDevicesCache.close) {
-            userDevicesCache.close();
-        }
-        mediaConn = undefined;
-        if (messageRetryManager) {
-            messageRetryManager.clear();
-        }
-    });
-    return {
-        ...sock,
-        userDevicesCache,
-        devicesMutex,
-        issuePrivacyTokens,
-        assertSessions,
-        relayMessage,
-        sendReceipt,
-        sendReceipts,
-        readMessages,
-        refreshMediaConn,
-        // Function (not getter) so the spread in chats.ts preserves the live closure binding.
-        getMediaHost: () => mediaHost,
-        waUploadToServer,
-        fetchPrivacySettings,
-        sendPeerDataOperationMessage,
-        createParticipantNodes,
-        getUSyncDevices,
-        messageRetryManager,
-        updateMemberLabel,
-        updateMediaMessage: async (message) => {
-            const content = assertMediaContent(message.message);
-            const mediaKey = content.mediaKey;
-            const meId = authState.creds.me.id;
-            const node = encryptMediaRetryRequest(message.key, mediaKey, meId);
-            let error = undefined;
-            await Promise.all([
-                sendNode(node),
-                waitForMsgMediaUpdate(async (update) => {
-                    const result = update.find(c => c.key.id === message.key.id);
-                    if (result) {
-                        if (result.error) {
-                            error = result.error;
-                        }
-                        else {
-                            try {
-                                const media = 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 = getUrlFromDirectPath(content.directPath, mediaHost);
-                                logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful');
-                            }
-                            catch (err) {
-                                error = err;
-                            }
-                        }
-                        return true;
-                    }
-                })
-            ]);
-            if (error) {
-                throw error;
-            }
-            ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
-            return message;
-        },
-        sendTable: async (jid, title, headers, rows, quoted, options = {}) => {
-			const { message, messageId } = Utils_1.generateTableContent(title, headers, rows, quoted, options)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+	const issuePrivacyTokens = async (jids, timestamp) => {
+		const t = (timestamp ?? (0, Utils_1.unixTimestampSeconds)()).toString()
+		const result = await query({
+			tag: 'iq',
+			attrs: {
+				to: WABinary_1.S_WHATSAPP_NET,
+				type: 'set',
+				xmlns: 'privacy'
+			},
+			content: [
+				{
+					tag: 'tokens',
+					attrs: {},
+					content: jids.map(jid => ({
+						tag: 'token',
+						attrs: {
+							jid: (0, WABinary_1.jidNormalizedUser)(jid),
+							t,
+							type: 'trusted_contact'
+						}
+					}))
+				}
+			]
+		})
+		return result
+	}
+	const getPrivacyTokens = issuePrivacyTokens
+	const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn)
+	const interactiveHandler = new interactive_handler_1.InteractiveMessageHandler(waUploadToServer, relayMessage, config, sock)
+	const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update')
+	return {
+		...sock,
+		issuePrivacyTokens,
+		getPrivacyTokens,
+		assertSessions,
+		relayMessage,
+		sendReceipt,
+		sendReceipts,
+		readMessages,
+		refreshMediaConn,
+		waUploadToServer,
+		fetchPrivacySettings,
+		sendPeerDataOperationMessage,
+		createParticipantNodes,
+		getUSyncDevices,
+		messageRetryManager,
+		updateMemberLabel,
+		updateMediaMessage: async message => {
+			const content = (0, Utils_1.assertMediaContent)(message.message)
+			const mediaKey = content.mediaKey
+			const meId = authState.creds.me.id
+			const node = (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId)
+			let error = undefined
+			await Promise.all([
+				sendNode(node),
+				waitForMsgMediaUpdate(async update => {
+					const result = update.find(c => c.key.id === message.key.id)
+					if (result) {
+						if (result.error) {
+							error = result.error
+						} else {
+							try {
+								const media = (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id)
+								if (media.result !== index_js_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
+									const resultStr = index_js_1.proto.MediaRetryNotification.ResultType[media.result]
+									throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, {
+										data: media,
+										statusCode: (0, Utils_1.getStatusCodeForMediaRetry)(media.result) || 404
+									})
+								}
+								content.directPath = media.directPath
+								content.url = (0, Utils_1.getUrlFromDirectPath)(content.directPath)
+								logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful')
+							} catch (err) {
+								error = err
+							}
+						}
+						return true
+					}
+				})
+			])
+			if (error) {
+				throw error
+			}
+			ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }])
+			return message
+		},
+
+		sendGroupStatus: async (groupIdsOrContent = [], contentOrGroups = {}, opts = {}) => {
+			const toGroupIdArray = input => {
+				if (Array.isArray(input)) {
+					return input
+				}
+				if (typeof input === 'string') {
+					return [input]
+				}
+				return []
+			}
+			const normalizeGroupJid = value => {
+				if (typeof value !== 'string') {
+					return ''
+				}
+				const trimmed = value.trim()
+				if (!trimmed) {
+					return ''
+				}
+				if (/^\d{8,}$/.test(trimmed)) {
+					return `${trimmed}@g.us`
+				}
+				return trimmed
+			}
+			const useNewSignature = Array.isArray(groupIdsOrContent) || typeof groupIdsOrContent === 'string'
+			const groupIds = useNewSignature ? toGroupIdArray(groupIdsOrContent) : toGroupIdArray(contentOrGroups)
+			const content = useNewSignature ? contentOrGroups || {} : groupIdsOrContent || {}
+			const sendOpts = opts || {}
+			const groupJids = groupIds.map(normalizeGroupJid).filter(jid => (0, WABinary_1.isJidGroup)(jid))
+			const nonGroupJids = groupIds.filter(jid => !(0, WABinary_1.isJidGroup)(normalizeGroupJid(jid)))
+			if (nonGroupJids.length) {
+				logger.warn({ nonGroupJids }, 'ignoring non-group JIDs in sendGroupStatus')
+			}
+			if (!groupJids.length) {
+				return []
+			}
+			const { allUsers } = await resolveStatusAudience(groupJids, false)
+			if (!allUsers.length) {
+				return []
+			}
+			const msg = await generateStatusMessage({
+				...content,
+				backgroundColor: content.backgroundColor || getRandomHexColor(),
+				font: normalizeStatusFont(content.font, logger)
+			})
+			await relayMessage(WABinary_1.STORIES_JID, msg.message, {
+				messageId: msg.key.id,
+				statusJidList: allUsers,
+				...(sendOpts.relay || {})
+			})
+			return groupJids
+		},
+		sendAlbumMessage: async (jid, medias, options = {}) => {
+			const userJid = authState.creds.me.id
+			for (const media of medias) {
+				if (!media.image && !media.video) throw new TypeError(`medias[i] must have image or video property`)
+			}
+			if (medias.length < 2) throw new RangeError('Minimum 2 media')
+			const time = options.delay || 500
+			delete options.delay
+			const album = await (0, Utils_1.generateWAMessageFromContent)(
+				jid,
+				{
+					albumMessage: {
+						expectedImageCount: medias.filter(media => media.image).length,
+						expectedVideoCount: medias.filter(media => media.video).length,
+						...options
+					}
+				},
+				{ userJid, ...options }
+			)
+			await relayMessage(jid, album.message, { messageId: album.key.id })
+			let mediaHandle
+			let msg
+			for (const i in medias) {
+				const media = medias[i]
+				if (media.image) {
+					msg = await (0, Utils_1.generateWAMessage)(
+						jid,
+						{
+							image: media.image,
+							...media,
+							...options
+						},
+						{
+							userJid,
+							upload: async (readStream, opts) => {
+								const up = await waUploadToServer(readStream, {
+									...opts,
+									newsletter: (0, WABinary_1.isJidNewsletter)(jid)
+								})
+								mediaHandle = up.handle
+								return up
+							},
+							...options
+						}
+					)
+				} else if (media.video) {
+					msg = await (0, Utils_1.generateWAMessage)(
+						jid,
+						{
+							video: media.video,
+							...media,
+							...options
+						},
+						{
+							userJid,
+							upload: async (readStream, opts) => {
+								const up = await waUploadToServer(readStream, {
+									...opts,
+									newsletter: (0, WABinary_1.isJidNewsletter)(jid)
+								})
+								mediaHandle = up.handle
+								return up
+							},
+							...options
+						}
+					)
+				}
+				if (msg) {
+					msg.message.messageContextInfo = {
+						messageAssociation: {
+							associationType: 1,
+							parentMessageKey: album.key
+						}
+					}
+				}
+				await relayMessage(jid, msg.message, { messageId: msg.key.id })
+				await (0, Utils_1.delay)(time)
+			}
+			return album
+		},
+
+		sendStatusMention: async (content, jids = []) => {
+			return await interactiveHandler.sendStatusWhatsApp(content, jids)
+		},
+		sendTable: async (jid, title, headers, rows, quoted, options = {}) => {
+			const { message, messageId } = message_composer_1.generateTableContent(title, headers, rows, quoted, options)
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
 		sendList: async (jid, title, items, quoted, options = {}) => {
-			const { message, messageId } = Utils_1.generateListContent(title, items, quoted, options)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			const { message, messageId } = message_composer_1.generateListContent(title, items, quoted, options)
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
 		sendCodeBlock: async (jid, code, quoted, options = {}) => {
-			const { message, messageId } = Utils_1.generateCodeBlockContent(code, quoted, options)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			const { message, messageId } = message_composer_1.generateCodeBlockContent(code, quoted, options)
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
 		sendLatex: async (jid, quoted, options) => {
-			const { message, messageId } = Utils_1.generateLatexContent(quoted, options)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			const { message, messageId } = message_composer_1.generateLatexContent(quoted, options)
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
 		sendLatexImage: async (jid, quoted, options, renderLatexToPng, uploadFn) => {
-			const { message, messageId } = await Utils_1.generateLatexImageContent(
+			const { message, messageId } = await message_composer_1.generateLatexImageContent(
 				quoted,
 				options,
 				uploadFn,
 				renderLatexToPng
 			)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
 		sendLatexInlineImage: async (jid, quoted, options, renderLatexToPng, uploadFn) => {
-			const { message, messageId } = await Utils_1.generateLatexInlineImageContent(
+			const { message, messageId } = await message_composer_1.generateLatexInlineImageContent(
 				quoted,
 				options,
 				uploadFn,
 				renderLatexToPng
 			)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
-		captureUnifiedResponse: Utils_1.captureUnifiedResponse,
+		captureUnifiedResponse: message_composer_1.captureUnifiedResponse,
 		sendUnifiedResponse: async (jid, quoted, captured) => {
-			const { message, messageId } = Utils_1.generateUnifiedResponseContent(quoted, captured)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			const { message, messageId } = message_composer_1.generateUnifiedResponseContent(quoted, captured)
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
 		sendRichMessage: async (jid, submessages, quoted, options = {}) => {
-			const { message, messageId } = Utils_1.generateRichMessageContent(submessages, quoted, options)
-			await relayMessage(jid, message, { messageId, noSelfSync: options.noSelfSync })
+			const { message, messageId } = message_composer_1.generateRichMessageContent(submessages, quoted, options)
+			await relayMessage(jid, message, { messageId })
 			return { message, messageId }
 		},
-        sendMessage: async (jid, content, options = {}) => {
-            const userJid = authState.creds.me.id;
-            const luki = new imup(Utils_1, waUploadToServer, relayMessage)
-            const { quoted, participant = false } = options;
-            const messageType = luki.detectType(content);
-            if (typeof content === 'object' &&
-                'disappearingMessagesInChat' in content &&
-                typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                isJidGroup(jid)) {
-                const { disappearingMessagesInChat } = content;
-                const value = typeof disappearingMessagesInChat === 'boolean'
-                    ? disappearingMessagesInChat
-                        ? WA_DEFAULT_EPHEMERAL
-                        : 0
-                    : disappearingMessagesInChat;
-                await groupToggleEphemeral(jid, value);
-            }
-            else {
-                if (messageType) {
-                    switch(messageType) {
-                        case 'PAYMENT':
-                            const paymentContent = await luki.handlePayment(content, quoted);
-                            return await relayMessage(jid, paymentContent, {
-                                messageId: Utils_1.generateMessageID(),
-                                noSelfSync: options.noSelfSync
-                            });
-                        case 'PRODUCT':
-                            const productContent = await luki.handleProduct(content, jid, quoted);
-                            const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                            return await relayMessage(jid, productMsg.message, {
-                                messageId: productMsg.key.id,
-                                noSelfSync: options.noSelfSync
-                            });
-                            
-                        case 'ALBUM':
-                            return await luki.handleAlbum(content, jid, quoted)
-                        case 'EVENT':
-                            return await luki.handleEvent(content, jid, quoted)
-                        case 'POLL_RESULT':
-                            return await luki.handlePollResult(content, jid, quoted)
-                        case 'ORDER':
-                            return await luki.handleOrderMessage(content, jid, quoted)
-                        case 'GROUP_STATUS':
-                            return await luki.handleGroupStory(content, jid, quoted)
-                        case 'GROUP_LABEL':
-                            return await luki.handleGbLabel(content, jid)
-                    }
-                }
-                const fullMsg = await generateWAMessage(jid, content, {
-                    logger,
-                    userJid,
-                    getUrlInfo: text => getUrlInfo(text, {
-                        thumbnailWidth: linkPreviewImageThumbnailWidth,
-                        fetchOpts: {
-                            timeout: 3000,
-                            ...(httpRequestOptions || {})
-                        },
-                        logger,
-                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                    }),
-                    //TODO: CACHE
-                    getProfilePicUrl: sock.profilePictureUrl,
-                    getCallLink: sock.createCallLink,
-                    upload: waUploadToServer,
-                    mediaCache: config.mediaCache,
-                    options: config.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;
-                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 (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) {
-                        additionalAttributes.edit = '8';
-                    }
-                    else {
-                        additionalAttributes.edit = '7';
-                    }
-                }
-                else if (isEditMsg) {
-                    additionalAttributes.edit = '1';
-                }
-                else if (isPinMsg) {
-                    additionalAttributes.edit = '2';
-                }
-                else if (isPollMessage) {
-                    additionalNodes.push({
-                        tag: 'meta',
-                        attrs: {
-                            polltype: 'creation'
-                        }
-                    });
-                }
-                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: aiLabel ? additionalNodes : options.additionalNodes,
-                    participant,
-                    noSelfSync: options.noSelfSync
-                });
-                if (config.emitOwnEvents) {
-                    process.nextTick(async () => {
-                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
-                    });
-                }
-                return fullMsg;
-            }
-        },
-        sendMessageMembers: async (jid, message, options = {}) => {
+		sendMessage: async (jid, content, options = {}) => {
+			const userJid = authState.creds.me.id
+			const iosBros = config.browser[0] === "iOS" || config.browser[1] === "Safari";
+	        const mId = iosBros ? Utils_1.generateIOSMessageID() : msgId ?? (0, Utils_1.generateMessageIDV2)(userJid)
+			// ── Normalize: buttons[].nativeFlowInfo -> interactiveButtons ──────
+			if (
+				typeof content === 'object' &&
+				Array.isArray(content.buttons) &&
+				content.buttons.length > 0 &&
+				content.buttons.some(b => b.nativeFlowInfo)
+			) {
+				const interactiveButtons = content.buttons.map(b => {
+					if (b.nativeFlowInfo) {
+						return {
+							name: b.nativeFlowInfo.name,
+							buttonParamsJson: b.nativeFlowInfo.paramsJson || '{}'
+						}
+					}
+					return {
+						name: 'quick_reply',
+						buttonParamsJson: JSON.stringify({
+							display_text: b.buttonText?.displayText || b.buttonId || 'Button',
+							id: b.buttonId || b.buttonText?.displayText || 'btn'
+						})
+					}
+				})
+				const { buttons, headerType, viewOnce, ...rest } = content
+				content = { ...rest, interactiveButtons }
+			}
+			if (
+				typeof content === 'object' &&
+				'disappearingMessagesInChat' in content &&
+				typeof content['disappearingMessagesInChat'] !== 'undefined' &&
+				(0, WABinary_1.isJidGroup)(jid)
+			) {
+				const { disappearingMessagesInChat } = content
+				const value =
+					typeof disappearingMessagesInChat === 'boolean'
+						? disappearingMessagesInChat
+							? WA_DEFAULT_EPHEMERAL
+							: 0
+						: disappearingMessagesInChat
+				await groupToggleEphemeral(jid, value)
+			} else if (interactiveHandler.detectType(content)) {
+				const { quoted } = options
+				const messageType = interactiveHandler.detectType(content)
+				switch (messageType) {
+					case 'PAYMENT': {
+						const paymentContent = await interactiveHandler.handlePayment(content, quoted)
+						return await relayMessage(jid, paymentContent, {
+							messageId: mId
+						})
+					}
+					case 'PRODUCT': {
+						const productContent = await interactiveHandler.handleProduct(content, jid, quoted)
+						const productMsg = await (0, Utils_1.generateWAMessageFromContent)(jid, productContent, { quoted, userJid })
+						return await relayMessage(jid, productMsg.message, {
+							messageId: productMsg.key.id
+						})
+					}
+					case 'INTERACTIVE': {
+						const interactiveContent = await interactiveHandler.handleInteractive(content, jid, quoted)
+						const interactiveMsg = await (0, Utils_1.generateWAMessageFromContent)(jid, interactiveContent, {
+							quoted,
+							userJid
+						})
+						return await relayMessage(jid, interactiveMsg.message, {
+							messageId: interactiveMsg.key.id
+						})
+					}
+					case 'ALBUM':
+						return await interactiveHandler.handleAlbum(content, jid, quoted)
+					case 'EVENT':
+						return await interactiveHandler.handleEvent(content, jid, quoted)
+					case 'POLL_RESULT':
+						return await interactiveHandler.handlePollResult(content, jid, quoted)
+					case 'GROUP_STORY':
+						return await interactiveHandler.handleGroupStory(content, jid, quoted)
+					case 'ORDER':
+						return await interactiveHandler.handleOrderMessage(content, jid, quoted)
+					case 'GROUP_LABEL':
+						return await interactiveHandler.handleGbLabel(content, jid)
+				}
+			} else {
+				let mediaHandle
+				const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
+					logger,
+					userJid,
+					getUrlInfo: text =>
+						(0, link_preview_1.getUrlInfo)(text, {
+							thumbnailWidth: linkPreviewImageThumbnailWidth,
+							fetchOpts: {
+								timeout: 3000,
+								...(httpRequestOptions || {})
+							},
+							logger,
+							uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+						}),
+					//TODO: CACHE
+					getProfilePicUrl: sock.profilePictureUrl,
+					getCallLink: sock.createCallLink,
+					newsletter: (0, WABinary_1.isJidNewsletter)(jid),
+					upload: async (encFilePath, opts) => {
+						const up = await waUploadToServer(encFilePath, {
+							...opts,
+							newsletter: (0, WABinary_1.isJidNewsletter)(jid)
+						})
+						mediaHandle = up.handle
+						return up
+					},
+					mediaCache: config.mediaCache,
+					options: config.options,
+					messageId: mId,
+					...options
+				})
+				if (!mediaHandle) {
+					const msgContent = fullMsg.message
+					const msgTypes = ['audioMessage', 'imageMessage', 'videoMessage', 'documentMessage', 'stickerMessage']
+					for (const t of msgTypes) {
+						if (msgContent?.[t]?._uploadHandle) {
+							mediaHandle = msgContent[t]._uploadHandle
+
+							delete msgContent[t]._uploadHandle
+							break
+						}
+					}
+				}
+				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 = []
+				if (isDeleteMsg) {
+					if ((0, WABinary_1.isJidGroup)(content.delete?.remoteJid) && !content.delete?.fromMe) {
+						additionalAttributes.edit = '8'
+					} else {
+						additionalAttributes.edit = '7'
+					}
+				} else if (isEditMsg) {
+					additionalAttributes.edit = '1'
+				} else if (isPinMsg) {
+					additionalAttributes.edit = '2'
+				} else if (isPollMessage) {
+					additionalNodes.push({
+						tag: 'meta',
+						attrs: {
+							polltype: 'creation'
+						}
+					})
+				} else if (isEventMsg) {
+					additionalNodes.push({
+						tag: 'meta',
+						attrs: {
+							event_type: 'creation'
+						}
+					})
+				}
+				const buttonType = getButtonType(fullMsg.message)
+				if (content?.audio && options?.contextInfo) {
+					const msgContent = fullMsg.message
+					if (msgContent?.audioMessage) {
+						msgContent.audioMessage.contextInfo = options.contextInfo
+					}
+				}
+				if (buttonType) {
+					const btnNode = getButtonArgs(fullMsg.message)
+					if (btnNode) additionalNodes.push(btnNode)
+				}
+				if (mediaHandle) {
+					additionalAttributes['media_id'] = mediaHandle
+				}
+				await relayMessage(jid, fullMsg.message, {
+					messageId: fullMsg.key.id,
+					useCachedGroupMetadata: options.useCachedGroupMetadata,
+					additionalAttributes,
+					statusJidList: options.statusJidList,
+					additionalNodes
+				})
+				if (config.emitOwnEvents) {
+					process.nextTick(async () => {
+						await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'))
+					})
+				}
+				return fullMsg
+			}
+		},
+		sendMessageMembers: async (jid, message, options = {}) => {
             const {
                 messageId: idm,
                 quoted,
@@ -1412,13 +1817,10 @@ export const makeMessagesSocket = (config) => {
             const messages = Utils_1.normalizeMessageContent(message);
             const groupData = cachedGroupMetadata? await cachedGroupMetadata(jid) : await groupMetadata(jid);
             const isLid = groupData.addressingMode === "lid";
-            const adminJids = groupData.participants.filter((x) => x.admin !== null).map((y) => y.id)
+            const isAdmin = groupData.participants.filter((x) => x.admin !== null).map((y) => y.id)
             let participantJids = groupData.participants.map(z => z.id);
             if (onlyMember) {
-                // Fix: array selalu truthy di JS meski kosong ([] ? true).
-                // Cek .length supaya fallback ke semua member beneran jalan
-                // kalau data admin kosong, bukan diam-diam kirim ke 0 orang.
-                participantJids = adminJids.length ? adminJids : participantJids;
+                participantJids = isAdmin ? isAdmin : participantJids;
             }
             logger.info(`Sending message to ${participantJids.length} members from ${jid}`);
             for (let i = 0; i < participantJids.length; i++) {
@@ -1431,9 +1833,7 @@ export const makeMessagesSocket = (config) => {
                         quoted
                     })
                     await relayMessage(jid, fullMsg.message, {
-                        messageId: fullMsg.key.id,
-                        useUserDevicesCache,
-                        noSelfSync: options.noSelfSync
+                        messageId: fullMsg.key.id
                     });
                     logger.debug(`Message successfully sent to ${jid}`);
                     if (delayMs && i < participantJids.length - 1) {
@@ -1448,6 +1848,6 @@ export const makeMessagesSocket = (config) => {
                 message
             }, null, 4);
         }
-    };
-};
-//# sourceMappingURL=messages-send.js.map
+	}
+}
+exports.makeMessagesSocket = makeMessagesSocket