@ubedsockets/baileys 1.6.9 → 1.7.1

package/lib/Socket/messages-recv.js

@@ -33,7 +33,55 @@ const makeMessagesRecvSocket = (config) => {
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
         useClones: false
     });
+    const groupParticipantJidCache = new node_cache_1.default({
+        stdTTL: 10 * 60, // 10 mins
+        useClones: false
+    });
+    const groupMetadataWarmupCache = new node_cache_1.default({
+        stdTTL: 60, // avoid repeated warmup calls per group
+        useClones: false
+    });
     let sendActiveReceipts = false;
+    const cacheGroupParticipants = (metadata) => {
+        for (const participant of metadata.participants || []) {
+            if (!participant.id || !participant.jid) {
+                continue;
+            }
+            groupParticipantJidCache.set(`${metadata.id}:${participant.id}`, participant.jid);
+            if (participant.lid) {
+                groupParticipantJidCache.set(`${metadata.id}:${participant.lid}`, participant.jid);
+            }
+        }
+    };
+    const warmupGroupParticipants = async (groupJid) => {
+        if (groupMetadataWarmupCache.get(groupJid)) {
+            return;
+        }
+        groupMetadataWarmupCache.set(groupJid, true);
+        try {
+            const metadata = await groupMetadata(groupJid);
+            cacheGroupParticipants(metadata);
+        }
+        catch (error) {
+            logger.debug({ error, groupJid }, 'failed to warm up group participant cache');
+        }
+    };
+    const resolveGroupParticipantJid = async (groupJid, participantLid) => {
+        const cacheKey = `${groupJid}:${participantLid}`;
+        const cachedParticipant = groupParticipantJidCache.get(cacheKey);
+        if (cachedParticipant) {
+            return cachedParticipant;
+        }
+        try {
+            const metadata = await groupMetadata(groupJid);
+            cacheGroupParticipants(metadata);
+            return groupParticipantJidCache.get(cacheKey);
+        }
+        catch (error) {
+            logger.debug({ error, groupJid, participantLid }, 'failed to resolve group participant jid');
+            return undefined;
+        }
+    };
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         const stanza = {
             tag: 'ack',
@@ -332,7 +380,7 @@ const makeMessagesRecvSocket = (config) => {
                 break;
                 break;
             default:
-            // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+            // console.log("WILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
     };
     const handleNewsletterNotification = (id, node) => {
@@ -778,14 +826,18 @@ const makeMessagesRecvSocket = (config) => {
                         }
                         if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid) && ((_f = (_e = (_d = (_c = msg.message) === null || _c === void 0 ? void 0 : _c.extendedTextMessage) === null || _d === void 0 ? void 0 : _d.contextInfo) === null || _e === void 0 ? void 0 : _e.participant) === null || _f === void 0 ? void 0 : _f.endsWith('@lid'))) {
                             if (msg.message.extendedTextMessage.contextInfo) {
-                                const metadata = await groupMetadata(msg.key.remoteJid);
                                 const sender = msg.message.extendedTextMessage.contextInfo.participant;
-                                const found = metadata.participants.find(p => p.id === sender);
-                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || sender;
+                                const resolvedSender = await resolveGroupParticipantJid(msg.key.remoteJid, sender);
+                                msg.message.extendedTextMessage.contextInfo.participant = resolvedSender || sender;
                             }
                         }
+                        else if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid)) {
+                            void warmupGroupParticipants(msg.key.remoteJid);
+                        }
                         if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
-                            msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
+                            msg.key.remoteJid = node.attrs.sender_pn
+                                || node.attrs.peer_recipient_pn
+                                || (0, WABinary_1.lidToJid)(msg.key.remoteJid);
                         }
                         let participant = msg.key.participant;
                         if (category === 'peer') { // special peer message

package/lib/Socket/messages-send.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesSocket = void 0;
-
 const boom_1 = require("@hapi/boom");
 const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const crypto_1 = require("crypto");
+const RexxHayanasi = require('./RHandler');
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Utils_1 = require("../Utils");
@@ -15,31 +15,10 @@ const link_preview_1 = require("../Utils/link-preview");
 const WABinary_1 = require("../WABinary");
 const WAUSync_1 = require("../WAUSync");
 const newsletter_1 = require("./newsletter");
-const aveline = require("./setup");
-
 const makeMessagesSocket = (config) => {
-    const { logger, 
-    linkPreviewImageThumbnailWidth, 
-    generateHighQualityLinkPreview, 
-    options: axiosOptions, 
-    patchMessageBeforeSending, 
-    cachedGroupMetadata, 
-    } = config;
-  
+    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, albumMessageItemDelayMs = 0, } = config;
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
-// ⒷⒶⒾⓁⒺⓎⓈ ⒷⓎ ⓋⓎⓏⒺⓃ
-    const { 
-    ev, 
-    authState, 
-    processingMutex, 
-    signalRepository, 
-    upsertMessage, 
-    query, 
-    fetchPrivacySettings, 
-    sendNode,
-    groupMetadata,
-    groupToggleEphemeral, 
-    } = 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, // 5 minutes
         useClones: false
@@ -77,7 +56,7 @@ const makeMessagesSocket = (config) => {
     /**
      * generic send receipt function
      * used for receipts of phone call, read, delivery etc.
-     */
+     * */
     const sendReceipt = async (jid, participant, messageIds, type) => {
         const node = {
             tag: 'receipt',
@@ -281,30 +260,16 @@ const makeMessagesSocket = (config) => {
         }));
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (
-    jid, 
-    message, 
-    { 
-    messageId: 
-    msgId, 
-    participant, 
-    additionalAttributes, 
-    additionalNodes, 
-    useUserDevicesCache, 
-    useCachedGroupMetadata, 
-    statusJidList, AI = true }) => {  
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
         var _a;
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
         const { user, server } = (0, WABinary_1.jidDecode)(jid);
         const statusJid = 'status@broadcast';
         const isGroup = server === 'g.us';
-        const isPrivatee = server === 's.whatsapp.net'  
         const isNewsletter = server === 'newsletter';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
-        const messages = Utils_1.normalizeMessageContent(message)
-        const pollMessage = messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3
         msgId = msgId || (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id);
         useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
@@ -524,33 +489,9 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-            if (pollMessage || messages.eventMessage) {
-                let attrs = {};
-                if (messages.eventMessage) {
-                    attrs.event_type = 'creation';
-                } else {
-                    attrs.polltype = 'creation';
-                    if (isNewsletter) {
-                        attrs.contenttype = (pollMessage && pollMessage.pollContentType === 2) ? 'image' : 'text';
-                    }
-                }
-                stanza.content.push({
-                    tag: 'meta',
-                    attrs: attrs
-                });
-            }
             if (additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
             }
-            if (AI && isPrivatee) {  
-               const botNode = {  
-                   tag: 'bot',   
-                   attrs: {  
-                   biz_bot: '1'  
-                 }  
-             }
-             stanza.content.push(botNode);   
-           }
             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' ||
@@ -620,13 +561,7 @@ const makeMessagesSocket = (config) => {
         if (message.imageMessage) {
             return 'image';
         }
-        else if (message.ptvMessage) {
-            return 'ptv';
-        }
         else if (message.videoMessage) {
-            if (message.videoMessage.ptv) {
-                return 'ptv';
-            }
             return message.videoMessage.gifPlayback ? 'gif' : 'video';
         }
         else if (message.audioMessage) {
@@ -665,9 +600,6 @@ const makeMessagesSocket = (config) => {
         else if (message.interactiveResponseMessage) {
             return 'native_flow_response';
         }
-        else if (message.richResponseMessage) {
-    return 'rich_response';
-}
         else if (message.groupInviteMessage) {
             return 'url';
         }
@@ -699,16 +631,16 @@ const makeMessagesSocket = (config) => {
         return result;
     };
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
-    const avelinel = new aveline(Utils_1, waUploadToServer, relayMessage);
+    const rexx = new RexxHayanasi(Utils_1, waUploadToServer, relayMessage);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
+        rexx,
         getPrivacyTokens,
         assertSessions,
         relayMessage,
         sendReceipt,
         sendReceipts,
-        avelinel, 
         readMessages,
         refreshMediaConn,
         waUploadToServer,
@@ -757,206 +689,9 @@ const makeMessagesSocket = (config) => {
             ]);
             return message;
         },
-        sendStatusMentions: async (content, jids = []) => {
-            const userJid = WABinary_1.jidNormalizedUser(authState.creds.me.id)
-            let allUsers = new Set()
-            allUsers.add(userJid)
-
-            for (const id of jids) {
-                const isGroup = WABinary_1.isJidGroup(id)
-                const isPrivate = WABinary_1.isJidUser(id)
-
-                if (isGroup) {
-                    try {
-                        const metadata = await cachedGroupMetadata(id) || await global.groupMetadataCache(id)
-                        const participants = metadata.participants.map(p => WABinary_1.jidNormalizedUser(p.id))
-                        participants.forEach(jid => allUsers.add(jid))
-                    } catch (error) {
-                        logger.error(`Error getting metadata for group ${id}: ${error}`)
-                    }
-                } else if (isPrivate) {
-                    allUsers.add(WABinary_1.jidNormalizedUser(id))
-                }
-            }
-
-            const uniqueUsers = Array.from(allUsers)
-            const getRandomHexColor = () => "#" + Math.floor(Math.random() * 16777215).toString(16).padStart(6, "0")
-
-            const isMedia = content.image || content.video || content.audio
-            const isAudio = !!content.audio
-
-            const messageContent = {
-                ...content
-            }
-
-            if (isMedia && !isAudio) {
-                if (messageContent.text) {
-                    messageContent.caption = messageContent.text
-
-                    delete messageContent.text
-                }
-
-                delete messageContent.ptt
-                delete messageContent.font
-                delete messageContent.backgroundColor
-                delete messageContent.textColor
-            }
-
-            if (isAudio) {
-                delete messageContent.text
-                delete messageContent.caption
-                delete messageContent.font
-                delete messageContent.textColor
-            }
-
-            const font = !isMedia ? (content.font || Math.floor(Math.random() * 9)) : undefined
-            const textColor = !isMedia ? (content.textColor || getRandomHexColor()) : undefined
-            const backgroundColor = (!isMedia || isAudio) ? (content.backgroundColor || getRandomHexColor()) : undefined
-            const ptt = isAudio ? (typeof content.ptt === 'boolean' ? content.ptt : true) : undefined
-
-            let msg
-            let mediaHandle
-            try {
-                msg = await Utils_1.generateWAMessage(WABinary_1.STORIES_JID, messageContent, {
-                    logger,
-                    userJid,
-                    getUrlInfo: text => link_preview_1.getUrlInfo(text, {
-                        thumbnailWidth: linkPreviewImageThumbnailWidth,
-                        fetchOpts: {
-                            timeout: 3000,
-                            ...axiosOptions || {}
-                        },
-                        logger,
-                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                    }),
-                    upload: async (encFilePath, opts) => {
-                        const up = await waUploadToServer(encFilePath, {
-                            ...opts
-                        })
-                        mediaHandle = up.handle
-                        return up
-                    },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    font,
-                    textColor,
-                    backgroundColor,
-                    ptt
-                })
-            } catch (error) {
-                logger.error(`Error generating message: ${error}`)
-                throw error
-            }
-
-            await relayMessage(WABinary_1.STORIES_JID, msg.message, {
-                messageId: msg.key.id,
-                statusJidList: uniqueUsers,
-                additionalNodes: [{
-                    tag: 'meta',
-                    attrs: {},
-                    content: [{
-                        tag: 'mentioned_users',
-                        attrs: {},
-                        content: jids.map(jid => ({
-                            tag: 'to',
-                            attrs: {
-                                jid: WABinary_1.jidNormalizedUser(jid)
-                            }
-                        }))
-                    }]
-                }]
-            })
-
-            for (const id of jids) {
-                try {
-                    const normalizedId = WABinary_1.jidNormalizedUser(id)
-                    const isPrivate = WABinary_1.isJidUser(normalizedId)
-                    const type = isPrivate ? 'statusMentionMessage' : 'groupStatusMentionMessage'
-
-                    const protocolMessage = {
-                        [type]: {
-                            message: {
-                                protocolMessage: {
-                                    key: msg.key,
-                                    type: 25
-                                }
-                            }
-                        },
-                        messageContextInfo: {
-                            messageSecret: crypto_1.randomBytes(32)
-                        }
-                    }
-
-                    const statusMsg = await Utils_1.generateWAMessageFromContent(normalizedId,
-                        protocolMessage, {}
-                    )
-
-                    await relayMessage(
-                        normalizedId,
-                        statusMsg.message, {
-                            additionalNodes: [{
-                                tag: 'meta',
-                                attrs: isPrivate ? {
-                                    is_status_mention: 'true'
-                                } : {
-                                    is_group_status_mention: 'true'
-                                }
-                            }]
-                        }
-                    )
-
-                    await Utils_1.delay(2000)
-                } catch (error) {
-                    logger.error(`Error sending to ${id}: ${error}`)
-                }
-            }
-
-            return msg
-        },
         sendMessage: async (jid, content, options = {}) => {
             var _a, _b, _c;
             const userJid = authState.creds.me.id;
-            const getParticipantAttr = () => filter ? { participant: { jid } } : {};
-            const { filter = false, quoted } = options;
-            const messageType = avelinel.detectType(content);
-        
-            if (messageType) {
-                switch (messageType) {
-                    case 'PAYMENT':
-                        const paymentContent = await avelinel.handlePayment(content, quoted);
-                        return await relayMessage(jid, paymentContent, {
-                            messageId: Utils_1.generateMessageID(),
-                            ...getParticipantAttr()
-                        });
-        
-                    case 'PRODUCT':
-                        const productContent = await avelinel.handleProduct(content, jid, quoted);
-                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                        return await relayMessage(jid, productMsg.message, {
-                            messageId: productMsg.key.id,
-                            ...getParticipantAttr()
-                        });
-        
-                    case 'INTERACTIVE':
-                        const interactiveContent = await avelinel.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':
-                        const albumContent = await avelinel.handleAlbum(content, jid, quoted);
-                        return albumContent;
-        
-                    case 'EVENT':
-                        return await avelinel.handleEvent(content, jid, quoted);
-        
-                    case 'POLL_RESULT':
-                        return await avelinel.handlePollResult(content, jid, quoted);
-                }
-            }
-                       
             if (!options.ephemeralExpiration) {
                 if ((0, WABinary_1.isJidGroup)(jid)) {
                     const groups = await sock.groupQuery(jid, 'get', [{
@@ -970,7 +705,6 @@ const makeMessagesSocket = (config) => {
                     options.ephemeralExpiration = expiration;
                 }
             }
-            
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' &&
@@ -1046,6 +780,36 @@ const makeMessagesSocket = (config) => {
                 }
                 return albumMsg;
             }
+        else if (typeof content === 'object' && 'stickerPack' in content) {
+    const msg = (0, Utils_1.generateWAMessageFromContent)(
+        jid,
+        content,
+        {
+            userJid,
+            upload: waUploadToServer,
+            logger,
+            options: config.options,
+            mediaUploadTimeoutMs: options.mediaUploadTimeoutMs
+        }
+    );
+
+    await relayMessage(jid, msg.message, {
+        messageId: msg.key.id,
+        useCachedGroupMetadata: options.useCachedGroupMetadata
+    });
+
+    if (config.emitOwnEvents) {
+        process.nextTick(() => {
+            processingMutex.mutex(() => upsertMessage(msg, 'append'));
+        });
+    }
+
+    return msg;
+        }
+            else if (content.groupStatusMessage) {
+                const { quoted } = options;
+                return await rexx.handleGroupStory(content, jid, quoted);
+            }    
             else {
                 let mediaHandle;
                 const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
@@ -1078,7 +842,7 @@ const makeMessagesSocket = (config) => {
                 const isPinMsg = 'pin' in content && !!content.pin;
                 const isKeepMsg = 'keep' in content && content.keep;
                 const isPollMessage = 'poll' in content && !!content.poll;
-                const isAiMsg = 'ai' in content && !!content.ai;
+                const isAiMsg = content && content.ai === true;
                 const additionalAttributes = {};
                 const additionalNodes = [];
                 // required for delete
@@ -1113,13 +877,16 @@ const makeMessagesSocket = (config) => {
                     });
                     // required to display AI icon on message
                 }
+                    
                 else if (isAiMsg) {
-                    additionalNodes.push({
-                    attrs: { 
-                        biz_bot: '1' 
-                    }, tag: "bot" 
-                });
-                }
+    fullMsg.message.messageContextInfo = {
+        ...(fullMsg.message.messageContextInfo || {}),
+        businessMessageType: 3,
+        aiMessageMetadata: {
+            isAiMessage: true
+        }
+    };
+}
                 if (mediaHandle) {
                     additionalAttributes['media_id'] = mediaHandle;
                 }