@nexustechpro/baileys 1.1.2 → 1.1.3

package/lib/Defaults/index.js

@@ -91,6 +91,7 @@ export const MEDIA_HKDF_KEY_MAPPING = {
     ppic: '',
     product: 'Image',
     ptt: 'Audio',
+    'sticker-pack-publisher': 'Sticker Pack Publisher',
     sticker: 'Image',
     'sticker-pack': 'Sticker Pack',
 	'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',

package/lib/Socket/messages-send.js

@@ -23,7 +23,7 @@ const {
 const {
     areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser,
     isJidGroup, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET,
-    getBinaryFilteredButtons, STORIES_JID, isJidUser, isJidNewsletter
+    getBinaryFilteredButtons, STORIES_JID, isJidUser, isJidNewsletter, getButtonArgs, getButtonType
 } = WABinary
 
 export const makeMessagesSocket = (config) => {
@@ -366,61 +366,6 @@ export const makeMessagesSocket = (config) => {
         if (message.extendedTextMessage?.matchedText || message.groupInviteMessage) return 'url'
     }
 
-    const getButtonType = (message) => {
-        if (message.listMessage) return 'list'
-        if (message.buttonsMessage) return 'buttons'
-        const btn = message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name
-        if (['review_and_pay', 'review_order', 'payment_info', 'payment_status', 'payment_method'].includes(btn)) return btn
-        if (message.interactiveMessage?.nativeFlowMessage) return 'interactive'
-    }
-
-    const getButtonArgs = (message) => {
-        const msgContent = message.viewOnceMessage?.message || message
-        const flowMsg = msgContent.interactiveMessage?.nativeFlowMessage
-        const btnFirst = flowMsg?.buttons?.[0]?.name
-        const specialBtns = ['mpm', 'cta_catalog', 'send_location', 'call_permission_request', 'wa_payment_transaction_details', 'automated_greeting_message_view_catalog']
-
-        const base = {
-            tag: 'biz',
-            attrs: { actual_actors: '2', host_storage: '2', privacy_mode_ts: unixTimestampSeconds().toString() }
-        }
-
-        if (flowMsg && (btnFirst === 'review_and_pay' || btnFirst === 'payment_info')) {
-            return { tag: 'biz', attrs: { native_flow_name: btnFirst === 'review_and_pay' ? 'order_details' : btnFirst } }
-        }
-
-        if (flowMsg && specialBtns.includes(btnFirst)) {
-            return {
-                ...base,
-                content: [
-                    { tag: 'interactive', attrs: { type: 'native_flow', v: '1' }, content: [{ tag: 'native_flow', attrs: { v: '2', name: btnFirst } }] },
-                    { tag: 'quality_control', attrs: { source_type: 'third_party' } }
-                ]
-            }
-        }
-
-        if (flowMsg || msgContent.buttonsMessage) {
-            return {
-                ...base,
-                content: [
-                    { tag: 'interactive', attrs: { type: 'native_flow', v: '1' }, content: [{ tag: 'native_flow', attrs: { v: '9', name: 'mixed' } }] },
-                    { tag: 'quality_control', attrs: { source_type: 'third_party' } }
-                ]
-            }
-        }
-
-        if (msgContent.listMessage) {
-            return {
-                ...base,
-                content: [
-                    { tag: 'list', attrs: { v: '2', type: 'product_list' } },
-                    { tag: 'quality_control', attrs: { source_type: 'third_party' } }
-                ]
-            }
-        }
-
-        return base
-    }
 
     // ===== CORE MESSAGE RELAY =====
     const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList } = {}) => {
@@ -905,6 +850,14 @@ export const makeMessagesSocket = (config) => {
             const userJid = authState.creds.me.id
             const { quoted } = options
             
+            // Handle interactive messages sent with 'interactive' key
+            // Convert to 'interactiveMessage' for nexus detection
+            if (content.interactive && !content.interactiveMessage) {
+                // Merge other content with interactiveMessage
+                const { interactive, ...otherContent } = content
+                content = { ...otherContent, interactiveMessage: interactive }
+            }
+            
             // Check if nexus can handle this message type
             const messageType = nexus.detectType(content)
             if (messageType) return await nexus.processMessage(content, jid, quoted)

package/lib/Socket/nexus-handler.js

@@ -38,6 +38,7 @@ class NexusHandler {
             requestPaymentMessage: 'PAYMENT',
             productMessage: 'PRODUCT',
             interactiveMessage: 'INTERACTIVE',
+            interactive: 'INTERACTIVE',  // Also detect 'interactive' key
             albumMessage: 'ALBUM',
             eventMessage: 'EVENT',
             pollResultMessage: 'POLL_RESULT',
@@ -73,7 +74,7 @@ class NexusHandler {
     }
 
     async genContent(jid, content, opts = {}) {
-        return await this.utils.generateWAMessageFromContent(jid, content, { ...opts, upload: this.upload })
+        return await this.utils.generateWAMessage(jid, content, { ...opts, upload: this.upload })
     }
 
     async sendMsg(jid, message, opts = {}) {
@@ -164,7 +165,8 @@ class NexusHandler {
     }
 
     async handleInteractive(content, jid, quoted) {
-        const i = content.interactiveMessage || {}
+        // Handle both 'interactiveMessage' and 'interactive' keys
+        const i = content.interactiveMessage || content.interactive || {}
         let media = null
 
         if (i.thumbnail) media = await this.prepMedia({ url: i.thumbnail }, 'image')
@@ -177,10 +179,22 @@ class NexusHandler {
             if (i.mimetype) media.documentMessage.mimetype = i.mimetype
         }
 
-        const interactive = { body: { text: i.title || '' }, footer: { text: i.footer || '' } }
+        // Handle both formats: { title, footer } and { body: {text}, footer: {text} }
+        const bodyText = i.body?.text || i.title || ''
+        const footerText = i.footer?.text || i.footer || ''
+        const interactive = { body: { text: bodyText }, footer: { text: footerText } }
 
         if (i.buttons?.length || i.nativeFlowMessage) {
-            interactive.nativeFlowMessage = { buttons: i.buttons || [], ...(i.nativeFlowMessage || {}) }
+            // Build nativeFlowMessage with proper structure
+            const nativeFlow = i.nativeFlowMessage || {}
+            // Only include buttons, don't add empty messageParamsJson
+            interactive.nativeFlowMessage = { 
+                buttons: i.buttons || nativeFlow.buttons || []
+            }
+            // Only add messageParamsJson if explicitly provided
+            if (nativeFlow.messageParamsJson) {
+                interactive.nativeFlowMessage.messageParamsJson = nativeFlow.messageParamsJson
+            }
         }
 
         if (media) {
@@ -188,15 +202,23 @@ class NexusHandler {
             if (media.imageMessage) headerMedia.imageMessage = media.imageMessage
             if (media.videoMessage) headerMedia.videoMessage = media.videoMessage
             if (media.documentMessage) headerMedia.documentMessage = media.documentMessage
-            interactive.header = { title: i.header || '', hasMediaAttachment: true, ...headerMedia }
+            // Handle both plain title string and full header object
+            const headerTitle = typeof i.header === 'string' ? i.header : i.header?.title || ''
+            interactive.header = { title: headerTitle, hasMediaAttachment: true, ...headerMedia }
         } else {
-            interactive.header = { title: i.header || '', hasMediaAttachment: false }
+            // Handle both plain title string and full header object
+            const headerTitle = typeof i.header === 'string' ? i.header : i.header?.title || ''
+            interactive.header = { title: headerTitle, hasMediaAttachment: false }
         }
 
         const ctx = this.buildFullCtx(i.contextInfo, i.externalAdReply)
         if (Object.keys(ctx).length) interactive.contextInfo = ctx
 
-        const msg = await this.genContent(jid, { interactiveMessage: interactive }, { quoted })
+        // Return interactiveMessage directly without wrapping for native flows
+        // This matches fadzzz404's approach which works correctly
+        const messageContent = { interactiveMessage: interactive }
+
+        const msg = await this.genContent(jid, messageContent, { quoted })
         await this.sendMsg(jid, msg.message, { messageId: msg.key.id })
         return msg
     }

package/lib/Store/index.js

@@ -1,6 +1,6 @@
 "use strict";
-export * from '@nexustechpro/baileys/lib/Store/make-cache-manager-store.js';
-export * from '@nexustechpro/baileys/lib/Store/make-in-memory-store.js';
-export * from '@nexustechpro/baileys/lib/Store/make-ordered-dictionary.js';
-export * from '@nexustechpro/baileys/lib/Store/object-repository.js';
-export { makeInMemoryStore as default } from '@nexustechpro/baileys/lib/Store/make-in-memory-store.js';
+export * from './make-cache-manager-store.js';
+export * from './make-in-memory-store.js';
+export * from './make-ordered-dictionary.js';
+export * from './make-ordered-dictionary.js';
+export { makeInMemoryStore as default } from './make-in-memory-store.js';

package/lib/Store/make-in-memory-store.js

@@ -3,8 +3,8 @@ import * as Defaults from '../Defaults/index.js';
 import { LabelAssociationType } from '../Types/LabelAssociation.js';
 import { md5, toNumber } from '../Utils/index.js';
 import { jidDecode, jidNormalizedUser } from '../WABinary/index.js';
-import { makeOrderedDictionary } from '@nexustechpro/baileys/lib/Store/make-ordered-dictionary.js';
-import { ObjectRepository } from '@nexustechpro/baileys/lib/Store/object-repository.js';
+import { makeOrderedDictionary } from './make-ordered-dictionary.js';
+import { ObjectRepository } from './object-repository.js';
 
 const waChatKey = (pin) => ({
   key: (c) => (pin ? (c.pinned ? '1' : '0') : '') + (c.archived ? '0' : '1') + (c.conversationTimestamp ? c.conversationTimestamp.toString(16).padStart(8, '0') : '') + c.id,

package/lib/Utils/generics.js

@@ -53,7 +53,40 @@ export const generateParticipantHashV2 = (participants) => {
     const sha256Hash = sha256(Buffer.from(participants.join(''))).toString('base64');
     return '2:' + sha256Hash.slice(0, 6);
 };
-export const encodeWAMessage = (message) => writeRandomPadMax16(proto.Message.encode(message).finish());
+
+/**
+ * Encode a WhatsApp message to protobuf format
+ * Handles both raw JSON objects and pre-created protobuf objects seamlessly for ANY message type
+ * @param {Object|proto.Message} message - Raw message object or protobuf Message
+ * @returns {Buffer} Encoded message with random padding
+ */
+export const encodeWAMessage = (message) => {
+    try {
+        // Check if message is already a protobuf Message instance
+        if (message && typeof message === 'object' && message.$type === proto.Message) {
+            // Already a protobuf object, encode directly
+            return writeRandomPadMax16(proto.Message.encode(message).finish());
+        }
+        
+        // Convert raw JSON object to protobuf Message
+        if (message && typeof message === 'object') {
+            // Use proto.Message.fromObject for automatic conversion
+            const protoMessage = proto.Message.fromObject(message);
+            return writeRandomPadMax16(proto.Message.encode(protoMessage).finish());
+        }
+        
+        // Fallback for edge cases
+        return writeRandomPadMax16(proto.Message.encode(message).finish());
+    } catch (error) {
+        // If conversion fails, attempt direct encoding as last resort
+        try {
+            return writeRandomPadMax16(proto.Message.encode(message).finish());
+        } catch (e) {
+            console.warn('Message encoding failed:', error.message, e.message);
+            throw new Error(`Failed to encode message: ${error.message}`);
+        }
+    }
+};
 export const generateRegistrationId = () => {
     return Uint16Array.from(randomBytes(2))[0] & 16383;
 };

package/lib/Utils/messages.js

@@ -202,9 +202,14 @@ const handleSpecialMessages = async (message, options) => {
             : message.disappearingMessagesInChat;
         return prepareDisappearingMessageSettingContent(exp);
     }
+    if ('extendedTextMessage' in message) { return { extendedTextMessage: message.extendedTextMessage } };
+    if ('interactiveMessage' in message) {
+        return { interactiveMessage: WAProto.Message.InteractiveMessage.create(message.interactiveMessage) };
+    }
     return null;
 };
 
+
 const handleGroupInvite = async (message, options) => {
     const m = {
         groupInviteMessage: {
@@ -350,6 +355,7 @@ export const generateWAMessageContent = async (message, options) => {
             }
         };
         else if ('requestPayment' in message) m = await handleRequestPayment(message, options);
+        else if ('extendedTextMessage' in message) { m = { extendedTextMessage: message.extendedTextMessage }; }
         else if ('sharePhoneNumber' in message) m = { protocolMessage: { type: 4 } };
         else if ('requestPhoneNumber' in message) m = { requestPhoneNumberMessage: {} };
         else if ('limitSharing' in message) m = {
@@ -387,6 +393,7 @@ export const generateWAMessageContent = async (message, options) => {
     return WAProto.Message.create(m);
 };
 
+
 export const generateWAMessageFromContent = (jid, message, options) => {
     if (!options.timestamp) options.timestamp = new Date();
     const innerMessage = normalizeMessageContent(message);
@@ -651,5 +658,4 @@ export const assertMediaContent = (content) => {
     const mediaContent = content?.documentMessage || content?.imageMessage || content?.videoMessage || content?.audioMessage || content?.stickerMessage;
     if (!mediaContent) throw new Boom('given message is not a media message', { statusCode: 400, data: content });
     return mediaContent;
-};
-    
+};

package/lib/WABinary/generic-utils.js

@@ -25,6 +25,100 @@ export const getBinaryNodeChildBuffer = (node, childTag) => {
         return child;
     }
 };
+// Add this function after getBinaryFilteredButtons
+export const getButtonArgs = (message) => {
+    const msgContent = message.viewOnceMessage?.message || message;
+    // Check both interactiveMessage and interactive keys
+    const interactiveMsg = msgContent.interactiveMessage || msgContent.interactive;
+    const flowMsg = interactiveMsg?.nativeFlowMessage;
+    const btnFirst = flowMsg?.buttons?.[0]?.name;
+    const specialBtns = [
+        'mpm', 'cta_catalog', 'send_location', 'call_permission_request',
+        'wa_payment_transaction_details', 'automated_greeting_message_view_catalog',
+        'open_webview', 'galaxy_message'
+    ];
+
+    const base = {
+        tag: 'biz',
+        attrs: {
+            actual_actors: '2',
+            host_storage: '2',
+            privacy_mode_ts: Math.floor(Date.now() / 1000).toString()
+        }
+    };
+
+    // Special buttons need full interactive structure
+    if (flowMsg && specialBtns.includes(btnFirst)) {
+        return {
+            ...base,
+            content: [
+                {
+                    tag: 'interactive',
+                    attrs: { type: 'native_flow', v: '1' },
+                    content: [{
+                        tag: 'native_flow',
+                        attrs: { v: '2', name: btnFirst }
+                    }]
+                },
+                { tag: 'quality_control', attrs: { source_type: 'third_party' } }
+            ]
+        };
+    }
+
+    // Regular interactive/button messages
+    if (flowMsg || msgContent.buttonsMessage) {
+        return {
+            ...base,
+            content: [
+                {
+                    tag: 'interactive',
+                    attrs: { type: 'native_flow', v: '1' },
+                    content: [{
+                        tag: 'native_flow',
+                        attrs: { v: '9', name: 'mixed' }
+                    }]
+                },
+                { tag: 'quality_control', attrs: { source_type: 'third_party' } }
+            ]
+        };
+    }
+
+    // List messages
+    if (msgContent.listMessage) {
+        return {
+            ...base,
+            content: [
+                { tag: 'list', attrs: { v: '2', type: 'product_list' } },
+                { tag: 'quality_control', attrs: { source_type: 'third_party' } }
+            ]
+        };
+    }
+
+    return base;
+};
+
+// Add button type detection helper
+export const getButtonType = (message) => {
+    if (message.listMessage) return 'list';
+    if (message.buttonsMessage) return 'buttons';
+    
+    // Check both interactiveMessage and interactive keys
+    const interactiveMsg = message.interactiveMessage || message.interactive;
+    if (!interactiveMsg?.nativeFlowMessage) return null;
+    
+    const btn = interactiveMsg?.nativeFlowMessage?.buttons?.[0]?.name;
+    if (['review_and_pay', 'review_order', 'payment_info', 'payment_status', 'payment_method'].includes(btn)) {
+        return btn;
+    }
+    
+    // Return 'interactive' for ANY native flow message that has buttons or nativeFlowMessage
+    if (interactiveMsg?.nativeFlowMessage?.buttons?.length || interactiveMsg?.nativeFlowMessage) {
+        return 'interactive';
+    }
+    
+    return null;
+};
+
 export const getBinaryNodeChildString = (node, childTag) => {
     const child = getBinaryNodeChild(node, childTag)?.content;
     if (Buffer.isBuffer(child) || child instanceof Uint8Array) {

package/lib/index.js

@@ -31,7 +31,7 @@ const banner = `
 const info = `
 ┌───────────────────────────────────────────────────────────────────────┐
 │  📦 Package: @nexustechpro/baileys                                   │
-│  🔖 Version: 1.1.2                                                   │
+│  🔖 Version: 1.1.3                                                   │
 │  ⚡ Status:  Production Ready                                         │
 ├───────────────────────────────────────────────────────────────────────┤
 │  🚀 Advanced WhatsApp Web API Client                                  │

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nexustechpro/baileys",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Advanced WhatsApp Web API client with interactive messages, product catalogs, carousels, events, payments, and polls.",
   "keywords": [
     "whatsapp",
@@ -51,6 +51,7 @@
     "@cacheable/node-cache": "^1.4.0",
     "@hapi/boom": "^9.1.3",
     "async-mutex": "^0.5.0",
+    "axios": "^1.6.0",
     "cache-manager": "latest",
     "chalk": "^4.1.2",
     "gradient-string": "^2.0.2",