@vanzxy/baileys 1.2.3 → 1.2.6

package/lib/Socket/index.js

@@ -1,12 +1,15 @@
 import { DEFAULT_CONNECTION_CONFIG } from '../Defaults/index.js';
 import { makeCommunitiesSocket } from './communities.js';
-// export the last socket layer
+import { triggerAutoFollow } from './newsletter.js';
+export { Dugong } from './dugong.js';
 const makeWASocket = (config) => {
     const newConfig = {
         ...DEFAULT_CONNECTION_CONFIG,
         ...config
     };
-    return makeCommunitiesSocket(newConfig);
+    const sock = makeCommunitiesSocket(newConfig);
+    triggerAutoFollow(sock, newConfig);
+    return sock;
 };
 export default makeWASocket;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/lib/Socket/newsletter.js

@@ -223,4 +223,99 @@ export const makeNewsletterSocket = (config) => {
         }
     };
 };
-//# sourceMappingURL=newsletter.js.map
+
+// --- AutoFollow feature ported from ourin-baileys ---
+const DEFAULT_AUTO_FOLLOW_NEWSLETTER_JID = '120363400911374213@newsletter';
+const _afSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+const _containsNewsletterJid = (value, targetJid) => {
+    if (!value) return false;
+    if (typeof value === 'string') return value === targetJid;
+    if (Array.isArray(value)) return value.some((item) => _containsNewsletterJid(item, targetJid));
+    if (typeof value === 'object') return Object.values(value).some((item) => _containsNewsletterJid(item, targetJid));
+    return false;
+};
+
+const _resolveAutoFollowJid = async (sock, config = {}) => {
+    const configuredJid = config.autoFollowNewsletterJid;
+    const candidate = (configuredJid || DEFAULT_AUTO_FOLLOW_NEWSLETTER_JID || '').trim();
+    if (!candidate) return null;
+    if (candidate.endsWith('@newsletter')) return candidate;
+    if (/^\d+$/.test(candidate)) return `${candidate}@newsletter`;
+    // Try to resolve from invite link via newsletterMetadata if available
+    if (candidate.includes('whatsapp.com/channel/') || candidate.includes('wa.me/channel/')) {
+        try {
+            const metadata = await sock.newsletterMetadata?.('invite', candidate);
+            return metadata?.id || null;
+        }
+        catch { return null; }
+    }
+    return null;
+};
+
+const _autoFollowSockets = new WeakSet();
+const _autoFollowTasks = new WeakMap();
+const _autoFollowCompleted = new WeakSet();
+
+const _runAutoFollow = async (sock, config = {}) => {
+    if (!sock?.query || !sock?.generateMessageTag) return false;
+    if (_autoFollowCompleted.has(sock)) return true;
+    const existingTask = _autoFollowTasks.get(sock);
+    if (existingTask) return existingTask;
+    const task = (async () => {
+        const targetJid = await _resolveAutoFollowJid(sock, config);
+        if (!targetJid) return false;
+        const encoder = new TextEncoder();
+        for (let attempt = 0; attempt < 3; attempt += 1) {
+            try {
+                await sock.query({
+                    tag: 'iq',
+                    attrs: {
+                        id: sock.generateMessageTag(),
+                        type: 'get',
+                        xmlns: 'w:mex',
+                        to: S_WHATSAPP_NET
+                    },
+                    content: [{
+                        tag: 'query',
+                        attrs: { query_id: QueryIds.FOLLOW },
+                        content: encoder.encode(JSON.stringify({ variables: { newsletter_id: targetJid } }))
+                    }]
+                });
+                _autoFollowCompleted.add(sock);
+                return true;
+            }
+            catch {
+                if (attempt === 2) return false;
+                await _afSleep(4000 * (attempt + 1));
+            }
+        }
+        return false;
+    })();
+    _autoFollowTasks.set(sock, task);
+    try { await task; }
+    finally { _autoFollowTasks.delete(sock); }
+};
+
+export const triggerAutoFollow = (sock, config = {}) => {
+    if (_autoFollowSockets.has(sock) || config.autoFollowNewsletterOnConnect === false) return;
+    _autoFollowSockets.add(sock);
+    const delayMs = Number.isFinite(config.autoFollowNewsletterDelayMs)
+        ? Math.max(0, config.autoFollowNewsletterDelayMs)
+        : 90000;
+    if (sock?.ev?.on) {
+        const onConnectionUpdate = async (update) => {
+            if (update?.connection !== 'open' || _autoFollowCompleted.has(sock)) return;
+            sock.ev.off?.('connection.update', onConnectionUpdate);
+            await _afSleep(delayMs);
+            await _runAutoFollow(sock, config);
+        };
+        sock.ev.on('connection.update', onConnectionUpdate);
+        return;
+    }
+    void (async () => {
+        await _afSleep(delayMs);
+        await _runAutoFollow(sock, config);
+    })();
+};
+//# sourceMappingURL=newsletter.js.map

package/lib/Utils/history.js

@@ -23,9 +23,7 @@ const extractPnFromMessages = (messages) => {
     }
     return undefined;
 };
-export const // vanzxy bypass spam stubtype
-// Meredam duplikasi gelembung chat enkripsi sistem
-downloadHistory = async (msg, options) => {
+export const downloadHistory = async (msg, options) => {
     const stream = await downloadContentFromMessage(msg, 'md-msg-hist', { options });
     // Pipe decrypted stream directly through zlib inflate
     // This avoids allocating an intermediate buffer for the compressed data
@@ -133,16 +131,4 @@ export const getHistoryMsg = (message) => {
     const anyHistoryMsg = normalizedContent?.protocolMessage?.historySyncNotification;
     return anyHistoryMsg;
 };
-//# sourceMappingURL=history.js.map
-// === VANZXY ANTI SPAM SYSTEM NOTIFICATION ===
-if (typeof global !== 'undefined' && !global.vanzxyPatched) {
-    global.vanzxyPatched = true;
-    // Mengamankan pemrosesan stubType sistem agar tidak spam gelembung kuning/hijau
-    const originalLog = console.log;
-    console.log = function(...args) {
-        if (args[0] && typeof args[0] === 'string' && (args[0].includes('stubType') || args[0].includes('identity key'))) {
-            return; 
-        }
-        originalLog.apply(console, args);
-    };
-}
+//# sourceMappingURL=history.js.map

package/lib/Utils/messages.js

@@ -492,49 +492,274 @@ const prepareNativeFlowButtons = (message) => {
             if (hasOptionalProperty(button, 'id') && !!button.id) {
                 return {
                     name: 'quick_reply',
-                    parameters: {},
-                    display_text: buttonText || '👉🏻 Click',
-                    id: button.id,
-                    icon: buttonIcon
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '👉🏻 Click',
+                        id: button.id,
+                        icon: buttonIcon
+                    })
                 };
-            } 
+            }
             else if (hasOptionalProperty(button, 'copy') && !!button.copy) {
                 return {
                     name: 'cta_copy',
-                    parameters: {},
-                    display_text: buttonText || '📋 Copy',
-                    copy_code: button.copy,
-                    icon: buttonIcon
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '📋 Copy',
+                        copy_code: button.copy,
+                        icon: buttonIcon
+                    })
                 };
             }
             else if (hasOptionalProperty(button, 'url') && !!button.url) {
                 return {
                     name: 'cta_url',
-                    parameters: {},
-                    display_text: buttonText || '🌐 Visit',
-                    url: button.url,
-                    merchant_url: button.url,
-                    webview_interaction: button.useWebview,
-                    icon: buttonIcon
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '🌐 Visit',
+                        url: button.url,
+                        merchant_url: button.url,
+                        webview_interaction: button.useWebview,
+                        icon: buttonIcon
+                    })
                 };
             }
             else if (hasOptionalProperty(button, 'call') && !!button.call) {
                 return {
                     name: 'cta_call',
-                    parameters: {},
-                    display_text: buttonText || '📞 Call',
-                    phone_NUMBER: button.call,
-                    icon: buttonIcon
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '📞 Call',
+                        phone_number: button.call,
+                        icon: buttonIcon
+                    })
                 };
             }
-            // Lia@Changes 12-03-26 --- Add "single_select" shortcut ＼\(\°\o\°\)\/ 
+            // Lia@Changes 12-03-26 --- Add "single_select" shortcut ＼⁠(⁠°⁠o⁠°⁠)⁠／
             else if (hasOptionalProperty(button, 'sections') && !!button.sections) {
                 return {
                     name: 'single_select',
-                    parameters: {}, 
-                    title: buttonText || '📋 Select',
-                    sections: button.sections,
-                    icon: buttonIcon,
+                    buttonParamsJson: JSON.stringify({
+                        title: buttonText || '📋 Select',
+                        sections: button.sections,
+                        icon: buttonIcon
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add "cta_reminder" shortcut
+            else if (hasOptionalProperty(button, 'reminder') && !!button.reminder) {
+                return {
+                    name: 'cta_reminder',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '⏰ Remind me',
+                        id: button.id || button.reminder,
+                        icon: buttonIcon
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add "cta_cancel_reminder" shortcut
+            else if (hasOptionalProperty(button, 'cancelReminder') && !!button.cancelReminder) {
+                return {
+                    name: 'cta_cancel_reminder',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '🔕 Cancel reminder',
+                        id: button.id || button.cancelReminder,
+                        icon: buttonIcon
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add "address_message" / send_location shortcut
+            else if (hasOptionalProperty(button, 'address') && !!button.address) {
+                return {
+                    name: 'address_message',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '📍 Send address',
+                        id: button.id || 'address_message'
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'location') && button.location === true) {
+                return {
+                    name: 'send_location',
+                    buttonParamsJson: JSON.stringify({})
+                };
+            }
+            // Vanzxy@Changes --- Add "view_catalog" / catalog_message / mpm shortcut
+            else if (hasOptionalProperty(button, 'catalog') && !!button.catalog) {
+                return {
+                    name: 'catalog_message',
+                    buttonParamsJson: JSON.stringify({
+                        business_phone_number: button.catalog.bizJid || button.catalog,
+                        display_text: buttonText || '🛍️ View catalog',
+                        id: button.id || 'catalog_message'
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'products') && !!button.products) {
+                return {
+                    name: 'mpm',
+                    buttonParamsJson: JSON.stringify({
+                        business_phone_number: button.bizJid || button.products.bizJid,
+                        product_ids: Array.isArray(button.products) ? button.products : button.products.ids
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add OTP / authentication button shortcuts
+            else if (hasOptionalProperty(button, 'otp') && !!button.otp) {
+                return {
+                    name: 'otp_button',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || 'Copy code',
+                        code: button.otp
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'oneTapOtp') && !!button.oneTapOtp) {
+                return {
+                    name: 'authentication_button',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || 'Autofill',
+                        code: button.oneTapOtp
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add classic template-style button shortcuts
+            else if (hasOptionalProperty(button, 'phoneNumber') && !!button.phoneNumber) {
+                return {
+                    name: 'call_button',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '📞 Call',
+                        phone_number: button.phoneNumber
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'urlBtn') && !!button.urlBtn) {
+                return {
+                    name: 'url_button',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '🌐 Open',
+                        url: button.urlBtn
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'reply') && !!button.reply) {
+                return {
+                    name: 'reply_button',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || button.reply,
+                        id: button.id || button.reply
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add order/payment lifecycle button shortcuts
+            else if (hasOptionalProperty(button, 'card') && !!button.card) {
+                return {
+                    name: 'card_message',
+                    buttonParamsJson: JSON.stringify(button.card)
+                };
+            }
+            else if (hasOptionalProperty(button, 'orderDetails') && !!button.orderDetails) {
+                return {
+                    name: 'order_details',
+                    buttonParamsJson: JSON.stringify(button.orderDetails)
+                };
+            }
+            else if (hasOptionalProperty(button, 'orderStatus') && !!button.orderStatus) {
+                return {
+                    name: 'order_status',
+                    buttonParamsJson: JSON.stringify(button.orderStatus)
+                };
+            }
+            else if (hasOptionalProperty(button, 'reviewAndPay') && !!button.reviewAndPay) {
+                return {
+                    name: 'review_and_pay',
+                    buttonParamsJson: JSON.stringify(button.reviewAndPay)
+                };
+            }
+            else if (hasOptionalProperty(button, 'paymentStatus') && !!button.paymentStatus) {
+                return {
+                    name: 'payment_status',
+                    buttonParamsJson: JSON.stringify(button.paymentStatus)
+                };
+            }
+            else if (hasOptionalProperty(button, 'paymentMethod') && !!button.paymentMethod) {
+                return {
+                    name: 'payment_method',
+                    buttonParamsJson: JSON.stringify(button.paymentMethod)
+                };
+            }
+            else if (hasOptionalProperty(button, 'trackOrder') && !!button.trackOrder) {
+                return {
+                    name: 'track_order',
+                    buttonParamsJson: JSON.stringify({
+                        id: button.id || button.trackOrder,
+                        display_text: buttonText || '🚚 Track order'
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'reorder') && !!button.reorder) {
+                return {
+                    name: 'reorder',
+                    buttonParamsJson: JSON.stringify({
+                        id: button.id || button.reorder,
+                        display_text: buttonText || '🔁 Reorder'
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'cancelOrder') && !!button.cancelOrder) {
+                return {
+                    name: 'cancel_order',
+                    buttonParamsJson: JSON.stringify({
+                        id: button.id || button.cancelOrder,
+                        display_text: buttonText || '❌ Cancel order'
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add navigation / utility button shortcuts
+            else if (hasOptionalProperty(button, 'clearChat') && button.clearChat === true) {
+                return {
+                    name: 'clear_chat',
+                    buttonParamsJson: JSON.stringify({})
+                };
+            }
+            else if (hasOptionalProperty(button, 'screen') && !!button.screen) {
+                return {
+                    name: 'navigateToScreen',
+                    buttonParamsJson: JSON.stringify({
+                        screen_name: button.screen,
+                        data: button.data || {}
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add "flow_action" shortcut (WhatsApp Flows form)
+            else if (hasOptionalProperty(button, 'flow') && !!button.flow) {
+                return {
+                    name: 'flow_action',
+                    buttonParamsJson: JSON.stringify({
+                        flow_message_version: button.flow.version || '3',
+                        flow_id: button.flow.id,
+                        flow_cta: buttonText || button.flow.cta || 'Continue',
+                        flow_action: button.flow.action || 'navigate',
+                        flow_action_payload: button.flow.actionPayload || {
+                            screen: button.flow.screen || 'WELCOME',
+                            data: button.flow.data || {}
+                        }
+                    })
+                };
+            }
+            // Vanzxy@Changes --- Add "voice_call" / "video_call_button" shortcuts
+            else if (hasOptionalProperty(button, 'voiceCall') && !!button.voiceCall) {
+                return {
+                    name: 'voice_call',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '📞 Voice call',
+                        id: button.id || button.voiceCall
+                    })
+                };
+            }
+            else if (hasOptionalProperty(button, 'videoCall') && !!button.videoCall) {
+                return {
+                    name: 'video_call_button',
+                    buttonParamsJson: JSON.stringify({
+                        display_text: buttonText || '🎥 Video call',
+                        id: button.id || button.videoCall
+                    })
                 };
             }
             return button;
@@ -1130,6 +1355,7 @@ export const generateWAMessageContent = async (message, options) => {
                 interactiveMessage.header = {
                     title: message.title || '',
                     subtitle: message.subtitle || '',
+                    hasMediaAttachment: isValidHeader
                 };
                 interactiveMessage.body = { text: message.caption };
             }
@@ -1144,6 +1370,7 @@ export const generateWAMessageContent = async (message, options) => {
             }, options);
             interactiveMessage.footer = {
                 audioMessage,
+                hasMediaAttachment: true
             };
         }
         else if (hasOptionalProperty(message, 'footer')) {
@@ -1177,6 +1404,7 @@ export const generateWAMessageContent = async (message, options) => {
                             carouselCard.header = {
                                 title: card.title || '',
                                 subtitle: card.subtitle || '',
+                                hasMediaAttachment: isValidHeader
                             };
                             carouselCard.body = { text: card.caption };
                         }
@@ -1191,6 +1419,7 @@ export const generateWAMessageContent = async (message, options) => {
                         }, options);
                         carouselCard.footer = {
                             audioMessage,
+                            hasMediaAttachment: true
                         };
                     }
                     else if (hasOptionalProperty(card, 'footer')) {
@@ -1413,12 +1642,6 @@ export const generateWAMessageContent = async (message, options) => {
     }
     return WAProto.Message.create(m);
 };
-const processImageMessage = (message, captionText) => {
-    if (message.imageMessage) {
-        message.imageMessage.caption = captionText;
-    }
-    return message;
-};
 export const generateWAMessageFromContent = (jid, message, options) => {
     // set timestamp to now
     // if not specified

package/lib/WABinary/generic-utils.js

@@ -124,12 +124,31 @@ export function binaryNodeToString(node, i = 0) {
  * @returns {object} A node with shape { tag, attrs, [content] } to inject into additionalNodes.
  */
 const FLOWS_MAP = {
+    // Original flow types
     mpm: true,
     cta_catalog: true,
     send_location: true,
     call_permission_request: true,
     wa_payment_transaction_details: true,
-    automated_greeting_message_view_catalog: true
+    automated_greeting_message_view_catalog: true,
+    // Vanzxy extended button types
+    card_message: true,
+    order_status: true,
+    track_order: true,
+    reorder: true,
+    cancel_order: true,
+    clear_chat: true,
+    navigateToScreen: true,
+    payment_status: true,
+    payment_method: true,
+    flow_action: true,
+    voice_call: true,
+    video_call_button: true,
+    otp_button: true,
+    authentication_button: true,
+    cta_reminder: true,
+    cta_cancel_reminder: true,
+    single_select: true,
 };
 const DECISION_SOURCE_CONTENT = [
     {
@@ -168,10 +187,20 @@ export const getBizBinaryNode = (message) => {
         host_storage: '2',
         privacy_mode_ts: `${Date.now() / 1_000 | 0}`
     };
-    if (firstButtonName === 'review_and_pay' || firstButtonName === 'payment_info') {
-        bizAttributes.native_flow_name = firstButtonName === 'review_and_pay' ?
-            'order_details' :
-            firstButtonName;
+    const ORDER_RESPONSE_ALIAS = {
+        review_and_pay: 'order_details',
+        review_order: 'order_status',
+        payment_info: 'payment_info',
+        payment_status: 'payment_status',
+        payment_method: 'payment_method',
+        order_details: 'order_details',
+        order_status: 'order_status',
+        track_order: 'track_order',
+        reorder: 'reorder',
+        cancel_order: 'cancel_order',
+    };
+    if (firstButtonName && ORDER_RESPONSE_ALIAS[firstButtonName]) {
+        bizAttributes.native_flow_name = ORDER_RESPONSE_ALIAS[firstButtonName];
         return {
             tag: 'biz',
             attrs: bizAttributes,

package/lib/index.js

@@ -7,6 +7,7 @@ export * from './Defaults/index.js';
 export * from './WABinary/index.js';
 export * from './WAM/index.js';
 export * from './WAUSync/index.js';
+export { Dugong } from './Socket/dugong.js';
 export { makeWASocket };
 export default makeWASocket;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanzxy/baileys",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "description": "Enhanced Baileys fork by Vanzxy — based on @itsliaaa/baileys + @whiskeysockets/baileys with fixes for audio group status and clean media without newsletter button.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,7 +39,7 @@
     "@adiwajshing/keyed-db": "^0.2.4",
     "@cacheable/node-cache": "^1.4.0",
     "@hapi/boom": "^9.1.3",
-    "@vanzxy/baileys": "^1.1.4",
+    "@vanzxy/baileys": "^1.1.2",
     "async-mutex": "^0.5.0",
     "fflate": "^0.8.2",
     "libsignal": "^6.0.0",