@hbmodsofc/baileys 2.5.0 → 3.0.0

package/lib/Socket/messages-send.js

@@ -1,47 +1,26 @@
-"use strict"; 
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
-}; 
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesSocket = void 0;
 const boom_1 = require("@hapi/boom");
-const node_cache_1 = __importDefault(require("node-cache"));
+const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
+const crypto_1 = require("crypto");
+const hbmodsofc = require('./hbmods');
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
-const axios_1 = require("axios")
-const Types_1 = require("../Types")
 const Utils_1 = require("../Utils");
 const link_preview_1 = require("../Utils/link-preview");
 const WABinary_1 = require("../WABinary");
+const WAUSync_1 = require("../WAUSync");
 const newsletter_1 = require("./newsletter");
-const WAUSync_1 = require("../WAUSync")
-const hbmodofc = require('./hbmods');
-var ListType = WAProto_1.proto.Message.ListMessage.ListType;
 const makeMessagesSocket = (config) => {
-    const {
-        logger,
-        linkPreviewImageThumbnailWidth, 
-        generateHighQualityLinkPreview,
-        options: axiosOptions,
-        patchMessageBeforeSending
-    } = config;
+    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, } = config;
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
-    const {
-        ev, 
-        authState, 
-        processingMutex, 
-        signalRepository, 
-        upsertMessage,
-        query,
-        fetchPrivacySettings,
-        generateMessageTag,
-        sendNode, 
-        groupMetadata,
-        groupToggleEphemeral,
-        executeUSyncQuery
-    } = sock;
+    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral, } = sock;
     const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
         useClones: false
     });
     let mediaConn;
@@ -58,9 +37,9 @@ const makeMessagesSocket = (config) => {
                     },
                     content: [{ tag: 'media_conn', attrs: {} }]
                 });
-                const mediaConnNode = WABinary_1.getBinaryNodeChild(result, 'media_conn');
+                const mediaConnNode = (0, WABinary_1.getBinaryNodeChild)(result, 'media_conn');
                 const node = {
-                    hosts: WABinary_1.getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
+                    hosts: (0, WABinary_1.getBinaryNodeChildren)(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
                         maxContentLengthBytes: +attrs.maxContentLengthBytes,
                     })),
@@ -89,7 +68,7 @@ const makeMessagesSocket = (config) => {
         if (isReadReceipt) {
             node.attrs.t = (0, Utils_1.unixTimestampSeconds)().toString();
         }
-        if (type === 'sender' && WABinary_1.isJidUser(jid)) {
+        if (type === 'sender' && (0, WABinary_1.isJidUser)(jid)) {
             node.attrs.recipient = jid;
             node.attrs.to = participant;
         }
@@ -100,7 +79,7 @@ const makeMessagesSocket = (config) => {
             }
         }
         if (type) {
-            node.attrs.type = WABinary_1.isJidNewsLetter(jid) ? 'read-self' : type;
+            node.attrs.type = (0, WABinary_1.isJidNewsletter)(jid) ? 'read-self' : type;
         }
         const remainingMessageIds = messageIds.slice(1);
         if (remainingMessageIds.length) {
@@ -134,70 +113,54 @@ const makeMessagesSocket = (config) => {
     };
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
-        const deviceResults = []
-
+        var _a;
+        const deviceResults = [];
         if (!useCache) {
-            logger.debug('not using cache for devices')
+            logger.debug('not using cache for devices');
         }
-
-        const toFetch = []
-
-        jids = Array.from(new Set(jids))
-
+        const toFetch = [];
+        jids = Array.from(new Set(jids));
         for (let jid of jids) {
-            const user = WABinary_1.jidDecode(jid)?.user
-
-            jid = WABinary_1.jidNormalizedUser(jid)
-
+            const user = (_a = (0, WABinary_1.jidDecode)(jid)) === null || _a === void 0 ? void 0 : _a.user;
+            jid = (0, WABinary_1.jidNormalizedUser)(jid);
             if (useCache) {
-                const devices = userDevicesCache.get(user)
-
+                const devices = userDevicesCache.get(user);
                 if (devices) {
-                    deviceResults.push(...devices)
-                    logger.trace({ user }, 'using cache for devices')
+                    deviceResults.push(...devices);
+                    logger.trace({ user }, 'using cache for devices');
                 }
-
                 else {
-                    toFetch.push(jid)
+                    toFetch.push(jid);
                 }
             }
-
             else {
-                toFetch.push(jid)
+                toFetch.push(jid);
             }
         }
-
         if (!toFetch.length) {
-            return deviceResults
+            return deviceResults;
         }
-
         const query = new WAUSync_1.USyncQuery()
             .withContext('message')
-            .withDeviceProtocol()
-
+            .withDeviceProtocol();
         for (const jid of toFetch) {
-            query.withUser(new WAUSync_1.USyncUser().withId(jid))
+            query.withUser(new WAUSync_1.USyncUser().withId(jid));
         }
-
-        const result = await executeUSyncQuery(query)
-
+        const result = await sock.executeUSyncQuery(query);
         if (result) {
-            const extracted = Utils_1.extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
-            const deviceMap = {}
-
+            const extracted = (0, Utils_1.extractDeviceJids)(result === null || result === void 0 ? void 0 : result.list, authState.creds.me.id, ignoreZeroDevices);
+            const deviceMap = {};
             for (const item of extracted) {
-                deviceMap[item.user] = deviceMap[item.user] || []
-                deviceMap[item.user].push(item)
-                deviceResults.push(item)
+                deviceMap[item.user] = deviceMap[item.user] || [];
+                deviceMap[item.user].push(item);
+                deviceResults.push(item);
             }
-
             for (const key in deviceMap) {
-                userDevicesCache.set(key, deviceMap[key])
+                userDevicesCache.set(key, deviceMap[key]);
             }
         }
-
-        return deviceResults
-    }
+        return deviceResults;
+    };
     const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
         let jidsRequiringFetch = [];
@@ -241,20 +204,19 @@ const makeMessagesSocket = (config) => {
         }
         return didFetchNewSession;
     };
-    
- 
     const sendPeerDataOperationMessage = async (pdoMessage) => {
-        if (!authState.creds.me?.id) {
-            throw new boom_1.Boom('Not authenticated')
+        var _a;
+        //TODO: for later, abstract the logic to send a Peer Message instead of just PDO - useful for App State Key Resync with phone
+        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
+            throw new boom_1.Boom('Not authenticated');
         }
-        
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
                 type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
             }
         };
-        const meJid = WABinary_1.jidNormalizedUser(authState.creds.me.id);
+        const meJid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
                 category: 'peer',
@@ -265,10 +227,17 @@ const makeMessagesSocket = (config) => {
         return msgId;
     };
     const createParticipantNodes = async (jids, message, extraAttrs) => {
-        const patched = await patchMessageBeforeSending(message, jids);
-        const bytes = (0, Utils_1.encodeWAMessage)(patched);
+        let patched = await patchMessageBeforeSending(message, jids);
+        if (!Array.isArray(patched)) {
+            patched = jids ? jids.map(jid => ({ recipientJid: jid, ...patched })) : [patched];
+        }
         let shouldIncludeDeviceIdentity = false;
-        const nodes = await Promise.all(jids.map(async (jid) => {
+        const nodes = await Promise.all(patched.map(async (patchedMessageWithJid) => {
+            const { recipientJid: jid, ...patchedMessage } = patchedMessageWithJid;
+            if (!jid) {
+                return {};
+            }
+            const bytes = (0, Utils_1.encodeWAMessage)(patchedMessage);
             const { type, ciphertext } = await signalRepository
                 .encryptMessage({ jid, data: bytes });
             if (type === 'pkmsg') {
@@ -290,34 +259,32 @@ const makeMessagesSocket = (config) => {
             return node;
         }));
         return { nodes, shouldIncludeDeviceIdentity };
-    }; //apela
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList, AI = false }) => {
+    };
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
+        var _a;
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
-        let didPushAdditional = false
-        const { user, server } = WABinary_1.jidDecode(jid);
+        const { user, server } = (0, WABinary_1.jidDecode)(jid);
         const statusJid = 'status@broadcast';
         const isGroup = server === 'g.us';
+        const isNewsletter = server === 'newsletter';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
-        const isPrivate = server === 's.whatsapp.net'
-        const isNewsletter = server === 'newsletter';
-        msgId = msgId || (0, Utils_1.generateMessageID)();
+        msgId = msgId || (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id);
         useUserDevicesCache = useUserDevicesCache !== false;
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
+        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
-        const destinationJid = (!isStatus) ? WABinary_1.jidEncode(user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net') : statusJid;
+        const destinationJid = (!isStatus) ? (0, WABinary_1.jidEncode)(user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net') : statusJid;
         const binaryNodeContent = [];
         const devices = [];
         const meMsg = {
             deviceSentMessage: {
                 destinationJid,
                 message
-            }
+            },
+            messageContextInfo: message.messageContextInfo
         };
-        const extraAttrs = {}
-        const messages = Utils_1.normalizeMessageContent(message)  
-        const buttonType = getButtonType(messages);
+        const extraAttrs = {};
         if (participant) {
             // when the retry request is not for a group
             // only send to the specific device that asked for a retry
@@ -325,80 +292,67 @@ const makeMessagesSocket = (config) => {
             if (!isGroup && !isStatus) {
                 additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
             }
-            const { user, device } = WABinary_1.jidDecode(participant.jid);
+            const { user, device } = (0, WABinary_1.jidDecode)(participant.jid);
             devices.push({ user, device });
         }
         await authState.keys.transaction(async () => {
-            const mediaType = getMediaType(messages);
-            
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+            const mediaType = getMediaType(message);
             if (mediaType) {
-                extraAttrs['mediatype'] = mediaType
+                extraAttrs['mediatype'] = mediaType;
             }
-            
-            if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) {
-                extraAttrs['decrypt-fail'] = 'hide'
-            } 
-            
-            if (messages.interactiveResponseMessage?.nativeFlowResponseMessage) {
-                extraAttrs['native_flow_name'] = messages.interactiveResponseMessage?.nativeFlowResponseMessage.name
+            if ((_a = (0, Utils_1.normalizeMessageContent)(message)) === null || _a === void 0 ? void 0 : _a.pinInChatMessage) {
+                extraAttrs['decrypt-fail'] = 'hide';
             }
-            
             if (isGroup || isStatus) {
                 const [groupData, senderKeyMap] = await Promise.all([
                     (async () => {
-                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
-                        if (groupData) {
+                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined;
+                        if (groupData && Array.isArray(groupData === null || groupData === void 0 ? void 0 : groupData.participants)) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
-
                         else if (!isStatus) {
-                            groupData = await groupMetadata(jid)
+                            groupData = await groupMetadata(jid);
                         }
-                        
                         return groupData;
                     })(),
                     (async () => {
                         if (!participant && !isStatus) {
-                            const result = await authState.keys.get('sender-key-memory', [jid])
-                            return result[jid] || {}
+                            const result = await authState.keys.get('sender-key-memory', [jid]);
+                            return result[jid] || {};
                         }
-
-                        return {}
-
-                    })()         
+                        return {};
+                    })()
                 ]);
                 if (!participant) {
-                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
-
+                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : [];
                     if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList)
+                        participantsList.push(...statusJidList);
                     }
-
-                 //   if (!isStatus) {
-                 //       const expiration = await getEphemeralGroup(jid)
-                 //       additionalAttributes = {
-                 //           ...additionalAttributes, 
-                 //           addressing_mode: 'pn',
-                 //           ...expiration ? { expiration: expiration.toString() } : null
-                 //       }
-                 //   }
-
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
-                    devices.push(...additionalDevices)
-                }
-                
-                const patched = await patchMessageBeforeSending(message, devices.map(d => WABinary_1.jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)));
-                const bytes = Utils_1.encodeWAMessage(patched);
-                
+                    if (!isStatus) {
+                        additionalAttributes = {
+                            ...additionalAttributes,
+                            // eslint-disable-next-line camelcase
+                            addressing_mode: (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) || 'pn'
+                        };
+                    }
+                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
+                    devices.push(...additionalDevices);
+                }
+                const patched = await patchMessageBeforeSending(message);
+                if (Array.isArray(patched)) {
+                    throw new boom_1.Boom('Per-jid patching is not supported in groups');
+                }
+                const bytes = (0, Utils_1.encodeWAMessage)(patched);
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
                     meId,
                 });
                 const senderKeyJids = [];
-                
+                // ensure a connection is established with every device
                 for (const { user, device } of devices) {
-                    const jid = WABinary_1.jidEncode(user, (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) === 'lid' ? 'lid' : 's.whatsapp.net', device);
+                    const jid = (0, WABinary_1.jidEncode)(user, (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) === 'lid' ? 'lid' : 's.whatsapp.net', device);
                     if (!senderKeyMap[jid] || !!participant) {
                         senderKeyJids.push(jid);
                         // store that this person has had the sender keys sent to them
@@ -416,115 +370,107 @@ const makeMessagesSocket = (config) => {
                         }
                     };
                     await assertSessions(senderKeyJids, false);
-                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, extraAttrs)
+                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, extraAttrs);
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
                 }
                 binaryNodeContent.push({
                     tag: 'enc',
-                    attrs: { v: '2', type: 'skmsg', ...extraAttrs },
+                    attrs: { v: '2', type: 'skmsg' },
                     content: ciphertext
                 });
                 await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
             }
             else if (isNewsletter) {
                 // Message edit
-                if (message.protocolMessage?.editedMessage) {
-                    msgId = message.protocolMessage.key?.id
-                    message = message.protocolMessage.editedMessage
+                if ((_b = message.protocolMessage) === null || _b === void 0 ? void 0 : _b.editedMessage) {
+                    msgId = (_c = message.protocolMessage.key) === null || _c === void 0 ? void 0 : _c.id;
+                    message = message.protocolMessage.editedMessage;
                 }
-
                 // Message delete
-                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = message.protocolMessage.key?.id
-                    message = {}
-                }
-
-                const patched = await patchMessageBeforeSending(message, [])
-                const bytes = Utils_1.encodeNewsletterMessage(patched)
-
+                if (((_d = message.protocolMessage) === null || _d === void 0 ? void 0 : _d.type) === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                    msgId = (_e = message.protocolMessage.key) === null || _e === void 0 ? void 0 : _e.id;
+                    message = {};
+                }
+                const patched = await patchMessageBeforeSending(message, []);
+                if (Array.isArray(patched)) {
+                    throw new boom_1.Boom('Per-jid patching is not supported in channel');
+                }
+                const bytes = (0, Utils_1.encodeNewsletterMessage)(patched);
                 binaryNodeContent.push({
                     tag: 'plaintext',
-                    attrs: extraAttrs ? extraAttrs : {},
+                    attrs: mediaType ? { mediatype: mediaType } : {},
                     content: bytes
-                })
+                });
             }
             else {
-                const { user: meUser } = WABinary_1.jidDecode(meId);
+                const { user: meUser } = (0, WABinary_1.jidDecode)(meId);
                 if (!participant) {
-                    devices.push({ user })
+                    devices.push({ user });
                     if (user !== meUser) {
-                        devices.push({ user: meUser })
+                        devices.push({ user: meUser });
                     }
-
-                    if (additionalAttributes?.['category'] !== 'peer') {
-                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true)
-
-                        devices.push(...additionalDevices)
+                    if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) !== 'peer') {
+                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
+                        devices.push(...additionalDevices);
                     }
                 }
                 const allJids = [];
                 const meJids = [];
                 const otherJids = [];
                 for (const { user, device } of devices) {
-                    const isMe = user === meUser
-                    const jid = WABinary_1.jidEncode(isMe && isLid ? authState.creds?.me?.lid?.split(':')[0] || user : user, isLid ? 'lid' : 's.whatsapp.net', device)
-
+                    const isMe = user === meUser;
+                    const jid = (0, WABinary_1.jidEncode)(isMe && isLid ? ((_g = (_f = authState.creds) === null || _f === void 0 ? void 0 : _f.me) === null || _g === void 0 ? void 0 : _g.lid.split(':')[0]) || user : user, isLid ? 'lid' : 's.whatsapp.net', device);
                     if (isMe) {
-                        meJids.push(jid)
+                        meJids.push(jid);
                     }
-
                     else {
-                        otherJids.push(jid)
+                        otherJids.push(jid);
                     }
-
-                    allJids.push(jid)
+                    allJids.push(jid);
                 }
                 await assertSessions(allJids, false);
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
                     createParticipantNodes(meJids, meMsg, extraAttrs),
                     createParticipantNodes(otherJids, message, extraAttrs)
-                ])
+                ]);
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
             if (participants.length) {
-                if (additionalAttributes?.['category'] === 'peer') {
-                    const peerNode = participants[0]?.content?.[0]
-
+                if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) === 'peer') {
+                    const peerNode = (_j = (_h = participants[0]) === null || _h === void 0 ? void 0 : _h.content) === null || _j === void 0 ? void 0 : _j[0];
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode) // push only enc
+                        binaryNodeContent.push(peerNode); // push only enc
                     }
                 }
-
                 else {
                     binaryNodeContent.push({
                         tag: 'participants',
                         attrs: {},
                         content: participants
-                    })
+                    });
                 }
             }
-
             const stanza = {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    type: getTypeMessage(messages), 
+                    type: isNewsletter ? getTypeMessage(message) : 'text',
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
-            }
+            };
             // if the participant to send to is explicitly specified (generally retry recp)
             // ensure the message is only sent to that person
             // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
             if (participant) {
-                if (WABinary_1.isJidGroup(destinationJid)) {
+                if ((0, WABinary_1.isJidGroup)(destinationJid)) {
                     stanza.attrs.to = destinationJid;
                     stanza.attrs.participant = participant.jid;
                 }
-                else if (WABinary_1.areJidsSameUser(participant.jid, meId)) {
+                else if ((0, WABinary_1.areJidsSameUser)(participant.jid, meId)) {
                     stanza.attrs.to = participant.jid;
                     stanza.attrs.recipient = destinationJid;
                 }
@@ -543,162 +489,123 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-     
-            if (AI && isPrivate) {
-                const botNode = {
-                    tag: 'bot', 
-                    attrs: {
-                        biz_bot: '1'
-                    }
-                }
-
-                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
-
-                if (filteredBizBot) {
-                    stanza.content.push(...additionalNodes) 
-                    didPushAdditional = true
-                }
-
-                else {
-                    stanza.content.push(botNode) 
-                }
+            if (additionalNodes && additionalNodes.length > 0) {
+                stanza.content.push(...additionalNodes);
             }
-            
-            if(!isNewsletter && buttonType && !isStatus) {             
-                const content = WABinary_1.getAdditionalNode(buttonType)
-                const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
-
-                if (filteredNode) {
-                    didPushAdditional = true
-                    stanza.content.push(...additionalNodes)
-                } 
-                else {
-                    stanza.content.push(...content)
+            const content = (0, Utils_1.normalizeMessageContent)(message);
+            const contentType = (0, Utils_1.getContentType)(content);
+            if (((0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidUser)(jid)) && (contentType === 'interactiveMessage' ||
+                contentType === 'buttonsMessage' ||
+                contentType === 'listMessage')) {
+                const bizNode = { tag: 'biz', attrs: {} };
+                if ((((_l = (_k = message === null || message === void 0 ? void 0 : message.viewOnceMessage) === null || _k === void 0 ? void 0 : _k.message) === null || _l === void 0 ? void 0 : _l.interactiveMessage) || ((_o = (_m = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) === null || _m === void 0 ? void 0 : _m.message) === null || _o === void 0 ? void 0 : _o.interactiveMessage) || ((_q = (_p = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) === null || _p === void 0 ? void 0 : _p.message) === null || _q === void 0 ? void 0 : _q.interactiveMessage) || (message === null || message === void 0 ? void 0 : message.interactiveMessage)) || (((_s = (_r = message === null || message === void 0 ? void 0 : message.viewOnceMessage) === null || _r === void 0 ? void 0 : _r.message) === null || _s === void 0 ? void 0 : _s.buttonsMessage) || ((_u = (_t = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) === null || _t === void 0 ? void 0 : _t.message) === null || _u === void 0 ? void 0 : _u.buttonsMessage) || ((_w = (_v = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) === null || _v === void 0 ? void 0 : _v.message) === null || _w === void 0 ? void 0 : _w.buttonsMessage) || (message === null || message === void 0 ? void 0 : message.buttonsMessage))) {
+                    bizNode.content = [{
+                            tag: 'interactive',
+                            attrs: {
+                                type: 'native_flow',
+                                v: '1'
+                            },
+                            content: [{
+                                    tag: 'native_flow',
+                                    attrs: { v: '9', name: 'mixed' }
+                                }]
+                        }];
                 }
-                logger.debug({ jid }, 'adding business node')
-            }         
-
-            if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
-                stanza.content.push(...additionalNodes);
+                else if (message === null || message === void 0 ? void 0 : message.listMessage) {
+                    // list message only support in private chat
+                    bizNode.content = [{
+                            tag: 'list',
+                            attrs: {
+                                type: 'product_list',
+                                v: '2'
+                            }
+                        }];
+                }
+                stanza.content.push(bizNode);
             }
-            
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
         });
-        
-        message = Types_1.WAProto.Message.fromObject(message)
-    
-        const messageJSON = {
-            key: {
-               remoteJid: jid,
-               fromMe: true,
-               id: msgId
-            },
-            message: message,
-            messageTimestamp: Utils_1.unixTimestampSeconds(new Date()),
-            messageStubParameters: [],
-            participant: WABinary_1.isJidGroup(jid) || WABinary_1.isJidStatusBroadcast(jid) ? meId : undefined,
-            status: Types_1.WAMessageStatus.PENDING
-        }
-
-        return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON)
-     //   return msgId;
+        return msgId;
     };
     const getTypeMessage = (msg) => {
-            const message = Utils_1.normalizeMessageContent(msg)  
-        if (message.reactionMessage) {
-            return 'reaction'
-        }       
-        else if (getMediaType(message)) {
-            return 'media'
-        }        
+        if (msg.viewOnceMessage) {
+            return getTypeMessage(msg.viewOnceMessage.message);
+        }
+        else if (msg.viewOnceMessageV2) {
+            return getTypeMessage(msg.viewOnceMessageV2.message);
+        }
+        else if (msg.viewOnceMessageV2Extension) {
+            return getTypeMessage(msg.viewOnceMessageV2Extension.message);
+        }
+        else if (msg.ephemeralMessage) {
+            return getTypeMessage(msg.ephemeralMessage.message);
+        }
+        else if (msg.documentWithCaptionMessage) {
+            return getTypeMessage(msg.documentWithCaptionMessage.message);
+        }
+        else if (msg.reactionMessage) {
+            return 'reaction';
+        }
+        else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
+            return 'poll';
+        }
+        else if (getMediaType(msg)) {
+            return 'media';
+        }
         else {
-            return 'text'
+            return 'text';
         }
-    }
-
+    };
     const getMediaType = (message) => {
         if (message.imageMessage) {
-            return 'image'
+            return 'image';
         }
         else if (message.videoMessage) {
-            return message.videoMessage.gifPlayback ? 'gif' : 'video'
+            return message.videoMessage.gifPlayback ? 'gif' : 'video';
         }
         else if (message.audioMessage) {
-            return message.audioMessage.ptt ? 'ptt' : 'audio'
+            return message.audioMessage.ptt ? 'ptt' : 'audio';
         }
         else if (message.contactMessage) {
-            return 'vcard'
+            return 'vcard';
         }
         else if (message.documentMessage) {
-            return 'document'
+            return 'document';
         }
         else if (message.contactsArrayMessage) {
-            return 'contact_array'
+            return 'contact_array';
         }
         else if (message.liveLocationMessage) {
-            return 'livelocation'
+            return 'livelocation';
         }
         else if (message.stickerMessage) {
-            return 'sticker'
+            return 'sticker';
         }
         else if (message.listMessage) {
-            return 'list'
+            return 'list';
         }
         else if (message.listResponseMessage) {
-            return 'list_response'
+            return 'list_response';
         }
         else if (message.buttonsResponseMessage) {
-            return 'buttons_response'
+            return 'buttons_response';
         }
         else if (message.orderMessage) {
-            return 'order'
+            return 'order';
         }
         else if (message.productMessage) {
-            return 'product'
+            return 'product';
         }
         else if (message.interactiveResponseMessage) {
-            return 'native_flow_response'
+            return 'native_flow_response';
         }
         else if (message.groupInviteMessage) {
-            return 'url'
-        }
-        else if (/https:\/\/wa\.me\/p\/\d+\/\d+/.test(message.extendedTextMessage?.text)) {
-            return 'productlink'
-        }
-    }
- 
-    const getButtonType = (message) => {
-        if (message.listMessage) {
-            return 'list'
-        }
-        else if (message.buttonsMessage) {
-            return 'buttons'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_and_pay') {
-            return 'review_and_pay'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_order') {
-            return 'review_order'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_info') {
-            return 'payment_info'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_status') {
-            return 'payment_status'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
-            return 'payment_method'
-        }
-        else if (message.interactiveMessage && message.interactiveMessage?.nativeFlowMessage) {
-            return 'interactive'
+            return 'url';
         }
-        else if (message.interactiveMessage?.nativeFlowMessage) {
-            return 'native_flow'
-        }
-    }
+    };
     const getPrivacyTokens = async (jids) => {
-        const t = Utils_1.unixTimestampSeconds().toString();
+        const t = (0, Utils_1.unixTimestampSeconds)().toString();
         const result = await query({
             tag: 'iq',
             attrs: {
@@ -713,7 +620,7 @@ const makeMessagesSocket = (config) => {
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: WABinary_1.jidNormalizedUser(jid),
+                            jid: (0, WABinary_1.jidNormalizedUser)(jid),
                             t,
                             type: 'trusted_contact'
                         }
@@ -722,34 +629,34 @@ const makeMessagesSocket = (config) => {
             ]
         });
         return result;
-    }  
+    };
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
-    const rahmi = new hbmodofc(Utils_1, waUploadToServer, relayMessage);
+    const miz = new hbmodsofc(Utils_1, waUploadToServer, relayMessage);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
+        miz,
         getPrivacyTokens,
         assertSessions,
         relayMessage,
         sendReceipt,
         sendReceipts,
-        rahmi,
         readMessages,
         refreshMediaConn,
+        waUploadToServer,
+        fetchPrivacySettings,
         getUSyncDevices,
         createParticipantNodes,
-        waUploadToServer,
         sendPeerDataOperationMessage,
-        fetchPrivacySettings,
         updateMediaMessage: async (message) => {
             const content = (0, Utils_1.assertMediaContent)(message.message);
             const mediaKey = content.mediaKey;
             const meId = authState.creds.me.id;
-            const node = (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
+            const node = await (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
             let error = undefined;
             await Promise.all([
                 sendNode(node),
-                waitForMsgMediaUpdate(update => {
+                waitForMsgMediaUpdate(async (update) => {
                     const result = update.find(c => c.key.id === message.key.id);
                     if (result) {
                         if (result.error) {
@@ -757,7 +664,7 @@ const makeMessagesSocket = (config) => {
                         }
                         else {
                             try {
-                                const media = (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
+                                const media = await (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
                                 if (media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
                                     const resultStr = WAProto_1.proto.MediaRetryNotification.ResultType[media.result];
                                     throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: (0, Utils_1.getStatusCodeForMediaRetry)(media.result) || 404 });
@@ -778,132 +685,197 @@ const makeMessagesSocket = (config) => {
                 throw error;
             }
             ev.emit('messages.update', [
-                {
-                    key: message.key,
-                    update: { 
-                        message: message.message
-                    }
-                }
+                { key: message.key, update: { message: message.message } }
             ]);
             return message;
         },
         sendMessage: async (jid, content, options = {}) => {
+            var _a, _b, _c;
             const userJid = authState.creds.me.id;
-            delete options.ephemeralExpiration
-            const { filter = false, quoted } = options;
-            const getParticipantAttr = () => filter ? { participant: { jid } } : {};
-            const messageType = rahmi.detectType(content);
-            if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
-                typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
-                const { disappearingMessagesInChat } = content
-
+            if (!options.ephemeralExpiration) {
+                if ((0, WABinary_1.isJidGroup)(jid)) {
+                    const groups = await sock.groupQuery(jid, 'get', [{
+                            tag: 'query',
+                            attrs: {
+                                request: 'interactive'
+                            }
+                        }]);
+                    const metadata = (0, WABinary_1.getBinaryNodeChild)(groups, 'group');
+                    const expiration = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(metadata, 'ephemeral')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.expiration) || 0;
+                    options.ephemeralExpiration = expiration;
+                }
+            }
+            if (typeof content === 'object' &&
+                'disappearingMessagesInChat' in content &&
+                typeof content['disappearingMessagesInChat'] !== 'undefined' &&
+                (0, WABinary_1.isJidGroup)(jid)) {
+                const { disappearingMessagesInChat } = content;
                 const value = typeof disappearingMessagesInChat === 'boolean' ?
                     (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-                    disappearingMessagesInChat
-
-                await groupToggleEphemeral(jid, value)
+                    disappearingMessagesInChat;
+                await groupToggleEphemeral(jid, value);
             }
-            
-            else {
-                let mediaHandle
-
-   
-            if (messageType) {
-                switch(messageType) {
-                    case 'PAYMENT':
-                        const paymentContent = await rahmi.handlePayment(content, quoted);
-                        return await relayMessage(jid, paymentContent, {
-                            messageId: Utils_1.generateMessageID(),
-                            ...getParticipantAttr()
-                        });
-                
-                    case 'PRODUCT':
-                        const productContent = await rahmi.handleProduct(content, jid, quoted);
-                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                        return await relayMessage(jid, productMsg.message, {
-                            messageId: productMsg.key.id,
-                            ...getParticipantAttr()
+            if (typeof content === 'object' && 'album' in content && content.album) {
+                const { album, caption } = content;
+                if (caption && !album[0].caption) {
+                    album[0].caption = caption;
+                }
+                let mediaHandle;
+                let mediaMsg;
+                const albumMsg = (0, Utils_1.generateWAMessageFromContent)(jid, {
+                    albumMessage: {
+                        expectedImageCount: album.filter(item => 'image' in item).length,
+                        expectedVideoCount: album.filter(item => 'video' in item).length
+                    }
+                }, { userJid, ...options });
+                await relayMessage(jid, albumMsg.message, {
+                    messageId: albumMsg.key.id
+                });
+                for (const i in album) {
+                    const media = album[i];
+                    if ('image' in media) {
+                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
+                            image: media.image,
+                            ...(media.caption ? { caption: media.caption } : {}),
+                            ...options
+                        }, {
+                            userJid,
+                            upload: async (readStream, opts) => {
+                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
+                                mediaHandle = up.handle;
+                                return up;
+                            },
+                            ...options,
                         });
-                
-                    case 'INTERACTIVE':
-                        const interactiveContent = await rahmi.handleInteractive(content, jid, quoted);
-                        const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
-                        return await relayMessage(jid, interactiveMsg.message, {
-                            messageId: interactiveMsg.key.id,
-                            ...getParticipantAttr()
+                    }
+                    else if ('video' in media) {
+                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
+                            video: media.video,
+                            ...(media.caption ? { caption: media.caption } : {}),
+                            ...(media.gifPlayback !== undefined ? { gifPlayback: media.gifPlayback } : {}),
+                            ...options
+                        }, {
+                            userJid,
+                            upload: async (readStream, opts) => {
+                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
+                                mediaHandle = up.handle;
+                                return up;
+                            },
+                            ...options,
                         });
-                    case 'ALBUM':
-                        return await rahmi.handleAlbum(content, jid, quoted)
-                    case 'EVENT':
-                        return await rahmi.handleEvent(content, jid, quoted)
-                    case 'POLL_RESULT':
-                        return await rahmi.handlePollResult(content, jid, quoted)
-                    case 'GROUP_STORY':
-                        return await rahmi.handleGroupStory(content, jid, quoted)
+                    }
+                    if (mediaMsg) {
+                        mediaMsg.message.messageContextInfo = {
+                            messageSecret: (0, crypto_1.randomBytes)(32),
+                            messageAssociation: {
+                                associationType: 1,
+                                parentMessageKey: albumMsg.key
+                            }
+                        };
+                    }
+                    await relayMessage(jid, mediaMsg.message, {
+                        messageId: mediaMsg.key.id
+                    });
+                    await new Promise(resolve => setTimeout(resolve, 800));
                 }
+                return albumMsg;
             }
-            const fullMsg = await Utils_1.generateWAMessage(jid, content, {
-                logger,
-                userJid,
-                quoted,
-                getUrlInfo: text => link_preview_1.getUrlInfo(text, {
-                    thumbnailWidth: linkPreviewImageThumbnailWidth,
-                    fetchOpts: {
-                        timeout: 3000,
-                        ...axiosOptions || {}
-                    },
+            else if (content.groupStatusMessage) {
+                const { quoted } = options;
+                return await miz.handleGroupStory(content, jid, quoted);
+            }           
+            else {
+                let mediaHandle;
+                const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
                     logger,
-                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                }),
-                upload: async (readStream, opts) => {
-                    const up = await waUploadToServer(readStream, {
-                        ...opts,
-                        newsletter: WABinary_1.isJidNewsLetter(jid)
-                    });
-                    return up;
-                },
-                mediaCache: config.mediaCache,
-                options: config.options,
-                ...options
-            });
-            
-            const isDeleteMsg = 'delete' in content && !!content.delete;
-            const isEditMsg = 'edit' in content && !!content.edit;
-            const isAiMsg = 'ai' in content && !!content.ai;
-            
-            const additionalAttributes = {};
-            const additionalNodes = [];
-
-            if (isDeleteMsg) {
-                const fromMe = content.delete?.fromMe;
-                const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
-                additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
-            } else if (isEditMsg) {
-                additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
-            } else if (isAiMsg) {
-                additionalNodes.push({
-                    attrs: { 
-                        biz_bot: '1' 
-                    }, tag: "bot" 
-                });
-            }
-            
-            await relayMessage(jid, fullMsg.message, {
-                messageId: fullMsg.key.id,
-                cachedGroupMetadata: options.cachedGroupMetadata,
-                additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
-                additionalAttributes,
-                statusJidList: options.statusJidList
-            });
-            
-            if (config.emitOwnEvents) {
-                process.nextTick(() => {
-                    processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    userJid,
+                    getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
+                        thumbnailWidth: linkPreviewImageThumbnailWidth,
+                        fetchOpts: {
+                            timeout: 3000,
+                            ...axiosOptions || {}
+                        },
+                        logger,
+                        uploadImage: generateHighQualityLinkPreview
+                            ? waUploadToServer
+                            : undefined
+                    }),
+                    getProfilePicUrl: sock.profilePictureUrl,
+                    upload: async (readStream, opts) => {
+                        const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
+                        mediaHandle = up.handle;
+                        return up;
+                    },
+                    mediaCache: config.mediaCache,
+                    options: config.options,
+                    messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
+                    ...options,
                 });
-            }
-            return fullMsg;
+                const isDeleteMsg = 'delete' in content && !!content.delete;
+                const isEditMsg = 'edit' in content && !!content.edit;
+                const isPinMsg = 'pin' in content && !!content.pin;
+                const isKeepMsg = 'keep' in content && content.keep;
+                const isPollMessage = 'poll' in content && !!content.poll;
+                const isAiMsg = content && content.ai === true;
+                const additionalAttributes = {};
+                const additionalNodes = [];
+                // required for delete
+                if (isDeleteMsg) {
+                    // if the chat is a group, and I am not the author, then delete the message as an admin
+                    if (((0, WABinary_1.isJidGroup)(content.delete.remoteJid) && !content.delete.fromMe) || (0, WABinary_1.isJidNewsletter)(jid)) {
+                        additionalAttributes.edit = '8';
+                    }
+                    else {
+                        additionalAttributes.edit = '7';
+                    }
+                    // required for edit message
+                }
+                else if (isEditMsg) {
+                    additionalAttributes.edit = (0, WABinary_1.isJidNewsletter)(jid) ? '3' : '1';
+                    // required for pin message
+                }
+                else if (isPinMsg) {
+                    additionalAttributes.edit = '2';
+                    // required for keep message
+                }
+                else if (isKeepMsg) {
+                    additionalAttributes.edit = '6';
+                    // required for polling message
+                }
+                else if (isPollMessage) {
+                    additionalNodes.push({
+                        tag: 'meta',
+                        attrs: {
+                            polltype: 'creation'
+                        },
+                    });
+                    // required to display AI icon on message
+                }
+                    
+                else if (isAiMsg) {
+    fullMsg.message.messageContextInfo = {
+        ...(fullMsg.message.messageContextInfo || {}),
+        businessMessageType: 3,
+        aiMessageMetadata: {
+            isAiMessage: true
+        }
+    };
+}
+                if (mediaHandle) {
+                    additionalAttributes['media_id'] = mediaHandle;
+                }
+                if ('cachedGroupMetadata' in options) {
+                    console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.');
+                }
+                await relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes, statusJidList: options.statusJidList });
+                if (config.emitOwnEvents) {
+                    process.nextTick(() => {
+                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
+                    });
+                }
+                return fullMsg;
             }
         }
-    }
+    };
 };
 exports.makeMessagesSocket = makeMessagesSocket;