@realvare/based 2.7.4 → 2.7.5

package/lib/Defaults/index.js

@@ -18,7 +18,7 @@ exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
 exports.NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
 exports.DICT_VERSION = 3;
 exports.KEY_BUNDLE_TYPE = Buffer.from([5]);
-exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]); // last is "DICT_VERSION"
+exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]); // last isambasedd "DICT_VERSION"
 /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
 exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
 exports.WA_CERT_DETAILS = {
@@ -53,13 +53,13 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
     transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
-    generateHighQualityLinkPreview: false,
+    generateHighQualityLinkPreview: true,
     options: {},
     appStateMacVerification: {
         patch: false,
         snapshot: false,
     },
-    countryCode: 'US',
+    countryCode: 'IT',
     getMessage: async () => undefined,
     cachedGroupMetadata: async () => undefined,
     makeSignalRepository: libsignal_1.makeLibSignalRepository

package/lib/Socket/messages-recv.js

@@ -815,7 +815,19 @@ const makeMessagesRecvSocket = (config) => {
             await Promise.all([
                 processingMutex.mutex(async () => {
                     var _a, _b, _c, _d, _e, _f;
-                    await decrypt();
+                    try {
+                        await decrypt();
+                    } catch (error) {
+                        if(error.message.includes('Bad MAC') || error.message.includes('No matching sessions')) {
+                            logger.warn({ key: msg.key, jid: author, error: error.message }, 'Decryption failed, clearing session to recover');
+                            const { SessionRecord } = require('../Signal');
+                            await signalRepository.storeSession(author, new SessionRecord());
+                            return sendMessageAck(node, Utils_1.NACK_REASONS.ParsingError);
+                        }
+
+                        throw error;
+                    }
+
                     // message failed to decrypt
                     if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
                         if (((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.MISSING_KEYS_ERROR_TEXT) {

package/lib/Socket/messages-send.js

@@ -26,7 +26,11 @@ const makeMessagesSocket = (config) => {
     });
 
     // Initialize rate limiter for anti-ban protection
-    const rateLimiter = new rate_limiter_1.default(1); // 1 message per second default
+    const messagesSendRate = config.messagesSendRate || 1;
+    if(messagesSendRate > 5) {
+        logger.warn(`messagesSendRate is set to a high value (${messagesSendRate}), this may increase the risk of getting banned. Recommended value is <= 3`);
+    }
+    const rateLimiter = new rate_limiter_1.default(messagesSendRate);
     let mediaConn;
     const refreshMediaConn = async (forceGet = false) => {
         const media = await mediaConn;
@@ -857,6 +861,7 @@ const makeMessagesSocket = (config) => {
                     throw new boom_1.Boom('Sticker data not found for sticker: ' + JSON.stringify(sticker), { statusCode: 400 });
                 }
                 const stickerContent = { sticker: stickerData };
+                let mediaHandle;
                 const stickerMsg = await (0, Utils_1.generateWAMessage)(jid, stickerContent, {
                     logger,
                     userJid,
@@ -1041,11 +1046,9 @@ const makeMessagesSocket = (config) => {
             return message;
         },
         sendMessage: async (jid, content, options = {}) => {
-            var _a, _b, _c;
-            const userJid = authState.creds.me.id;
-
+            var _a;
             // Handle admin-only messages by sending private messages to each admin
-            if (content.contextInfo?.isAdminOnly && (0, WABinary_1.isJidGroup)(jid)) {
+            if (((_a = content.contextInfo) === null || _a === void 0 ? void 0 : _a.isAdminOnly) && (0, WABinary_1.isJidGroup)(jid)) {
                 try {
                     // Get group metadata to find admins
                     const metadata = await sock.groupMetadata(jid);
@@ -1091,319 +1094,7 @@ const makeMessagesSocket = (config) => {
                     throw error;
                 }
             }
-
-            if (!options.ephemeralExpiration) {
-                if ((0, WABinary_1.isJidGroup)(jid)) {
-                    const groups = await sock.groupQuery(jid, 'get', [{
-                            tag: 'query',
-                            attrs: {
-                                request: 'interactive'
-                            }
-                        }]);
-                    const metadata = (0, WABinary_1.getBinaryNodeChild)(groups, 'group');
-                    const expiration = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(metadata, 'ephemeral')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.expiration) || 0;
-                    options.ephemeralExpiration = expiration;
-                }
-            }
-            if (typeof content === 'object' &&
-                'disappearingMessagesInChat' in content &&
-                typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                (0, WABinary_1.isJidGroup)(jid)) {
-                const { disappearingMessagesInChat } = content;
-                const value = typeof disappearingMessagesInChat === 'boolean' ?
-                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-                    disappearingMessagesInChat;
-                await groupToggleEphemeral(jid, value);
-            }
-            if (typeof content === 'object' && 'album' in content && content.album) {
-                const { album, caption } = content;
-                if (caption && !album[0].caption) {
-                    album[0].caption = caption;
-                }
-                let mediaHandle;
-                let mediaMsg;
-                const albumMsg = (0, Utils_1.generateWAMessageFromContent)(jid, {
-                    albumMessage: {
-                        expectedImageCount: album.filter(item => 'image' in item).length,
-                        expectedVideoCount: album.filter(item => 'video' in item).length
-                    }
-                }, { userJid, ...options });
-                await relayMessage(jid, albumMsg.message, {
-                    messageId: albumMsg.key.id
-                });
-                for (const i in album) {
-                    const media = album[i];
-                    if ('image' in media) {
-                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
-                            image: media.image,
-                            ...(media.caption ? { caption: media.caption } : {}),
-                            ...options
-                        }, {
-                            userJid,
-                            upload: async (readStream, opts) => {
-                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                                mediaHandle = up.handle;
-                                return up;
-                            },
-                            ...options,
-                        });
-                    }
-                    else if ('video' in media) {
-                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
-                            video: media.video,
-                            ...(media.caption ? { caption: media.caption } : {}),
-                            ...(media.gifPlayback !== undefined ? { gifPlayback: media.gifPlayback } : {}),
-                            ...options
-                        }, {
-                            userJid,
-                            upload: async (readStream, opts) => {
-                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                                mediaHandle = up.handle;
-                                return up;
-                            },
-                            ...options,
-                        });
-                    }
-                    else if ('url' in media) {
-                        // Assume URL is an image if not specified
-                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
-                            image: media.url,
-                            ...(media.caption ? { caption: media.caption } : {}),
-                            ...options
-                        }, {
-                            userJid,
-                            upload: async (readStream, opts) => {
-                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                                mediaHandle = up.handle;
-                                return up;
-                            },
-                            ...options,
-                        });
-                    }
-                    if (mediaMsg) {
-                        mediaMsg.message.messageContextInfo = {
-                            messageSecret: (0, crypto_1.randomBytes)(32),
-                            messageAssociation: {
-                                associationType: 1,
-                                parentMessageKey: albumMsg.key
-                            }
-                        };
-                        await relayMessage(jid, mediaMsg.message, {
-                            messageId: mediaMsg.key.id
-                        });
-                        await new Promise(resolve => setTimeout(resolve, 800));
-                    }
-                }
-                return albumMsg;
-            }
-            else if (typeof content === 'object' && 'stickerPack' in content && content.stickerPack) {
-                // Send sticker pack metadata first, then each sticker associated with it
-                const { stickerPack } = content;
-                const stickers = stickerPack.stickers || [];
-                if (!Array.isArray(stickers) || stickers.length === 0) {
-                    throw new boom_1.Boom('stickerPack requires at least one sticker', { statusCode: 400 });
-                }
-
-                // Prepare cover thumbnail if provided
-                let thumbnailDirectPath;
-                let thumbnailEncSha256;
-                let thumbnailSha256;
-                let thumbnailHeight;
-                let thumbnailWidth;
-                if (stickerPack.cover) {
-                    try {
-                        const thumbMsg = await (0, Utils_1.prepareWAMessageMedia)({ image: stickerPack.cover }, {
-                            logger,
-                            userJid,
-                            upload: async (readStream, opts) => {
-                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                                return up;
-                            },
-                            mediaCache: config.mediaCache,
-                            options: config.options,
-                            messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
-                            ...options,
-                        });
-                        if (thumbMsg.imageMessage) {
-                            thumbnailDirectPath = thumbMsg.imageMessage.directPath;
-                            thumbnailEncSha256 = thumbMsg.imageMessage.fileEncSha256;
-                            thumbnailSha256 = thumbMsg.imageMessage.fileSha256;
-                            thumbnailHeight = thumbMsg.imageMessage.height;
-                            thumbnailWidth = thumbMsg.imageMessage.width;
-                        }
-                    }
-                    catch (err) {
-                        logger === null || logger === void 0 ? void 0 : logger.warn({ err }, 'failed to prepare stickerPack cover');
-                    }
-                }
-
-                // Map stickers metadata to proto-friendly shape
-                const protoStickers = stickers.map((s, idx) => ({
-                    fileName: s.fileName || `sticker_${idx}.webp`,
-                    isAnimated: !!s.isAnimated,
-                    emojis: Array.isArray(s.emojis) ? s.emojis : (s.emojis ? [s.emojis] : []),
-                    accessibilityLabel: s.accessibilityLabel,
-                    isLottie: !!s.isLottie,
-                    mimetype: s.mimetype || 'image/webp'
-                }));
-
-                const stickerPackObj = {
-                    name: stickerPack.name,
-                    publisher: stickerPack.publisher,
-                    packDescription: stickerPack.description,
-                    stickers: protoStickers,
-                    thumbnailDirectPath,
-                    thumbnailEncSha256,
-                    thumbnailSha256,
-                    thumbnailHeight,
-                    thumbnailWidth,
-                };
-
-                // Create and send the pack metadata message
-                const contentForSend = { stickerPackMessage: WAProto_1.proto.Message.StickerPackMessage.fromObject(stickerPackObj) };
-                const packMsg = (0, Utils_1.generateWAMessageFromContent)(jid, contentForSend, {
-                    userJid,
-                    upload: waUploadToServer,
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
-                    ...options,
-                });
-                await relayMessage(jid, packMsg.message, { messageId: packMsg.key.id });
-
-                // Send each sticker associated with the pack
-                let lastMsg = packMsg;
-                for (const sticker of stickers) {
-                    const stickerData = sticker.sticker || sticker.data || sticker.buffer || sticker.image || sticker.url || sticker;
-                    if (!stickerData) {
-                        throw new boom_1.Boom('Sticker data not found for sticker: ' + JSON.stringify(sticker), { statusCode: 400 });
-                    }
-                    const stickerContent = { sticker: stickerData };
-                    const stickerMsg = await (0, Utils_1.generateWAMessage)(jid, stickerContent, {
-                        logger,
-                        userJid,
-                        upload: async (readStream, opts) => {
-                            const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                            return up;
-                        },
-                        mediaCache: config.mediaCache,
-                        options: config.options,
-                        messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
-                        ...options,
-                    });
-                    // Associate sticker with the pack message
-                    stickerMsg.message.messageContextInfo = {
-                        messageSecret: (0, crypto_1.randomBytes)(32),
-                        messageAssociation: {
-                            associationType: 1,
-                            parentMessageKey: packMsg.key
-                        }
-                    };
-                    await relayMessage(jid, stickerMsg.message, { messageId: stickerMsg.key.id });
-                    lastMsg = stickerMsg;
-                    // Add delay between stickers to avoid rate limiting
-                    await new Promise(resolve => setTimeout(resolve, 800));
-                }
-                return lastMsg;
-            }
-            else {
-                let mediaHandle;
-                const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
-                    logger,
-                    userJid,
-                    getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
-                        thumbnailWidth: linkPreviewImageThumbnailWidth,
-                        fetchOpts: {
-                            timeout: 3000,
-                            ...axiosOptions || {}
-                        },
-                        logger,
-                        uploadImage: generateHighQualityLinkPreview
-                            ? waUploadToServer
-                            : undefined
-                    }),
-                    getProfilePicUrl: sock.profilePictureUrl,
-                    upload: async (readStream, opts) => {
-                        const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
-                        mediaHandle = up.handle;
-                        return up;
-                    },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
-                    ...options,
-                });
-                const isDeleteMsg = 'delete' in content && !!content.delete;
-                const isEditMsg = 'edit' in content && !!content.edit;
-                const isPinMsg = 'pin' in content && !!content.pin;
-                const isKeepMsg = 'keep' in content && content.keep;
-                const isPollMessage = 'poll' in content && !!content.poll;
-                const isAiMsg = options.ai === true;
-                const additionalAttributes = {};
-                const additionalNodes = [];
-                // required for delete
-                if (isDeleteMsg) {
-                    // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if (((0, WABinary_1.isJidGroup)(content.delete.remoteJid) && !content.delete.fromMe) || (0, WABinary_1.isJidNewsletter)(jid)) {
-                        additionalAttributes.edit = '8';
-                    }
-                    else {
-                        additionalAttributes.edit = '7';
-                    }
-                    // required for edit message
-                }
-                else if (isEditMsg) {
-                    additionalAttributes.edit = (0, WABinary_1.isJidNewsletter)(jid) ? '3' : '1';
-                    // required for pin message
-                }
-                else if (isPinMsg) {
-                    additionalAttributes.edit = '2';
-                    // required for keep message
-                }
-                else if (isKeepMsg) {
-                    additionalAttributes.edit = '6';
-                    // required for polling message
-                }
-                else if (isPollMessage) {
-                    additionalNodes.push({
-                        tag: 'meta',
-                        attrs: {
-                            polltype: 'creation'
-                        },
-                    });
-                    // required to display AI icon on message
-                }
-                else if (isAiMsg) {
-                    additionalNodes.push({
-                        attrs: {
-                            biz_bot: '1'
-                        },
-                        tag: "bot"
-                    });
-                }
-                if (mediaHandle) {
-                    additionalAttributes['media_id'] = mediaHandle;
-                }
-                if ('cachedGroupMetadata' in options) {
-                    console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.');
-                }
-                // Add AI context if needed
-                if (isAiMsg) {
-                    fullMsg.message.messageContextInfo = {
-                        ...fullMsg.message.messageContextInfo,
-                        biz_bot: '1'
-                    };
-                }
-
-
-                await rateLimiter.add(() => relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes, statusJidList: options.statusJidList }));
-                if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
-                    });
-                }
-                return fullMsg;
-            }
+			return rateLimiter.add(() => sendMessageInternal(jid, content, options));
         }
     };
 };

package/lib/Types/Socket.d.ts

@@ -125,4 +125,8 @@ export type SocketConfig = {
      * The number of messages to fetch at a time when interacting with newsletters
      */
     newsletterPageSize?: number;
+    /** Rate limit for sending messages per second. Defaults to 1. Set to a higher value for faster sending, but this may increase the risk of getting ur number banned. */
+    messagesSendRate?: number;
+    /** Adds a random delay to message sending to simulate human behavior. Defaults to true. Set to false for faster sending, but this may increase the risk of getting blocked. */
+    humanizeMessages?: boolean;
 };

package/lib/WAM/encode.js

@@ -7,7 +7,7 @@ const encodeWAM = (binaryInfo) => {
     binaryInfo.buffer = [];
     encodeWAMHeader(binaryInfo);
     encodeEvents(binaryInfo);
-    console.log(binaryInfo.buffer);
+    
     const totalSize = binaryInfo.buffer
         .map((a) => a.length)
         .reduce((a, b) => a + b);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.4",
+  "version": "2.7.5",
   "description": "whatsapp api by sam",
   "keywords": [
     "baileys",
@@ -12,9 +12,9 @@
     "multi-device",
     "based"
   ],
-  "homepage": "https://github.com/realvare/based.git",
+  "homepage": "git+https://github.com/realvare/based.git",
   "repository": {
-    "url": "https://github.com/realvare/based.git"
+    "url": "git+https://github.com/realvare/based.git"
   },
   "license": "MIT",
   "author": "realvare",
@@ -52,7 +52,7 @@
     "gradient-string": "^2.0.2",
     "jimp": "^1.6.0",
     "libphonenumber-js": "^1.12.31",
-    "libsignal": "npm:@newfadel/libsignal-node",
+    "libsignal": "github:realvare/libsignal",
     "lodash": "^4.17.21",
     "music-metadata": "^11.7.0",
     "pino": "^10.1.0",
@@ -68,7 +68,7 @@
     "@types/sharp": "^0.32.0",
     "@types/ws": "^8.5.10",
     "conventional-changelog-cli": "^2.2.2",
-    "eslint": "^8.57.0",
+    "eslint": "^9.0.0",
     "jest": "^29.7.0",
     "jimp": "^1.6.0",
     "json": "^11.0.0",
@@ -79,8 +79,8 @@
     "sharp": "^0.33.5",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.9.3"
+    "typedoc": "^0.27.0",
+    "typescript": "^5.8.0"
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",
@@ -106,4 +106,4 @@
   "engines": {
     "node": ">=20.0.0"
   }
-}
+}