@mrlegendbot/baileys 1.2.5 → 1.2.7

package/lib/Socket/messages-send.js

@@ -1,6 +1,6 @@
 import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto/compiler.js';
+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, generateWAMessageFromContent, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
@@ -10,1299 +10,1342 @@ import { buildMergedTcTokenIndexWrite, isTcTokenExpired, resolveIssuanceJid, res
 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';
-import util from 'node:util';
-import { createHmac } from 'node:crypto';
-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);
-  const inFlightTcTokenIssuance = new Set();
-  const userDevicesCache = config.userDevicesCache || new NodeCache({
-    stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
-    useClones: false
-  });
-  const devicesMutex = makeMutex();
-  const messageRetryManager = enableRecentMessageCache ? new MessageRetryManager(logger, maxMsgRetryCount) : null;
-  const encryptionMutex = makeKeyedMutex();
-  let mediaConn;
-  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: {}
-          }]
+
+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);
+
+    const inFlightTcTokenIssuance = new Set();
+    const userDevicesCache = config.userDevicesCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
+            useClones: false
         });
-        const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
-        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;
-  };
-  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 devicesMutex = makeMutex();
+    const messageRetryManager = enableRecentMessageCache ? new MessageRetryManager(logger, maxMsgRetryCount) : null;
+    const encryptionMutex = makeKeyedMutex();
+    let mediaConn;
+    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');
+                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;
     };
-    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);
-  };
-  const sendReceipts = async (keys, type) => {
-    const recps = aggregateMessageKeysNotFromMe(keys);
-    for (const {
-      jid,
-      participant,
-      messageIds
-    } of recps) {
-      await sendReceipt(jid, participant, messageIds, type);
-    }
-  };
-  const readMessages = async keys => {
-    const privacySettings = await fetchPrivacySettings();
-    const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
-    await sendReceipts(keys, readType);
-  };
-  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));
-    }
-    const result = await sock.executeUSyncQuery(query);
-    if (result) {
-      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
-        })));
-        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 sendReceipt = async (jid, participant, messageIds, type) => {
+        if (!messageIds || messageIds.length === 0) {
+            throw new Boom('missing ids in receipt');
         }
-      }
-      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);
-      }
-      for (const [user, userDevices] of Object.entries(deviceMap)) {
-        const isLidUser = requestedLidUsers.has(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');
+        const node = {
+            tag: 'receipt',
+            attrs: {
+                id: messageIds[0]
+            }
+        };
+        const isReadReceipt = type === 'read' || type === 'read-self';
+        if (isReadReceipt) {
+            node.attrs.t = unixTimestampSeconds().toString();
         }
-      }
-      await devicesMutex.mutex(async () => {
-        if (userDevicesCache.mset) {
-          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]);
-          }
+        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
+            node.attrs.recipient = jid;
+            node.attrs.to = participant;
         }
-      });
-      const userDeviceUpdates = {};
-      for (const [userId, devices] of Object.entries(deviceMap)) {
-        if (devices && devices.length > 0) {
-          userDeviceUpdates[userId] = devices.map(d => d.device?.toString() || '0');
+        else {
+            node.attrs.to = jid;
+            if (participant) {
+                node.attrs.participant = participant;
+            }
         }
-      }
-      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');
+        if (type) {
+            node.attrs.type = type;
         }
-      }
-    }
-    return deviceResults;
-  };
-  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()
+        const remainingMessageIds = messageIds.slice(1);
+        if (remainingMessageIds.length) {
+            node.content = [
+                {
+                    tag: 'list',
+                    attrs: {},
+                    content: remainingMessageIds.map(id => ({
+                        tag: 'item',
+                        attrs: { id }
+                    }))
+                }
+            ];
         }
-      }
-    }, {
-      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;
+        logger.debug({ attrs: node.attrs, messageIds }, 'sending receipt for messages');
+        await sendNode(node);
+    };
+
+    const sendReceipts = async (keys, type) => {
+        const recps = aggregateMessageKeysNotFromMe(keys);
+        for (const { jid, participant, messageIds } of recps) {
+            await sendReceipt(jid, participant, messageIds, type);
         }
-      }
-      jidsRequiringFetch.push(jid);
-    }
-    if (jidsRequiringFetch.length) {
-      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 => {
-    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 readMessages = async (keys) => {
+        const privacySettings = await fetchPrivacySettings();
+        const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
+        await sendReceipts(keys, readType);
+    };
+
+    const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
+        const deviceResults = [];
+        if (!useCache) {
+            logger.debug('not using cache for devices');
         }
-        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,
-    participants: retryParticipants,
-    isSecret,
-    protected: protectedSend,
-    me: meOnly,
-    additionalAttributes,
-    additionalNodes,
-    useUserDevicesCache,
-    useCachedGroupMetadata,
-    statusJidList,
-    cstoken = true
-  }) => {
-    const meId = assertMeId(authState.creds);
-    const meLid = authState.creds.me?.lid;
-    const isRetryResend = Boolean(retryParticipants?.jid && retryParticipants?.count != null);
-    const isRecipientOnly = 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 isGroupOrStatus = isGroup || isStatus;
-    const finalJid = jid;
-    msgId = msgId || generateMessageIDV2(meId);
-    useUserDevicesCache = useUserDevicesCache !== false;
-    useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
-    const participants = [];
-    const destinationJid = !isStatus ? finalJid : statusJid;
-    const binaryNodeContent = [];
-    const devices = [];
-    let reportingMessage;
-    const meMsg = {
-      deviceSentMessage: {
-        destinationJid,
-        message
-      },
-      messageContextInfo: message.messageContextInfo
-    };
-    const extraAttrs = {};
-    if (isRetryResend) {
-      if (!isGroup && !isStatus) {
-        additionalAttributes = {
-          ...additionalAttributes,
-          device_fanout: 'false'
-        };
-      }
-      const {
-        user,
-        device
-      } = jidDecode(retryParticipants.jid);
-      devices.push({
-        user,
-        device,
-        jid: retryParticipants.jid
-      });
-    }
-    if ((isRecipientOnly || isSecret || protectedSend || meOnly) && !isGroup && !isStatus) {
-      additionalAttributes = {
-        ...additionalAttributes,
-        device_fanout: 'false'
-      };
-    }
-    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 (!retryParticipants && !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()
-          };
+        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);
         }
-        if (isStatus && statusJidList) {
-          participantsList.push(...statusJidList);
+        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);
+            }
         }
-        const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
-        devices.push(...additionalDevices);
-        if (isGroup) {
-          additionalAttributes = {
-            ...additionalAttributes,
-            addressing_mode: groupData?.addressingMode || 'lid'
-          };
+        if (!toFetch.length) {
+            return deviceResults;
         }
-        const patched = await patchMessageBeforeSending(message);
-        if (Array.isArray(patched)) {
-          throw new Boom('Per-jid patching is not supported in groups');
+        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 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 || !!retryParticipants) && !isHostedLidUser(deviceJid) && !isHostedPnUser(deviceJid) && device.device !== 99) {
-            senderKeyRecipients.push(deviceJid);
-            senderKeyMap[deviceJid] = true;
-          }
+        const queryObj = new USyncQuery().withContext('message').withDeviceProtocol().withLIDProtocol();
+        for (const jid of toFetch) {
+            queryObj.withUser(new USyncUser().withId(jid));
         }
-        if (senderKeyRecipients.length) {
-          logger.debug({
-            senderKeyJids: senderKeyRecipients
-          }, 'sending new sender key');
-          const senderKeyMsg = {
-            senderKeyDistributionMessage: {
-              axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
-              groupId: destinationJid
+        const result = await sock.executeUSyncQuery(queryObj);
+        if (result) {
+            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 })));
+                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 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 {
-        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 (!isRetryResend) {
-          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)
-          });
-          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)
+            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);
+            }
+            for (const [user, userDevices] of Object.entries(deviceMap)) {
+                const isLidUser = requestedLidUsers.has(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) {
+                    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]);
+                    }
+                }
             });
-          }
-          if (additionalAttributes?.['category'] !== 'peer') {
-            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], 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 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) continue;
-          const isMe = user === mePnUser || user === meLidUser;
-          const hasDevice = jid.includes(':');
-          if (isRecipientOnly && isMe) continue;
-          if (isSecret && !(!isMe && !hasDevice)) continue;
-          if (protectedSend && !isMe && hasDevice) continue;
-          if (meOnly && !isMe) continue;
-          if (isMe) meRecipients.push(jid);else otherRecipients.push(jid);
-          allRecipients.push(jid);
-        }
-        await assertSessions(allRecipients);
-        const [{
-          nodes: meNodes,
-          shouldIncludeDeviceIdentity: s1
-        }, {
-          nodes: otherNodes,
-          shouldIncludeDeviceIdentity: s2
-        }] = await Promise.all([createParticipantNodes(meRecipients, meMsg || message, extraAttrs), createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)]);
-        participants.push(...meNodes);
-        participants.push(...otherNodes);
-        if (meRecipients.length > 0 || otherRecipients.length > 0) {
-          extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
-        }
-        shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
-      }
-      if (isRetryResend) {
-        const isParticipantLid = isLidUser(retryParticipants.jid);
-        const isMe = areJidsSameUser(retryParticipants.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 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');
+                }
             }
-          }
         }
-        const encodedMessageToSend = isMe ? encodeWAMessage({
-          deviceSentMessage: {
-            destinationJid,
-            message: messageToSend
-          }
-        }) : encodeWAMessage(messageToSend);
-        const {
-          type,
-          ciphertext: encryptedContent
-        } = await signalRepository.encryptMessage({
-          data: encodedMessageToSend,
-          jid: retryParticipants.jid
-        });
-        binaryNodeContent.push({
-          tag: 'enc',
-          attrs: {
-            v: '2',
-            type,
-            count: retryParticipants.count.toString()
-          },
-          content: encryptedContent
+        return deviceResults;
+    };
+
+    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
+                }
+            ]
         });
-      }
-      if (participants.length) {
-        if (additionalAttributes?.['category'] === 'peer') {
-          const peerNode = participants[0]?.content?.[0];
-          if (peerNode) {
-            binaryNodeContent.push(peerNode);
-          }
-        } else {
-          binaryNodeContent.push({
-            tag: 'participants',
-            attrs: {},
-            content: participants
-          });
+    };
+
+    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);
         }
-      }
-      const stanza = {
-        tag: 'message',
-        attrs: {
-          id: msgId,
-          to: destinationJid,
-          type: getMessageType(message),
-          ...(additionalAttributes || {})
-        },
-        content: binaryNodeContent
-      };
-      if (isRetryResend) {
-        if (isJidGroup(destinationJid)) {
-          stanza.attrs.to = destinationJid;
-          stanza.attrs.participant = retryParticipants.jid;
-        } else if (areJidsSameUser(retryParticipants.jid, meId)) {
-          stanza.attrs.to = retryParticipants.jid;
-          stanza.attrs.recipient = destinationJid;
-        } else {
-          stanza.attrs.to = retryParticipants.jid;
-        }
-      } else {
-        stanza.attrs.to = destinationJid;
-      }
-      if (shouldIncludeDeviceIdentity) {
-        ;
-        stanza.content.push({
-          tag: 'device-identity',
-          attrs: {},
-          content: 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: retryParticipants?.jid
-          };
-          const reportingNode = await 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');
+        if (jidsRequiringFetch.length) {
+            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;
         }
-      }
-      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');
+        return didFetchNewSession;
+    };
+
+    const sendPeerDataOperationMessage = async (pdoMessage) => {
+        if (!authState.creds.me?.id) {
+            throw new Boom('Not authenticated');
         }
-      }
-      if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
-        ;
-        stanza.content.push({
-          tag: 'tctoken',
-          attrs: {},
-          content: tcTokenBuffer
-        });
-      }
-      if (cstoken && is1on1Send && !tcTokenBuffer?.length) {
-        try {
-          const lidJid = await resolveTcTokenJid(destinationJid, getLIDForPN);
-          if (isLidUser(lidJid)) {
-            const saltRes = await authState.keys.get('nct-salt', ['default']);
-            const nctSalt = saltRes?.default;
-            if (nctSalt?.length) {
-              const cs = createHmac('sha256', Buffer.from(nctSalt)).update(Buffer.from(lidJid, 'utf8')).digest();
-              stanza.content.push({
-                tag: 'cstoken',
-                attrs: {},
-                content: cs
-              });
-              logger.debug({
-                jid: destinationJid,
-                lid: lidJid
-              }, 'attached cstoken (nct fallback)');
-            } else {
-              logger.debug({
-                jid: destinationJid
-              }, 'cstoken requested but no nct salt stored yet');
+        const protocolMessage = {
+            protocolMessage: {
+                peerDataOperationRequestMessage: pdoMessage,
+                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
             }
-          } else {
-            logger.debug({
-              jid: destinationJid
-            }, 'cstoken requested but recipient has no LID');
-          }
-        } catch (err) {
-          logger.debug({
-            jid: destinationJid,
-            err: err?.message
-          }, 'cstoken attach failed');
-        }
-      }
-      if (additionalNodes && additionalNodes.length > 0) {
-        ;
-        stanza.content.push(...additionalNodes);
-      }
-      let inner = message;
-      let hasWrapper = false;
-      let hasSpecial = false;
-      while (inner && typeof inner === "object") {
-        const entry = Object.entries(inner).find(([, v]) => v && typeof v === "object" && (v.message || v.templateMessage || v.buttonsMessage || v.interactiveMessage));
-        if (!entry) break;
-        const [, value] = entry;
-        if (value.message) {
-          hasWrapper = true;
-        }
-        if (value.templateMessage || value.buttonsMessage || value.interactiveMessage) {
-          hasSpecial = true;
-        }
-        inner = value.message || value.templateMessage || value.buttonsMessage || value.interactiveMessage;
-      }
-      if (hasWrapper || hasSpecial) {
-        stanza.content.push({
-          tag: 'biz',
-          attrs: {},
-          content: [{
-            tag: 'interactive',
-            attrs: {
-              type: 'native_flow',
-              v: '1'
+        };
+        const meJid = jidNormalizedUser(authState.creds.me.id);
+        const msgId = await relayMessage(meJid, protocolMessage, {
+            additionalAttributes: {
+                category: 'peer',
+                push_priority: 'high_force'
             },
-            content: [{
-              tag: 'native_flow',
-              attrs: {
-                name: 'quick_reply'
-              }
-            }]
-          }]
-        });
-      }
-      const buttonType = getButtonType(message);
-      if (buttonType) {
-        stanza.content.push({
-          tag: 'biz',
-          attrs: {},
-          content: [{
-            tag: buttonType,
-            attrs: getButtonArgs(message)
-          }]
-        });
-        logger.debug({
-          jid
-        }, 'adding business node');
-      }
-      logger.debug({
-        msgId
-      }, `sending message to ${participants.length} devices`);
-      await sendNode(stanza);
-      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
-            }
-          });
-        }).catch(err => {
-          logger.debug({
-            jid: destinationJid,
-            err: err?.message
-          }, 'fire-and-forget tctoken issuance failed');
-        }).finally(() => {
-          inFlightTcTokenIssuance.delete(tcTokenJid);
+            additionalNodes: [
+                {
+                    tag: 'meta',
+                    attrs: { appdata: 'default' }
+                }
+            ]
         });
-      }
-      if (messageRetryManager && !retryParticipants) {
-        messageRetryManager.addRecentMessage(destinationJid, msgId, message);
-      }
-    }, 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.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.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) {
-      return {};
-    } else if (message.listMessage) {
-      const type = message.listMessage.listType;
-      if (!type) {
-        throw new Boom('Expected list type inside message');
-      }
-      return {
-        v: '2',
-        type: proto.ListMessage.ListType[type].toLowerCase()
-      };
-    } else {
-      return {};
-    }
-  };
-  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,
-    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 {
+        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 {
-              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
+                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
+                            }
+                        ]
+                    };
                 });
-              }
-              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 node;
             }
-          }
-          return true;
+            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 });
         }
-      })]);
-      if (error) {
-        throw error;
-      }
-      ev.emit('messages.update', [{
-        key: message.key,
-        update: {
-          message: message.message
-        }
-      }]);
-      return message;
-    },
-    richMenu: async (target, content = {}) => {
-      let header = content?.header;
-      let body = content?.body;
-      let footer = content?.footer;
-      let dihh = {};
-      let sex = [];
-      if (header) {
-        const {
-          disclaimer = false,
-          disclaimerText = ' ',
-          image = { inline: false },
-          title = ''
-        } = header ?? {};
-        if (disclaimer) {
-          dihh = {
-            messageContextInfo: {
-              botMetadata: {
-                messageDisclaimerText: disclaimerText
-              }
+        return { nodes, shouldIncludeDeviceIdentity };
+    };
+
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
+        const normalizedForStatus = normalizeMessageContent(message);
+        const hasGroupStatusWrapper = Boolean(normalizedForStatus?.groupStatusMessageV2 || normalizedForStatus?.groupStatusMessage);
+        if (hasGroupStatusWrapper) {
+            const decodedForStatus = jidDecode(jid);
+            if (decodedForStatus?.server === 'g.us') {
+                try {
+                    if (!statusJidList?.length) {
+                        const meta = await groupMetadata(jid);
+                        const users = new Set();
+                        for (const p of (meta?.participants || [])) {
+                            const pj = jidNormalizedUser(p.id);
+                            if (pj) users.add(pj);
+                        }
+                        const ownJid = jidNormalizedUser(authState.creds.me.id);
+                        if (ownJid) users.add(ownJid);
+                        statusJidList = [...users];
+                    }
+                    if (statusJidList?.length) {
+                        logger.debug({ jid, audience: statusJidList.length }, 'routing groupStatus wrapper message through status@broadcast');
+                        jid = 'status@broadcast';
+                    } else {
+                        logger.warn({ jid }, 'failed to resolve audience for groupStatus wrapper message');
+                    }
+                } catch (error) {
+                    logger.warn({ jid, trace: error?.stack || String(error) }, 'failed to resolve audience for groupStatus wrapper message');
+                }
             }
-          };
         }
-        if (title) {
-          sex.push({
-            __typename: 'GenAIUnifiedResponseSection',
-            view_model: {
-              __typename: 'GenAISingleLayoutViewModel',
-              primitive: {
-                __typename: 'FOATextPrimitive',
-                text: '# ' + title
-              }
+        const meId = assertMeId(authState.creds);
+        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 isGroupOrStatus = isGroup || isStatus;
+        const finalJid = jid;
+        msgId = msgId || generateMessageIDV2(meId);
+        useUserDevicesCache = useUserDevicesCache !== false;
+        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
+        const participants = [];
+        const destinationJid = !isStatus ? finalJid : statusJid;
+        const binaryNodeContent = [];
+        const devices = [];
+        let reportingMessage;
+        const meMsg = {
+            deviceSentMessage: {
+                destinationJid,
+                message
+            },
+            messageContextInfo: message.messageContextInfo
+        };
+        const extraAttrs = {};
+        if (participant) {
+            if (!isGroup && !isStatus) {
+                additionalAttributes = { ...additionalAttributes, device_fanout: 'false' };
             }
-          });
+            const { user, device } = jidDecode(participant.jid);
+            devices.push({
+                user,
+                device,
+                jid: participant.jid
+            });
         }
-        if (image?.url) {
-          if (image?.inline) {
-            sex.push({
-              __typename: 'GenAIUnifiedResponseSection',
-              view_model: {
-                __typename: 'GenAISingleLayoutViewModel',
-                primitive: {
-                  __typename: 'GenAIMarkdownTextUXPrimitive',
-                  text: '{{header}}.{{/header}}',
-                  inline_entities: [{
-                    __typename: 'GenAITextInlineEntity',
-                    key: 'header',
-                    metadata: {
-                      __typename: 'GenAILatexItem',
-                      latex_expression: '.',
-                      font_height: 24,
-                      padding: 4,
-                      latex_image: {
-                        __typename: 'GenAIMediaItem',
-                        mime_type: image.mime_type || 'image/png',
-                        url: image.url,
-                        url_fallback: image.url,
-                        width: image.width || 500,
-                        height: image.height || 500,
-                        expiration_timestamp_ms: Date.now() + 86400000
-                      }
-                    }
-                  }]
+        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)?.richResponseMessage) {
+                const richMsg = normalizeMessageContent(message).richResponseMessage;
+                const stanza = {
+                    tag: 'message',
+                    attrs: {
+                        to: jid,
+                        id: msgId,
+                        type: 'rich_response',
+                        ...(additionalAttributes || {})
+                    },
+                    content: [{
+                        tag: 'rich_response',
+                        attrs: {},
+                        content: [{
+                            tag: 'unified_response',
+                            attrs: {},
+                            content: richMsg.unifiedResponse?.data || ''
+                        }]
+                    }]
+                };
+                if (richMsg.submessages) {
+                    stanza.content[0].content.push({
+                        tag: 'submessages',
+                        attrs: {},
+                        content: richMsg.submessages.map(sm => ({
+                            tag: 'submessage',
+                            attrs: {
+                                type: sm.messageType?.toString() || '2'
+                            },
+                            content: sm.messageText || ''
+                        }))
+                    });
                 }
-              }
-            });
-          } else {
-            sex.push({
-              __typename: 'GenAIUnifiedResponseSection',
+                if (richMsg.contextInfo) {
+                    stanza.content[0].attrs.contextInfo = JSON.stringify(richMsg.contextInfo);
+                }
+                logger.debug({ msgId }, `sending rich response 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, !!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');
+                }
+                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
+                        }
+                    };
+                    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 {
+                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' : 's.whatsapp.net';
+                    devices.push({
+                        user,
+                        device: 0,
+                        jid: jidEncode(user, targetUserServer, 0)
+                    });
+                    if (user !== ownUser) {
+                        const ownUserServer = isLid ? 'lid' : 's.whatsapp.net';
+                        const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user;
+                        devices.push({
+                            user: ownUserForAddressing,
+                            device: 0,
+                            jid: jidEncode(ownUserForAddressing, ownUserServer, 0)
+                        });
+                    }
+                    if (additionalAttributes?.['category'] !== 'peer') {
+                        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], 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 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;
+                    }
+                    const isMe = user === mePnUser || user === meLidUser;
+                    if (isMe) {
+                        meRecipients.push(jid);
+                    }
+                    else {
+                        otherRecipients.push(jid);
+                    }
+                    allRecipients.push(jid);
+                }
+                await assertSessions(allRecipients);
+                const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
+                    createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
+                    createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
+                ]);
+                participants.push(...meNodes);
+                participants.push(...otherNodes);
+                if (meRecipients.length > 0 || otherRecipients.length > 0) {
+                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
+                }
+                shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
+            }
+            if (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 (peerNode) {
+                        binaryNodeContent.push(peerNode);
+                    }
+                }
+                else {
+                    binaryNodeContent.push({
+                        tag: 'participants',
+                        attrs: {},
+                        content: participants
+                    });
+                }
+            }
+            const stanza = {
+                tag: 'message',
+                attrs: {
+                    id: msgId,
+                    to: destinationJid,
+                    type: getMessageType(message),
+                    ...(additionalAttributes || {})
+                },
+                content: binaryNodeContent
+            };
+            if (participant) {
+                if (isJidGroup(destinationJid)) {
+                    stanza.attrs.to = destinationJid;
+                    stanza.attrs.participant = participant.jid;
+                }
+                else if (areJidsSameUser(participant.jid, meId)) {
+                    stanza.attrs.to = participant.jid;
+                    stanza.attrs.recipient = destinationJid;
+                }
+                else {
+                    stanza.attrs.to = participant.jid;
+                }
+            }
+            else {
+                stanza.attrs.to = destinationJid;
+            }
+            if (shouldIncludeDeviceIdentity) {
+                stanza.content.push({
+                    tag: 'device-identity',
+                    attrs: {},
+                    content: 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');
+                    }
+                }
+                catch (error) {
+                    logger.warn({ jid, trace: error?.stack }, 'failed to attach reporting token');
+                }
+            }
+            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');
+                }
+            }
+            if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
+                stanza.content.push({
+                    tag: 'tctoken',
+                    attrs: {},
+                    content: tcTokenBuffer
+                });
+            }
+            if (additionalNodes && additionalNodes.length > 0) {
+                stanza.content.push(...additionalNodes);
+            }
+            logger.debug({ msgId }, `sending message to ${participants.length} devices`);
+            await sendNode(stanza);
+            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
+                        }
+                    });
+                })
+                    .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);
+            }
+        }, 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.pollUpdateMessage) {
+            return 'poll';
+        }
+        if (normalizedMessage.eventMessage) {
+            return 'event';
+        }
+        if (normalizedMessage.groupStatusMessage) {
+            return 'group_status';
+        }
+        if (normalizedMessage.richResponseMessage) {
+            return 'rich_response';
+        }
+        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';
+        }
+        else if (message.richResponseMessage) {
+            return 'rich_response';
+        }
+        else if (message.groupStatusMessage) {
+            if (message.groupStatusMessage.image) return 'image';
+            if (message.groupStatusMessage.video) return 'video';
+            if (message.groupStatusMessage.audio) return 'audio';
+            if (message.groupStatusMessage.sticker) return 'sticker';
+            return 'text';
+        }
+        return '';
+    };
+
+    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');
+
+    const createQuickReplyButton = (displayText, id) => ({
+        buttonId: id || `btn_${Date.now()}`,
+        buttonText: { displayText },
+        type: 1
+    });
+
+    const createUrlButton = (displayText, url) => ({
+        buttonText: { displayText },
+        type: 2,
+        url
+    });
+
+    const createCallButton = (displayText, phoneNumber) => ({
+        buttonText: { displayText },
+        type: 3,
+        phoneNumber
+    });
+
+    const createLocationButton = (displayText) => ({
+        buttonText: { displayText },
+        type: 4
+    });
+
+    const createContactButton = (displayText) => ({
+        buttonText: { displayText },
+        type: 5
+    });
+
+    const createPollButton = (displayText) => ({
+        buttonText: { displayText },
+        type: 6
+    });
+
+    const createInteractiveReplyButton = (id, title) => ({
+        type: 'reply',
+        reply: {
+            id,
+            title
+        }
+    });
+
+    const createInteractiveUrlButton = (displayText, url) => ({
+        type: 'url',
+        url: {
+            displayText,
+            url
+        }
+    });
+
+    const createInteractiveCallButton = (displayText, phoneNumber) => ({
+        type: 'call',
+        call: {
+            displayText,
+            phoneNumber
+        }
+    });
+
+    const createInteractiveCatalogButton = (displayText, catalogId, businessOwnerJid) => ({
+        type: 'catalog',
+        catalog: {
+            displayText,
+            catalogId,
+            businessOwnerJid
+        }
+    });
+
+    const createListMessage = (title, description, buttonText, sections) => ({
+        listMessage: {
+            title,
+            description,
+            buttonText,
+            listType: 1,
+            sections: sections || []
+        }
+    });
+
+    const createListSection = (title, rows) => ({
+        title,
+        rows: rows.map(row => ({
+            title: row.title,
+            description: row.description || '',
+            rowId: row.rowId || `row_${Date.now()}_${Math.random()}`
+        }))
+    });
+
+    const createButtonsMessage = (text, footer, buttons, headerType = 1) => ({
+        buttonsMessage: {
+            contentText: text,
+            footerText: footer || '',
+            buttons: buttons || [],
+            headerType
+        }
+    });
+
+    const createButtonsMessageWithHeader = (text, footer, headerTitle, buttons) => ({
+        buttonsMessage: {
+            contentText: text,
+            footerText: footer || '',
+            headerType: 4,
+            headerTitle,
+            buttons: buttons || []
+        }
+    });
+
+    const createButtonsMessageWithImageHeader = (text, footer, imageUrl, buttons) => ({
+        buttonsMessage: {
+            contentText: text,
+            footerText: footer || '',
+            headerType: 2,
+            headerImage: { url: imageUrl },
+            buttons: buttons || []
+        }
+    });
+
+    const createButtonsMessageWithDocumentHeader = (text, footer, documentUrl, fileName, buttons) => ({
+        buttonsMessage: {
+            contentText: text,
+            footerText: footer || '',
+            headerType: 3,
+            headerDocument: { url: documentUrl, fileName },
+            buttons: buttons || []
+        }
+    });
+
+    const createTemplateMessage = (text, footer, templateId, buttons) => ({
+        templateMessage: {
+            hydratedTemplate: {
+                hydratedContentText: text,
+                hydratedFooterText: footer || '',
+                hydratedButtons: buttons || []
+            }
+        }
+    });
+
+    const createCatalogMessage = (businessOwnerJid, catalogItems) => ({
+        catalogMessage: {
+            businessOwnerJid,
+            catalogItems: catalogItems || []
+        }
+    });
+
+    const createProductMessage = (productId, businessOwnerJid, catalogId) => ({
+        productMessage: {
+            productId,
+            businessOwnerJid,
+            catalogId
+        }
+    });
+
+    const createCollectionMessage = (businessOwnerJid, catalogId) => ({
+        collectionMessage: {
+            businessOwnerJid,
+            catalogId
+        }
+    });
+
+    const createOrderMessage = (orderId, items, total, currency) => ({
+        orderMessage: {
+            orderId,
+            items: items || [],
+            total: total || 0,
+            currency: currency || 'PKR'
+        }
+    });
+
+    const createInteractiveMessage = (body, footer, header, action, contextInfo) => ({
+        interactiveMessage: {
+            body: { text: body },
+            footer: footer ? { text: footer } : undefined,
+            header: header || undefined,
+            action: action || {
+                buttons: [],
+                sections: []
+            },
+            contextInfo: contextInfo || undefined
+        }
+    });
+
+    const createInteractiveButtonsAction = (buttons) => ({
+        buttons: buttons.map(btn => ({
+            type: btn.type,
+            reply: btn.reply,
+            url: btn.url,
+            call: btn.call,
+            catalog: btn.catalog,
+            copy: btn.copy,
+            flow: btn.flow,
+            optout: btn.optout,
+            onetime: btn.onetime,
+            auth: btn.auth,
+            otp: btn.otp,
+            payment: btn.payment,
+            schedule: btn.schedule,
+            feedback: btn.feedback,
+            share: btn.share,
+            download: btn.download,
+            upload: btn.upload,
+            verify: btn.verify,
+            approve: btn.approve,
+            reject: btn.reject,
+            forward: btn.forward,
+            mute: btn.mute,
+            unmute: btn.unmute,
+            archive: btn.archive,
+            unarchive: btn.unarchive,
+            pin: btn.pin,
+            unpin: btn.unpin,
+            bookmark: btn.bookmark,
+            unbookmark: btn.unbookmark,
+            flag: btn.flag,
+            unflag: btn.unflag,
+            lock: btn.lock,
+            unlock: btn.unlock,
+            address: btn.address,
+            location: btn.location,
+            voice: btn.voice,
+            video: btn.video,
+            image: btn.image,
+            document: btn.document,
+            audio: btn.audio,
+            sticker: btn.sticker
+        }))
+    });
+
+    const createInteractiveListAction = (title, buttonText, sections) => ({
+        sections: sections.map(section => ({
+            title: section.title,
+            rows: section.rows.map(row => ({
+                id: row.id,
+                title: row.title,
+                description: row.description || ''
+            }))
+        })),
+        button: buttonText || 'Select Option'
+    });
+
+    const createInteractiveCatalogAction = (catalogId, businessOwnerJid, displayText) => ({
+        catalog: {
+            catalogId,
+            businessOwnerJid,
+            displayText
+        }
+    });
+
+const sendRichResponseMessage = async (jid, richResponseData, options = {}) => {
+    const message = {
+        richResponseMessage: richResponseData
+    };
+    return await sendMessage(jid, message, options);
+};
+
+    const richMenu = async (target, content = {}) => {
+      let header = content?.header;
+      let body = content?.body;
+      let footer = content?.footer;
+      let dihh = {};
+      let sex = [];
+      if (header) {
+        const {
+          disclaimer = false,
+          disclaimerText = ' ',
+          image = { inline: false },
+          title = ''
+        } = header ?? {};
+        if (disclaimer) {
+          dihh = {
+            messageContextInfo: {
+              botMetadata: {
+                messageDisclaimerText: disclaimerText
+              }
+            }
+          };
+        }
+        if (title) {
+          sex.push({
+            __typename: 'GenAIUnifiedResponseSection',
+            view_model: {
+              __typename: 'GenAISingleLayoutViewModel',
+              primitive: {
+                __typename: 'FOATextPrimitive',
+                text: '# ' + title
+              }
+            }
+          });
+        }
+        if (image?.url) {
+          if (image?.inline) {
+            sex.push({
+              __typename: 'GenAIUnifiedResponseSection',
+              view_model: {
+                __typename: 'GenAISingleLayoutViewModel',
+                primitive: {
+                  __typename: 'GenAIMarkdownTextUXPrimitive',
+                  text: '{{header}}.{{/header}}',
+                  inline_entities: [{
+                    __typename: 'GenAITextInlineEntity',
+                    key: 'header',
+                    metadata: {
+                      __typename: 'GenAILatexItem',
+                      latex_expression: '.',
+                      font_height: 24,
+                      padding: 4,
+                      latex_image: {
+                        __typename: 'GenAIMediaItem',
+                        mime_type: image.mime_type || 'image/png',
+                        url: image.url,
+                        url_fallback: image.url,
+                        width: image.width || 500,
+                        height: image.height || 500,
+                        expiration_timestamp_ms: Date.now() + 86400000
+                      }
+                    }
+                  }]
+                }
+              }
+            });
+          } else {
+            sex.push({
+              __typename: 'GenAIUnifiedResponseSection',
               view_model: {
                 __typename: 'GenAISingleLayoutViewModel',
                 primitive: {
@@ -1461,133 +1504,1214 @@ export const makeMessagesSocket = config => {
         messageId: waMsg.key.id
       });
       return waMsg;
-    },
-    sendjson: async (target, json = {}, config = {}) => {
-      const msg = generateWAMessageFromContent(target, json, {});
-      return relayMessage(target, msg.message, { messageId: msg.key.id, ...config });
-    },
-    decodeJid: jid => {
-      if (!jid) return jid;
-      if (/\:\d+@/gi.test(jid)) {
-        const decode = jidDecode(jid) || {};
-        return (decode.user && decode.server && `${decode.user}@${decode.server}`) || jid;
-      }
-      return jid;
-    },
-    makeFakeCommand: async (m, text, chatUpdate) => {
-      const x = {};
-      x.chat = m.key?.remoteJid;
-      x.fromMe = m.key?.fromMe;
-      if ((m.key?.participant?.endsWith('@lid')) && (m.key?.participant === sock.user?.lid)) {
-        x.sender = sock.user?.lid;
-      } else {
-        x.sender = sock.decodeJid((x.fromMe && sock.user?.id) || x.participant || m.key?.participant || x.chat || '');
-      }
-      m.sender = x.sender;
-      let recipient;
-      if (m.key?.remoteJid?.includes(':')) {
-        recipient = m.key.remoteJid.split(':')[0] + '@lid';
-      } else {
-        recipient = m.key?.remoteJid;
-      }
-      const messages = await generateWAMessageFromContent(
-        recipient,
-        { extendedTextMessage: { text: text || '' } },
-        {}
-      );
-      messages.key.fromMe = true;
-      messages.key.id = 'INTERNAL-CMD';
-      messages.pushName = m.pushName;
-      if (chatUpdate) {
-        messages.key.participant = chatUpdate[0]?.update?.pollUpdates?.[0]?.pollUpdateMessageKey?.participant || '';
-      }
-      return ev.emit('messages.upsert', { messages: [messages], type: 'append' });
-    },
-    pollMenu: async (jid, name = '', pollOptions = [], context = {}, selectableCount = 1) => {
-      const values = pollOptions.map(o => typeof o === 'string' ? o : o.vote);
-      const pollMsg = await sock.sendMessage(jid, {
-        poll: { name, values, selectableCount },
-        ...(context && typeof context === 'object' ? context : {})
-      });
-      sock.tempPollStore.push({ id: pollMsg.key.id, cmds: pollOptions });
-      return pollMsg;
-    },
-    tempPollStore: [],
-    sendMessage: async (jid, content, options = {}) => {
-      const userJid = authState.creds.me.id;
-      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 {
-        const fullMsg = await generateWAMessage(jid, content, {
-          logger,
-          userJid,
-          getUrlInfo: text => getUrlInfo(text, {
-            thumbnailWidth: linkPreviewImageThumbnailWidth,
-            fetchOpts: {
-              timeout: 3000,
-              ...(httpRequestOptions || {})
-            },
-            logger,
-            uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-          }),
-          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 = [];
-        if (isDeleteMsg) {
-          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'
+    };
+    const sendMessage = async (jid, content, options = {}) => {
+        if (content.groupStatusMessage || content.groupStatus) {
+            const statusContent = content.groupStatusMessage || content.groupStatus;
+            const fullMsg = await generateWAMessage(jid, {
+                groupStatusMessage: statusContent
+            }, {
+                logger,
+                userJid: authState.creds.me.id,
+                upload: waUploadToServer,
+                mediaCache: config.mediaCache,
+                messageId: generateMessageIDV2(sock.user?.id)
+            });
+            await relayMessage(jid, fullMsg.message, {
+                messageId: fullMsg.key.id,
+                additionalAttributes: { type: 'group_status' },
+                additionalNodes: [{ tag: 'meta', attrs: { type: 'group_status' } }]
+            });
+            if (config.emitOwnEvents) {
+                process.nextTick(async () => {
+                    await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                });
             }
-          });
-        } else if (isEventMsg) {
-          additionalNodes.push({
-            tag: 'meta',
-            attrs: {
-              event_type: 'creation'
+            return fullMsg;
+        }
+        const userJid = authState.creds.me.id;
+        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 {
+            const fullMsg = await generateWAMessage(jid, content, {
+                logger,
+                userJid,
+                getUrlInfo: text => getUrlInfo(text, {
+                    thumbnailWidth: linkPreviewImageThumbnailWidth,
+                    fetchOpts: {
+                        timeout: 3000,
+                        ...(httpRequestOptions || {})
+                    },
+                    logger,
+                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+                }),
+                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 = [];
+            if (isDeleteMsg) {
+                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
+            });
+            if (config.emitOwnEvents) {
+                process.nextTick(async () => {
+                    await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                });
+            }
+            return fullMsg;
         }
-        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'));
-          });
+    };
+
+    const sendQuickReplyButtons = async (jid, text, buttons, footer = '') => {
+        const message = createButtonsMessage(text, footer, buttons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendUrlButtons = async (jid, text, urlButtons, footer = '') => {
+        const message = createButtonsMessage(text, footer, urlButtons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendMixedButtons = async (jid, text, buttons, footer = '') => {
+        const message = createButtonsMessage(text, footer, buttons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendButtonsWithHeader = async (jid, text, headerTitle, buttons, footer = '') => {
+        const message = createButtonsMessageWithHeader(text, footer, headerTitle, buttons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendButtonsWithImageHeader = async (jid, text, imageUrl, buttons, footer = '') => {
+        const message = createButtonsMessageWithImageHeader(text, footer, imageUrl, buttons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendButtonsWithDocumentHeader = async (jid, text, documentUrl, fileName, buttons, footer = '') => {
+        const message = createButtonsMessageWithDocumentHeader(text, footer, documentUrl, fileName, buttons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendListMessage = async (jid, title, description, buttonText, sections) => {
+        const message = createListMessage(title, description, buttonText, sections);
+        return await sendMessage(jid, message);
+    };
+
+    const sendInteractiveButtons = async (jid, body, footer, buttons, header = null) => {
+        const action = createInteractiveButtonsAction(buttons);
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendInteractiveList = async (jid, body, footer, title, buttonText, sections, header = null) => {
+        const action = createInteractiveListAction(title, buttonText, sections);
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendInteractiveCatalog = async (jid, body, footer, catalogId, businessOwnerJid, displayText, header = null) => {
+        const action = createInteractiveCatalogAction(catalogId, businessOwnerJid, displayText);
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendPollMessage = async (jid, question, options, optionsType = 0) => {
+        const message = {
+            pollCreationMessage: {
+                name: question,
+                options: options.map(opt => ({
+                    optionName: opt
+                })),
+                selectableOptionsCount: 1,
+                optionsType: optionsType
+            }
+        };
+        return await sendMessage(jid, message);
+    };
+
+    const sendCallButton = async (jid, text, phoneNumber, displayText, footer = '') => {
+        const callButton = createCallButton(displayText, phoneNumber);
+        const message = createButtonsMessage(text, footer, [callButton]);
+        return await sendMessage(jid, message);
+    };
+
+    const sendLocationButton = async (jid, text, displayText, footer = '') => {
+        const locationButton = createLocationButton(displayText);
+        const message = createButtonsMessage(text, footer, [locationButton]);
+        return await sendMessage(jid, message);
+    };
+
+    const sendContactButton = async (jid, text, displayText, footer = '') => {
+        const contactButton = createContactButton(displayText);
+        const message = createButtonsMessage(text, footer, [contactButton]);
+        return await sendMessage(jid, message);
+    };
+
+    const sendTemplateMessage = async (jid, text, templateId, buttons, footer = '') => {
+        const message = createTemplateMessage(text, footer, templateId, buttons);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCatalogMessage = async (jid, businessOwnerJid, catalogItems) => {
+        const message = createCatalogMessage(businessOwnerJid, catalogItems);
+        return await sendMessage(jid, message);
+    };
+
+    const sendProductMessage = async (jid, productId, businessOwnerJid, catalogId) => {
+        const message = createProductMessage(productId, businessOwnerJid, catalogId);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCollectionMessage = async (jid, businessOwnerJid, catalogId) => {
+        const message = createCollectionMessage(businessOwnerJid, catalogId);
+        return await sendMessage(jid, message);
+    };
+
+    const createNativeFlowButton = (flowId, displayText, flowData) => ({
+        type: 'flow',
+        flow: {
+            flowId: flowId,
+            displayText: displayText || 'Continue',
+            flowData: flowData || {}
         }
-        return fullMsg;
-      }
-    }
-  };
-};
+    });
+
+    const sendNativeFlow = async (jid, body, footer, flowId, displayText, flowData = {}, header = null) => {
+        const action = {
+            buttons: [{
+                type: 'flow',
+                flow: {
+                    flowId: flowId,
+                    displayText: displayText || 'Continue',
+                    flowData: flowData
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const createCarouselCard = (cardId, title, subtitle, body, footer, buttons, media = null) => ({
+        cardId: cardId || `card_${Date.now()}`,
+        header: {
+            title: title || '',
+            subtitle: subtitle || '',
+            hasMedia: !!media,
+            media: media || null
+        },
+        body: { text: body || '' },
+        footer: footer ? { text: footer } : undefined,
+        buttons: buttons || []
+    });
+
+    const sendCarousel = async (jid, body, footer, cards, header = null) => {
+        const action = {
+            carousel: {
+                cards: cards.map(card => ({
+                    cardId: card.cardId,
+                    header: {
+                        title: card.header.title,
+                        subtitle: card.header.subtitle || '',
+                        hasMedia: card.header.hasMedia || false,
+                        media: card.header.media || null
+                    },
+                    body: { text: card.body.text },
+                    footer: card.footer || undefined,
+                    buttons: card.buttons || []
+                }))
+            }
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendMultiProductMessage = async (jid, businessOwnerJid, catalogId, products, body = 'Browse our products', footer = '', header = null) => {
+        const action = {
+            catalog: {
+                businessOwnerJid: businessOwnerJid,
+                catalogId: catalogId,
+                products: products.map(p => ({
+                    productId: p.id,
+                    title: p.title,
+                    description: p.description || '',
+                    price: p.price || '0',
+                    currency: p.currency || 'PKR',
+                    image: p.image || null
+                }))
+            }
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendSingleProductMessage = async (jid, productId, businessOwnerJid, catalogId) => {
+        const message = {
+            productMessage: {
+                productId: productId,
+                businessOwnerJid: businessOwnerJid,
+                catalogId: catalogId
+            }
+        };
+        return await sendMessage(jid, message);
+    };
+
+    const sendSectionList = async (jid, title, buttonText, sections, body = 'Choose an option', footer = '', header = null) => {
+        const action = {
+            sections: sections.map(section => ({
+                title: section.title,
+                rows: section.rows.map(row => ({
+                    id: row.id || `row_${Date.now()}`,
+                    title: row.title,
+                    description: row.description || ''
+                }))
+            })),
+            button: buttonText || 'Select'
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendReplyButton = async (jid, text, buttonText, buttonId, footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'reply',
+                reply: {
+                    id: buttonId || `reply_${Date.now()}`,
+                    title: buttonText
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCTAUrl = async (jid, text, displayText, url, footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'url',
+                url: {
+                    displayText: displayText,
+                    url: url
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCTAPhone = async (jid, text, displayText, phoneNumber, footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'call',
+                call: {
+                    displayText: displayText,
+                    phoneNumber: phoneNumber
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCopyCodeButton = async (jid, text, code, buttonText = 'Copy Code', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'copy',
+                copy: {
+                    displayText: buttonText,
+                    code: code
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendFlowButton = async (jid, text, flowId, flowData = {}, buttonText = 'Continue', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'flow',
+                flow: {
+                    flowId: flowId,
+                    displayText: buttonText,
+                    flowData: flowData
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendOptOutButton = async (jid, text, footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'optout',
+                optout: {
+                    displayText: 'Unsubscribe'
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendOneTapButton = async (jid, text, authCode, buttonText = 'Authenticate', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'onetime',
+                onetime: {
+                    displayText: buttonText,
+                    code: authCode
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendZeroTapButton = async (jid, text, authToken, footer = '', header = null) => {
+        const message = {
+            protocolMessage: {
+                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE,
+                peerDataOperationRequestMessage: {
+                    zeroTap: {
+                        displayText: text,
+                        token: authToken
+                    }
+                }
+            }
+        };
+        return await sendMessage(jid, message);
+    };
+
+    const sendAuthButton = async (jid, text, authType, authData, buttonText = 'Authenticate', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'auth',
+                auth: {
+                    displayText: buttonText,
+                    authType: authType,
+                    authData: authData
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendOTPButton = async (jid, text, otp, buttonText = 'Verify OTP', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'otp',
+                otp: {
+                    displayText: buttonText,
+                    otp: otp
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendPaymentButton = async (jid, text, amount, currency = 'PKR', paymentId, buttonText = 'Pay Now', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'payment',
+                payment: {
+                    displayText: buttonText,
+                    amount: amount,
+                    currency: currency,
+                    paymentId: paymentId || `pay_${Date.now()}`
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendScheduleButton = async (jid, text, scheduleId, startTime, endTime, buttonText = 'Schedule', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'schedule',
+                schedule: {
+                    displayText: buttonText,
+                    scheduleId: scheduleId || `sch_${Date.now()}`,
+                    startTime: startTime,
+                    endTime: endTime
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendFeedbackButton = async (jid, text, feedbackId, ratingType = 'stars', buttonText = 'Give Feedback', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'feedback',
+                feedback: {
+                    displayText: buttonText,
+                    feedbackId: feedbackId || `fb_${Date.now()}`,
+                    ratingType: ratingType
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendShareButton = async (jid, text, shareTarget, shareData, buttonText = 'Share', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'share',
+                share: {
+                    displayText: buttonText,
+                    shareTarget: shareTarget,
+                    shareData: shareData
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendDownloadButton = async (jid, text, fileId, fileType, fileSize, buttonText = 'Download', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'download',
+                download: {
+                    displayText: buttonText,
+                    fileId: fileId || `dl_${Date.now()}`,
+                    fileType: fileType,
+                    fileSize: fileSize
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendUploadButton = async (jid, text, uploadType, maxSize, acceptedFormats, buttonText = 'Upload', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'upload',
+                upload: {
+                    displayText: buttonText,
+                    uploadType: uploadType,
+                    maxSize: maxSize,
+                    acceptedFormats: acceptedFormats
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendVerifyButton = async (jid, text, verifyType, verificationId, buttonText = 'Verify', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'verify',
+                verify: {
+                    displayText: buttonText,
+                    verifyType: verifyType,
+                    verificationId: verificationId || `vf_${Date.now()}`
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendApproveRejectButton = async (jid, text, approvalId, approvalType, approveText = 'Approve', rejectText = 'Reject', footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'approve',
+                    approve: {
+                        displayText: approveText,
+                        approvalId: approvalId || `app_${Date.now()}`,
+                        approvalType: approvalType
+                    }
+                },
+                {
+                    type: 'reject',
+                    reject: {
+                        displayText: rejectText,
+                        approvalId: approvalId || `app_${Date.now()}`,
+                        reason: ''
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendForwardButton = async (jid, text, forwardId, forwardType, buttonText = 'Forward', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'forward',
+                forward: {
+                    displayText: buttonText,
+                    forwardId: forwardId || `fw_${Date.now()}`,
+                    forwardType: forwardType
+                }
+            }]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendMuteUnmuteButton = async (jid, text, conversationId, muteText = 'Mute', unmuteText = 'Unmute', footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'mute',
+                    mute: {
+                        displayText: muteText,
+                        conversationId: conversationId || `conv_${Date.now()}`,
+                        duration: 3600
+                    }
+                },
+                {
+                    type: 'unmute',
+                    unmute: {
+                        displayText: unmuteText,
+                        conversationId: conversationId || `conv_${Date.now()}`
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendArchiveUnarchiveButton = async (jid, text, archiveId, archiveType, archiveText = 'Archive', unarchiveText = 'Unarchive', footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'archive',
+                    archive: {
+                        displayText: archiveText,
+                        archiveId: archiveId || `arch_${Date.now()}`,
+                        archiveType: archiveType
+                    }
+                },
+                {
+                    type: 'unarchive',
+                    unarchive: {
+                        displayText: unarchiveText,
+                        archiveId: archiveId || `arch_${Date.now()}`
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendPinUnpinButton = async (jid, text, pinId, pinType, pinText = 'Pin', unpinText = 'Unpin', duration = 86400, footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'pin',
+                    pin: {
+                        displayText: pinText,
+                        pinId: pinId || `pin_${Date.now()}`,
+                        pinType: pinType,
+                        duration: duration
+                    }
+                },
+                {
+                    type: 'unpin',
+                    unpin: {
+                        displayText: unpinText,
+                        pinId: pinId || `pin_${Date.now()}`
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendBookmarkButton = async (jid, text, bookmarkId, bookmarkCategory, bookmarkText = 'Bookmark', unbookmarkText = 'Remove', footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'bookmark',
+                    bookmark: {
+                        displayText: bookmarkText,
+                        bookmarkId: bookmarkId || `bm_${Date.now()}`,
+                        bookmarkCategory: bookmarkCategory
+                    }
+                },
+                {
+                    type: 'unbookmark',
+                    unbookmark: {
+                        displayText: unbookmarkText,
+                        bookmarkId: bookmarkId || `bm_${Date.now()}`
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendFlagUnflagButton = async (jid, text, flagId, flagCategory, flagText = 'Flag', unflagText = 'Unflag', priority = 'normal', footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'flag',
+                    flag: {
+                        displayText: flagText,
+                        flagId: flagId || `fl_${Date.now()}`,
+                        flagCategory: flagCategory,
+                        priority: priority
+                    }
+                },
+                {
+                    type: 'unflag',
+                    unflag: {
+                        displayText: unflagText,
+                        flagId: flagId || `fl_${Date.now()}`
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendLockUnlockButton = async (jid, text, lockId, lockType, lockText = 'Lock', unlockText = 'Unlock', duration = 3600, footer = '', header = null) => {
+        const action = {
+            buttons: [
+                {
+                    type: 'lock',
+                    lock: {
+                        displayText: lockText,
+                        lockId: lockId || `lk_${Date.now()}`,
+                        lockType: lockType,
+                        duration: duration
+                    }
+                },
+                {
+                    type: 'unlock',
+                    unlock: {
+                        displayText: unlockText,
+                        lockId: lockId || `lk_${Date.now()}`
+                    }
+                }
+            ]
+        };
+        const message = createInteractiveMessage(text, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendAddressRequestButton = async (jid, body, buttonText = 'Share Address', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'address',
+                address: {
+                    displayText: buttonText
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendLocationRequestButton = async (jid, body, buttonText = 'Share Location', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'location',
+                location: {
+                    displayText: buttonText
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendVoiceCallButton = async (jid, body, phoneNumber, buttonText = 'Voice Call', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'voice',
+                voice: {
+                    displayText: buttonText,
+                    phoneNumber: phoneNumber
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendVideoCallButton = async (jid, body, phoneNumber, buttonText = 'Video Call', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'video',
+                video: {
+                    displayText: buttonText,
+                    phoneNumber: phoneNumber
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendImageButton = async (jid, body, imageUrl, buttonText = 'View Image', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'image',
+                image: {
+                    displayText: buttonText,
+                    url: imageUrl
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendDocumentButton = async (jid, body, documentUrl, fileName, buttonText = 'View Document', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'document',
+                document: {
+                    displayText: buttonText,
+                    url: documentUrl,
+                    fileName: fileName
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendAudioButton = async (jid, body, audioUrl, buttonText = 'Play Audio', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'audio',
+                audio: {
+                    displayText: buttonText,
+                    url: audioUrl
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendStickerButton = async (jid, body, stickerUrl, buttonText = 'View Sticker', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'sticker',
+                sticker: {
+                    displayText: buttonText,
+                    url: stickerUrl
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendInteractiveNativeFlow = async (jid, body, footer, flowId, flowData = {}, buttonText = 'Continue', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'flow',
+                flow: {
+                    flowId: flowId,
+                    displayText: buttonText,
+                    flowData: flowData
+                }
+            }]
+        };
+        const message = createInteractiveMessage(body, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCollectShoppingInterest = async (jid, productCategory, buttonText = 'I\'m Interested', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'interest',
+                interest: {
+                    displayText: buttonText,
+                    category: productCategory
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Are you interested in ${productCategory}?`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendGetFeedback = async (jid, feedbackType, buttonText = 'Give Feedback', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'feedback',
+                feedback: {
+                    displayText: buttonText,
+                    feedbackType: feedbackType
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Please provide your feedback on ${feedbackType}`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendSurveyButton = async (jid, surveyId, surveyQuestion, buttonText = 'Take Survey', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'survey',
+                survey: {
+                    displayText: buttonText,
+                    surveyId: surveyId || `sv_${Date.now()}`,
+                    question: surveyQuestion
+                }
+            }]
+        };
+        const message = createInteractiveMessage(surveyQuestion, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCustomerSupportButton = async (jid, supportTopic, buttonText = 'Contact Support', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'support',
+                support: {
+                    displayText: buttonText,
+                    topic: supportTopic
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Need help with ${supportTopic}?`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendReminderButton = async (jid, reminderText, buttonText = 'Set Reminder', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'reminder',
+                reminder: {
+                    displayText: buttonText,
+                    text: reminderText
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Reminder: ${reminderText}`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendConfirmButton = async (jid, actionText, buttonText = 'Confirm', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'confirm',
+                confirm: {
+                    displayText: buttonText,
+                    action: actionText
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Confirm: ${actionText}?`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCancelButton = async (jid, actionText, buttonText = 'Cancel', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'cancel',
+                cancel: {
+                    displayText: buttonText,
+                    action: actionText
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Cancel: ${actionText}?`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendOrderStatusButton = async (jid, orderId, buttonText = 'Check Status', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'orderstatus',
+                orderstatus: {
+                    displayText: buttonText,
+                    orderId: orderId
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Check status for order #${orderId}`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendTrackOrderButton = async (jid, orderId, buttonText = 'Track Order', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'track',
+                track: {
+                    displayText: buttonText,
+                    orderId: orderId
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Track order #${orderId}`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendReOrderButton = async (jid, orderId, buttonText = 'Reorder', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'reorder',
+                reorder: {
+                    displayText: buttonText,
+                    orderId: orderId
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Reorder #${orderId}?`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    const sendCancelOrderButton = async (jid, orderId, buttonText = 'Cancel Order', footer = '', header = null) => {
+        const action = {
+            buttons: [{
+                type: 'cancelorder',
+                cancelorder: {
+                    displayText: buttonText,
+                    orderId: orderId
+                }
+            }]
+        };
+        const message = createInteractiveMessage(`Cancel order #${orderId}?`, footer, header, action);
+        return await sendMessage(jid, message);
+    };
+
+    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,
+        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;
+        },
+        richMenu,
+        sendRichResponseMessage,
+        createQuickReplyButton,
+        createUrlButton,
+        createCallButton,
+        createLocationButton,
+        createContactButton,
+        createPollButton,
+        createInteractiveReplyButton,
+        createInteractiveUrlButton,
+        createInteractiveCallButton,
+        createInteractiveCatalogButton,
+        createListMessage,
+        createListSection,
+        createButtonsMessage,
+        createButtonsMessageWithHeader,
+        createButtonsMessageWithImageHeader,
+        createButtonsMessageWithDocumentHeader,
+        createTemplateMessage,
+        createCatalogMessage,
+        createProductMessage,
+        createCollectionMessage,
+        createOrderMessage,
+        createInteractiveMessage,
+        createInteractiveButtonsAction,
+        createInteractiveListAction,
+        createInteractiveCatalogAction,
+        sendQuickReplyButtons,
+        sendUrlButtons,
+        sendMixedButtons,
+        sendButtonsWithHeader,
+        sendButtonsWithImageHeader,
+        sendButtonsWithDocumentHeader,
+        sendListMessage,
+        sendInteractiveButtons,
+        sendInteractiveList,
+        sendInteractiveCatalog,
+        sendPollMessage,
+        sendCallButton,
+        sendLocationButton,
+        sendContactButton,
+        sendTemplateMessage,
+        sendCatalogMessage,
+        sendProductMessage,
+        sendCollectionMessage,
+        sendMessage,
+        createNativeFlowButton,
+        sendNativeFlow,
+        createCarouselCard,
+        sendCarousel,
+        sendMultiProductMessage,
+        sendSingleProductMessage,
+        sendSectionList,
+        sendReplyButton,
+        sendCTAUrl,
+        sendCTAPhone,
+        sendCopyCodeButton,
+        sendFlowButton,
+        sendOptOutButton,
+        sendOneTapButton,
+        sendZeroTapButton,
+        sendAuthButton,
+        sendOTPButton,
+        sendPaymentButton,
+        sendScheduleButton,
+        sendFeedbackButton,
+        sendShareButton,
+        sendDownloadButton,
+        sendUploadButton,
+        sendVerifyButton,
+        sendApproveRejectButton,
+        sendForwardButton,
+        sendMuteUnmuteButton,
+        sendArchiveUnarchiveButton,
+        sendPinUnpinButton,
+        sendBookmarkButton,
+        sendFlagUnflagButton,
+        sendLockUnlockButton,
+        sendAddressRequestButton,
+        sendLocationRequestButton,
+        sendVoiceCallButton,
+        sendVideoCallButton,
+        sendImageButton,
+        sendDocumentButton,
+        sendAudioButton,
+        sendStickerButton,
+        sendInteractiveNativeFlow,
+        sendCollectShoppingInterest,
+        sendGetFeedback,
+        sendSurveyButton,
+        sendCustomerSupportButton,
+        sendReminderButton,
+        sendConfirmButton,
+        sendCancelButton,
+        sendOrderStatusButton,
+        sendTrackOrderButton,
+        sendReOrderButton,
+        sendCancelOrderButton
+    };
+};