@realvare/based 2.7.62 → 2.7.71

package/lib/Socket/messages-send.js

@@ -7,6 +7,7 @@ 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 AbortController = require("abort-controller");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Utils_1 = require("../Utils");
@@ -15,7 +16,6 @@ const link_preview_1 = require("../Utils/link-preview");
 const WABinary_1 = require("../WABinary");
 const WAUSync_1 = require("../WAUSync");
 const newsletter_1 = require("./newsletter");
-const rate_limiter_1 = __importDefault(require("../Utils/rate-limiter"));
 const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, } = config;
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
@@ -24,13 +24,7 @@ const makeMessagesSocket = (config) => {
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
         useClones: false
     });
-
-    // Initialize rate limiter for anti-ban protection
-    const messagesSendRate = config.messagesSendRate || 1;
-    if(messagesSendRate > 5) {
-        logger.warn(`messagesSendRate is set to a high value (${messagesSendRate}), this may increase the risk of getting banned. Recommended value is <= 3`);
-    }
-    const rateLimiter = new rate_limiter_1.default(messagesSendRate);
+    const inFlightDeviceFetch = new Map();
     let mediaConn;
     const refreshMediaConn = async (forceGet = false) => {
         const media = await mediaConn;
@@ -127,6 +121,8 @@ const makeMessagesSocket = (config) => {
             logger.debug('not using cache for devices');
         }
         const toFetch = [];
+        const usersToFetch = new Set();
+        const inFlightPromises = [];
         jids = Array.from(new Set(jids));
         for (let jid of jids) {
             const user = (_a = (0, WABinary_1.jidDecode)(jid)) === null || _a === void 0 ? void 0 : _a.user;
@@ -138,42 +134,128 @@ const makeMessagesSocket = (config) => {
                     logger.trace({ user }, 'using cache for devices');
                 }
                 else {
-                    toFetch.push(jid);
+                    const inFlight = user ? inFlightDeviceFetch.get(user) : undefined;
+                    if (inFlight) {
+                        inFlightPromises.push(inFlight.then(devs => {
+                            if (devs && devs.length) {
+                                deviceResults.push(...devs);
+                            }
+                        }));
+                    }
+                    else {
+                        toFetch.push(jid);
+                        if (user) {
+                            usersToFetch.add(user);
+                        }
+                    }
                 }
             }
             else {
                 toFetch.push(jid);
+                if (user) {
+                    usersToFetch.add(user);
+                }
             }
         }
+        if (inFlightPromises.length) {
+            await Promise.all(inFlightPromises);
+        }
         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));
-        }
-        const result = await sock.executeUSyncQuery(query);
-        if (result) {
-            const extracted = (0, Utils_1.extractDeviceJids)(result === null || result === void 0 ? void 0 : result.list, authState.creds.me.id, ignoreZeroDevices);
+        const fetchPromise = (async () => {
+            const query = new WAUSync_1.USyncQuery()
+                .withContext('message')
+                .withDeviceProtocol();
+            for (const jid of toFetch) {
+                query.withUser(new WAUSync_1.USyncUser().withId(jid));
+            }
+            const result = await sock.executeUSyncQuery(query);
             const deviceMap = {};
-            for (const item of extracted) {
-                deviceMap[item.user] = deviceMap[item.user] || [];
-                deviceMap[item.user].push(item);
-                deviceResults.push(item);
+            if (result) {
+                const extracted = (0, Utils_1.extractDeviceJids)(result === null || result === void 0 ? void 0 : result.list, authState.creds.me.id, ignoreZeroDevices);
+                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]);
+                }
             }
-            for (const key in deviceMap) {
-                userDevicesCache.set(key, deviceMap[key]);
+            return deviceMap;
+        })();
+        for (const user of usersToFetch) {
+            inFlightDeviceFetch.set(user, fetchPromise.then(deviceMap => deviceMap[user] || []));
+        }
+        try {
+            await fetchPromise;
+        }
+        finally {
+            for (const user of usersToFetch) {
+                const current = inFlightDeviceFetch.get(user);
+                if (current) {
+                    inFlightDeviceFetch.delete(user);
+                }
             }
         }
         return deviceResults;
     };
+    // Cache to track JIDs that have failed session fetching to prevent infinite loops
+    const failedSessionFetchCache = new Map();
+    const FAILED_SESSION_CACHE_TTL = 5 * 60 * 1000; // 5 minutes
+    // Cache to track recently sent messages to prevent duplicate sends
+    const recentlySentMessagesCache = new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+        useClones: false,
+        maxKeys: 1000 // Limit to prevent memory issues
+    });
+    const inFlightSessionFetch = new Map();
+    
+    // Cleanup function to remove expired entries from the cache
+    const cleanupFailedSessionCache = () => {
+        const now = Date.now();
+        for (const [jid, failureTime] of failedSessionFetchCache.entries()) {
+            if (now - failureTime >= FAILED_SESSION_CACHE_TTL) {
+                failedSessionFetchCache.delete(jid);
+            }
+        }
+    };
+    
+    // Run cleanup every 5 minutes
+    const cleanupInterval = setInterval(cleanupFailedSessionCache, 5 * 60 * 1000);
+    
+    // Helper function to check if message was recently sent
+    const wasMessageRecentlySent = (msgId, jid) => {
+        const cacheKey = `${msgId}:${jid}`;
+        return recentlySentMessagesCache.has(cacheKey);
+    };
+    
+    // Helper function to mark message as recently sent
+    const markMessageAsSent = (msgId, jid) => {
+        const cacheKey = `${msgId}:${jid}`;
+        recentlySentMessagesCache.set(cacheKey, true);
+    };
+    
     const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
         let jidsRequiringFetch = [];
         if (force) {
-            jidsRequiringFetch = jids;
+            // Filter out JIDs that have recently failed session fetching
+            jidsRequiringFetch = jids.filter(jid => {
+                const failureTime = failedSessionFetchCache.get(jid);
+                if (failureTime && (Date.now() - failureTime) < FAILED_SESSION_CACHE_TTL) {
+                    logger.debug({ jid }, 'skipping session fetch for recently failed JID');
+                    return false;
+                }
+                return true;
+            });
+            
+            // If all JIDs are filtered out, return early without attempting fetch
+            if (jidsRequiringFetch.length === 0 && jids.length > 0) {
+                logger.debug({ originalJids: jids }, 'all JIDs recently failed, skipping session fetch entirely');
+                return didFetchNewSession;
+            }
         }
         else {
             const addrs = jids.map(jid => (signalRepository
@@ -183,57 +265,130 @@ const makeMessagesSocket = (config) => {
                 const signalId = signalRepository
                     .jidToSignalProtocolAddress(jid);
                 if (!sessions[signalId]) {
-                    jidsRequiringFetch.push(jid);
+                    // Also check if this JID recently failed
+                    const failureTime = failedSessionFetchCache.get(jid);
+                    if (!failureTime || (Date.now() - failureTime) >= FAILED_SESSION_CACHE_TTL) {
+                        jidsRequiringFetch.push(jid);
+                    }
                 }
             }
         }
         if (jidsRequiringFetch.length) {
+            const awaitingInflight = [];
+            const uniqueJids = Array.from(new Set(jidsRequiringFetch));
+            jidsRequiringFetch = [];
+            for (const jid of uniqueJids) {
+                const inFlight = inFlightSessionFetch.get(jid);
+                if (inFlight) {
+                    awaitingInflight.push(inFlight);
+                }
+                else {
+                    jidsRequiringFetch.push(jid);
+                }
+            }
             logger.debug({ jidsRequiringFetch }, 'fetching sessions');
-            const result = await query({
-                tag: 'iq',
-                attrs: {
-                    xmlns: 'encrypt',
-                    type: 'get',
-                    to: WABinary_1.S_WHATSAPP_NET,
-                },
-                content: [
-                    {
-                        tag: 'key',
-                        attrs: {},
-                        content: jidsRequiringFetch.map(jid => ({
-                            tag: 'user',
-                            attrs: { jid },
-                        }))
+            const TOTAL_TIMEOUT_MS = 120000; // 120 seconds
+            const abortController = new AbortController();
+            const timeout = setTimeout(() => abortController.abort(), TOTAL_TIMEOUT_MS);
+            try {
+                const BATCH_SIZE = 50;
+                for (let i = 0; i < jidsRequiringFetch.length; i += BATCH_SIZE) {
+                    const batch = jidsRequiringFetch.slice(i, i + BATCH_SIZE);
+                    try {
+                        const batchPromise = (0, retry_1.retryWithBackoff)(() => query({
+                            tag: 'iq',
+                            attrs: {
+                                xmlns: 'encrypt',
+                                type: 'get',
+                                to: WABinary_1.S_WHATSAPP_NET,
+                            },
+                            content: [
+                                {
+                                    tag: 'key',
+                                    attrs: {},
+                                    content: batch.map(jid => ({
+                                        tag: 'user',
+                                        attrs: { jid },
+                                    }))
+                                }
+                            ]
+                        }), {
+                            retries: 4,
+                            baseMs: 2000,
+                            maxMs: 10000,
+                            jitter: true,
+                            timeoutPerAttemptMs: 25000,
+                            shouldRetry: (err) => {
+                                var _a;
+                                const status = ((_a = err.output) === null || _a === void 0 ? void 0 : _a.statusCode) || (err === null || err === void 0 ? void 0 : err.statusCode);
+                                // Don't retry "not-acceptable" (406) errors as they indicate permission issues
+                                // Don't retry aborted requests as they were intentionally cancelled
+                                if (status === 406 || err.message === 'aborted' || err.code === 'ABORT_ERR') {
+                                    return false;
+                                }
+                                return !status || (status >= 500 || status === 408 || status === 429) || err.message.includes('WebSocket is not open');
+                            },
+                            onRetry: (err, n) => logger === null || logger === void 0 ? void 0 : logger.warn({ err, attempt: n }, 'retrying fetch sessions'),
+                            signal: abortController.signal
+                        });
+                        for (const jid of batch) {
+                            inFlightSessionFetch.set(jid, batchPromise.then(() => undefined));
+                        }
+                        const result = await batchPromise;
+                        await (0, Utils_1.parseAndInjectE2ESessions)(result, signalRepository);
+                        didFetchNewSession = true;
+                        for (const jid of batch) {
+                            inFlightSessionFetch.delete(jid);
+                        }
+                    } catch (err) {
+                        // Cache failed JIDs to prevent infinite retries
+                        logger.warn({ err, batch }, 'session fetch failed for batch, caching failed JIDs');
+                        for (const jid of batch) {
+                            failedSessionFetchCache.set(jid, Date.now());
+                            inFlightSessionFetch.delete(jid);
+                        }
+                        // Re-throw the error so the caller knows the fetch failed
+                        throw err;
                     }
-                ]
-            });
-            await (0, Utils_1.parseAndInjectE2ESessions)(result, signalRepository);
-            didFetchNewSession = true;
+                }
+                if (awaitingInflight.length) {
+                    await Promise.all(awaitingInflight);
+                }
+            } finally {
+                clearTimeout(timeout);
+            }
         }
         return didFetchNewSession;
     };
-    const sendPeerDataOperationMessage = async (pdoMessage) => {
+    const sendPeerMessage = async (protocolMessageContent, options = {}) => {
         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
-            }
+            protocolMessage: protocolMessageContent
         };
+        
         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',
+                ...options.additionalAttributes
             },
+            ...options
         });
         return msgId;
     };
+    
+    const sendPeerDataOperationMessage = async (pdoMessage) => {
+        return sendPeerMessage({
+            peerDataOperationRequestMessage: pdoMessage,
+            type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
+        });
+    };
     const createParticipantNodes = async (jids, message, extraAttrs) => {
         let patched = await patchMessageBeforeSending(message, jids);
         if (!Array.isArray(patched)) {
@@ -279,6 +434,13 @@ const makeMessagesSocket = (config) => {
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
         msgId = msgId || (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id);
+        
+        // Check if this message was recently sent to prevent duplicate sends
+        if (wasMessageRecentlySent(msgId, jid)) {
+            logger.debug({ msgId, jid }, 'message recently sent, skipping duplicate send');
+            return msgId;
+        }
+        
         useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
@@ -549,9 +711,9 @@ const makeMessagesSocket = (config) => {
             }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await (0, retry_1.retryWithBackoff)(({ signal }) => sendNode(stanza, { signal }), {
-                retries: 3,
-                baseMs: 300,
-                maxMs: 4000,
+                retries: 2,       // Riduci i tentativi
+                baseMs: 100,      // Riduci l'attesa iniziale
+                maxMs: 2000,      // Riduci l'attesa massima
                 jitter: true,
                 timeoutPerAttemptMs: 5000,
                 shouldRetry: (err) => {
@@ -561,6 +723,9 @@ const makeMessagesSocket = (config) => {
                 },
                 onRetry: (err, n) => logger?.warn?.({ err, attempt: n }, 'retrying sendNode')
             });
+            
+            // Mark message as successfully sent to prevent duplicate sends
+            markMessageAsSent(msgId, jid);
         });
         return msgId;
     };
@@ -666,205 +831,171 @@ const makeMessagesSocket = (config) => {
         });
         return result;
     };
-    const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
-    const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
-
-    // Helper function to send message without admin-only logic
-    const sendMessageInternal = async (jid, content, options = {}) => {
-        var _a, _b, _c;
-        const userJid = authState.creds.me.id;
-
-        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;
+     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
+     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
+     return {
+         ...sock,
+         getPrivacyTokens,
+         assertSessions,
+         relayMessage,
+         sendReceipt,
+         sendReceipts,
+         readMessages,
+         sendPeerDataOperationMessage,
+         sendPeerMessage,
+         getUSyncDevices,
+         getFailedSessionCache: () => failedSessionFetchCache,
+         getFailedSessionCacheTTL: () => FAILED_SESSION_CACHE_TTL,
+         getRecentlySentMessagesCache: () => recentlySentMessagesCache,
+        wasMessageRecentlySent,
+        markMessageAsSent,
+        sendMessage: async (jid, content, options = {}) => {
+            var _a, _b, _c;
+            const userJid = authState.creds.me.id;
+            if (!options.ephemeralExpiration) {
+                if ((0, WABinary_1.isJidGroup)(jid)) {
+                    const useCache = options.useCachedGroupMetadata !== false;
+                    const groupData = (useCache && cachedGroupMetadata) ? await cachedGroupMetadata(jid) : await groupMetadata(jid);
+                    options.ephemeralExpiration = (groupData === null || groupData === void 0 ? void 0 : groupData.ephemeralDuration) || 0;
+                }
             }
-        }
-        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);
-        }
-        if (typeof content === 'object' && 'album' in content && content.album) {
-            const { album, caption } = content;
-            if (caption && !album[0].caption) {
-                album[0].caption = caption;
+            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);
             }
-            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,
-                    });
+            // Handle pin messages
+            if (typeof content === 'object' && 'pin' in content && content.pin) {
+                const pinData = typeof content.pin === 'object' ? content.pin : { key: content.pin };
+                // Map type: 1 = PIN_FOR_ALL, 2 = UNPIN_FOR_ALL
+                const pinType = pinData.type !== undefined ? pinData.type : (content.type !== undefined ? content.type : WAProto_1.proto.Message.PinInChatMessage.Type.PIN_FOR_ALL);
+                const msgId = (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id);
+                const pinMessage = {
+                    pinInChatMessage: {
+                        key: pinData.key,
+                        type: pinType,
+                        senderTimestampMs: Date.now()
+                    }
+                };
+                // Add messageContextInfo only for PIN (type 1), not for UNPIN (type 2)
+                if (pinType === WAProto_1.proto.Message.PinInChatMessage.Type.PIN_FOR_ALL) {
+                    pinMessage.messageContextInfo = {
+                        messageAddOnDurationInSecs: pinData.time || content.time || 86400, // Default 24 hours
+                        messageAddOnExpiryType: WAProto_1.proto.MessageContextInfo.MessageAddonExpiryType.STATIC
+                    };
                 }
-                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,
+                const fullMsg = {
+                    key: {
+                        remoteJid: jid,
+                        fromMe: true,
+                        id: msgId,
+                        participant: userJid
+                    },
+                    message: pinMessage,
+                    messageTimestamp: (0, Utils_1.unixTimestampSeconds)()
+                };
+                await relayMessage(jid, fullMsg.message, { //oopsie, questo è il fix per il pin 😿
+                    messageId: fullMsg.key.id,
+                    useCachedGroupMetadata: options.useCachedGroupMetadata,
+                    additionalAttributes: {
+                        edit: '2',
+                        ...(options.additionalAttributes || {})
+                    }
+                });
+                if (config.emitOwnEvents) {
+                    process.nextTick(() => {
+                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
                     });
                 }
-                else if ('url' in media) {
-                    // Assume URL is an image if not specified
-                    mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
-                        image: media.url,
-                        ...(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,
-                    });
+                return fullMsg;
+            }
+            if (typeof content === 'object' && 'album' in content && content.album) {
+                const { album, caption } = content;
+                if (caption && !album[0].caption) {
+                    album[0].caption = caption;
                 }
-                if (mediaMsg) {
-                    mediaMsg.message.messageContextInfo = {
-                        messageSecret: (0, crypto_1.randomBytes)(32),
-                        messageAssociation: {
-                            associationType: 1,
-                            parentMessageKey: albumMsg.key
-                        }
-                    };
+                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,
+                        });
+                    }
+                    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,
+                        });
+                    }
+                    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;
-        }
-        else if (typeof content === 'object' && 'stickerPack' in content && content.stickerPack) {
-            // Send sticker pack metadata first, then each sticker associated with it
-            const { stickerPack } = content;
-            const stickers = stickerPack.stickers || [];
-            if (!Array.isArray(stickers) || stickers.length === 0) {
-                throw new boom_1.Boom('stickerPack requires at least one sticker', { statusCode: 400 });
-            }
-
-            // Prepare cover thumbnail if provided
-            let thumbnailDirectPath;
-            let thumbnailEncSha256;
-            let thumbnailSha256;
-            let thumbnailHeight;
-            let thumbnailWidth;
-            if (stickerPack.cover) {
-                try {
-                    const thumbMsg = await (0, Utils_1.prepareWAMessageMedia)({ image: stickerPack.cover }, {
-                        logger,
-                        userJid,
-                        upload: async (readStream, opts) => {
-                            const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                            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,
-                    });
-                    if (thumbMsg.imageMessage) {
-                        thumbnailDirectPath = thumbMsg.imageMessage.directPath;
-                        thumbnailEncSha256 = thumbMsg.imageMessage.fileEncSha256;
-                        thumbnailSha256 = thumbMsg.imageMessage.fileSha256;
-                        thumbnailHeight = thumbMsg.imageMessage.height;
-                        thumbnailWidth = thumbMsg.imageMessage.width;
-                    }
-                }
-                catch (err) {
-                    logger === null || logger === void 0 ? void 0 : logger.warn({ err }, 'failed to prepare stickerPack cover');
+                    await new Promise(resolve => setTimeout(resolve, 100));
                 }
+                return albumMsg;
             }
-
-            // Map stickers metadata to proto-friendly shape
-            const protoStickers = stickers.map((s, idx) => ({
-                fileName: s.fileName || `sticker_${idx}.webp`,
-                isAnimated: !!s.isAnimated,
-                emojis: Array.isArray(s.emojis) ? s.emojis : (s.emojis ? [s.emojis] : []),
-                accessibilityLabel: s.accessibilityLabel,
-                isLottie: !!s.isLottie,
-                mimetype: s.mimetype || 'image/webp'
-            }));
-
-            const stickerPackObj = {
-                name: stickerPack.name,
-                publisher: stickerPack.publisher,
-                packDescription: stickerPack.description,
-                stickers: protoStickers,
-                thumbnailDirectPath,
-                thumbnailEncSha256,
-                thumbnailSha256,
-                thumbnailHeight,
-                thumbnailWidth,
-            };
-
-            // Create and send the pack metadata message
-            const contentForSend = { stickerPackMessage: WAProto_1.proto.Message.StickerPackMessage.fromObject(stickerPackObj) };
-            const packMsg = (0, Utils_1.generateWAMessageFromContent)(jid, contentForSend, {
-                userJid,
-                upload: waUploadToServer,
-                mediaCache: config.mediaCache,
-                options: config.options,
-                messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
-                ...options,
-            });
-            await relayMessage(jid, packMsg.message, { messageId: packMsg.key.id });
-
-            // Send each sticker associated with the pack
-            let lastMsg = packMsg;
-            for (const sticker of stickers) {
-                const stickerData = sticker.sticker || sticker.data || sticker.buffer || sticker.image || sticker.url || sticker;
-                if (!stickerData) {
-                    throw new boom_1.Boom('Sticker data not found for sticker: ' + JSON.stringify(sticker), { statusCode: 400 });
-                }
-                const stickerContent = { sticker: stickerData };
+            else {
                 let mediaHandle;
-                const stickerMsg = await (0, Utils_1.generateWAMessage)(jid, stickerContent, {
+                const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
                     logger,
                     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;
@@ -875,243 +1006,80 @@ const makeMessagesSocket = (config) => {
                     messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
                     ...options,
                 });
-                // Associate sticker with the pack message
-                stickerMsg.message.messageContextInfo = {
-                    messageSecret: (0, crypto_1.randomBytes)(32),
-                    messageAssociation: {
-                        associationType: 1,
-                        parentMessageKey: packMsg.key
+                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 = 'ai' in content && !!content.ai;
+                const isAiRichResponseMsg = 'richResponse' in content && !!content.richResponse;
+                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';
                     }
-                };
-                await relayMessage(jid, stickerMsg.message, { messageId: stickerMsg.key.id });
-                lastMsg = stickerMsg;
-                // Add delay between stickers to avoid rate limiting
-                await new Promise(resolve => setTimeout(resolve, 800));
-            }
-            return lastMsg;
-        }
-        else {
-            let mediaHandle;
-            const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
-                logger,
-                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,
-            });
-            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 = options.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 {
-                    additionalAttributes.edit = '7';
+                else if (isEditMsg) {
+                    additionalAttributes.edit = (0, WABinary_1.isJidNewsletter)(jid) ? '3' : '1';
+                    // required for pin message
                 }
-                // 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) {
-                additionalNodes.push({
-                    attrs: {
-                        biz_bot: '1'
-                    },
-                    tag: "bot"
-                });
-            }
-            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.');
-            }
-            // Add AI context if needed
-            if (isAiMsg) {
-                fullMsg.message.messageContextInfo = {
-                    ...fullMsg.message.messageContextInfo,
-                    biz_bot: '1'
-                };
-            }
-
-
-            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;
-        }
-    };
-
-    // Helper function to send missed call note
-    const sendMissedCallNote = async (jid, media, options = {}) => {
-        const prepared = await prepareWAMessageMedia(media, { upload: sock.waUploadToServer });
-        return sock.sendMessage(jid, {
-            ...prepared,
-            ptt: !!media.audio,
-            contextInfo: {
-                externalAdReply: {
-                    title: 'Missed Call Note',
-                    body: options.callInfo?.id ? `From call ${options.callInfo.id}` : 'Recent call'
+                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 || isAiRichResponseMsg) {
+                    additionalNodes.push({
+                        attrs: {
+                            biz_bot: '1'
+                        },
+                        tag: "bot"
+                    });
+                }
+                if (mediaHandle) {
+                    additionalAttributes['media_id'] = mediaHandle;
+                }
+                if ('cachedGroupMetadata' in options) {
+                    logger.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 || isAiRichResponseMsg) ? additionalNodes : options.additionalNodes, statusJidList: options.statusJidList });
+                if (config.emitOwnEvents) {
+                    process.nextTick(() => {
+                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
+                    });
+                }
+                return fullMsg;
             }
-        });
+        }
     };
-
+    
+    // Import interactive methods
+    const { makeInteractiveSocket } = require('./messages-interactive');
+    const interactiveSocket = makeInteractiveSocket(config);
+    
     return {
         ...sock,
-        getPrivacyTokens,
-        assertSessions,
-        relayMessage,
-        sendReceipt,
-        sendReceipts,
-        readMessages,
-        refreshMediaConn,
-        waUploadToServer,
-        fetchPrivacySettings,
-        getUSyncDevices,
-        createParticipantNodes,
-        sendPeerDataOperationMessage,
-        sendMissedCallNote,
-        updateMediaMessage: async (message) => {
-            const content = (0, Utils_1.assertMediaContent)(message.message);
-            const mediaKey = content.mediaKey;
-            const meId = authState.creds.me.id;
-            const node = await (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
-            let error = undefined;
-            await Promise.all([
-                sendNode(node),
-                waitForMsgMediaUpdate(async (update) => {
-                    const result = update.find(c => c.key.id === message.key.id);
-                    if (result) {
-                        if (result.error) {
-                            error = result.error;
-                        }
-                        else {
-                            try {
-                                const media = 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 });
-                                }
-                                content.directPath = media.directPath;
-                                content.url = (0, Utils_1.getUrlFromDirectPath)(content.directPath);
-                                logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful');
-                            }
-                            catch (err) {
-                                error = err;
-                            }
-                        }
-                        return true;
-                    }
-                })
-            ]);
-            if (error) {
-                throw error;
-            }
-            ev.emit('messages.update', [
-                { key: message.key, update: { message: message.message } }
-            ]);
-            return message;
-        },
-        sendMessage: async (jid, content, options = {}) => {
-            var _a;
-            // Handle admin-only messages by sending private messages to each admin
-            if (((_a = content.contextInfo) === null || _a === void 0 ? void 0 : _a.isAdminOnly) && (0, WABinary_1.isJidGroup)(jid)) {
-                try {
-                    // Get group metadata to find admins
-                    const metadata = await sock.groupMetadata(jid);
-                    const participants = metadata.participants || [];
-
-                    // Find admin JIDs and ensure they are properly formatted
-                    const adminJids = participants
-                        .filter(p => p.admin === 'admin' || p.admin === 'superadmin')
-                        .map(p => (0, WABinary_1.jidNormalizedUser)(p.id));
-
-                    if (adminJids.length === 0) {
-                        throw new boom_1.Boom('No admins found in group', { statusCode: 400 });
-                    }
-
-                    // Remove isAdminOnly from content to avoid recursion
-                    const contentCopy = { ...content };
-                    if (contentCopy.contextInfo) {
-                        const { isAdminOnly, ...contextInfoRest } = contentCopy.contextInfo;
-                        contentCopy.contextInfo = contextInfoRest;
-                    }
-
-                    // Add group context to indicate this is from a group
-                    contentCopy.contextInfo = {
-                        ...contentCopy.contextInfo,
-                        groupJid: jid,
-                        adminOnlyMessage: true
-                    };
-
-                    // Send private message to each admin
-                    const results = [];
-                    for (const adminJid of adminJids) {
-                        try {
-                            const result = await rateLimiter.add(() => sendMessageInternal(adminJid, contentCopy, options));
-                            results.push(result);
-                        } catch (error) {
-                            console.warn(`Failed to send admin-only message to ${adminJid}:`, error);
-                        }
-                    }
-
-                    return results.length > 0 ? results[0] : null; // Return first successful result
-                } catch (error) {
-                    console.error('Failed to send admin-only message:', error);
-                    throw error;
-                }
-            }
-			return rateLimiter.add(() => sendMessageInternal(jid, content, options));
-        }
+        ...interactiveSocket,
+        sendMessage
     };
 };
-exports.makeMessagesSocket = makeMessagesSocket;
+exports.makeMessagesSocket = makeMessagesSocket;