alwaysaqioo 1.1.1 → 1.1.3

package/lib/Socket/messages-send.js

@@ -1,4 +1,4 @@
-"use strict"; 
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 }; 
@@ -8,14 +8,10 @@ const boom_1 = require("@hapi/boom");
 const node_cache_1 = __importDefault(require("node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
-const 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 newsletter_1 = require("./newsletter");
-const WAUSync_1 = require("../WAUSync")
-const imup = require('./luxu');
 var ListType = WAProto_1.proto.Message.ListMessage.ListType;
 const makeMessagesSocket = (config) => {
     const {
@@ -37,8 +33,7 @@ const makeMessagesSocket = (config) => {
         generateMessageTag,
         sendNode, 
         groupMetadata,
-        groupToggleEphemeral,
-        executeUSyncQuery
+        groupToggleEphemeral
     } = sock;
     const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
@@ -58,9 +53,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 +84,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 +95,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 +129,74 @@ 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 users = [];
+        jids = Array.from(new Set(jids));
         for (let jid of jids) {
-            const user = WABinary_1.jidDecode(jid)?.user
-
-            jid = WABinary_1.jidNormalizedUser(jid)
-
-            if (useCache) {
-                const devices = userDevicesCache.get(user)
-
-                if (devices) {
-                    deviceResults.push(...devices)
-                    logger.trace({ user }, 'using cache for devices')
-                }
-
-                else {
-                    toFetch.push(jid)
-                }
+            const user = (_a = (0, WABinary_1.jidDecode)(jid)) === null || _a === void 0 ? void 0 : _a.user;
+            jid = (0, WABinary_1.jidNormalizedUser)(jid);
+            const devices = userDevicesCache.get(user);
+            if (devices && useCache) {
+                deviceResults.push(...devices);
+                logger.trace({ user }, 'using cache for devices');
             }
-
             else {
-                toFetch.push(jid)
+                users.push({ tag: 'user', attrs: { jid } });
             }
         }
-
-        if (!toFetch.length) {
-            return deviceResults
-        }
-
-        const query = new WAUSync_1.USyncQuery()
-            .withContext('message')
-            .withDeviceProtocol()
-
-        for (const jid of toFetch) {
-            query.withUser(new WAUSync_1.USyncUser().withId(jid))
+        if (!users.length) {
+            return deviceResults;
         }
-
-        const result = await executeUSyncQuery(query)
-
-        if (result) {
-            const extracted = Utils_1.extractDeviceJids(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)
-            }
-
-            for (const key in deviceMap) {
-                userDevicesCache.set(key, deviceMap[key])
-            }
-        }
-
-        return deviceResults
-    }
+        const iq = {
+            tag: 'iq',
+            attrs: {
+                to: WABinary_1.S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'usync',
+            },
+            content: [
+                {
+                    tag: 'usync',
+                    attrs: {
+                        sid: generateMessageTag(),
+                        mode: 'query',
+                        last: 'true',
+                        index: '0',
+                        context: 'message',
+                    },
+                    content: [
+                        {
+                            tag: 'query',
+                            attrs: {},
+                            content: [
+                                {
+                                    tag: 'devices',
+                                    attrs: { version: '2' }
+                                }
+                            ]
+                        },
+                        { tag: 'list', attrs: {}, content: users }
+                    ]
+                },
+            ],
+        };
+        const result = await query(iq);
+        const extracted = (0, Utils_1.extractDeviceJids)(result, 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);
+        }
+        for (const key in deviceMap) {
+            userDevicesCache.set(key, deviceMap[key]);
+        }
+        return deviceResults;
+    };
     const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
         let jidsRequiringFetch = [];
@@ -241,29 +240,6 @@ const makeMessagesSocket = (config) => {
         }
         return didFetchNewSession;
     };
-    
- 
-    const sendPeerDataOperationMessage = async (pdoMessage) => {
-        if (!authState.creds.me?.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 msgId = await relayMessage(meJid, protocolMessage, {
-            additionalAttributes: {
-                category: 'peer',
-                // eslint-disable-next-line camelcase
-                push_priority: 'high_force',
-            },
-        });
-        return msgId;
-    };
     const createParticipantNodes = async (jids, message, extraAttrs) => {
         const patched = await patchMessageBeforeSending(message, jids);
         const bytes = (0, Utils_1.encodeWAMessage)(patched);
@@ -291,11 +267,11 @@ const makeMessagesSocket = (config) => {
         }));
         return { nodes, shouldIncludeDeviceIdentity };
     }; //apela
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList, AI = true }) => {
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList, AI = true }) => {
         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 isStatus = jid === statusJid;
@@ -304,9 +280,8 @@ const makeMessagesSocket = (config) => {
         const isNewsletter = server === 'newsletter';
         msgId = msgId || (0, Utils_1.generateMessageID)();
         useUserDevicesCache = useUserDevicesCache !== false;
-        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 = {
@@ -315,9 +290,6 @@ const makeMessagesSocket = (config) => {
                 message
             }
         };
-        const extraAttrs = {}
-        const messages = Utils_1.normalizeMessageContent(message)  
-        const buttonType = getButtonType(messages);
         if (participant) {
             // when the retry request is not for a group
             // only send to the specific device that asked for a retry
@@ -325,80 +297,51 @@ 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);
-            
-            if (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
-            }
-            
+            var _a, _b, _c, _d, _e, _f;
+            const mediaType = getMediaType(message);
             if (isGroup || isStatus) {
                 const [groupData, senderKeyMap] = await Promise.all([
                     (async () => {
-                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
+                        let groupData = cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined;
                         if (groupData) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
-
-                        else if (!isStatus) {
-                            groupData = await groupMetadata(jid)
+                        if (!groupData && !isStatus) {
+                            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 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);
-                
+                const patched = await patchMessageBeforeSending(message, devices.map(d => (0, WABinary_1.jidEncode)(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)));
+                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 +359,95 @@ const makeMessagesSocket = (config) => {
                         }
                     };
                     await assertSessions(senderKeyJids, false);
-                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, extraAttrs)
+                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, mediaType ? { mediatype: mediaType } : undefined);
                     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 ((_a = message.protocolMessage) === null || _a === void 0 ? void 0 : _a.editedMessage) {
+                    msgId = (_b = message.protocolMessage.key) === null || _b === void 0 ? void 0 : _b.id;
+                    message = message.protocolMessage.editedMessage;
                 }
-
                 // Message delete
-                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = message.protocolMessage.key?.id
-                    message = {}
+                if (((_c = message.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                    msgId = (_d = message.protocolMessage.key) === null || _d === void 0 ? void 0 : _d.id;
+                    message = {};
                 }
-
-                const patched = await patchMessageBeforeSending(message, [])
-                const bytes = Utils_1.encodeNewsletterMessage(patched)
-
+                const patched = await patchMessageBeforeSending(message, []);
+                const bytes = WAProto_1.proto.Message.encode(patched).finish();
                 binaryNodeContent.push({
                     tag: 'plaintext',
-                    attrs: extraAttrs ? extraAttrs : {},
+                    attrs: mediaType ? { mediatype: mediaType } : {},
                     content: bytes
-                })
+                });
             }
             else {
-                const { user: meUser } = WABinary_1.jidDecode(meId);
+                const { user: meUser, device: meDevice } = (0, WABinary_1.jidDecode)(meId);
                 if (!participant) {
-                    devices.push({ user })
-                    if (user !== meUser) {
-                        devices.push({ user: meUser })
-                    }
-
-                    if (additionalAttributes?.['category'] !== 'peer') {
-                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true)
-
-                        devices.push(...additionalDevices)
+                    devices.push({ user });
+                    // do not send message to self if the device is 0 (mobile)
+                    if (meDevice !== undefined && meDevice !== 0) {
+                        devices.push({ user: meUser });
                     }
+                    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 ? ((_f = (_e = authState.creds) === null || _e === void 0 ? void 0 : _e.me) === null || _f === void 0 ? void 0 : _f.lid.split(':')[0]) || user : user, isLid ? 'lid' : '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)
-                ])
+                    createParticipantNodes(meJids, meMsg, mediaType ? { mediatype: mediaType } : undefined),
+                    createParticipantNodes(otherJids, message, mediaType ? { mediatype: mediaType } : undefined)
+                ]);
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
             if (participants.length) {
-                if (additionalAttributes?.['category'] === 'peer') {
-                    const peerNode = participants[0]?.content?.[0]
-
-                    if (peerNode) {
-                        binaryNodeContent.push(peerNode) // push only enc
-                    }
-                }
-
-                else {
-                    binaryNodeContent.push({
-                        tag: 'participants',
-                        attrs: {},
-                        content: participants
-                    })
-                }
+                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,6 +466,28 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
+            if (additionalNodes && additionalNodes.length > 0) {
+                stanza.content.push(...additionalNodes);
+            }
+            else {
+                if (((0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidUser)(jid)) && ((message === null || message === void 0 ? void 0 : message.viewOnceMessage) ? message === null || message === void 0 ? void 0 : message.viewOnceMessage : (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) ? message === null || message === void 0 ? void 0 : message.viewOnceMessageV2 : (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) ? message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension : (message === null || message === void 0 ? void 0 : message.ephemeralMessage) ? message === null || message === void 0 ? void 0 : message.ephemeralMessage : (message === null || message === void 0 ? void 0 : message.templateMessage) ? message === null || message === void 0 ? void 0 : message.templateMessage : (message === null || message === void 0 ? void 0 : message.interactiveMessage) ? message === null || message === void 0 ? void 0 : message.interactiveMessage : message === null || message === void 0 ? void 0 : message.buttonsMessage)) {
+                    stanza.content.push({
+                        tag: 'biz',
+                        attrs: {},
+                        content: [{
+                                tag: 'interactive',
+                                attrs: {
+                                    type: 'native_flow',
+                                    v: '1'
+                                },
+                                content: [{
+                                        tag: 'native_flow',
+                                        attrs: { v: '9', name: 'mixed' }
+                                    }]
+                            }]
+                    });
+                }
+            }
      
             if (AI && isPrivate) {
                 const botNode = {
@@ -552,7 +497,7 @@ const makeMessagesSocket = (config) => {
                     }
                 }
 
-                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = WABinary_1.getBinaryFilteredBizBot(additionalNodes ? additionalNodes : []) 
 
                 if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
@@ -563,46 +508,24 @@ const makeMessagesSocket = (config) => {
                     stanza.content.push(botNode) 
                 }
             }
-            
-            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)
-                }
-                logger.debug({ jid }, 'adding business node')
-            }         
-
-            if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
-                stanza.content.push(...additionalNodes);
+            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);
         });
-        
-        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)  
@@ -667,38 +590,93 @@ const makeMessagesSocket = (config) => {
             return 'productlink'
         }
     }
- 
     const getButtonType = (message) => {
-        if (message.listMessage) {
-            return 'list'
-        }
+            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'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage) {
+        else if(message.interactiveMessage?.nativeFlowMessage) {
             return 'native_flow'
         }
     }
+    const getButtonArgs = (message) => {
+        if (message.interactiveMessage?.nativeFlowMessage && message.interactiveMessage.nativeFlowMessage?.buttons?.length > 0 && message.interactiveMessage.nativeFlowMessage.buttons[0].name === 'review_and_pay') {
+                return {
+                    tag: 'biz', 
+                    attrs: {
+                        native_flow_name: 'order_details'
+                }
+            } 
+        } else if (message.interactiveMessage?.nativeFlowMessage && message.interactiveMessage.nativeFlowMessage?.buttons?.length > 0 && message.interactiveMessage.nativeFlowMessage.buttons[0].name === 'payment_info') {
+                return {
+                    tag: 'biz', 
+                    attrs: {
+                        native_flow_name: 'payment_info'
+                }
+            }
+        } else if (message.interactiveMessage?.nativeFlowMessage &&message.interactiveMessage.nativeFlowMessage?.buttons?.length > 0 &&
+            ['mpm', 'cta_catalog', 'send_location', 'call_permission_request', 'wa_payment_transaction_details', 'automated_greeting_message_view_catalog']
+            .includes(message.interactiveMessage.nativeFlowMessage.buttons[0].name)) {
+            return {
+                tag: 'biz',
+                attrs: {},
+                content: [{
+                    tag: 'interactive',
+                    attrs: {
+                        type: 'native_flow',
+                        v: '1'
+                    },
+                    content: [{
+                        tag: 'native_flow',
+                        attrs: {
+                        	v: '2', 
+                            name: message.interactiveMessage.nativeFlowMessage.buttons[0].name
+                        }
+                    }]
+                }]
+            }
+        } else if (message.interactiveMessage?.nativeFlowMessage || message.buttonsMessage) {
+            return {
+                tag: 'biz', 
+                attrs: {}, 
+                content: [{
+                    tag: 'interactive', 
+                    attrs: {
+                        type: 'native_flow', 
+                        v: '1'
+                    }, 
+                    content: [{
+                        tag: 'native_flow', 
+                        attrs: {
+                            v: '9', 
+                            name: 'mixed'
+                        }
+                    }]
+                }]
+            }
+        } else if (message.listMessage) {
+            return {
+                tag: 'biz', 
+                attrs: {}, 
+                content: [{
+                    tag: 'list', 
+                    attrs: {
+                        v: '2', 
+                        type: 'product_list'
+                    }
+                }]
+            }
+        } else {
+            return {
+                tag: 'biz', 
+                attrs: {}
+            }
+        }
+    }
     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 +691,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,9 +700,31 @@ const makeMessagesSocket = (config) => {
             ]
         });
         return result;
-    }  
+    }
+ 
+    const sendPeerDataOperationMessage = async (pdoMessage) => {
+        var _a;
+        //TODO: for later, abstract the logic to send a Peer Message instead of just PDO - useful for App State Key Resync with phone
+        if (!((_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 = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
+        const msgId = await relayMessage(meJid, protocolMessage, {
+            additionalAttributes: {
+                category: 'peer',
+                // eslint-disable-next-line camelcase
+                push_priority: 'high_force',
+            },
+        });
+        return msgId;
+    };
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
-    const luki = new imup(Utils_1, waUploadToServer, relayMessage);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
@@ -733,7 +733,7 @@ const makeMessagesSocket = (config) => {
         relayMessage,
         sendReceipt,
         sendReceipts,
-        luki,
+        getButtonArgs,
         readMessages,
         refreshMediaConn,
         getUSyncDevices,
@@ -778,74 +778,96 @@ 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 = {}) => {
             const userJid = authState.creds.me.id;
-            delete options.ephemeralExpiration
             const { filter = false, quoted } = options;
-            const getParticipantAttr = () => filter ? { participant: { jid } } : {};
-            const messageType = luki.detectType(content);
-            if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
-                typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
-                const { disappearingMessagesInChat } = content
-
-                const value = typeof disappearingMessagesInChat === 'boolean' ?
-                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-                    disappearingMessagesInChat
-
-                await groupToggleEphemeral(jid, value)
-            }
-            
-            else {
-                let mediaHandle
+            const getParticipantAttr = () => {
+                return filter ? {
+                    participant: { jid }
+                } : {};
+            };
 
-   
-            if (messageType) {
-                switch(messageType) {
-                    case 'PAYMENT':
-                        const paymentContent = await luki.handlePayment(content, quoted);
-                        return await relayMessage(jid, paymentContent, {
-                            messageId: Utils_1.generateMessageID(),
-                            ...getParticipantAttr()
-                        });
+            if ('productMessage' in content) {
+                const { title, description, thumbnail, productId, retailerId, url, body = "", footer = "", buttons = [] } = content.productMessage;
+                const { imageMessage } = await Utils_1.generateWAMessageContent(
+                    { image: { url: thumbnail }}, 
+                    { upload: waUploadToServer });
+
+                const msg = await Utils_1.generateWAMessageFromContent(jid, {
+                    viewOnceMessage: {
+                        message: {
+                            interactiveMessage: {
+                                body: { text: body },
+                                footer: { text: footer },
+                                header: {
+                                    title,
+                                    hasMediaAttachment: true,
+                                    productMessage: {
+                                        product: {
+                                            productImage: imageMessage,
+                                            productId,
+                                            title,
+                                            description,
+                                            currencyCode: "IDR",
+                                            priceAmount1000: null,
+                                            retailerId,
+                                            url,
+                                            productImageCount: 1
+                                        },
+                                        businessOwnerJid: "0@s.whatsapp.net"
+                                    }
+                                },
+                                nativeFlowMessage: { buttons }
+                            }
+                        }
+                    }
+                }, { quoted });
                 
-                    case 'PRODUCT':
-                        const productContent = await luki.handleProduct(content, jid, quoted);
-                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                        return await relayMessage(jid, productMsg.message, {
-                            messageId: productMsg.key.id,
-                            ...getParticipantAttr()
-                        });
+                return await relayMessage(jid, msg.message, {
+                    messageId: msg.key.id,
+                    ...getParticipantAttr()
+                });
+            }
+            if ('interactiveMessage' in content) {
+                const { title, footer, thumbnail, buttons = [] } = content.interactiveMessage;
+                const header = thumbnail ? WAProto_1.proto.Message.InteractiveMessage.Header.create({
+                    title: "",
+                    hasMediaAttachment: true,
+                    ...(await Utils_1.prepareWAMessageMedia(
+                        { image: { url: thumbnail } },
+                        { upload: waUploadToServer }
+                    ))
+                }) : WAProto_1.proto.Message.InteractiveMessage.Header.create({
+                    title: "",
+                    hasMediaAttachment: false
+                });
+                const msg = await Utils_1.generateWAMessageFromContent(jid, {
+                    viewOnceMessage: {
+                        message: {
+                            messageContextInfo: {
+                                deviceListMetadata: {},
+                                deviceListMetadataVersion: 2
+                            },
+                            interactiveMessage: WAProto_1.proto.Message.InteractiveMessage.create({
+                                body: { text: title },
+                                footer: { text: footer },
+                                header,
+                                nativeFlowMessage: { buttons }
+                            })
+                        }
+                    }
+                }, { quoted });
                 
-                    case 'INTERACTIVE':
-                        const interactiveContent = await luki.handleInteractive(content, jid, quoted);
-                        const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
-                        return await relayMessage(jid, interactiveMsg.message, {
-                            messageId: interactiveMsg.key.id,
-                            ...getParticipantAttr()
-                        });
-                    case 'ALBUM':
-                        return await luki.handleAlbum(content, jid, quoted)
-                    case 'EVENT':
-                        return await luki.handleEvent(content, jid, quoted)
-                    case 'POLL_RESULT':
-                        return await luki.handlePollResult(content, jid, quoted)
-                    case 'STATUS_MENTION':
-                        return await luki.handleStMention(content, jid, quoted)
-                    case 'ORDER':
-                        return await luki.handleOrderMessage(content, jid, quoted)
-                    case 'GROUP_STATUS':
-                        return await luki.handleGroupStory(content, jid, quoted)
-                }
+                return await relayMessage(jid, msg.message, {
+                    messageId: msg.key.id,
+                    ...getParticipantAttr()
+                });
             }
+
             const fullMsg = await Utils_1.generateWAMessage(jid, content, {
                 logger,
                 userJid,
@@ -870,14 +892,14 @@ const makeMessagesSocket = (config) => {
                 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);
@@ -891,7 +913,7 @@ const makeMessagesSocket = (config) => {
                     }, tag: "bot" 
                 });
             }
-            
+
             await relayMessage(jid, fullMsg.message, {
                 messageId: fullMsg.key.id,
                 cachedGroupMetadata: options.cachedGroupMetadata,
@@ -906,7 +928,6 @@ const makeMessagesSocket = (config) => {
                 });
             }
             return fullMsg;
-            }
         }
     }
 };