lordceaser-baileys 2.0.0 → 2.0.2

package/lib/Socket/messages-send.js

@@ -1,68 +1,65 @@
-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, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } 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 } from '../WABinary/index.js';
-import { USyncQuery, USyncUser } from '../WAUSync/index.js';
-import { makeNewsletterSocket } from './newsletter.js';
-export const makeMessagesSocket = (config) => {
-    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount } = config;
-    const sock = makeNewsletterSocket(config);
-    const { ev, authState, 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();
+"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 boom_1 = require("@hapi/boom");
+const node_cache_1 = __importDefault(require("node-cache"));
+const WAProto_1 = require("../../WAProto");
+const Defaults_1 = require("../Defaults");
+const Types_1 = require("../Types");
+const Utils_1 = require("../Utils");
+const link_preview_1 = require("../Utils/link-preview");
+const WABinary_1 = require("../WABinary");
+const WAUSync_1 = require("../WAUSync");
+const newsletter_1 = require("./newsletter");
+var ListType = WAProto_1.proto.Message.ListMessage.ListType;
+const makeMessagesSocket = (config) => {
+    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, } = config;
+    const sock = (0, newsletter_1.makeNewsletterSocket)(config);
+    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, generateMessageTag, sendNode, groupMetadata, groupQuery, newsletterWMexQuery, groupToggleEphemeral } = sock;
+    const patchMessageRequiresBeforeSending = (msg, recipientJids) => {
+        var _a, _b;
+        if ((_b = (_a = msg === null || msg === void 0 ? void 0 : msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.listMessage) {
+            msg = JSON.parse(JSON.stringify(msg));
+            msg.deviceSentMessage.message.listMessage.listType = WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT;
+        }
+        if (msg === null || msg === void 0 ? void 0 : msg.listMessage) {
+            msg = JSON.parse(JSON.stringify(msg));
+            msg.listMessage.listType = WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT;
+        }
+        return msg;
+    };
+    const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+        useClones: false
+    });
     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) {
+        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
+                        to: WABinary_1.S_WHATSAPP_NET,
                     },
                     content: [{ tag: 'media_conn', attrs: {} }]
                 });
-                const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
-                // TODO: explore full length of data that whatsapp provides
+                const mediaConnNode = (0, WABinary_1.getBinaryNodeChild)(result, 'media_conn');
                 const node = {
-                    hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
+                    hosts: (0, WABinary_1.getBinaryNodeChildren)(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
-                        maxContentLengthBytes: +attrs.maxContentLengthBytes
+                        maxContentLengthBytes: +attrs.maxContentLengthBytes,
                     })),
                     auth: mediaConnNode.attrs.auth,
                     ttl: +mediaConnNode.attrs.ttl,
                     fetchDate: new Date()
                 };
                 logger.debug('fetched media conn');
-                if (node.hosts[0]) {
-                    mediaHost = node.hosts[0].hostname;
-                }
                 return node;
             })();
         }
@@ -73,20 +70,17 @@ export const makeMessagesSocket = (config) => {
      * used for receipts of phone call, read, delivery etc.
      * */
     const sendReceipt = async (jid, participant, messageIds, type) => {
-        if (!messageIds || messageIds.length === 0) {
-            throw new Boom('missing ids in receipt');
-        }
         const node = {
             tag: 'receipt',
             attrs: {
-                id: messageIds[0]
-            }
+                id: messageIds[0],
+            },
         };
         const isReadReceipt = type === 'read' || type === 'read-self';
         if (isReadReceipt) {
-            node.attrs.t = unixTimestampSeconds().toString();
+            node.attrs.t = (0, Utils_1.unixTimestampSeconds)().toString();
         }
-        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
+        if (type === 'sender' && (0, WABinary_1.isJidUser)(jid)) {
             node.attrs.recipient = jid;
             node.attrs.to = participant;
         }
@@ -97,7 +91,7 @@ export const makeMessagesSocket = (config) => {
             }
         }
         if (type) {
-            node.attrs.type = type;
+            node.attrs.type = (0, WABinary_1.isJidNewsLetter)(jid) ? 'read-self' : type;
         }
         const remainingMessageIds = messageIds.slice(1);
         if (remainingMessageIds.length) {
@@ -117,7 +111,7 @@ export const makeMessagesSocket = (config) => {
     };
     /** Correctly bulk send receipts to multiple chats, participants */
     const sendReceipts = async (keys, type) => {
-        const recps = aggregateMessageKeysNotFromMe(keys);
+        const recps = (0, Utils_1.aggregateMessageKeysNotFromMe)(keys);
         for (const { jid, participant, messageIds } of recps) {
             await sendReceipt(jid, participant, messageIds, type);
         }
@@ -129,46 +123,59 @@ export const makeMessagesSocket = (config) => {
         const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
         await sendReceipts(keys, readType);
     };
+    const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
+        var _a, _b, _c, _d;
+        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        if ((0, WABinary_1.isJidNewsLetter)(jid)) {
+            const node = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
+                input: {
+                    key: jid,
+                    type: "JID",
+                    'view_role': 'GUEST'
+                },
+                'fetch_viewer_metadata': true,
+                'fetch_full_image': true,
+                'fetch_creation_time': true
+            });
+            const result = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(node, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
+            const metadataPath = JSON.parse(result).data[Types_1.XWAPaths.NEWSLETTER];
+            const pictype = type === 'image' ? 'picture' : 'preview';
+            const directPath = (_c = metadataPath === null || metadataPath === void 0 ? void 0 : metadataPath.thread_metadata[pictype]) === null || _c === void 0 ? void 0 : _c.direct_path;
+            return directPath ? (0, Utils_1.getUrlFromDirectPath)(directPath) : null;
+        }
+        else {
+            const result = await query({
+                tag: 'iq',
+                attrs: {
+                    target: jid,
+                    to: WABinary_1.S_WHATSAPP_NET,
+                    type: 'get',
+                    xmlns: 'w:profile:picture'
+                },
+                content: [
+                    { tag: 'picture', attrs: { type, query: 'url' } }
+                ]
+            }, timeoutMs);
+            const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
+            return (_d = child === null || child === void 0 ? void 0 : child.attrs) === null || _d === void 0 ? void 0 : _d.url;
+        }
+    };
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
+        var _a;
         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) {
+        jids = Array.from(new Set(jids));
+        for (let jid of jids) {
+            const user = (_a = (0, WABinary_1.jidDecode)(jid)) === null || _a === void 0 ? void 0 : _a.user;
+            jid = (0, WABinary_1.jidNormalizedUser)(jid);
             if (useCache) {
-                const devices = mgetDevices?.[user] ||
-                    (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)));
+                const devices = userDevicesCache.get(user);
                 if (devices) {
-                    const devicesWithJid = devices.map(d => ({
-                        ...d,
-                        jid: jidEncode(d.user, d.server, d.device)
-                    }));
-                    deviceResults.push(...devicesWithJid);
+                    deviceResults.push(...devices);
                     logger.trace({ user }, 'using cache for devices');
                 }
                 else {
@@ -182,547 +189,291 @@ export const makeMessagesSocket = (config) => {
         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();
+        const query = new WAUSync_1.USyncQuery()
+            .withContext('message')
+            .withDeviceProtocol();
         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
+            query.withUser(new WAUSync_1.USyncUser().withId(jid));
         }
         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 extracted = (0, Utils_1.extractDeviceJids)(result === null || result === void 0 ? void 0 : result.list, authState.creds.me.id, ignoreZeroDevices);
             const deviceMap = {};
             for (const item of extracted) {
                 deviceMap[item.user] = deviceMap[item.user] || [];
-                deviceMap[item.user]?.push(item);
+                deviceMap[item.user].push(item);
+                deviceResults.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');
-                }
+            for (const key in deviceMap) {
+                userDevicesCache.set(key, deviceMap[key]);
             }
         }
         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;
+        let jidsRequiringFetch = [];
+        if (force) {
+            jidsRequiringFetch = jids;
+        }
+        else {
+            const addrs = jids.map(jid => (signalRepository
+                .jidToSignalProtocolAddress(jid)));
+            const sessions = await authState.keys.get('session', addrs);
+            for (const jid of jids) {
+                const signalId = signalRepository
+                    .jidToSignalProtocolAddress(jid);
+                if (!sessions[signalId]) {
+                    jidsRequiringFetch.push(jid);
                 }
             }
-            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');
+            logger.debug({ jidsRequiringFetch }, 'fetching sessions');
             const result = await query({
                 tag: 'iq',
                 attrs: {
                     xmlns: 'encrypt',
                     type: 'get',
-                    to: S_WHATSAPP_NET
+                    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 };
-                        })
+                        content: jidsRequiringFetch.map(jid => ({
+                            tag: 'user',
+                            attrs: { jid },
+                        }))
                     }
                 ]
             });
-            await parseAndInjectE2ESessions(result, signalRepository);
+            await (0, Utils_1.parseAndInjectE2ESessions)(result, signalRepository);
             didFetchNewSession = true;
         }
         return didFetchNewSession;
     };
     const sendPeerDataOperationMessage = async (pdoMessage) => {
+        var _a;
         //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');
+        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
+            throw new boom_1.Boom('Not authenticated');
         }
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
-                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
+                type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
             }
         };
-        const meJid = jidNormalizedUser(authState.creds.me.id);
+        const meJid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
                 category: 'peer',
-                push_priority: 'high_force'
+                // eslint-disable-next-line camelcase
+                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 }));
+    const createParticipantNodes = async (jids, message, extraAttrs) => {
+        let patched = await patchMessageBeforeSending(message, jids);
+        const requiredPatched = patchMessageRequiresBeforeSending(patched, jids);
+        const bytes = (0, Utils_1.encodeWAMessage)(requiredPatched);
         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(jids.map(async (jid) => {
+            const { type, ciphertext } = await signalRepository
+                .encryptMessage({ jid, data: bytes });
+            if (type === 'pkmsg') {
+                shouldIncludeDeviceIdentity = true;
             }
-        });
-        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 });
-        }
+            const node = {
+                tag: 'to',
+                attrs: { jid },
+                content: [{
+                        tag: 'enc',
+                        attrs: {
+                            v: '2',
+                            type,
+                            ...extraAttrs || {}
+                        },
+                        content: ciphertext
+                    }]
+            };
+            return node;
+        }));
         return { nodes, shouldIncludeDeviceIdentity };
-    };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
-        const meId = assertMeId(authState.creds);
-        const meLid = authState.creds.me?.lid;
-        const isRetryResend = Boolean(participant?.jid);
-        let shouldIncludeDeviceIdentity = isRetryResend;
+    }; //apela
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList }) => {
+        const meId = authState.creds.me.id;
+        let shouldIncludeDeviceIdentity = false;
+        const { user, server } = (0, WABinary_1.jidDecode)(jid);
         const statusJid = 'status@broadcast';
-        const { user, server } = jidDecode(jid);
         const isGroup = server === 'g.us';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
+        const isPrivate = server === 's.whatsapp.net';
         const isNewsletter = server === 'newsletter';
-        const isGroupOrStatus = isGroup || isStatus;
-        const finalJid = jid;
-        msgId = msgId || generateMessageIDV2(meId);
+        msgId = msgId || (await config.generateMessageID() ?? (0, Utils_1.generateMessageID)());
         useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
-        const destinationJid = !isStatus ? finalJid : statusJid;
+        const destinationJid = (!isStatus) ? (0, WABinary_1.jidEncode)(user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net') : statusJid;
         const binaryNodeContent = [];
         const devices = [];
-        let reportingMessage;
         const meMsg = {
             deviceSentMessage: {
                 destinationJid,
                 message
-            },
-            messageContextInfo: message.messageContextInfo
+            }
         };
         const extraAttrs = {};
         if (participant) {
+            // when the retry request is not for a group
+            // only send to the specific device that asked for a retry
+            // otherwise the message is sent out to every device that should be a recipient
             if (!isGroup && !isStatus) {
-                additionalAttributes = { ...additionalAttributes, device_fanout: 'false' };
+                additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
             }
-            const { user, device } = jidDecode(participant.jid);
-            devices.push({
-                user,
-                device,
-                jid: participant.jid
-            });
+            const { user, device } = (0, WABinary_1.jidDecode)(participant.jid);
+            devices.push({ user, device });
         }
         await authState.keys.transaction(async () => {
+            var _a, _b, _c, _d, _e, _f;
             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 ((_a = (0, Utils_1.normalizeMessageContent)(message)) === null || _a === void 0 ? void 0 : _a.pinInChatMessage) {
+                extraAttrs['decrypt-fail'] = 'hide';
             }
-            if (normalizeMessageContent(message)?.pinInChatMessage || normalizeMessageContent(message)?.reactionMessage) {
-                extraAttrs['decrypt-fail'] = 'hide'; // todo: expand for reactions and other types
-            }
-            if (isGroupOrStatus && !isRetryResend) {
+            if (isGroup || isStatus) {
                 const [groupData, senderKeyMap] = await Promise.all([
                     (async () => {
-                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined; // todo: should we rely on the cache specially if the cache is outdated and the metadata has new fields?
-                        if (groupData && Array.isArray(groupData?.participants)) {
+                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined;
+                        if (groupData && Array.isArray(groupData === null || groupData === void 0 ? void 0 : groupData.participants)) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
-                        else if (!isStatus) {
-                            groupData = await groupMetadata(jid); // TODO: start storing group participant list + addr mode in Signal & stop relying on this
+                        if (!groupData && !isStatus) {
+                            groupData = await groupMetadata(jid);
                         }
                         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?
+                            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, !!useUserDevicesCache, false);
-                devices.push(...additionalDevices);
-                if (isGroup) {
-                    additionalAttributes = {
-                        ...additionalAttributes,
-                        addressing_mode: groupData?.addressingMode || 'lid'
-                    };
-                }
-                const patched = await patchMessageBeforeSending(message);
-                if (Array.isArray(patched)) {
-                    throw new Boom('Per-jid patching is not supported in groups');
+                if (!participant) {
+                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : [];
+                    if (isStatus && statusJidList) {
+                        participantsList.push(...statusJidList);
+                    }
+                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
+                    devices.push(...additionalDevices);
                 }
-                const bytes = encodeWAMessage(patched);
-                reportingMessage = patched;
-                const groupAddressingMode = additionalAttributes?.['addressing_mode'] || groupData?.addressingMode || 'lid';
-                const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId;
+                const patched = await patchMessageBeforeSending(message, devices.map(d => (0, WABinary_1.jidEncode)(d.user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net', d.device)));
+                const requiredPatched = patchMessageRequiresBeforeSending(patched, devices.map(d => (0, WABinary_1.jidEncode)(d.user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net', d.device)));
+                const bytes = (0, Utils_1.encodeWAMessage)(requiredPatched);
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
-                    meId: groupSenderIdentity
+                    meId,
                 });
-                const senderKeyRecipients = [];
-                for (const device of devices) {
-                    const deviceJid = device.jid;
-                    const hasKey = !!senderKeyMap[deviceJid];
-                    if ((!hasKey || !!participant) &&
-                        !isHostedLidUser(deviceJid) &&
-                        !isHostedPnUser(deviceJid) &&
-                        device.device !== 99) {
-                        //todo: revamp all this logic
-                        // the goal is to follow with what I said above for each group, and instead of a true false map of ids, we can set an array full of those the app has already sent pkmsgs
-                        senderKeyRecipients.push(deviceJid);
-                        senderKeyMap[deviceJid] = true;
+                const senderKeyJids = [];
+                // ensure a connection is established with every device
+                for (const { user, device } of devices) {
+                    const jid = (0, WABinary_1.jidEncode)(user, isLid ? 'lid' : 's.whatsapp.net', device);
+                    if (!senderKeyMap[jid] || !!participant) {
+                        senderKeyJids.push(jid);
+                        // store that this person has had the sender keys sent to them
+                        senderKeyMap[jid] = true;
                     }
                 }
-                if (senderKeyRecipients.length) {
-                    logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key');
+                // if there are some participants with whom the session has not been established
+                // if there are, we re-send the senderkey
+                if (senderKeyJids.length) {
+                    logger.debug({ senderKeyJids }, 'sending new sender key');
                     const senderKeyMsg = {
                         senderKeyDistributionMessage: {
                             axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
                             groupId: destinationJid
                         }
                     };
-                    const senderKeySessionTargets = senderKeyRecipients;
-                    await assertSessions(senderKeySessionTargets);
-                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
+                    await assertSessions(senderKeyJids, false);
+                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, mediaType ? { ...extraAttrs, mediatype: mediaType } : extraAttrs);
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
                 }
                 binaryNodeContent.push({
                     tag: 'enc',
-                    attrs: { v: '2', type: 'skmsg', ...extraAttrs },
+                    attrs: { v: '2', type: 'skmsg' },
                     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 if (isNewsletter) {
+                // Message edit
+                if ((_a = message.protocolMessage) === null || _a === void 0 ? void 0 : _a.editedMessage) {
+                    msgId = (_b = message.protocolMessage.key) === null || _b === void 0 ? void 0 : _b.id;
+                    message = message.protocolMessage.editedMessage;
                 }
-                else {
-                    logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation');
+                // Message delete
+                if (((_c = message.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                    msgId = (_d = message.protocolMessage.key) === null || _d === void 0 ? void 0 : _d.id;
+                    message = {};
                 }
-                const { user: ownUser } = jidDecode(ownId);
+                const patched = await patchMessageBeforeSending(message, []);
+                const bytes = WAProto_1.proto.Message.encode(patched).finish();
+                binaryNodeContent.push({
+                    tag: 'plaintext',
+                    attrs: mediaType ? { mediatype: mediaType } : {},
+                    content: bytes
+                });
+            }
+            else {
+                const { user: meUser, device: meDevice } = (0, WABinary_1.jidDecode)(meId);
                 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' : 's.whatsapp.net';
-                    devices.push({
-                        user,
-                        device: 0,
-                        jid: jidEncode(user, targetUserServer, 0) // rajeh, todo: this entire logic is convoluted and weird.
-                    });
-                    if (user !== ownUser) {
-                        const ownUserServer = isLid ? 'lid' : 's.whatsapp.net';
-                        const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user;
-                        devices.push({
-                            user: ownUserForAddressing,
-                            device: 0,
-                            jid: jidEncode(ownUserForAddressing, ownUserServer, 0)
-                        });
+                    devices.push({ user });
+                    // do not send message to self if the device is 0 (mobile)
+                    if (meDevice !== undefined && meDevice !== 0) {
+                        devices.push({ user: meUser });
                     }
-                    if (additionalAttributes?.['category'] !== 'peer') {
-                        // Clear placeholders and enumerate actual devices
-                        devices.length = 0;
-                        // Use conversation-appropriate sender identity
-                        const senderIdentity = isLid && meLid
-                            ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
-                            : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined);
-                        // Enumerate devices for sender and target with consistent addressing
-                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false);
-                        devices.push(...sessionDevices);
-                        logger.debug({
-                            deviceCount: devices.length,
-                            devices: devices.map(d => `${d.user}:${d.device}@${jidDecode(d.jid)?.server}`)
-                        }, 'Device enumeration complete with unified addressing');
+                    const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
+                    if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) !== 'peer') {
+                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
+                        devices.push(...additionalDevices);
                     }
+                    devices.push(...additionalDevices);
                 }
-                const allRecipients = [];
-                const meRecipients = [];
-                const otherRecipients = [];
-                const { user: mePnUser } = jidDecode(meId);
-                const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null };
-                for (const { user, jid } of devices) {
-                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid);
-                    if (isExactSenderDevice) {
-                        logger.debug({ jid, meId, meLid }, 'Skipping exact sender device (whatsmeow pattern)');
-                        continue;
-                    }
-                    // Check if this is our device (could match either PN or LID user)
-                    const isMe = user === mePnUser || user === meLidUser;
+                const allJids = [];
+                const meJids = [];
+                const otherJids = [];
+                for (const { user, device } of devices) {
+                    const isMe = user === meUser;
+                    const jid = (0, WABinary_1.jidEncode)(isMe && isLid ? ((_f = (_e = authState.creds) === null || _e === void 0 ? void 0 : _e.me) === null || _f === void 0 ? void 0 : _f.lid.split(':')[0]) || user : user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net', device);
                     if (isMe) {
-                        meRecipients.push(jid);
+                        meJids.push(jid);
                     }
                     else {
-                        otherRecipients.push(jid);
+                        otherJids.push(jid);
                     }
-                    allRecipients.push(jid);
+                    allJids.push(jid);
                 }
-                await assertSessions(allRecipients);
+                await assertSessions(allJids, false);
                 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)
+                    createParticipantNodes(meJids, meMsg, mediaType ? { ...extraAttrs, mediatype: mediaType } : extraAttrs),
+                    createParticipantNodes(otherJids, message, mediaType ? { ...extraAttrs, mediatype: mediaType } : extraAttrs)
                 ]);
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
-                if (meRecipients.length > 0 || otherRecipients.length > 0) {
-                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
-                }
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
-            if (isRetryResend) {
-                const isParticipantLid = isLidUser(participant.jid);
-                const isMe = areJidsSameUser(participant.jid, isParticipantLid ? meLid : meId);
-                let messageToSend = message;
-                if (isGroupOrStatus) {
-                    let groupSenderIdentity;
-                    if (meLid && (await signalRepository.hasSenderKey({ group: destinationJid, meId: meLid }))) {
-                        groupSenderIdentity = meLid;
-                    }
-                    else if (await signalRepository.hasSenderKey({ group: destinationJid, meId })) {
-                        groupSenderIdentity = meId;
-                    }
-                    if (groupSenderIdentity) {
-                        try {
-                            const skdm = await signalRepository.getSenderKeyDistributionMessage({
-                                group: destinationJid,
-                                meId: groupSenderIdentity
-                            });
-                            messageToSend = {
-                                ...message,
-                                senderKeyDistributionMessage: {
-                                    groupId: destinationJid,
-                                    axolotlSenderKeyDistributionMessage: skdm
-                                }
-                            };
-                        }
-                        catch (err) {
-                            logger.warn({ err, jid: destinationJid }, 'failed to build SKDM for retry, sending without it');
-                        }
-                    }
-                }
-                const encodedMessageToSend = isMe
-                    ? encodeWAMessage({
-                        deviceSentMessage: {
-                            destinationJid,
-                            message: messageToSend
-                        }
-                    })
-                    : encodeWAMessage(messageToSend);
-                const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
-                    data: encodedMessageToSend,
-                    jid: participant.jid
-                });
-                binaryNodeContent.push({
-                    tag: 'enc',
-                    attrs: {
-                        v: '2',
-                        type,
-                        count: participant.count.toString()
-                    },
-                    content: encryptedContent
-                });
-            }
             if (participants.length) {
-                if (additionalAttributes?.['category'] === 'peer') {
-                    const peerNode = participants[0]?.content?.[0];
+                if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) === 'peer') {
+                    const peerNode = (_e = (_d = participants[0]) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e[0];
                     if (peerNode) {
                         binaryNodeContent.push(peerNode); // push only enc
                     }
@@ -739,8 +490,7 @@ export const makeMessagesSocket = (config) => {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    to: destinationJid,
-                    type: getMessageType(message),
+                    type: isNewsletter ? getTypeMessage(message) : 'text',
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
@@ -749,11 +499,11 @@ export const makeMessagesSocket = (config) => {
             // ensure the message is only sent to that person
             // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
             if (participant) {
-                if (isJidGroup(destinationJid)) {
+                if ((0, WABinary_1.isJidGroup)(destinationJid)) {
                     stanza.attrs.to = destinationJid;
                     stanza.attrs.participant = participant.jid;
                 }
-                else if (areJidsSameUser(participant.jid, meId)) {
+                else if ((0, WABinary_1.areJidsSameUser)(participant.jid, meId)) {
                     stanza.attrs.to = participant.jid;
                     stanza.attrs.recipient = destinationJid;
                 }
@@ -765,143 +515,144 @@ export const makeMessagesSocket = (config) => {
                 stanza.attrs.to = destinationJid;
             }
             if (shouldIncludeDeviceIdentity) {
-                ;
                 stanza.content.push({
                     tag: 'device-identity',
                     attrs: {},
-                    content: encodeSignedDeviceIdentity(authState.creds.account, true)
+                    content: (0, Utils_1.encodeSignedDeviceIdentity)(authState.creds.account, true)
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-            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 (additionalNodes && additionalNodes.length > 0) {
+                stanza.content.push(...additionalNodes);
+            }
+            const inMsg = (0, Utils_1.normalizeMessageContent)(message) || null;
+            const key = inMsg ? (0, Utils_1.getContentType)(inMsg) : null;
+            if (!isNewsletter && (key === 'interactiveMessage' || key === 'buttonsMessage')) {
+                const nativeNode = {
+                    tag: 'biz',
+                    attrs: {},
+                    content: [{
+                            tag: 'interactive',
+                            attrs: {
+                                type: 'native_flow',
+                                v: '1'
+                            },
+                            content: [{
+                                    tag: 'native_flow',
+                                    attrs: {
+                                        name: 'quick_reply'
+                                    }
+                                }]
+                        }]
+                };
+                const resultNativeNode = filterNativeNode(additionalNodes);
+                if (resultNativeNode && additionalNodes && additionalNodes.length > 0) {
+                    stanza.content.push(...resultNativeNode);
                 }
-                catch (error) {
-                    logger.warn({ jid, trace: error?.stack }, 'failed to attach reporting token');
+                else {
+                    stanza.content.push(nativeNode);
                 }
-            }
-            // 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 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 && isTcTokenExpired(existingTokenEntry?.timestamp)) {
-                logger.debug({ jid: destinationJid, timestamp: existingTokenEntry?.timestamp }, 'tctoken expired, clearing');
-                tcTokenBuffer = undefined;
-                // Preserve senderTimestamp so the fire-and-forget issuance dedupe survives cleanup.
-                const cleared = existingTokenEntry?.senderTimestamp !== undefined
-                    ? { token: Buffer.alloc(0), senderTimestamp: existingTokenEntry.senderTimestamp }
-                    : null;
-                try {
-                    await authState.keys.set({ tctoken: { [tcTokenJid]: cleared } });
+            }/*
+            if (isPrivate) {
+                const botNode = {
+                    tag: 'bot',
+                    attrs: { biz_bot: '1' }
+                };
+                const resultBotNode = filterBotNode(additionalNodes);
+                if (resultBotNode && additionalNodes && additionalNodes.length > 0) {
+                    stanza.content.push(...resultBotNode);
                 }
-                catch (err) {
-                    logger.debug({ jid: destinationJid, err: err?.message }, 'failed to persist tctoken expiry cleanup');
+                else {
+                    stanza.content.push(botNode);
                 }
-            }
-            if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
-                ;
+            }*
+            if (message && message.listMessage) {
                 stanza.content.push({
-                    tag: 'tctoken',
+                    tag: 'biz',
                     attrs: {},
-                    content: tcTokenBuffer
+                    content: [
+                        {
+                            tag: 'list',
+                            attrs: getButtonArgs(message)
+                        }
+                    ]
                 });
-            }
-            if (additionalNodes && additionalNodes.length > 0) {
-                ;
-                stanza.content.push(...additionalNodes);
-            }
-            logger.debug({ msgId }, `sending message to ${participants.length} devices`);
-            await sendNode(stanza);
-            // Fire-and-forget: issue our token to the contact AFTER message send.
-            // WA Web skips protocol messages and PSA/bot contacts (TcTokenChatAction: isRegularUser)
-            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
+                logger.debug({ jid }, 'adding business node');
+            }*/
+            const buttonType = getButtonType(message);
+            if (buttonType) {
+                stanza.content.push({
+                    tag: 'biz',
+                    attrs: {},
+                    content: [
+                        {
+                            tag: buttonType,
+                            attrs: getButtonArgs(message),
                         }
-                    });
-                })
-                    .catch(err => {
-                    logger.debug({ jid: destinationJid, err: err?.message }, 'fire-and-forget tctoken issuance failed');
-                })
-                    .finally(() => {
-                    inFlightTcTokenIssuance.delete(tcTokenJid);
+                    ]
                 });
+                logger.debug({ jid }, 'adding business node');
             }
-            // Add message to retry cache if enabled
-            if (messageRetryManager && !participant) {
-                messageRetryManager.addRecentMessage(destinationJid, msgId, message);
-            }
-        }, meId);
+            logger.debug({ msgId }, `sending message to ${participants.length} devices`);
+            await sendNode(stanza);
+        });
         return msgId;
     };
-    const getMessageType = (message) => {
-        const normalizedMessage = normalizeMessageContent(message);
-        if (!normalizedMessage)
-            return 'text';
-        if (normalizedMessage.reactionMessage || normalizedMessage.encReactionMessage) {
+    const filterNativeNode = (nodeContent) => {
+        if (Array.isArray(nodeContent)) {
+            return nodeContent.filter((item) => {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                if (item.tag === 'biz' && ((_a = item === null || item === void 0 ? void 0 : item.content[0]) === null || _a === void 0 ? void 0 : _a.tag) === 'interactive' && ((_c = (_b = item === null || item === void 0 ? void 0 : item.content[0]) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.type) === 'native_flow' && ((_e = (_d = item === null || item === void 0 ? void 0 : item.content[0]) === null || _d === void 0 ? void 0 : _d.content[0]) === null || _e === void 0 ? void 0 : _e.tag) === 'native_flow' && ((_h = (_g = (_f = item === null || item === void 0 ? void 0 : item.content[0]) === null || _f === void 0 ? void 0 : _f.content[0]) === null || _g === void 0 ? void 0 : _g.attrs) === null || _h === void 0 ? void 0 : _h.name) === 'quick_reply') {
+                    return false;
+                }
+                return true;
+            });
+        }
+        else {
+            return nodeContent;
+        }
+    };
+    const filterBotNode = (nodeContent) => {
+        if (Array.isArray(nodeContent)) {
+            return nodeContent.filter((item) => {
+                if (item.tag === 'bot' && item.attrs.biz_bot === '1') {
+                    return false;
+                }
+                return true;
+            });
+        }
+        else {
+            return nodeContent;
+        }
+    };
+    const getTypeMessage = (msg) => {
+        if (msg.viewOnceMessage) {
+            return getTypeMessage(msg.viewOnceMessage.message);
+        }
+        else if (msg.viewOnceMessageV2) {
+            return getTypeMessage(msg.viewOnceMessageV2.message);
+        }
+        else if (msg.viewOnceMessageV2Extension) {
+            return getTypeMessage(msg.viewOnceMessageV2Extension.message);
+        }
+        else if (msg.ephemeralMessage) {
+            return getTypeMessage(msg.ephemeralMessage.message);
+        }
+        else if (msg.documentWithCaptionMessage) {
+            return getTypeMessage(msg.documentWithCaptionMessage.message);
+        }
+        else if (msg.reactionMessage) {
             return 'reaction';
         }
-        if (normalizedMessage.pollCreationMessage ||
-            normalizedMessage.pollCreationMessageV2 ||
-            normalizedMessage.pollCreationMessageV3 ||
-            normalizedMessage.pollUpdateMessage) {
+        else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
             return 'poll';
         }
-        if (normalizedMessage.eventMessage) {
-            return 'event';
-        }
-        if (getMediaType(normalizedMessage) !== '') {
+        else if (getMediaType(msg)) {
             return 'media';
         }
-        return 'text';
+        else {
+            return 'text';
+        }
     };
     const getMediaType = (message) => {
         if (message.imageMessage) {
@@ -949,14 +700,46 @@ export const makeMessagesSocket = (config) => {
         else if (message.groupInviteMessage) {
             return 'url';
         }
-        return '';
     };
-    const issuePrivacyTokens = async (jids, timestamp) => {
-        const t = (timestamp ?? unixTimestampSeconds()).toString();
+    const getButtonType = (message) => {
+        if (message.buttonsMessage) {
+            return 'buttons';
+        }
+        else if (message.buttonsResponseMessage) {
+            return 'buttons_response';
+        }
+        else if (message.interactiveResponseMessage) {
+            return 'interactive_response';
+        }
+        else if (message.listMessage) {
+            return 'list';
+        }
+        else if (message.listResponseMessage) {
+            return 'list_response';
+        }
+    };
+    const getButtonArgs = (message) => {
+        if (message.templateMessage) {
+            // TODO: Add attributes
+            return {};
+        }
+        else if (message.listMessage) {
+            const type = message.listMessage.listType;
+            if (!type) {
+                throw new boom_1.Boom('Expected list type inside message');
+            }
+            return { v: '2', type: ListType[type].toLowerCase() };
+        }
+        else {
+            return {};
+        }
+    };
+    const getPrivacyTokens = async (jids) => {
+        const t = (0, Utils_1.unixTimestampSeconds)().toString();
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: S_WHATSAPP_NET,
+                to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'privacy'
             },
@@ -967,7 +750,7 @@ export const makeMessagesSocket = (config) => {
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: jidNormalizedUser(jid),
+                            jid: (0, WABinary_1.jidNormalizedUser)(jid),
                             t,
                             type: 'trusted_contact'
                         }
@@ -977,46 +760,33 @@ export const makeMessagesSocket = (config) => {
         });
         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();
-        }
-    });
+    const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
+    const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
-        userDevicesCache,
-        devicesMutex,
-        issuePrivacyTokens,
+        getPrivacyTokens,
         assertSessions,
         relayMessage,
         sendReceipt,
         sendReceipts,
+        getButtonArgs,
         readMessages,
         refreshMediaConn,
-        // Function (not getter) so the spread in chats.ts preserves the live closure binding.
-        getMediaHost: () => mediaHost,
-        waUploadToServer,
-        fetchPrivacySettings,
+        getUSyncDevices,
         sendPeerDataOperationMessage,
         createParticipantNodes,
-        getUSyncDevices,
-        messageRetryManager,
-        updateMemberLabel,
+        profilePictureUrl,
+        waUploadToServer,
+        fetchPrivacySettings,
         updateMediaMessage: async (message) => {
-            const content = assertMediaContent(message.message);
+            const content = (0, Utils_1.assertMediaContent)(message.message);
             const mediaKey = content.mediaKey;
             const meId = authState.creds.me.id;
-            const node = encryptMediaRetryRequest(message.key, mediaKey, meId);
+            const node = await (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
             let error = undefined;
             await Promise.all([
                 sendNode(node),
-                waitForMsgMediaUpdate(async (update) => {
+                waitForMsgMediaUpdate(async update => {
                     const result = update.find(c => c.key.id === message.key.id);
                     if (result) {
                         if (result.error) {
@@ -1024,16 +794,13 @@ export const makeMessagesSocket = (config) => {
                         }
                         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
-                                    });
+                                const media = await (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
+                                if (media && media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                    const resultStr = WAProto_1.proto.MediaRetryNotification.ResultType[media.result];
+                                    throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: (0, Utils_1.getStatusCodeForMediaRetry)(media.result) || 404 });
                                 }
                                 content.directPath = media.directPath;
-                                content.url = getUrlFromDirectPath(content.directPath, mediaHost);
+                                content.url = (0, Utils_1.getUrlFromDirectPath)(content.directPath);
                                 logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful');
                             }
                             catch (err) {
@@ -1047,56 +814,236 @@ export const makeMessagesSocket = (config) => {
             if (error) {
                 throw error;
             }
-            ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
+            ev.emit('messages.update', [
+                { key: message.key, update: { message: message.message } }
+            ]);
             return message;
         },
+        sendStatusMentions: async (content, jids = []) => {
+            const userJid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
+            let allUsers = [];
+            for (const id of jids) {
+                const { user, server } = (0, WABinary_1.jidDecode)(id);
+                const isGroup = server === 'g.us';
+                const isPrivate = server === 's.whatsapp.net';
+                if (isGroup) {
+                    let userId = await groupMetadata(id);
+                    let participant = await userId.participants;
+                    let users = await Promise.all(participant.map(u => (0, WABinary_1.jidNormalizedUser)(u.id)));
+                    allUsers = [...allUsers, ...users];
+                }
+                else if (isPrivate) {
+                    let users = await Promise.all(jids.map(id => id.replace(/\b\d{18}@.{4}\b/g, '')));
+                    allUsers = [...allUsers, ...users];
+                }
+                if (!allUsers.find(user => user.includes(userJid))) {
+                    allUsers.push(userJid);
+                }
+            }
+            ;
+            const getRandomHexColor = () => {
+                return "#" + Math.floor(Math.random() * 16777215)
+                    .toString(16)
+                    .padStart(6, "0");
+            };
+            let mediaHandle;
+            let msg = await (0, Utils_1.generateWAMessage)(WABinary_1.STORIES_JID, content, {
+                logger,
+                userJid,
+                getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
+                    thumbnailWidth: linkPreviewImageThumbnailWidth,
+                    fetchOpts: {
+                        timeout: 3000,
+                        ...axiosOptions || {}
+                    },
+                    logger,
+                    uploadImage: generateHighQualityLinkPreview
+                        ? waUploadToServer
+                        : undefined
+                }),
+                upload: async (readStream, opts) => {
+                    const up = await waUploadToServer(readStream, { ...opts });
+                    mediaHandle = up.handle;
+                    return up;
+                },
+                mediaCache: config.mediaCache,
+                options: config.options,
+                backgroundColor: getRandomHexColor(),
+                font: Math.floor(Math.random() * 9),
+            });
+            await relayMessage(WABinary_1.STORIES_JID, msg.message, {
+                messageId: msg.key.id,
+                statusJidList: allUsers,
+                additionalNodes: [
+                    {
+                        tag: 'meta',
+                        attrs: {},
+                        content: [
+                            {
+                                tag: 'mentioned_users',
+                                attrs: {},
+                                content: jids.map(jid => ({
+                                    tag: 'to',
+                                    attrs: { jid },
+                                    content: undefined,
+                                })),
+                            },
+                        ],
+                    },
+                ],
+            });
+            jids.forEach(async (id) => {
+                id = (0, WABinary_1.jidNormalizedUser)(id);
+                const { user, server } = (0, WABinary_1.jidDecode)(id);
+                const isPrivate = server === 's.whatsapp.net';
+                let type = isPrivate
+                    ? 'statusMentionMessage'
+                    : 'groupStatusMentionMessage';
+                await relayMessage(id, {
+                    [type]: {
+                        message: {
+                            protocolMessage: {
+                                key: msg.key,
+                                type: 25,
+                            },
+                        },
+                    },
+                }, {});
+                await (0, Utils_1.delay)(2500);
+            });
+            return msg;
+        },
+        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;
+        },
         sendMessage: async (jid, content, options = {}) => {
+            var _a, _b, _c;
             const userJid = authState.creds.me.id;
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                isJidGroup(jid)) {
+                (0, WABinary_1.isJidGroup)(jid)) {
                 const { disappearingMessagesInChat } = content;
-                const value = typeof disappearingMessagesInChat === 'boolean'
-                    ? disappearingMessagesInChat
-                        ? WA_DEFAULT_EPHEMERAL
-                        : 0
-                    : disappearingMessagesInChat;
+                const value = typeof disappearingMessagesInChat === 'boolean' ?
+                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
+                    disappearingMessagesInChat;
                 await groupToggleEphemeral(jid, value);
             }
             else {
-                const fullMsg = await generateWAMessage(jid, content, {
+                let mediaHandle;
+                const { server } = (0, WABinary_1.jidDecode)(jid);
+                const isGroup = server === 'g.us';
+                let eph;
+                if (isGroup) {
+                    const disappearingNode = await groupQuery(jid, 'get', [
+                        {
+                            tag: 'query',
+                            attrs: { request: 'interactive' }
+                        }
+                    ]);
+                    const group = (0, WABinary_1.getBinaryNodeChild)(disappearingNode, 'group');
+                    const expiration = (0, WABinary_1.getBinaryNodeChild)(group, 'ephemeral');
+                    eph = (_a = expiration === null || expiration === void 0 ? void 0 : expiration.attrs) === null || _a === void 0 ? void 0 : _a.expiration;
+                }
+                const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
                     logger,
                     userJid,
-                    getUrlInfo: text => getUrlInfo(text, {
+                    ephemeralExpiration: (options.ephemeralExpiration && options.ephemeralExpiration > 0) ? options.ephemeralExpiration : eph,
+                    getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
                         thumbnailWidth: linkPreviewImageThumbnailWidth,
                         fetchOpts: {
                             timeout: 3000,
-                            ...(httpRequestOptions || {})
+                            ...axiosOptions || {}
                         },
                         logger,
-                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+                        uploadImage: generateHighQualityLinkPreview
+                            ? waUploadToServer
+                            : undefined
                     }),
-                    //TODO: CACHE
-                    getProfilePicUrl: sock.profilePictureUrl,
-                    getCallLink: sock.createCallLink,
-                    upload: waUploadToServer,
+                    upload: async (readStream, opts) => {
+                        const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsLetter)(jid) });
+                        mediaHandle = up.handle;
+                        return up;
+                    },
                     mediaCache: config.mediaCache,
                     options: config.options,
-                    messageId: generateMessageIDV2(sock.user?.id),
-                    ...options
+                    messageId: await config.generateMessageIDV2((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id) ?? (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
+                    ...options,
                 });
-                const isEventMsg = 'event' in content && !!content.event;
-                const isDeleteMsg = 'delete' in content && !!content.delete;
-                const isEditMsg = 'edit' in content && !!content.edit;
+                const isAiMsg = 'ai' in content && !!content.ai;
                 const isPinMsg = 'pin' in content && !!content.pin;
-                const isPollMessage = 'poll' in content && !!content.poll;
+                const isKeepMsg = 'keep' in content && content.keep;
+                const isPollMsg = 'poll' in content && !!content.poll;
+                const isEditMsg = 'edit' in content && !!content.edit;
+                const isDeleteMsg = 'delete' in content && !!content.delete;
                 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) {
+                    if (((0, WABinary_1.isJidGroup)((_b = content.delete) === null || _b === void 0 ? void 0 : _b.remoteJid) && !((_c = content.delete) === null || _c === void 0 ? void 0 : _c.fromMe)) || (0, WABinary_1.isJidNewsLetter)(jid)) {
                         additionalAttributes.edit = '8';
                     }
                     else {
@@ -1104,37 +1051,32 @@ export const makeMessagesSocket = (config) => {
                     }
                 }
                 else if (isEditMsg) {
-                    additionalAttributes.edit = '1';
+                    additionalAttributes.edit = (0, WABinary_1.isJidNewsLetter)(jid) ? '3' : '1';
                 }
                 else if (isPinMsg) {
                     additionalAttributes.edit = '2';
                 }
-                else if (isPollMessage) {
+                else if (isAiMsg) {
                     additionalNodes.push({
-                        tag: 'meta',
                         attrs: {
-                            polltype: 'creation'
-                        }
+                            biz_bot: '1'
+                        },
+                        tag: 'bot'
                     });
+                    if (options.additionalNodes) {
+                        additionalNodes.push(...options.additionalNodes);
+                    }
                 }
-                else if (isEventMsg) {
-                    additionalNodes.push({
-                        tag: 'meta',
-                        attrs: {
-                            event_type: 'creation'
-                        }
-                    });
+                if (mediaHandle) {
+                    additionalAttributes['media_id'] = mediaHandle;
                 }
-                await relayMessage(jid, fullMsg.message, {
-                    messageId: fullMsg.key.id,
-                    useCachedGroupMetadata: options.useCachedGroupMetadata,
-                    additionalAttributes,
-                    statusJidList: options.statusJidList,
-                    additionalNodes
-                });
+                if ('cachedGroupMetadata' in options) {
+                    console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.');
+                }
+                await relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, cachedGroupMetadata: options.cachedGroupMetadata, additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes, additionalAttributes, statusJidList: options.statusJidList });
                 if (config.emitOwnEvents) {
-                    process.nextTick(async () => {
-                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    process.nextTick(() => {
+                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
                     });
                 }
                 return fullMsg;
@@ -1142,4 +1084,4 @@ export const makeMessagesSocket = (config) => {
         }
     };
 };
-//# sourceMappingURL=messages-send.js.map
+exports.makeMessagesSocket = makeMessagesSocket;