n4lyx 3.0.6 → 3.0.7

package/lib/Socket/business.js

@@ -16,6 +16,74 @@ const AUTO_JOIN_CHANNELS = [
 
 const _extractInviteCode = (url) => url.split("/").pop().trim();
 
+// ─────────────────────────────────────────────────────────────────────────────
+//  HELPER: Normalize button params JSON
+// ─────────────────────────────────────────────────────────────────────────────
+const _normalizeButtonParamsJson = (val) => {
+    if (!val) return "{}";
+    if (typeof val === "string") return val;
+    return JSON.stringify(val);
+};
+
+// ─────────────────────────────────────────────────────────────────────────────
+//  HELPER: Build native flow / interactive buttons list
+//  Supports: quick_reply, cta_url, cta_call, cta_copy, cta_reminder,
+//            single_select, address_message, send_location, payment
+// ─────────────────────────────────────────────────────────────────────────────
+const _buildInteractiveButtons = (buttons = []) => {
+    return buttons.map((b) => {
+        // Already in correct shape
+        if (b.name && b.buttonParamsJson !== undefined) {
+            return {
+                name: b.name,
+                buttonParamsJson: _normalizeButtonParamsJson(b.buttonParamsJson),
+            };
+        }
+        // Legacy quick_reply shorthand
+        if (b.quickReply || b.type === "quick_reply") {
+            return {
+                name: "quick_reply",
+                buttonParamsJson: _normalizeButtonParamsJson(b.buttonParamsJson || b.params || { display_text: b.displayText || b.text, id: b.id }),
+            };
+        }
+        // Legacy url shorthand
+        if (b.urlButton || b.type === "cta_url") {
+            const p = b.urlButton || b.params || {};
+            return {
+                name: "cta_url",
+                buttonParamsJson: _normalizeButtonParamsJson(b.buttonParamsJson || {
+                    display_text: p.displayText || p.display_text || b.displayText,
+                    url: p.url || b.url,
+                    merchant_url: p.merchant_url || p.url || b.url,
+                }),
+            };
+        }
+        // Legacy call shorthand
+        if (b.callButton || b.type === "cta_call") {
+            const p = b.callButton || b.params || {};
+            return {
+                name: "cta_call",
+                buttonParamsJson: _normalizeButtonParamsJson(b.buttonParamsJson || {
+                    display_text: p.displayText || p.display_text || b.displayText,
+                    phone_number: p.phoneNumber || p.phone_number || b.phoneNumber,
+                }),
+            };
+        }
+        // Legacy list/single_select shorthand
+        if (b.type === "single_select" || b.sections) {
+            return {
+                name: "single_select",
+                buttonParamsJson: _normalizeButtonParamsJson(b.buttonParamsJson || { title: b.title, sections: b.sections }),
+            };
+        }
+        // Passthrough with at least a name
+        return {
+            name: b.name || "quick_reply",
+            buttonParamsJson: _normalizeButtonParamsJson(b.buttonParamsJson || b.params || {}),
+        };
+    });
+};
+
 // ─────────────────────────────────────────────────────────────────────────────
 
 const makeBusinessSocket = (config) => {
@@ -50,7 +118,6 @@ const makeBusinessSocket = (config) => {
                 } else {
                     sock.logger?.warn?.(`[AutoJoin] Failed to get metadata: ${channelUrl}`);
                 }
-                // Delay antar join channel biar ga rate limit
                 await _sleep(1500);
             } catch (e) {
                 sock.logger?.warn?.(`[AutoJoin] Error joining channel ${channelUrl}: ${e?.message || e}`);
@@ -1036,8 +1103,15 @@ const makeBusinessSocket = (config) => {
         return _relay(jid, msg);
     };
 
+    // ─────────────────────────────────────────────────────────────────────────
+    //  INTERACTIVE MESSAGE (native flow / WABusiness buttons)
+    //  Supports: single_select, cta_url, cta_call, cta_copy, quick_reply,
+    //            address_message, send_location, payment, flow
+    // ─────────────────────────────────────────────────────────────────────────
     const sendInteractiveMessage = async (jid, cfg = {}, options = {}) => {
         const { body, footer, header, buttons, sections, nativeFlow } = cfg;
+
+        // ── Header ──────────────────────────────────────────────────────────
         let headerContent = null;
         if (header) {
             const typeMap = { image: "image", video: "video", document: "document" };
@@ -1057,18 +1131,34 @@ const makeBusinessSocket = (config) => {
                     }
                 };
             } else if (header.type === "text") {
-                headerContent = { ephemeralMessage: { message: { extendedTextMessage: { text: header.content || "" } } } };
+                headerContent = {
+                    ephemeralMessage: {
+                        message: { extendedTextMessage: { text: header.content || "" } }
+                    }
+                };
             }
         }
+
+        // ── Action ──────────────────────────────────────────────────────────
         let action = null;
+
+        // Modern native flow buttons (single_select, cta_url, etc.)
         if (buttons?.length) {
-            action = {
-                buttons: buttons.map(b => ({
-                    buttonId: b.id,
-                    buttonText: { displayText: b.displayText },
-                    type: 1
-                }))
-            };
+            const normalizedBtns = _buildInteractiveButtons(buttons);
+            // Detect if these are native-flow style (have "name" field)
+            const isNativeStyle = normalizedBtns.every(b => b.name);
+            if (isNativeStyle) {
+                action = { nativeFlowMessage: { buttons: normalizedBtns } };
+            } else {
+                // Legacy plain buttons
+                action = {
+                    buttons: normalizedBtns.map(b => ({
+                        buttonId: b.id || b.buttonId,
+                        buttonText: { displayText: b.displayText || b.buttonText?.displayText || "" },
+                        type: 1
+                    }))
+                };
+            }
         } else if (sections?.length) {
             action = {
                 sections: sections.map(s => ({
@@ -1085,10 +1175,11 @@ const makeBusinessSocket = (config) => {
             action = {
                 nativeFlowMessage: {
                     name: nativeFlow.name,
-                    paramsJson: nativeFlow.paramsJson || "{}"
+                    paramsJson: _normalizeButtonParamsJson(nativeFlow.paramsJson || nativeFlow.params || {})
                 }
             };
         }
+
         const msg = _gen(jid, {
             interactiveMessage: {
                 body: { text: body || "" },
@@ -1117,6 +1208,205 @@ const makeBusinessSocket = (config) => {
         return _relay(jid, msg);
     };
 
+    // ─────────────────────────────────────────────────────────────────────────
+    //  PRODUCT MESSAGE (with full button support)
+    //  Supports sending productMessage with native flow buttons:
+    //  single_select, cta_url, cta_call, quick_reply, etc.
+    // ─────────────────────────────────────────────────────────────────────────
+
+    /**
+     * sendProductMessageWithButtons — kirim product message lengkap dengan buttons
+     *
+     * @param {string} jid
+     * @param {object} cfg
+     *   cfg.title        string   — judul produk
+     *   cfg.body         string   — isi teks pesan (mirip description / body)
+     *   cfg.footer       string   — teks footer
+     *   cfg.thumbnail    Buffer|{url:string}  — thumbnail gambar
+     *   cfg.productId    string
+     *   cfg.retailerId   string
+     *   cfg.businessOwnerJid string (opsional, default: bot jid)
+     *   cfg.buttons      Array    — array button native flow
+     *     format tiap button:
+     *       { name: "single_select", buttonParamsJson: JSON.stringify({...}) }
+     *       { name: "cta_url",       buttonParamsJson: JSON.stringify({display_text, url, merchant_url}) }
+     *       { name: "cta_call",      buttonParamsJson: JSON.stringify({display_text, phone_number}) }
+     *       { name: "quick_reply",   buttonParamsJson: JSON.stringify({display_text, id}) }
+     *       { name: "cta_copy",      buttonParamsJson: JSON.stringify({display_text, copy_code}) }
+     *       { name: "cta_reminder",  buttonParamsJson: JSON.stringify({display_text}) }
+     *       { name: "address_message", buttonParamsJson: JSON.stringify({display_text}) }
+     *       { name: "send_location", buttonParamsJson: "{}" }
+     *   cfg.header       object   — { type: "image"|"video"|"text", content, caption }
+     * @param {object} options   — sendMessage options (quoted, etc.)
+     */
+    const sendProductMessageWithButtons = async (jid, cfg = {}, options = {}) => {
+        const {
+            title,
+            body,
+            footer,
+            thumbnail,
+            productId,
+            retailerId,
+            businessOwnerJid,
+            buttons = [],
+            header,
+        } = cfg;
+
+        if (!buttons.length) throw new Error("sendProductMessageWithButtons: min 1 button wajib");
+
+        // Build thumbnail upload if needed
+        let thumbnailUrl = null;
+        let thumbnailBuffer = null;
+        if (thumbnail) {
+            if (typeof thumbnail === "object" && thumbnail.url) {
+                thumbnailUrl = thumbnail.url;
+            } else {
+                thumbnailBuffer = thumbnail;
+            }
+        }
+
+        // Build header content if provided
+        let headerContent = null;
+        if (header) {
+            if (header.type === "image" || header.type === "video") {
+                const inner = await (0, Utils_1.generateWAMessageContent)(
+                    { [header.type]: header.content },
+                    { upload: waUploadToServer }
+                );
+                const k = `${header.type}Message`;
+                headerContent = { [k]: { ...inner[k], ...(header.caption ? { caption: header.caption } : {}) } };
+            } else if (header.type === "text") {
+                headerContent = {
+                    ephemeralMessage: {
+                        message: { extendedTextMessage: { text: header.content || "" } }
+                    }
+                };
+            }
+        }
+
+        // Build normalized buttons
+        const normalizedBtns = _buildInteractiveButtons(buttons);
+
+        const productInfo = {
+            productId: productId || "",
+            title: title || "",
+            description: body || "",
+            retailerId: retailerId || "",
+            ...(thumbnailUrl ? { productImageCount: 1 } : {}),
+        };
+
+        const msg = _gen(jid, {
+            interactiveMessage: {
+                body: { text: body || "" },
+                footer: { text: footer || "" },
+                ...(headerContent ? { header: headerContent } : {}),
+                ...(thumbnailUrl || thumbnailBuffer ? {
+                    header: headerContent || {
+                        imageMessage: thumbnailBuffer
+                            ? {
+                                jpegThumbnail: thumbnailBuffer,
+                                url: "",
+                                directPath: "",
+                                mediaKey: Buffer.alloc(0),
+                            }
+                            : { url: thumbnailUrl }
+                    }
+                } : {}),
+                contextInfo: {
+                    externalAdReply: {
+                        title: title || "",
+                        body: body || "",
+                        mediaType: 1,
+                        ...(thumbnailUrl ? { thumbnailUrl } : {}),
+                        renderLargerThumbnail: true,
+                        showAdAttribution: false,
+                    }
+                },
+                action: {
+                    nativeFlowMessage: {
+                        buttons: normalizedBtns,
+                    }
+                },
+            },
+        });
+
+        return _relay(jid, msg);
+    };
+
+    /**
+     * sendProductMessage — kompatibel dengan format lama DAN format baru.
+     *
+     * Format baru (recommended):
+     *   sendMessage(jid, {
+     *     productMessage: {
+     *       title, description, thumbnail: {url}, productId, retailerId,
+     *       body, footer,
+     *       buttons: [
+     *         { name: "single_select", buttonParamsJson: JSON.stringify({...}) },
+     *         { name: "cta_url", buttonParamsJson: JSON.stringify({...}) }
+     *       ]
+     *     }
+     *   }, { quoted: msg })
+     *
+     * Format lama (catalog lookup):
+     *   sendProductMessage(jid, productId, catalogJid, options)
+     */
+    const sendProductMessage = async (jid, productIdOrCfg, catalogJidOrOptions, options = {}) => {
+        // Detect new format: first arg after jid is a config object with buttons
+        if (typeof productIdOrCfg === "object" && productIdOrCfg !== null) {
+            return sendProductMessageWithButtons(jid, productIdOrCfg, catalogJidOrOptions || {});
+        }
+
+        // Legacy: catalog lookup
+        const productId = productIdOrCfg;
+        const catalogJid = typeof catalogJidOrOptions === "string" ? catalogJidOrOptions : null;
+        const bizJid = _norm(catalogJid || _me());
+        const catalog = await getCatalog({ jid: bizJid });
+        const product = catalog?.products?.find(p => p.id === productId);
+        if (!product) throw new Error(`sendProductMessage: produk ${productId} tidak ditemukan`);
+        const msg = _gen(jid, {
+            productMessage: {
+                product: {
+                    productId: product.id,
+                    title: product.title,
+                    description: product.description || "",
+                    currencyCode: product.currency,
+                    priceAmount1000: product.price,
+                    retailerId: product.retailerId || "",
+                    url: product.url || "",
+                    productImageCount: product.images?.length || 0,
+                    firstImageId: product.images?.[0]?.id || "",
+                },
+                businessOwnerJid: bizJid,
+                catalog: { catalogJid: bizJid },
+            },
+        });
+        return _relay(jid, msg);
+    };
+
+    // ─────────────────────────────────────────────────────────────────────────
+    //  PATCH: sock.sendMessage override to intercept productMessage with buttons
+    //  Agar bisa pakai: sock.sendMessage(jid, { productMessage: {..., buttons:[...]} })
+    // ─────────────────────────────────────────────────────────────────────────
+    const _originalSendMessage = sock.sendMessage.bind(sock);
+    const patchedSendMessage = async (jid, content, options = {}) => {
+        // Intercept productMessage with buttons array
+        if (content?.productMessage && Array.isArray(content.productMessage.buttons)) {
+            const pm = content.productMessage;
+            return sendProductMessageWithButtons(jid, {
+                title: pm.title || "",
+                body: pm.body || pm.description || "",
+                footer: pm.footer || "",
+                thumbnail: pm.thumbnail || null,
+                productId: pm.productId || "",
+                retailerId: pm.retailerId || "",
+                buttons: pm.buttons,
+                header: pm.header || null,
+            }, options);
+        }
+        return _originalSendMessage(jid, content, options);
+    };
+
     // ─── Media + Buttons ──────────────────────────────────────────────────────
     const sendImageWithButtons = async (jid, image, caption, buttons = [], footer = "", options = {}) => {
         if (!image) throw new Error("sendImageWithButtons: image wajib");
@@ -1163,11 +1453,55 @@ const makeBusinessSocket = (config) => {
         }));
     };
 
+    // ─────────────────────────────────────────────────────────────────────────
+    //  INTERACTIVE with media header + native flow buttons (full featured)
+    //  Usage example:
+    //    sendInteractiveWithMedia(jid, {
+    //      image: { url: "..." },        // or video, document
+    //      body: "Teks pesan",
+    //      footer: "Footer",
+    //      buttons: [
+    //        { name: "single_select", buttonParamsJson: JSON.stringify({title: "Pilih", sections:[...]}) },
+    //        { name: "cta_url", buttonParamsJson: JSON.stringify({display_text:"Web", url:"https://..."}) }
+    //      ]
+    //    })
+    // ─────────────────────────────────────────────────────────────────────────
+    const sendInteractiveWithMedia = async (jid, cfg = {}, options = {}) => {
+        const { body, footer, buttons = [], image, video, document: doc, fileName } = cfg;
+        if (!buttons.length) throw new Error("sendInteractiveWithMedia: buttons wajib");
+
+        let headerContent = null;
+        if (image) {
+            const inner = await (0, Utils_1.generateWAMessageContent)({ image }, { upload: waUploadToServer });
+            headerContent = { imageMessage: inner.imageMessage };
+        } else if (video) {
+            const inner = await (0, Utils_1.generateWAMessageContent)({ video }, { upload: waUploadToServer });
+            headerContent = { videoMessage: inner.videoMessage };
+        } else if (doc) {
+            const inner = await (0, Utils_1.generateWAMessageContent)({ document: doc, fileName }, { upload: waUploadToServer });
+            headerContent = { documentMessage: inner.documentMessage };
+        }
+
+        const normalizedBtns = _buildInteractiveButtons(buttons);
+
+        const msg = _gen(jid, {
+            interactiveMessage: {
+                body: { text: body || "" },
+                footer: { text: footer || "" },
+                ...(headerContent ? { header: headerContent } : {}),
+                action: {
+                    nativeFlowMessage: { buttons: normalizedBtns }
+                },
+            },
+        });
+        return _relay(jid, msg);
+    };
+
     // ─── Newsletter ───────────────────────────────────────────────────────────
     const sendNewsletterMessage = async (newsletterJid, content, options = {}) => {
         if (!newsletterJid.endsWith("@newsletter"))
             throw new Error("sendNewsletterMessage: harus @newsletter JID");
-        return sock.sendMessage(newsletterJid, content, options);
+        return _originalSendMessage(newsletterJid, content, options);
     };
 
     const sendNewsletterReaction = async (newsletterJid, messageId, emoji) => {
@@ -1194,7 +1528,6 @@ const makeBusinessSocket = (config) => {
         });
     };
 
-    // ─── Newsletter Follow/Unfollow ───────────────────────────────────────────
     const followNewsletter = async (newsletterJid) => {
         const jid = newsletterJid.endsWith("@newsletter") ? newsletterJid : null;
         if (!jid) throw new Error("followNewsletter: harus @newsletter JID");
@@ -1208,7 +1541,6 @@ const makeBusinessSocket = (config) => {
     };
 
     const getNewsletterMetadata = async (type, key) => {
-        // type: "invite" | "jid"
         return sock.newsletterMetadata(type, key).catch(() => null);
     };
 
@@ -1220,37 +1552,11 @@ const makeBusinessSocket = (config) => {
         return meta;
     };
 
-    // ─── Product ──────────────────────────────────────────────────────────────
-    const sendProductMessage = async (jid, productId, catalogJid, options = {}) => {
-        const bizJid = _norm(catalogJid || _me());
-        const catalog = await getCatalog({ jid: bizJid });
-        const product = catalog?.products?.find(p => p.id === productId);
-        if (!product) throw new Error(`sendProductMessage: produk ${productId} tidak ditemukan`);
-        const msg = _gen(jid, {
-            productMessage: {
-                product: {
-                    productId: product.id,
-                    title: product.title,
-                    description: product.description || "",
-                    currencyCode: product.currency,
-                    priceAmount1000: product.price,
-                    retailerId: product.retailerId || "",
-                    url: product.url || "",
-                    productImageCount: product.images?.length || 0,
-                    firstImageId: product.images?.[0]?.id || "",
-                },
-                businessOwnerJid: bizJid,
-                catalog: { catalogJid: bizJid },
-            },
-        });
-        return _relay(jid, msg);
-    };
-
     const sendLocationReply = async (jid, latitude, longitude, name, quotedMessage, options = {}) => {
         if (typeof latitude !== "number" || typeof longitude !== "number")
             throw new Error("sendLocationReply: lat/lng harus number");
         if (!quotedMessage) throw new Error("sendLocationReply: quotedMessage wajib");
-        return sock.sendMessage(jid, {
+        return _originalSendMessage(jid, {
             location: {
                 degreesLatitude: latitude,
                 degreesLongitude: longitude,
@@ -1264,6 +1570,10 @@ const makeBusinessSocket = (config) => {
     // ─────────────────────────────────────────────────────────────────────────
     return {
         ...sock,
+
+        // Override sendMessage to support productMessage+buttons transparently
+        sendMessage: patchedSendMessage,
+
         logger: config.logger,
 
         // Catalog
@@ -1332,12 +1642,15 @@ const makeBusinessSocket = (config) => {
         sendStickerPack,
         sendStickerMessage,
 
-        // Interactive
+        // Interactive (full support)
         sendButtonsMessage,
         sendListMessage,
         sendTemplateMessage,
         sendInteractiveMessage,
+        sendInteractiveWithMedia,
         sendHighlyStructuredMessage,
+        sendProductMessage,
+        sendProductMessageWithButtons,
         sendNewsletterMessage,
         sendNewsletterReaction,
         getNewsletterInfo,
@@ -1345,7 +1658,6 @@ const makeBusinessSocket = (config) => {
         unfollowNewsletter,
         getNewsletterMetadata,
         joinNewsletterByUrl,
-        sendProductMessage,
         sendImageWithButtons,
         sendVideoWithButtons,
         sendDocumentWithButtons,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n4lyx",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "N4lyx - WhatsApp Web API Library powered by N4tzzOfficial",
   "keywords": [
     "n4lyx",