@realvare/based 2.7.70 → 2.7.71

package/lib/Utils/messages.js

@@ -56,6 +56,7 @@ const assertColor = async (color) => {
     let assertedColor;
     if (typeof color === 'number') {
         assertedColor = color > 0 ? color : 0xffffffff + Number(color) + 1;
+        return assertedColor;
     }
     else {
         let hex = color.trim().replace('#', '');
@@ -245,41 +246,35 @@ const generateWAMessageContent = async (message, options) => {
     var _p, _q;
 
     // Cross-platform externalAdReply thumbnail handling
-    if (message.contextInfo?.externalAdReply) {
-        const externalAdReply = message.contextInfo.externalAdReply;
-
-        // If thumbnailUrl is provided but no thumbnail binary data, try to fetch and convert for all platforms
-        if (externalAdReply.thumbnailUrl && !externalAdReply.thumbnail) {
+    const fixupExternalAdReplyThumb = async (externalAdReply) => {
+        const thumbUrl = externalAdReply.originalImageUrl || externalAdReply.thumbnailUrl;
+        const currentThumb = externalAdReply.thumbnail;
+        const currentThumbLen = currentThumb && typeof currentThumb.length === 'number' ? currentThumb.length : 0;
+        if (thumbUrl && (!currentThumb || currentThumbLen < 2000)) {
             try {
-                // Attempt to download the thumbnail image for cross-platform compatibility
-                const axiosResponse = await axios_1.default.get(externalAdReply.thumbnailUrl, {
-                    responseType: 'arraybuffer',
-                    timeout: 5000,
+                const stream = await (0, messages_media_1.getHttpStream)(thumbUrl, {
+                    timeout: 8000,
                     headers: {
                         'User-Agent': 'WhatsApp/2.23.20.15 iOS/16.0 Device/iPhone'
                     }
                 });
-
-                if (axiosResponse.status === 200) {
-                    externalAdReply.thumbnail = Buffer.from(axiosResponse.data);
-                    // Clear thumbnailUrl since we now have binary data
-                    delete externalAdReply.thumbnailUrl;
-                    options.logger?.debug('Successfully downloaded externalAdReply thumbnail for cross-platform compatibility');
-                }
-            } catch (error) {
-                // If thumbnail download fails, keep thumbnailUrl as fallback
-                options.logger?.warn('Failed to download externalAdReply thumbnail for cross-platform compatibility:', error.message);
+                const { buffer } = await (0, messages_media_1.extractImageThumb)(stream, 512, 80);
+                externalAdReply.thumbnail = buffer;
+            }
+            catch (error) {
+                options.logger?.warn('Failed to generate externalAdReply thumbnail for cross-platform compatibility:', error.message);
             }
         }
-
-        // Ensure renderLargerThumbnail is set for better display across platforms
         if (externalAdReply.renderLargerThumbnail === undefined) {
-            externalAdReply.renderLargerThumbnail = false;
-            options.logger?.debug('Set renderLargerThumbnail=false for improved cross-platform display');
+            externalAdReply.renderLargerThumbnail = true;
         }
-
-        // Update the contextInfo with modified externalAdReply
-        message.contextInfo.externalAdReply = externalAdReply;
+        return externalAdReply;
+    };
+    if (message.contextInfo?.externalAdReply) {
+        message.contextInfo.externalAdReply = await fixupExternalAdReplyThumb(message.contextInfo.externalAdReply);
+    }
+    if (message.externalAdReply) {
+        message.externalAdReply = await fixupExternalAdReplyThumb(message.externalAdReply);
     }
 
     let m = {};
@@ -447,13 +442,28 @@ const generateWAMessageContent = async (message, options) => {
         m.keepInChatMessage.timestampMs = Date.now();
     }
     else if ('call' in message) {
-        m = {
-            scheduledCallCreationMessage: {
-                scheduledTimestampMs: (_a = message.call.time) !== null && _a !== void 0 ? _a : Date.now(),
-                callType: (_b = message.call.type) !== null && _b !== void 0 ? _b : 1,
-                title: message.call.title
-            }
-        };
+        const call = message.call;
+        if (call && typeof call === 'object' && (
+            'callKey' in call
+                || 'conversionSource' in call
+                || 'conversionData' in call
+                || 'conversionDelaySeconds' in call
+                || 'ctwaSignals' in call
+                || 'ctwaPayload' in call
+                || 'nativeFlowCallButtonPayload' in call
+                || 'deeplinkPayload' in call
+        )) {
+            m.call = WAProto_1.proto.Message.Call.fromObject(call);
+        }
+        else {
+            m = {
+                scheduledCallCreationMessage: {
+                    scheduledTimestampMs: (_a = call === null || call === void 0 ? void 0 : call.time) !== null && _a !== void 0 ? _a : Date.now(),
+                    callType: (_b = call === null || call === void 0 ? void 0 : call.type) !== null && _b !== void 0 ? _b : 1,
+                    title: call === null || call === void 0 ? void 0 : call.title
+                }
+            };
+        }
     }
     else if ('paymentInvite' in message) {
         m.paymentInviteMessage = {
@@ -619,12 +629,12 @@ const generateWAMessageContent = async (message, options) => {
         };
     }
     else if ('richResponse' in message) {
-        m.richResponseMessage = {
+        m.richResponseMessage = WAProto_1.proto.AIRichResponseMessage.fromObject({
             messageType: message.richResponse.messageType !== undefined ? message.richResponse.messageType : 1, // AI_RICH_RESPONSE_TYPE_STANDARD
             submessages: message.richResponse.submessages || [],
             unifiedResponse: message.richResponse.unifiedResponse,
             contextInfo: message.richResponse.contextInfo
-        };
+        });
     }
     else if ('eventResponse' in message && !!message.eventResponse) {
         m.eventResponseMessage = {
@@ -813,7 +823,7 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPayment' in message) {
         const reqPayment = message.requestPayment;
         const sticker = reqPayment.sticker ?
-            await (0, exports.prepareWAMessageMedia)({ sticker: reqPayment.sticker, ...options }, options)
+            await (0, exports.prepareWAMessageMedia)({ sticker: reqPayment.sticker }, options)
             : null;
         let notes = {};
         if (reqPayment.sticker) {
@@ -863,9 +873,6 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPhoneNumber' in message) {
         m.requestPhoneNumberMessage = {};
     }
-    else if ('call' in message) {
-        m.callMessage = Types_1.WAProto.Message.CallMessage.fromObject(message.call);
-    }
     else if ('newsletterMessage' in message) {
         m.newsletterMessage = Types_1.WAProto.Message.NewsletterMessage.fromObject(message.newsletterMessage);
     }
@@ -960,6 +967,46 @@ const generateWAMessageContent = async (message, options) => {
             background: message.payment.background
         });
     }
+    else if ('comment' in message) {
+        m.commentMessage = {
+            message: message.comment.message,
+            targetMessageKey: message.comment.targetMessageKey
+        };
+    }
+    else if ('question' in message) {
+        m.questionMessage = {
+            text: message.question.text,
+            contextInfo: message.question.contextInfo
+        };
+    }
+    else if ('questionResponse' in message) {
+        m.questionResponseMessage = {
+            key: message.questionResponse.key,
+            text: message.questionResponse.text
+        };
+    }
+    else if ('statusQuestionAnswer' in message) {
+        m.statusQuestionAnswerMessage = {
+            key: message.statusQuestionAnswer.key,
+            text: message.statusQuestionAnswer.text
+        };
+    }
+    else if ('statusQuoted' in message) {
+        m.statusQuotedMessage = {
+            type: message.statusQuoted.type,
+            text: message.statusQuoted.text,
+            thumbnail: message.statusQuoted.thumbnail,
+            jid: message.statusQuoted.jid,
+            originalStatusId: message.statusQuoted.originalStatusId
+        };
+    }
+    else if ('statusStickerInteraction' in message) {
+        m.statusStickerInteractionMessage = {
+            key: message.statusStickerInteraction.key,
+            stickerKey: message.statusStickerInteraction.stickerKey,
+            type: message.statusStickerInteraction.type
+        };
+    }
     else if ('album' in message) {
         const imageMessages = message.album.filter(item => 'image' in item);
         const videoMessages = message.album.filter(item => 'video' in item);
@@ -1056,7 +1103,7 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: (_j = message === null || message === void 0 ? void 0 : message.media) !== null && _j !== void 0 ? _j : false,
+                hasMediaAttachment: !!(message === null || message === void 0 ? void 0 : message.media),
             };
             Object.assign(interactiveMessage.header, m);
         }
@@ -1077,11 +1124,35 @@ const generateWAMessageContent = async (message, options) => {
             }
         }
         if ('title' in message && !!message.title) {
-            interactiveMessage.header = {
+            const headerData = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: (_k = message === null || message === void 0 ? void 0 : message.media) !== null && _k !== void 0 ? _k : false,
+                hasMediaAttachment: !!message.media,
             };
+            
+            // Process media attachments for interactive buttons
+            if (message.media) {
+                if (message.media.image) {
+                    const mediaMessage = await (0, exports.prepareWAMessageMedia)({ image: message.media.image }, options);
+                    if (mediaMessage.imageMessage) {
+                        headerData.imageMessage = mediaMessage.imageMessage;
+                    }
+                }
+                else if (message.media.video) {
+                    const mediaMessage = await (0, exports.prepareWAMessageMedia)({ video: message.media.video }, options);
+                    if (mediaMessage.videoMessage) {
+                        headerData.videoMessage = mediaMessage.videoMessage;
+                    }
+                }
+                else if (message.media.document) {
+                    const mediaMessage = await (0, exports.prepareWAMessageMedia)({ document: message.media.document }, options);
+                    if (mediaMessage.documentMessage) {
+                        headerData.documentMessage = mediaMessage.documentMessage;
+                    }
+                }
+            }
+            
+            interactiveMessage.header = headerData;
             // Support for ProductMessage in header
             if (message.headerProduct) {
                 const productMedia = await (0, exports.prepareWAMessageMedia)({ image: message.headerProduct.productImage }, options);
@@ -1123,7 +1194,7 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: (_l = message === null || message === void 0 ? void 0 : message.media) !== null && _l !== void 0 ? _l : false,
+                hasMediaAttachment: !!(message === null || message === void 0 ? void 0 : message.media),
             };
             Object.assign(interactiveMessage.header, m);
         }
@@ -1136,7 +1207,7 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: (_m = message === null || message === void 0 ? void 0 : message.media) !== null && _m !== void 0 ? _m : false,
+                hasMediaAttachment: !!(message === null || message === void 0 ? void 0 : message.media),
             };
             Object.assign(interactiveMessage.header, m);
         }
@@ -1719,4 +1790,4 @@ const clearCache = () => {
         // Silently fail if cache manager is not available
     }
 };
-exports.clearCache = clearCache;
+exports.clearCache = clearCache;

package/lib/WABinary/generic-utils.js

@@ -54,7 +54,11 @@ exports.getBinaryNodeChildUInt = getBinaryNodeChildUInt;
 const assertNodeErrorFree = (node) => {
     const errNode = (0, exports.getBinaryNodeChild)(node, 'error');
     if (errNode) {
-        throw new boom_1.Boom(errNode.attrs.text || 'Unknown error', { data: +errNode.attrs.code });
+        const code = +errNode.attrs.code;
+        throw new boom_1.Boom(errNode.attrs.text || 'Unknown error', {
+            data: code,
+            statusCode: code || undefined
+        });
     }
 };
 exports.assertNodeErrorFree = assertNodeErrorFree;

package/lib/WABinary/jid-utils.d.ts

@@ -34,4 +34,5 @@ export declare const isJidStatusBroadcast: (jid: string) => jid is "status@broad
 export declare const isJidBot: (jid: string | undefined) => boolean | "" | undefined;
 export declare const jidNormalizedUser: (jid: string | undefined) => string;
 export declare const lidToJid: (jid: string) => string;
+export declare const resolveJid: (jid: string | undefined) => string | undefined;
 export declare const getBotJid: (jid: string) => string;

package/lib/WABinary/jid-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAndConvertLidToJid = exports.validateAndCleanJid = exports.lidToJidEnhanced = exports.lidToJid = exports.getBotJid = exports.jidNormalizedUser = exports.isJidBot = exports.isJidStatusBroadcast = exports.isJidGroup = exports.isJidNewsletter = exports.isJidBroadcast = exports.isLid = exports.assertLid = exports.isJidUser = exports.isJidMetaAi = exports.areJidsSameUser = exports.jidDecode = exports.jidEncode = exports.META_AI_JID = exports.STORIES_JID = exports.PSA_WID = exports.SERVER_JID = exports.OFFICIAL_BIZ_JID = exports.S_WHATSAPP_NET = void 0;
+exports.validateAndConvertLidToJid = exports.validateAndCleanJid = exports.lidToJidEnhanced = exports.resolveJid = exports.lidToJid = exports.getBotJid = exports.jidNormalizedUser = exports.isJidBot = exports.isJidStatusBroadcast = exports.isJidGroup = exports.isJidNewsletter = exports.isJidBroadcast = exports.isLid = exports.assertLid = exports.isJidUser = exports.isJidMetaAi = exports.areJidsSameUser = exports.jidDecode = exports.jidEncode = exports.META_AI_JID = exports.STORIES_JID = exports.PSA_WID = exports.SERVER_JID = exports.OFFICIAL_BIZ_JID = exports.S_WHATSAPP_NET = void 0;
 exports.S_WHATSAPP_NET = '@s.whatsapp.net';
 exports.OFFICIAL_BIZ_JID = '16505361212@c.us';
 exports.SERVER_JID = 'server@c.us';
@@ -161,6 +161,14 @@ const lidToJid = (jid) => {
 };
 exports.lidToJid = lidToJid;
 
+const resolveJid = (jid) => {
+    if (typeof jid === 'string' && jid.endsWith('@lid')) {
+        return lidToJid(jid);
+    }
+    return jid;
+};
+exports.resolveJid = resolveJid;
+
 /**
  * Enhanced LID to JID conversion with phone number validation
  * Validates that the phone number has a valid international format

package/lib/index.js

@@ -1,12 +1,10 @@
 "use strict";
 
 const chalk = require("chalk");
-const gradient = require("gradient-string");
 
-// Only show banner if not in test environment and not explicitly disabled
 if (process.env.NODE_ENV !== 'test' && process.env.SUPPRESS_BANNER !== 'true') {
     const samakavare = 'baileys by sam aka vare - https://github.com/realvare • https://www.npmjs.com/~realvare';
-    console.log('\n' + gradient(['#520f8dff', '#431888ff'])(samakavare) + '\n');
+    console.log('\n' + chalk.hex('#6349d8ff')(samakavare) + '\n');
 }
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -52,4 +50,4 @@ __exportStar(require("./WABinary"), exports);
 __exportStar(require("./WAM"), exports);
 __exportStar(require("./WAUSync"), exports);
 
-exports.default = Socket_1.default;
+exports.default = Socket_1.default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.70",
-  "description": "whatsapp api by sam",
+  "version": "2.7.71",
+  "description": "Whatsapp api by Sam",
   "keywords": [
     "baileys",
     "whatsapp",
@@ -10,6 +10,8 @@
     "whatsapp-bot",
     "automation",
     "multi-device",
+    "samakavare",
+    "realvare",
     "based",
     "varebot"
   ],
@@ -50,7 +52,6 @@
     "cache-manager": "^7.2.5",
     "chalk": "^4.1.2",
     "cheerio": "^1.1.2",
-    "gradient-string": "^2.0.2",
     "jimp": "^0.22.10",
     "libphonenumber-js": "^1.12.31",
     "libsignal": "github:realvare/libsignal",