@baileys-md/baileys 11.2.4 → 12.0.0

package/lib/Utils/message-retry-manager.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageRetryManager = void 0;
+
+const lru_cache_1 = require("lru-cache");
+
+const RECENT_MESSAGES_SIZE = 512;
+
+const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000;
+
+const PHONE_REQUEST_DELAY = 3000;
+
+class MessageRetryManager {
+    constructor(logger, maxMsgRetryCount) {
+        this.logger = logger;
+        this.maxMsgRetryCount = maxMsgRetryCount;
+        this._recentMessagesMap = new lru_cache_1.LRUCache({
+            max: RECENT_MESSAGES_SIZE
+        });
+        this._sessionRecreateHistory = new lru_cache_1.LRUCache({
+            ttl: RECREATE_SESSION_TIMEOUT * 2,
+            ttlAutopurge: true
+        });
+        this._retryCounters = new lru_cache_1.LRUCache({
+            ttl: 15 * 60 * 1000,
+            ttlAutopurge: true,
+            updateAgeOnGet: true
+        });
+        this._pendingPhoneRequests = {};
+        this.statistics = {
+            totalRetries: 0,
+            successfulRetries: 0,
+            failedRetries: 0,
+            mediaRetries: 0,
+            sessionRecreations: 0,
+            phoneRequests: 0
+        };
+        this.maxMsgRetryCount = maxMsgRetryCount;
+    }
+    addRecentMessage(to, id, message) {
+        const key = { to, id };
+        const keyStr = this._keyToString(key);
+        this._recentMessagesMap.set(keyStr, {
+            message,
+            timestamp: Date.now()
+        });
+        this.logger.debug(`Added message to retry cache: ${to}/${id}`);
+    }
+    getRecentMessage(to, id) {
+        const key = { to, id };
+        const keyStr = this._keyToString(key);
+        return this._recentMessagesMap.get(keyStr);
+    }
+    shouldRecreateSession(jid, retryCount, hasSession) {
+        if (!hasSession) {
+            this._sessionRecreateHistory.set(jid, Date.now());
+            this.statistics.sessionRecreations++;
+            return {
+                reason: "we don't have a Signal session with them",
+                recreate: true
+            };
+        }
+        if (retryCount < 2) {
+            return { reason: '', recreate: false };
+        }
+        const now = Date.now();
+        const prevTime = this._sessionRecreateHistory.get(jid);
+        if (!prevTime || now - prevTime > RECREATE_SESSION_TIMEOUT) {
+            this._sessionRecreateHistory.set(jid, now);
+            this.statistics.sessionRecreations++;
+            return {
+                reason: 'retry count > 1 and over an hour since last recreation',
+                recreate: true
+            };
+        }
+        return { reason: '', recreate: false };
+    }
+    incrementRetryCount(messageId) {
+        this._retryCounters.set(messageId, (this._retryCounters.get(messageId) || 0) + 1);
+        this.statistics.totalRetries++;
+        return this._retryCounters.get(messageId);
+    }
+    getRetryCount(messageId) {
+        return this._retryCounters.get(messageId) || 0;
+    }
+    hasExceededMaxRetries(messageId) {
+        return this.getRetryCount(messageId) >= this.maxMsgRetryCount;
+    }
+    markRetrySuccess(messageId) {
+        this.statistics.successfulRetries++;
+        this._retryCounters.delete(messageId);
+        this._cancelPendingPhoneRequest(messageId);
+    }
+    markRetryFailed(messageId) {
+        this.statistics.failedRetries++;
+        this._retryCounters.delete(messageId);
+    }
+    schedulePhoneRequest(messageId, callback, delay = PHONE_REQUEST_DELAY) {
+        this._cancelPendingPhoneRequest(messageId);
+        this._pendingPhoneRequests[messageId] = setTimeout(() => {
+            delete this._pendingPhoneRequests[messageId];
+            this.statistics.phoneRequests++;
+            callback();
+        }, delay);
+        this.logger.debug(`Scheduled phone request for message ${messageId} with ${delay}ms delay`);
+    }
+    cancelPendingPhoneRequest(messageId) {
+        const timeout = this._pendingPhoneRequests[messageId];
+        if (timeout) {
+            clearTimeout(timeout);
+            delete this._pendingPhoneRequests[messageId];
+            this.logger.debug(`Cancelled pending phone request for message ${messageId}`);
+        }
+    }
+    _keyToString(key) {
+        return `${key.to}:${key.id}`;
+    }
+    _cancelPendingPhoneRequest(messageId) {
+        const timeout = this._pendingPhoneRequests[messageId];
+        if (timeout) {
+            clearTimeout(timeout);
+            delete this._pendingPhoneRequests[messageId];
+            this.logger.debug(`Cancelled pending phone request for message ${messageId}`);
+        }
+    }
+}
+
+exports.MessageRetryManager = MessageRetryManager;

package/lib/Utils/messages-media.js

@@ -36,15 +36,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.hkdfInfoKey = void 0;
+exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.extractVideoThumb = exports.hkdfInfoKey = void 0;
 exports.getMediaKeys = getMediaKeys;
+exports.uploadFile = uploadFile;
+exports.vid2jpg = vid2jpg;
 exports.getAudioDuration = getAudioDuration;
 exports.getAudioWaveform = getAudioWaveform;
 exports.generateThumbnail = generateThumbnail;
 exports.extensionForMediaMessage = extensionForMediaMessage;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
-const child_process_1 = require("child_process");
+const form_data_1 = __importDefault(require("form-data"));
+const cheerio = __importStar(require("cheerio"));
 const Crypto = __importStar(require("crypto"));
 const events_1 = require("events");
 const fs_1 = require("fs");
@@ -52,6 +55,7 @@ const os_1 = require("os");
 const path_1 = require("path");
 const jimp_1 = __importDefault(require("jimp"));
 const stream_1 = require("stream");
+const child_process_1 = require("child_process");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
@@ -99,18 +103,176 @@ async function getMediaKeys(buffer, mediaType) {
         macKey: expandedMediaKey.slice(48, 80),
     };
 }
-/** Extracts video thumb using FFMPEG */
-const extractVideoThumb = async (path, destPath, time, size) => new Promise((resolve, reject) => {
-    const cmd = `ffmpeg -ss ${time} -i ${path} -y -vf scale=${size.width}:-1 -vframes 1 -f image2 ${destPath}`;
-    (0, child_process_1.exec)(cmd, (err) => {
-        if (err) {
-            reject(err);
+async function uploadFile(buffer, logger) {
+    const { fromBuffer } = await Promise.resolve().then(() => __importStar(require('file-type')));
+    const fileType = await fromBuffer(buffer);
+    if (!fileType)
+        throw new Error("Failed to detect file type.");
+    const { ext, mime } = fileType;
+    const services = [
+        {
+            name: "catbox",
+            url: "https://catbox.moe/user/api.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("fileToUpload", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                form.append("reqtype", "fileupload");
+                return form;
+            },
+            parseResponse: res => res.data
+        },
+        {
+            name: "pdi.moe",
+            url: "https://scdn.pdi.moe/upload",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("file", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime
+                });
+                return form;
+            },
+            parseResponse: res => res.data.result.url
+        },
+        {
+            name: "qu.ax",
+            url: "https://qu.ax/upload.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("files[]", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                return form;
+            },
+            parseResponse: res => {
+                var _a, _b, _c;
+                if (!((_c = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url))
+                    throw new Error("Failed to get URL from qu.ax");
+                return res.data.files[0].url;
+            }
+        },
+        {
+            name: "uguu.se",
+            url: "https://uguu.se/upload.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("files[]", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                return form;
+            },
+            parseResponse: res => {
+                var _a, _b, _c;
+                if (!((_c = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url))
+                    throw new Error("Failed to get URL from uguu.se");
+                return res.data.files[0].url;
+            }
+        },
+        {
+            name: "tmpfiles",
+            url: "https://tmpfiles.org/api/v1/upload",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("file", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime
+                });
+                return form;
+            },
+            parseResponse: res => {
+                const match = res.data.data.url.match(/https:\/\/tmpfiles\.org\/(.*)/);
+                if (!match)
+                    throw new Error("Failed to parse tmpfiles URL.");
+                return `https://tmpfiles.org/dl/${match[1]}`;
+            }
         }
-        else {
-            resolve();
+    ];
+    for (const service of services) {
+        try {
+            const form = service.buildForm();
+            const res = await axios_1.default.post(service.url, form, {
+                headers: form.getHeaders()
+            });
+            const url = service.parseResponse(res);
+            return url;
+        }
+        catch (error) {
+            logger === null || logger === void 0 ? void 0 : logger.debug(`[${service.name}] eror:`, (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
+    }
+    throw new Error("All upload services failed.");
+}
+async function vid2jpg(videoUrl) {
+    try {
+        const { data } = await axios_1.default.get(`https://ezgif.com/video-to-jpg?url=${encodeURIComponent(videoUrl)}`);
+        const $ = cheerio.load(data);
+        const fileToken = $('input[name="file"]').attr("value");
+        if (!fileToken) {
+            throw new Error("Failed to retrieve file token. The video URL may be invalid or inaccessible.");
+        }
+        const formData = new URLSearchParams();
+        formData.append("file", fileToken);
+        formData.append("end", "1");
+        formData.append("video-to-jpg", "Convert to JPG!");
+        const convert = await axios_1.default.post(`https://ezgif.com/video-to-jpg/${fileToken}`, formData);
+        const $2 = cheerio.load(convert.data);
+        let imageUrl = $2("#output img").first().attr("src");
+        if (!imageUrl) {
+            throw new Error("Could not locate the converted image output.");
         }
+        if (imageUrl.startsWith("//")) {
+            imageUrl = "https:" + imageUrl;
+        }
+        else if (imageUrl.startsWith("/")) {
+            const cdnMatch = imageUrl.match(/\/(s\d+\..+?)\/.*/);
+            if (cdnMatch) {
+                imageUrl = "https://" + imageUrl.slice(2);
+            }
+            else {
+                imageUrl = "https://ezgif.com" + imageUrl;
+            }
+        }
+        return imageUrl;
+    }
+    catch (error) {
+        throw new Error("Failed to convert video to JPG: " + error.message);
+    }
+}
+/**
+ * Extracts video thumbnail using FFmpeg
+ */
+const extractVideoThumb = async (videoPath, time = '00:00:00', size = { width: 256 }) => {
+    return new Promise((resolve, reject) => {
+        const args = [
+            '-ss', time,
+            '-i', videoPath,
+            '-y',
+            '-vf', `scale=${size.width}:-1`,
+            '-vframes', '1',
+            '-f', 'image2',
+            '-vcodec', 'mjpeg',
+            'pipe:1'
+        ];
+        const ffmpeg = (0, child_process_1.spawn)('ffmpeg', args);
+        const chunks = [];
+        let errorOutput = '';
+        ffmpeg.stdout.on('data', chunk => chunks.push(chunk));
+        ffmpeg.stderr.on('data', data => {
+            errorOutput += data.toString();
+        });
+        ffmpeg.on('error', reject);
+        ffmpeg.on('close', code => {
+            if (code === 0) return resolve(Buffer.concat(chunks));
+            reject(new Error(`ffmpeg exited with code ${code}\n${errorOutput}`));
+        });
     });
-});
+};
+exports.extractVideoThumb = extractVideoThumb;
 const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     var _a, _b;
     if (bufferOrFilePath instanceof stream_1.Readable) {
@@ -189,26 +351,20 @@ exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
     const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
     let metadata;
+    const options = {
+        duration: true
+    };
     if (Buffer.isBuffer(buffer)) {
-        metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseBuffer(buffer, undefined, options);
     }
     else if (typeof buffer === 'string') {
-        const rStream = (0, fs_1.createReadStream)(buffer);
-        try {
-            metadata = await musicMetadata.parseStream(rStream, undefined, { duration: true });
-        }
-        finally {
-            rStream.destroy();
-        }
+        metadata = await musicMetadata.parseFile(buffer, options);
     }
     else {
-        metadata = await musicMetadata.parseStream(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseStream(buffer, undefined, options);
     }
     return metadata.format.duration;
 }
-/**
-  referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
- */
 async function getAudioWaveform(buffer, logger) {
     try {
         const { default: decoder } = await eval('import(\'audio-decode\')');
@@ -224,22 +380,20 @@ async function getAudioWaveform(buffer, logger) {
             audioData = await (0, exports.toBuffer)(buffer);
         }
         const audioBuffer = await decoder(audioData);
-        const rawData = audioBuffer.getChannelData(0); // We only need to work with one channel of data
-        const samples = 64; // Number of samples we want to have in our final data set
-        const blockSize = Math.floor(rawData.length / samples); // the number of samples in each subdivision
+        const rawData = audioBuffer.getChannelData(0);
+        const samples = 64;
+        const blockSize = Math.floor(rawData.length / samples);
         const filteredData = [];
         for (let i = 0; i < samples; i++) {
-            const blockStart = blockSize * i; // the location of the first sample in the block
+            const blockStart = blockSize * i;
             let sum = 0;
             for (let j = 0; j < blockSize; j++) {
-                sum = sum + Math.abs(rawData[blockStart + j]); // find the sum of all the samples in the block
+                sum = sum + Math.abs(rawData[blockStart + j]);
             }
-            filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
+            filteredData.push(sum / blockSize);
         }
-        // This guarantees that the largest data point will be set to 1, and the rest of the data will scale proportionally.
         const multiplier = Math.pow(Math.max(...filteredData), -1);
         const normalizedData = filteredData.map((n) => n * multiplier);
-        // Generate waveform like WhatsApp
         const waveform = new Uint8Array(normalizedData.map((n) => Math.floor(100 * n)));
         return waveform;
     }
@@ -292,12 +446,28 @@ async function generateThumbnail(file, mediaType, options) {
         }
     }
     else if (mediaType === 'video') {
-        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
         try {
-            await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 });
-            const buff = await fs_1.promises.readFile(imgFilename);
-            thumbnail = buff.toString('base64');
+            let videoPath = file;
+            if (Buffer.isBuffer(file) || file instanceof stream_1.Readable) {
+                videoPath = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.mp4');
+                const buffer = Buffer.isBuffer(file) ? file : await (0, exports.toBuffer)(file);
+                await fs_1.promises.writeFile(videoPath, buffer);
+            }
+            const thumbnailBuffer = await (0, exports.extractVideoThumb)(videoPath);
+            const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
+            await fs_1.promises.writeFile(imgFilename, thumbnailBuffer);
+            const { buffer: processedThumbnailBuffer, original } = await (0, exports.extractImageThumb)(imgFilename);
+            thumbnail = processedThumbnailBuffer.toString('base64');
+            if (original.width && original.height) {
+                originalImageDimensions = {
+                    width: original.width,
+                    height: original.height,
+                };
+            }
             await fs_1.promises.unlink(imgFilename);
+            if (videoPath !== file) {
+                await fs_1.promises.unlink(videoPath);
+            }
         }
         catch (err) {
             (_a = options.logger) === null || _a === void 0 ? void 0 : _a.debug('could not generate video thumb: ' + err);
@@ -343,7 +513,6 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
         };
     }
     catch (error) {
-        // destroy all streams with error
         stream.destroy();
         if (didSaveToTmpPath) {
             try {
@@ -419,7 +588,6 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
         };
     }
     catch (error) {
-        // destroy all streams with error
         encWriteStream.destroy();
         writeStream === null || writeStream === void 0 ? void 0 : writeStream.destroy();
         aes.destroy();
@@ -452,20 +620,19 @@ const toSmallestChunkSize = (num) => {
 const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
 exports.getUrlFromDirectPath = getUrlFromDirectPath;
 const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
-    const downloadUrl = url || (0, exports.getUrlFromDirectPath)(directPath);
+    const isValidMediaUrl = url === null || url === void 0 ? void 0 : url.startsWith('https://mmg.whatsapp.net/');
+    const downloadUrl = isValidMediaUrl ? url : (0, exports.getUrlFromDirectPath)(directPath);
+    if (!downloadUrl) {
+        throw new boom_1.Boom('No valid media URL or directPath present in message', { statusCode: 400 });
+    }
     const keys = await getMediaKeys(mediaKey, type);
     return (0, exports.downloadEncryptedContent)(downloadUrl, keys, opts);
 };
 exports.downloadContentFromMessage = downloadContentFromMessage;
-/**
- * Decrypts and downloads an AES256-CBC encrypted file given the keys.
- * Assumes the SHA256 of the plaintext is appended to the end of the ciphertext
- * */
 const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startByte, endByte, options } = {}) => {
     let bytesFetched = 0;
     let startChunk = 0;
     let firstBlockIsIV = false;
-    // if a start byte is specified -- then we need to fetch the previous chunk as that will form the IV
     if (startByte) {
         const chunk = toSmallestChunkSize(startByte || 0);
         if (chunk) {
@@ -485,7 +652,6 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             headers.Range += endChunk;
         }
     }
-    // download the message
     const fetched = await (0, exports.getHttpStream)(downloadUrl, {
         ...options || {},
         headers,
@@ -518,8 +684,6 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
                     data = data.slice(AES_CHUNK_SIZE);
                 }
                 aes = Crypto.createDecipheriv('aes-256-cbc', cipherKey, ivValue);
-                // if an end byte that is not EOF is specified
-                // stop auto padding (PKCS7) -- otherwise throws an error for decryption
                 if (endByte) {
                     aes.setAutoPadding(false);
                 }
@@ -563,7 +727,6 @@ function extensionForMediaMessage(message) {
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
-        // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
@@ -581,7 +744,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         }
         for (const { hostname, maxContentLengthBytes } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
-            const auth = encodeURIComponent(uploadInfo.auth); // the auth token
+            const auth = encodeURIComponent(uploadInfo.auth);
             const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
             let result;
             try {
@@ -633,9 +796,6 @@ exports.getWAUploadToServer = getWAUploadToServer;
 const getMediaRetryKey = (mediaKey) => {
     return (0, crypto_1.hkdf)(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
 };
-/**
- * Generate a binary node that will request the phone to re-upload the media & return the newly uploaded URL
- */
 const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     const recp = { stanzaId: key.id };
     const recpBuffer = WAProto_1.proto.ServerErrorReceipt.encode(recp).finish();
@@ -650,9 +810,6 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
             type: 'server-error'
         },
         content: [
-            // this encrypt node is actually pretty useless
-            // the media is returned even without this node
-            // keeping it here to maintain parity with WA Web
             {
                 tag: 'encrypt',
                 attrs: {},
@@ -666,7 +823,6 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
                 attrs: {
                     jid: key.remoteJid,
                     'from_me': (!!key.fromMe).toString(),
-                    // @ts-ignore
                     participant: key.participant || undefined
                 }
             }
@@ -718,7 +874,6 @@ const MEDIA_RETRY_STATUS_MAP = {
     [WAProto_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
     [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418,
 };
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function __importStar(arg0) {
     throw new Error('Function not implemented.');
-}
+}

package/lib/Utils/messages.js

@@ -434,12 +434,12 @@ const generateWAMessageContent = async (message, options) => {
             m.pollCreationMessageV2 = pollCreationMessage;
         }
         else {
-            if (message.poll.selectableCount > 0) {
+            if (message.poll.selectableCount === 1) {
                 // poll v3 is for single select polls
                 m.pollCreationMessageV3 = pollCreationMessage;
             }
             else {
-                // poll v3 for multiple choice polls
+                // poll for multiple choice polls
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
@@ -499,6 +499,14 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPhoneNumber' in message) {
         m.requestPhoneNumberMessage = {};
     }
+    else if ('album' in message) {
+        const imageMessages = message.album.filter(item => 'image' in item);
+        const videoMessages = message.album.filter(item => 'video' in item);
+        m.albumMessage = WAProto_1.proto.Message.AlbumMessage.fromObject({
+            expectedImageCount: imageMessages.length,
+            expectedVideoCount: videoMessages.length,
+        });
+    }
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
@@ -563,7 +571,7 @@ const generateWAMessageContent = async (message, options) => {
             title: message.title,
             footerText: message.footer,
             description: message.text,
-            listType: message.hasOwnProperty('listType') ? message.listType : WAProto_1.proto.Message.ListMessage.ListType.PRODUCT_LIST
+            listType: WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT
         };
         m = { listMessage };
     }
@@ -798,7 +806,12 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4)
             || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5)
             || (message === null || message === void 0 ? void 0 : message.statusAddYours)
-            || (message === null || message === void 0 ? void 0 : message.groupStatusMessage));
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessage)
+            || (message === null || message === void 0 ? void 0 : message.limitSharingMessage)
+            || (message === null || message === void 0 ? void 0 : message.botTaskMessage)
+            || (message === null || message === void 0 ? void 0 : message.questionMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2)
+            || (message === null || message === void 0 ? void 0 : message.botForwardedMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -871,9 +884,8 @@ const updateMessageWithReaction = (msg, reaction) => {
     const authorID = (0, generics_1.getKeyAuthor)(reaction.key);
     const reactions = (msg.reactions || [])
         .filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
-    if (reaction.text) {
-        reactions.push(reaction);
-    }
+    reaction.text = reaction.text || '';
+    reactions.push(reaction);
     msg.reactions = reactions;
 };
 exports.updateMessageWithReaction = updateMessageWithReaction;
@@ -1016,3 +1028,22 @@ const assertMediaContent = (content) => {
     return mediaContent;
 };
 exports.assertMediaContent = assertMediaContent;
+
+const toJid = (id) => {
+    if (!id)
+        return '';
+    if (id.endsWith('@lid'))
+        return id.replace('@lid', '@s.whatsapp.net');
+    if (id.includes('@'))
+        return id;
+    return `${id}@s.whatsapp.net`;
+};
+exports.toJid = toJid;
+const getSenderLid = (message) => {
+    const sender = message.key.participant || message.key.remoteJid;
+    const user = (0, WABinary_1.jidDecode)(sender)?.user || '';
+    const lid = (0, WABinary_1.jidEncode)(user, 'lid');
+    console.log('sender lid:', lid);
+    return { jid: sender, lid };
+};
+exports.getSenderLid = getSenderLid;

package/lib/Utils/noise-handler.js

@@ -11,7 +11,7 @@ const generateIV = (counter) => {
     new DataView(iv).setUint32(8, counter);
     return new Uint8Array(iv);
 };
-const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
+const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' });
     const authenticate = (data) => {
         if (!isFinished) {
@@ -83,15 +83,10 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             const decStaticContent = decrypt(serverHello.static);
             await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent));
             const certDecoded = decrypt(serverHello.payload);
-            if (mobile) {
-                WAProto_1.proto.CertChain.NoiseCertificate.decode(certDecoded);
-            }
-            else {
-                const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
-                const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
-                if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
-                    throw new boom_1.Boom('certification match failed', { statusCode: 400 });
-                }
+            const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
+            const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
+            if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
+                throw new boom_1.Boom('certification match failed', { statusCode: 400 });
             }
             const keyEnc = encrypt(noiseKey.public);
             await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));