@genuxofficial/baileys 2.0.0 → 4.0.0

package/lib/Utils/lt-hash.js

@@ -15,37 +15,71 @@ class d {
     add(e, t) {
         var r = this;
         for (const item of t) {
-            e = r._addSingle(e, item);
+            try {
+                e = r._addSingle(e, item);
+            }
+            catch (error) {
+                continue;
+            }
         }
         return e;
     }
     subtract(e, t) {
         var r = this;
         for (const item of t) {
-            e = r._subtractSingle(e, item);
+            try {
+                e = r._subtractSingle(e, item);
+            }
+            catch (error) {
+                continue;
+            }
         }
         return e;
     }
     subtractThenAdd(e, t, r) {
         var n = this;
-        return n.add(n.subtract(e, r), t);
+        try {
+            return n.add(n.subtract(e, r), t);
+        }
+        catch (error) {
+            return e;
+        }
     }
     async _addSingle(e, t) {
         var r = this;
-        const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e + t));
+        try {
+            const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
+            return r.performPointwiseWithOverflow(await e, n, ((e, t) => e + t));
+        }
+        catch (error) {
+            return e;
+        }
     }
     async _subtractSingle(e, t) {
         var r = this;
-        const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e - t));
+        try {
+            const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
+            return r.performPointwiseWithOverflow(e, n, ((e, t) => e - t));
+        }
+        catch (error) {
+            return e;
+        }
     }
     performPointwiseWithOverflow(e, t, r) {
-        const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a);
-        for (let e = 0; e < n.byteLength; e += 2) {
-            s.setUint16(e, r(n.getUint16(e, !0), i.getUint16(e, !0)), !0);
+        try {
+            const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a);
+            for (let e = 0; e < n.byteLength; e += 2) {
+                try {
+                    s.setUint16(e, r(n.getUint16(e, !0), i.getUint16(e, !0)), !0);
+                }
+                catch (error) {
+                }
+            }
+            return a;
+        }
+        catch (error) {
+            return e;
         }
-        return a;
     }
 }
 exports.LT_HASH_ANTI_TAMPERING = new d('WhatsApp Patch Integrity');

package/lib/Utils/make-mutex.d.ts

@@ -1,7 +1,7 @@
 export declare const makeMutex: () => {
-    mutex<T>(code: () => Promise<T> | T): Promise<T>;
+    mutex<T>(code: () => T | Promise<T>): Promise<T>;
 };
 export type Mutex = ReturnType<typeof makeMutex>;
 export declare const makeKeyedMutex: () => {
-    mutex<T>(key: string, task: () => Promise<T> | T): Promise<T>;
+    mutex<T>(key: string, task: () => T | Promise<T>): Promise<T>;
 };

package/lib/Utils/messages-media.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { AxiosRequestConfig } from 'axios';
 import { Readable, Transform } from 'stream';
@@ -10,7 +14,7 @@ export declare const hkdfInfoKey: (type: MediaType) => string;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
 export declare function getMediaKeys(buffer: Uint8Array | string | null | undefined, mediaType: MediaType): Promise<MediaDecryptionKeyInfo>;
 export declare const extractImageThumb: (bufferOrFilePath: Readable | Buffer | string, width?: number) => Promise<{
-    buffer: Buffer<ArrayBufferLike>;
+    buffer: Buffer;
     original: {
         width: number | undefined;
         height: number | undefined;
@@ -18,21 +22,7 @@ export declare const extractImageThumb: (bufferOrFilePath: Readable | Buffer | s
 }>;
 export declare const encodeBase64EncodedStringForUpload: (b64: string) => string;
 export declare const generateProfilePicture: (mediaUpload: WAMediaUpload) => Promise<{
-    img: Buffer<ArrayBufferLike>;
-}>;
-export declare const generateProfilePictureFull: (img: any) => Promise<{
-    img: any;
-}>;
-export declare const generateProfilePictureFP: (buffer: any) => Promise<{
-    img: any;
-    preview: any;
-}>;
-export declare const generatePP: (buffer: any) => Promise<{
-    img: any;
-    preview: any;
-}>;
-export declare const changeprofileFull: (img: any) => Promise<{
-    img: any;
+    img: Buffer;
 }>;
 /** gets the SHA256 of the given media message */
 export declare const mediaMessageSHA256B64: (message: WAMessageContent) => string | null | undefined;
@@ -40,9 +30,9 @@ export declare function getAudioDuration(buffer: Buffer | string | Readable): Pr
 /**
   referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
  */
-export declare function getAudioWaveform(buffer: Buffer | string | Readable, logger?: ILogger): Promise<Uint8Array<ArrayBuffer> | undefined>;
+export declare function getAudioWaveform(buffer: Buffer | string | Readable, logger?: ILogger): Promise<Uint8Array | undefined>;
 export declare const toReadable: (buffer: Buffer) => Readable;
-export declare const toBuffer: (stream: Readable) => Promise<Buffer<ArrayBuffer>>;
+export declare const toBuffer: (stream: Readable) => Promise<Buffer>;
 export declare const getStream: (item: WAMediaUpload, opts?: AxiosRequestConfig) => Promise<{
     readonly stream: Readable;
     readonly type: "buffer";
@@ -76,20 +66,20 @@ type EncryptedStreamOptions = {
 };
 export declare const prepareStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
     mediaKey: undefined;
-    encWriteStream: Buffer<ArrayBuffer>;
+    encWriteStream: Buffer;
     fileLength: number;
-    fileSha256: Buffer<ArrayBufferLike>;
+    fileSha256: Buffer;
     fileEncSha256: undefined;
     bodyPath: string | undefined;
     didSaveToTmpPath: boolean;
 }>;
 export declare const encryptedStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
-    mediaKey: Buffer<ArrayBufferLike>;
+    mediaKey: Buffer;
     encWriteStream: Readable;
     bodyPath: string | undefined;
-    mac: Buffer<ArrayBuffer>;
-    fileEncSha256: Buffer<ArrayBufferLike>;
-    fileSha256: Buffer<ArrayBufferLike>;
+    mac: Buffer;
+    fileEncSha256: Buffer;
+    fileSha256: Buffer;
     fileLength: number;
     didSaveToTmpPath: boolean;
 }>;
@@ -116,8 +106,8 @@ export declare const decodeMediaRetryNode: (node: BinaryNode) => {
     media?: {
         ciphertext: Uint8Array;
         iv: Uint8Array;
-    };
-    error?: Boom;
+    } | undefined;
+    error?: Boom<any> | undefined;
 };
 export declare const decryptMediaRetryData: ({ ciphertext, iv }: {
     ciphertext: Uint8Array;

package/lib/Utils/messages-media.js

@@ -15,33 +15,18 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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.changeprofileFull = exports.generatePP = exports.generateProfilePictureFP = exports.generateProfilePictureFull = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.hkdfInfoKey = void 0;
-exports.getMediaKeys = getMediaKeys;
-exports.getAudioDuration = getAudioDuration;
-exports.getAudioWaveform = getAudioWaveform;
-exports.generateThumbnail = generateThumbnail;
-exports.extensionForMediaMessage = extensionForMediaMessage;
+exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.extensionForMediaMessage = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.generateThumbnail = exports.getStream = exports.toBuffer = exports.toReadable = exports.getAudioWaveform = exports.getAudioDuration = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.getMediaKeys = exports.hkdfInfoKey = void 0;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const child_process_1 = require("child_process");
@@ -61,11 +46,13 @@ const getTmpFilesDirectory = () => (0, os_1.tmpdir)();
 const getImageProcessingLibrary = async () => {
     const [_jimp, sharp] = await Promise.all([
         (async () => {
-            const jimp = await (Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { }));
+            const jimp = await (import('jimp')
+                .catch(() => { }));
             return jimp;
         })(),
         (async () => {
-            const sharp = await (Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { }));
+            const sharp = await (import('sharp')
+                .catch(() => { }));
             return sharp;
         })()
     ]);
@@ -99,6 +86,7 @@ async function getMediaKeys(buffer, mediaType) {
         macKey: expandedMediaKey.slice(48, 80),
     };
 }
+exports.getMediaKeys = getMediaKeys;
 /** 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}`;
@@ -180,76 +168,6 @@ const generateProfilePicture = async (mediaUpload) => {
     };
 };
 exports.generateProfilePicture = generateProfilePicture;
-const generateProfilePictureFull = async (img) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await read(img);
-    const min = Math.min(jimp.getWidth(), jimp.getHeight());
-    const cropped = jimp.crop(0, 0, jimp.getWidth(), jimp.getHeight());
-    let width = jimp.getWidth(), hight = jimp.getHeight(), ratio;
-    if (width > hight) {
-        ratio = jimp.getWidth() / 720;
-    }
-    else {
-        ratio = jimp.getWidth() / 324;
-    }
-    ;
-    width = width / ratio;
-    hight = hight / ratio;
-    img = cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG);
-    return {
-        img: await cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG),
-    };
-};
-exports.generateProfilePictureFull = generateProfilePictureFull;
-const generateProfilePictureFP = async (buffer) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await Jimp.read(buffer);
-    const min = jimp.getWidth();
-    const max = jimp.getHeight();
-    const cropped = jimp.crop(0, 0, min, max);
-    return {
-        img: await cropped.scaleToFit(720, 720).getBufferAsync(Jimp.MIME_JPEG),
-        preview: await cropped.normalize().getBufferAsync(Jimp.MIME_JPEG),
-    };
-};
-exports.generateProfilePictureFP = generateProfilePictureFP;
-const generatePP = async (buffer) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await Jimp.read(buffer);
-    const min = jimp.getWidth();
-    const max = jimp.getHeight();
-    const cropped = jimp.crop(0, 0, min, max);
-    return {
-        img: await cropped.scaleToFit(720, 720).getBufferAsync(Jimp.MIME_JPEG),
-        preview: await cropped.normalize().getBufferAsync(Jimp.MIME_JPEG),
-    };
-};
-exports.generatePP = generatePP;
-const changeprofileFull = async (img) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await read(img);
-    const min = Math.min(jimp.getWidth(), jimp.getHeight());
-    const cropped = jimp.crop(0, 0, jimp.getWidth(), jimp.getHeight());
-    let width = jimp.getWidth(), hight = jimp.getHeight(), ratio;
-    if (width > hight) {
-        ratio = jimp.getWidth() / 720;
-    }
-    else {
-        ratio = jimp.getWidth() / 324;
-    }
-    ;
-    width = width / ratio;
-    hight = hight / ratio;
-    img = cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG);
-    return {
-        img: await cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG),
-    };
-};
-exports.changeprofileFull = changeprofileFull;
 /** gets the SHA256 of the given media message */
 const mediaMessageSHA256B64 = (message) => {
     const media = Object.values(message)[0];
@@ -257,7 +175,7 @@ const mediaMessageSHA256B64 = (message) => {
 };
 exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
-    const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
+    const musicMetadata = await import('music-metadata');
     let metadata;
     if (Buffer.isBuffer(buffer)) {
         metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
@@ -276,6 +194,7 @@ async function getAudioDuration(buffer) {
     }
     return metadata.format.duration;
 }
+exports.getAudioDuration = getAudioDuration;
 /**
   referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
  */
@@ -317,6 +236,7 @@ async function getAudioWaveform(buffer, logger) {
         logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
     }
 }
+exports.getAudioWaveform = getAudioWaveform;
 const toReadable = (buffer) => {
     const readable = new stream_1.Readable({ read: () => { } });
     readable.push(buffer);
@@ -362,7 +282,7 @@ async function generateThumbnail(file, mediaType, options) {
         }
     }
     else if (mediaType === 'video') {
-        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
+        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageID)() + '.jpg');
         try {
             await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 });
             const buff = await fs_1.promises.readFile(imgFilename);
@@ -378,6 +298,7 @@ async function generateThumbnail(file, mediaType, options) {
         originalImageDimensions
     };
 }
+exports.generateThumbnail = generateThumbnail;
 const getHttpStream = async (url, options = {}) => {
     const fetched = await axios_1.default.get(url.toString(), { ...options, responseType: 'stream' });
     return fetched.data;
@@ -394,7 +315,7 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
             bodyPath = media.url;
         }
         else if (saveOriginalFileIfRequired) {
-            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
+            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
             (0, fs_1.writeFileSync)(bodyPath, buffer);
             didSaveToTmpPath = true;
         }
@@ -437,10 +358,10 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     let writeStream;
     let didSaveToTmpPath = false;
     if (type === 'file') {
-        bodyPath = media.url.toString();
+        bodyPath = media.url;
     }
     else if (saveOriginalFileIfRequired) {
-        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
+        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
         writeStream = (0, fs_1.createWriteStream)(bodyPath);
         didSaveToTmpPath = true;
     }
@@ -460,8 +381,10 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                 });
             }
             sha256Plain = sha256Plain.update(data);
-            if (writeStream && !writeStream.write(data)) {
-                await (0, events_1.once)(writeStream, 'drain');
+            if (writeStream) {
+                if (!writeStream.write(data)) {
+                    await (0, events_1.once)(writeStream, 'drain');
+                }
             }
             onChunk(aes.update(data));
         }
@@ -628,6 +551,7 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
+exports.extensionForMediaMessage = extensionForMediaMessage;
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;

package/lib/Utils/messages.d.ts

@@ -1,3 +1,6 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { type Transform } from 'stream';
 import { proto } from '../../WAProto';
 import { ILogger } from './logger';
@@ -9,7 +12,7 @@ import { MediaDownloadOptions } from './messages-media';
  * @returns the URL, eg. https://google.com
  */
 export declare const extractUrlFromText: (text: string) => string | undefined;
-export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions["getUrlInfo"], logger: MessageGenerationOptions["logger"]) => Promise<import("../Types").WAUrlInfo | undefined>;
+export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions['getUrlInfo'], logger: MessageGenerationOptions['logger']) => Promise<import("../Types").WAUrlInfo | undefined>;
 export declare const prepareWAMessageMedia: (message: AnyMediaMessageContent, options: MediaGenerationOptions) => Promise<proto.Message>;
 export declare const prepareDisappearingMessageSettingContent: (ephemeralExpiration?: number) => proto.Message;
 /**
@@ -40,11 +43,11 @@ export declare const extractMessageContent: (content: WAMessageContent | undefin
  */
 export declare const getDevice: (id: string) => "android" | "unknown" | "web" | "ios" | "desktop";
 /** Upserts a receipt in the message */
-export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, "userReceipt">, receipt: MessageUserReceipt) => void;
+export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, 'userReceipt'>, receipt: MessageUserReceipt) => void;
 /** Update the message with a new reaction */
-export declare const updateMessageWithReaction: (msg: Pick<WAMessage, "reactions">, reaction: proto.IReaction) => void;
+export declare const updateMessageWithReaction: (msg: Pick<WAMessage, 'reactions'>, reaction: proto.IReaction) => void;
 /** Update the message with a new poll update */
-export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, "pollUpdates">, update: proto.IPollUpdate) => void;
+export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, 'pollUpdates'>, update: proto.IPollUpdate) => void;
 type VoteAggregation = {
     name: string;
     voters: string[];
@@ -69,7 +72,7 @@ type DownloadMediaMessageContext = {
 /**
  * Downloads the given message. Throws an error if it's not a media message
  */
-export declare const downloadMediaMessage: <Type extends "buffer" | "stream">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer<ArrayBufferLike> : Transform>;
+export declare const downloadMediaMessage: <Type extends "stream" | "buffer">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer : Transform>;
 /** Checks whether the given message is a media message; if it is returns the inner content */
 export declare const assertMediaContent: (content: proto.IMessage | null | undefined) => proto.Message.IVideoMessage | proto.Message.IImageMessage | proto.Message.IAudioMessage | proto.Message.IDocumentMessage | proto.Message.IStickerMessage;
 export {};

package/lib/Utils/messages.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
-exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
+exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.getAggregateVotesInPollMessage = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
@@ -275,9 +274,6 @@ const generateWAMessageContent = async (message, options) => {
             extContent.font = options.font;
         }
         m.extendedTextMessage = extContent;
-        m.messageContextInfo = {
-            messageSecret: (0, crypto_1.randomBytes)(32)
-        };
     }
     else if ('contacts' in message) {
         const contactLen = message.contacts.contacts.length;
@@ -737,7 +733,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)(),
+            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageID)(),
         },
         message: message,
         messageTimestamp: timestamp,
@@ -801,10 +797,7 @@ 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.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.groupStatusMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -932,6 +925,7 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     }
     return Object.values(voteHashMap);
 }
+exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 /** Given a list of message keys, aggregates them by chat & sender. Useful for sending read receipts in bulk */
 const aggregateMessageKeysNotFromMe = (keys) => {
     const keyMap = {};
@@ -959,13 +953,17 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
     const result = await downloadMsg()
         .catch(async (error) => {
         var _a;
-        if (ctx && axios_1.default.isAxiosError(error) && // check if the message requires a reupload
-            REUPLOAD_REQUIRED_STATUS.includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) {
-            ctx.logger.info({ key: message.key }, 'sending reupload media request...');
-            // request reupload
-            message = await ctx.reuploadRequest(message);
-            const result = await downloadMsg();
-            return result;
+        if (ctx) {
+            if (axios_1.default.isAxiosError(error)) {
+                // check if the message requires a reupload
+                if (REUPLOAD_REQUIRED_STATUS.includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) {
+                    ctx.logger.info({ key: message.key }, 'sending reupload media request...');
+                    // request reupload
+                    message = await ctx.reuploadRequest(message);
+                    const result = await downloadMsg();
+                    return result;
+                }
+            }
         }
         throw error;
     });

package/lib/Utils/noise-handler.d.ts

@@ -1,19 +1,22 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { ILogger } from './logger';
 import { proto } from '../../WAProto';
 import { KeyPair } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
+export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;
+    mobile: boolean;
     logger: ILogger;
     routingInfo?: Buffer | undefined;
 }) => {
-    encrypt: (plaintext: Uint8Array) => Buffer<ArrayBuffer>;
-    decrypt: (ciphertext: Uint8Array) => Buffer<ArrayBuffer>;
+    encrypt: (plaintext: Uint8Array) => Buffer;
+    decrypt: (ciphertext: Uint8Array) => Buffer;
     authenticate: (data: Uint8Array) => void;
     mixIntoKey: (data: Uint8Array) => Promise<void>;
     finishInit: () => Promise<void>;
-    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Promise<Buffer<ArrayBuffer>>;
-    encodeFrame: (data: Buffer | Uint8Array) => Buffer<ArrayBuffer>;
+    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Promise<Buffer>;
+    encodeFrame: (data: Buffer | Uint8Array) => Buffer;
     decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => Promise<void>;
 };

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, logger, routingInfo }) => {
+const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' });
     const authenticate = (data) => {
         if (!isFinished) {
@@ -83,10 +83,15 @@ 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);
-            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 });
+            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 keyEnc = encrypt(noiseKey.public);
             await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));

package/lib/Utils/process-message.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChatId = exports.shouldIncrementChatUnread = exports.isRealMessage = exports.cleanMessage = void 0;
-exports.decryptPollVote = decryptPollVote;
+exports.decryptPollVote = exports.getChatId = exports.shouldIncrementChatUnread = exports.isRealMessage = exports.cleanMessage = void 0;
 const WAProto_1 = require("../../WAProto");
 const Types_1 = require("../Types");
 const messages_1 = require("../Utils/messages");
@@ -102,6 +101,7 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
         return Buffer.from(txt);
     }
 }
+exports.decryptPollVote = decryptPollVote;
 const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const meId = creds.me.id;