ishumdz-bail 1.0.17 → 1.0.18

package/README.md

@@ -83,6 +83,7 @@ sock.ev.on('creds.update', saveCreds)
 | 🔄 **Classify Disconnect** | Maps every WA disconnect code to `{ category, shouldReconnect, backoffMs }` — properly handles code 515 (restartRequired) as recoverable, not fatal |
 | ⏱️ **Rate Limiter** | Anti-spam pacing calculator: enforces per-minute/hour/day caps, burst allowance, new-chat delays, identical-message dedup |
 | 🖼️ **Album Message** | Send multiple images/videos as a single WA album/grid, with per-item or top-level caption and `gifPlayback` support |
+| 🔘 **Horizontal Buttons** | Modern native-flow buttons that render on ALL clients — text, image, video, GIF headers + classic location map-card style + automatic group conversion |
 | 🤖 **AI Label Config** | `aiLabel: true/false` in socket config — controls whether outgoing messages carry the `biz_bot` attribute that WA uses to render the AI icon |
 | 🔎 **USync Username Protocol** | Username resolution baked into USync queries — resolve WA usernames alongside contacts in a single round-trip |
 | 📥 **Offline Node Processor** | Batch-processes pending stanzas received while offline, preventing message loss on reconnect |
@@ -413,6 +414,108 @@ await sock.sendMessage(jid, {
 
 ---
 
+## 🔘 Horizontal Buttons (Interactive Messages)
+
+> ⚡ **Fixed in this fork:** classic text-only `buttonsMessage` is rejected by new WhatsApp
+> clients ("Your version of WhatsApp doesn't support it"). The `buttons` API now sends
+> **native flow (interactiveMessage)** buttons that render on **all modern clients** —
+> normal messages, images, videos and GIFs. Location keeps the classic map-card style.
+
+### Text + Horizontal Buttons
+
+```javascript
+await sock.sendMessage(jid, {
+    text: 'Pong 9 Ms ⚡\nDeveloper: ISHAN-X × LOVELY',
+    footer: 'ISHAN-X MD PRO',
+    buttons: [
+        { buttonText: { displayText: 'menu' },  buttonId: 'menu',  type: 1 },
+        { buttonText: { displayText: 'owner' }, buttonId: 'owner', type: 1 }
+    ]
+})
+```
+
+### Image / Video / GIF + Buttons
+
+```javascript
+// Image header
+await sock.sendMessage(jid, {
+    image: { url: './banner.jpg' },
+    caption: 'Welcome!',
+    footer: 'My Bot',
+    buttons: [
+        { buttonText: { displayText: 'menu' },  buttonId: 'menu',  type: 1 },
+        { buttonText: { displayText: 'owner' }, buttonId: 'owner', type: 1 }
+    ]
+})
+
+// GIF header (animated, loops like a GIF)
+await sock.sendMessage(jid, {
+    gif: { url: './animation.gif' },
+    caption: 'Live preview!',
+    buttons: [ /* ... */ ]
+})
+
+// Video header (gifPlayback = loop like a GIF)
+await sock.sendMessage(jid, {
+    video: { url: './clip.mp4' },
+    gifPlayback: true,
+    caption: 'Watch this',
+    buttons: [ /* ... */ ]
+})
+```
+
+### Location Map-Card + Buttons (classic style, still renders on new clients)
+
+```javascript
+await sock.sendMessage(jid, {
+    location: {
+        degreesLatitude: 9.9312,
+        degreesLongitude: 76.2673,
+        name: 'ISHAN-X MD PRO',           // bold title under the map
+        address: 'Select an option below', // 📍 subtitle
+        // jpegThumbnail: buffer — custom map image (optional)
+    },
+    text: 'Pong 9 Ms ⚡',
+    buttons: [
+        { buttonText: { displayText: 'menu' },  buttonId: 'menu',  type: 1 },
+        { buttonText: { displayText: 'owner' }, buttonId: 'owner', type: 1 }
+    ]
+})
+```
+
+### Handling Button Clicks
+
+Button replies arrive in `messages.upsert` — native flow uses
+`interactiveResponseMessage`, classic uses `buttonsResponseMessage`:
+
+```javascript
+sock.ev.on('messages.upsert', async ({ messages, type }) => {
+    if (type !== 'notify') return
+    const msg = messages[0]
+    if (!msg.message || msg.key.fromMe) return
+
+    let clickedId = msg.message.buttonsResponseMessage?.selectedButtonId
+    const native = msg.message.interactiveResponseMessage?.nativeFlowResponseMessage
+    if (!clickedId && native?.paramsJson) {
+        try { clickedId = JSON.parse(native.paramsJson).id } catch {}
+    }
+
+    if (clickedId === 'menu')  await sock.sendMessage(msg.key.remoteJid, { text: '📋 MENU...' })
+    if (clickedId === 'owner') await sock.sendMessage(msg.key.remoteJid, { text: '👑 Owner...' })
+})
+```
+
+> **Notes**
+> - Groups: `listMessage` / `buttonsMessage` / `templateMessage` are auto-converted to
+>   interactive native flow on send — buttons work in groups too.
+> - WhatsApp Web and very old clients don't render native flow cards — mobile clients
+>   (recent Android/iOS) render them fully.
+> - Full working demo: [`examples/ping-buttons.js`](examples/ping-buttons.js)
+>   (`.ping` → image + horizontal buttons + click handling) and a visual preview in
+>   [`banner-preview.html`](banner-preview.html).
+
+---
+
 ## 🚫 Ban Checker
 
 4-factor ban detection against WhatsApp's own servers — no third-party API:
@@ -576,6 +679,9 @@ sock.ev.on('connection.update', ({ connection, lastDisconnect }) => {
 
 Anti-ban pacing calculator — wire into your send path before each `sendMessage`:
 
+> ⚡ **Fixed in this fork:** `RateLimiter` and `classifyDisconnect` are now properly
+> exported from the package root (the files existed but were never re-exported).
+
 ```javascript
 import { RateLimiter } from 'ishumdz-bail'
 

package/lib/Utils/index.js

@@ -20,4 +20,7 @@ export * from './companion-reg-client-utils.js';
 export * from './identity-change-handler.js';
 export * from './stanza-ack.js';
 export * from './message-composer.js';
+// PATCH: export anti-ban utilities (files existed but were never re-exported)
+export * from './rate-limiter.js';
+export * from './classify-disconnect.js';
 //# sourceMappingURL=index.js.map

package/lib/Utils/messages.js

@@ -589,48 +589,127 @@ export const generateWAMessageContent = async (message, options) => {
         m = { interactiveMessage };
     }
 	else if ('buttonsMessage' in message && !!message.buttonsMessage) {
-		// PATCH: raw buttonsMessage pass-through — classic horizontal buttons (reference: Case X Plugin case.js).
-		// Fully-formed ButtonsMessage with any header (location/image/video/
-		// document), contentText, footerText, headerType and buttons[].
-		// type:1 buttons render in one horizontal row; nativeFlowInfo
-		// single_select opens a list sheet on tap.
-		m = { buttonsMessage: proto.Message.ButtonsMessage.create(message.buttonsMessage) };
+		// PATCH: raw buttonsMessage — media/location headers keep classic pass-through
+		// (new WhatsApp clients still render those fine, e.g. location+menu cards).
+		// Text-only ButtonsMessage is rejected by new clients ("version doesn't
+		// support it"), so convert it to interactiveMessage (native flow
+		// quick_reply buttons) which renders on all modern clients.
+		const bMsg = message.buttonsMessage;
+		const hasMediaHeader = !!(bMsg.imageMessage || bMsg.videoMessage || bMsg.documentMessage || bMsg.locationMessage);
+		if (hasMediaHeader) {
+			m = { buttonsMessage: proto.Message.ButtonsMessage.create(bMsg) };
+		} else {
+			const flowButtons = (bMsg.buttons || []).map(btn => ({
+				name: 'quick_reply',
+				buttonParamsJson: JSON.stringify({
+					display_text: btn.buttonText?.displayText || btn.buttonText || '',
+					id: btn.buttonId || btn.buttonText?.displayText || ''
+				})
+			}));
+			const interactive = {
+				nativeFlowMessage: {
+					buttons: flowButtons,
+					messageParamsJson: '',
+					messageVersion: 1
+				},
+				body: { text: bMsg.contentText || bMsg.text || '' },
+				footer: bMsg.footerText ? { text: bMsg.footerText } : undefined
+			};
+			applyContextInfoAndMentions(interactive, { contextInfo: bMsg.contextInfo });
+			m = { interactiveMessage: interactive };
+		}
 	}
 	else if ('buttons' in message && !!message.buttons) {
-        const buttonsMessage = {
-            buttons: message.buttons.map(b => ({ ...b, type: proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
-        };
-        if ('text' in message) {
-            buttonsMessage.contentText = message.text;
-            buttonsMessage.headerType = ButtonType.EMPTY;
+        // PATCH: `buttons` API — text/caption/img/video builds interactiveMessage
+        // (native flow) so the horizontal button row renders on ALL modern
+        // WhatsApp clients (classic text-only buttonsMessage is rejected by new
+        // clients: "version doesn't support it").
+        // `location` keeps the classic map-card style (LOCATION header 6) —
+        // big map header + title + body + horizontal buttons below, still
+        // rendered by modern clients.
+        if ('location' in message && !!message.location) {
+            const loc = message.location;
+            const buttonsMessage = {
+                buttons: message.buttons.map(b => ({ ...b, type: proto.Message.ButtonsMessage.Button.Type.RESPONSE })),
+                contentText: message.text || message.caption || '',
+                headerType: ButtonType.LOCATION,
+                locationMessage: {
+                    degreesLatitude: loc.degreesLatitude ?? loc.latitude ?? 0,
+                    degreesLongitude: loc.degreesLongitude ?? loc.longitude ?? 0,
+                    name: loc.name ?? null,
+                    address: loc.address ?? null,
+                    ...(loc.jpegThumbnail ? { jpegThumbnail: loc.jpegThumbnail } : {})
+                }
+            };
+            if ('footer' in message && !!message.footer) {
+                buttonsMessage.footerText = message.footer;
+            }
+            if (message.contextInfo || message.mentions) {
+                buttonsMessage.contextInfo = {
+                    ...(message.contextInfo || {}),
+                    ...(message.mentions ? { mentionedJid: message.mentions } : {})
+                };
+            }
+            m = { buttonsMessage: proto.Message.ButtonsMessage.create(buttonsMessage) };
         }
         else {
-            if ('caption' in message) {
-                buttonsMessage.contentText = message.caption;
+            const flowButtons = message.buttons.map(b => ({
+                name: 'quick_reply',
+                buttonParamsJson: JSON.stringify({
+                    display_text: b.buttonText?.displayText || b.displayText || b.text || '',
+                    id: b.buttonId || b.id || b.buttonText?.displayText || ''
+                })
+            }));
+            const interactiveMessage = {
+                nativeFlowMessage: {
+                    buttons: flowButtons,
+                    messageParamsJson: '',
+                    messageVersion: 1
+                }
+            };
+            if ('text' in message) {
+                interactiveMessage.body = { text: message.text };
+            } else if ('caption' in message) {
+                interactiveMessage.body = { text: message.caption };
+            }
+            if ('title' in message && !!message.title) {
+                interactiveMessage.header = {
+                    title: message.title,
+                    subtitle: message.subtitle || '',
+                    hasMediaAttachment: false
+                };
             }
-            // PATCH: prepare media headers for caption+buttons (fork bug fix).
-            // The media branch never ran before this point, so m is empty and
-            // getContentType(m) crashed. Build the header right here instead.
             if ('video' in message && !!message.video) {
                 const media = await prepareWAMessageMedia({ video: message.video }, options);
-                buttonsMessage.videoMessage = media.videoMessage;
-                if (message.gifPlayback) buttonsMessage.videoMessage.gifPlayback = true;
-                buttonsMessage.headerType = ButtonType.VIDEO;
+                interactiveMessage.header = {
+                    ...(interactiveMessage.header || {}),
+                    videoMessage: media.videoMessage,
+                    hasMediaAttachment: true
+                };
+                if (message.gifPlayback) interactiveMessage.header.videoMessage.gifPlayback = true;
+            } else if ('gif' in message && !!message.gif) {
+                // PATCH: direct `gif` key — animated GIF header (video with gifPlayback)
+                const media = await prepareWAMessageMedia({ video: message.gif }, options);
+                interactiveMessage.header = {
+                    ...(interactiveMessage.header || {}),
+                    videoMessage: media.videoMessage,
+                    hasMediaAttachment: true
+                };
+                interactiveMessage.header.videoMessage.gifPlayback = true;
             } else if ('image' in message && !!message.image) {
                 const media = await prepareWAMessageMedia({ image: message.image }, options);
-                buttonsMessage.imageMessage = media.imageMessage;
-                buttonsMessage.headerType = ButtonType.IMAGE;
-            } else {
-                const contentType = getContentType(m);
-                const type = contentType.replace('Message', '').toUpperCase();
-                buttonsMessage.headerType = ButtonType[type];
-                Object.assign(buttonsMessage, m);
+                interactiveMessage.header = {
+                    ...(interactiveMessage.header || {}),
+                    imageMessage: media.imageMessage,
+                    hasMediaAttachment: true
+                };
             }
+            if ('footer' in message && !!message.footer) {
+                interactiveMessage.footer = { text: message.footer };
+            }
+            applyContextInfoAndMentions(interactiveMessage, message);
+            m = { interactiveMessage };
         }
-        if ('footer' in message && !!message.footer) {
-            buttonsMessage.footerText = message.footer;
-        }
-        m = { buttonsMessage };
     }
     else if (hasNonNullishProperty(message, 'sections') || hasNonNullishProperty(message, 'productList')) {
         const isProductList = hasNonNullishProperty(message, 'productList');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ishumdz-bail",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "WhatsApp API Modification By Lovely",
     "keywords": [
         "whatsapp",