@d0v3riz/baileys 6.7.18 → 6.7.20

package/lib/Utils/generics.js

@@ -17,21 +17,21 @@ const baileys_version_json_1 = require("../Defaults/baileys-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
 const PLATFORM_MAP = {
-    'aix': 'AIX',
-    'darwin': 'Mac OS',
-    'win32': 'Windows',
-    'android': 'Android',
-    'freebsd': 'FreeBSD',
-    'openbsd': 'OpenBSD',
-    'sunos': 'Solaris'
+    aix: 'AIX',
+    darwin: 'Mac OS',
+    win32: 'Windows',
+    android: 'Android',
+    freebsd: 'FreeBSD',
+    openbsd: 'OpenBSD',
+    sunos: 'Solaris'
 };
 exports.Browsers = {
-    ubuntu: (browser) => ['Ubuntu', browser, '22.04.4'],
-    macOS: (browser) => ['Mac OS', browser, '14.4.1'],
-    baileys: (browser) => ['Baileys', browser, '6.5.0'],
-    windows: (browser) => ['Windows', browser, '10.0.22631'],
+    ubuntu: browser => ['Ubuntu', browser, '22.04.4'],
+    macOS: browser => ['Mac OS', browser, '14.4.1'],
+    baileys: browser => ['Baileys', browser, '6.5.0'],
+    windows: browser => ['Windows', browser, '10.0.22631'],
     /** The appropriate browser based on your OS & release */
-    appropriate: (browser) => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
+    appropriate: browser => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
 };
 const getPlatformId = (browser) => {
     const platformType = WAProto_1.proto.DeviceProps.PlatformType[browser.toUpperCase()];
@@ -55,7 +55,7 @@ exports.BufferJSON = {
         return value;
     }
 };
-const getKeyAuthor = (key, meId = 'me') => (((key === null || key === void 0 ? void 0 : key.fromMe) ? meId : (key === null || key === void 0 ? void 0 : key.participant) || (key === null || key === void 0 ? void 0 : key.remoteJid)) || '');
+const getKeyAuthor = (key, meId = 'me') => ((key === null || key === void 0 ? void 0 : key.fromMe) ? meId : (key === null || key === void 0 ? void 0 : key.participant) || (key === null || key === void 0 ? void 0 : key.remoteJid)) || '';
 exports.getKeyAuthor = getKeyAuthor;
 const writeRandomPadMax16 = (msg) => {
     const pad = (0, crypto_1.randomBytes)(1);
@@ -78,7 +78,7 @@ const unpadRandomMax16 = (e) => {
     return new Uint8Array(t.buffer, t.byteOffset, t.length - r);
 };
 exports.unpadRandomMax16 = unpadRandomMax16;
-const encodeWAMessage = (message) => ((0, exports.writeRandomPadMax16)(WAProto_1.proto.Message.encode(message).finish()));
+const encodeWAMessage = (message) => (0, exports.writeRandomPadMax16)(WAProto_1.proto.Message.encode(message).finish());
 exports.encodeWAMessage = encodeWAMessage;
 const generateRegistrationId = () => {
     return Uint16Array.from((0, crypto_1.randomBytes)(2))[0] & 16383;
@@ -94,7 +94,7 @@ const encodeBigEndian = (e, t = 4) => {
     return a;
 };
 exports.encodeBigEndian = encodeBigEndian;
-const toNumber = (t) => ((typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t || 0);
+const toNumber = (t) => typeof t === 'object' && t ? ('toNumber' in t ? t.toNumber() : t.low) : t || 0;
 exports.toNumber = toNumber;
 /** unix timestamp of a date in seconds */
 const unixTimestampSeconds = (date = new Date()) => Math.floor(date.getTime() / 1000);
@@ -112,8 +112,8 @@ const debouncedTimeout = (intervalMs = 1000, task) => {
             timeout && clearTimeout(timeout);
             timeout = undefined;
         },
-        setTask: (newTask) => task = newTask,
-        setInterval: (newInterval) => intervalMs = newInterval
+        setTask: (newTask) => (task = newTask),
+        setInterval: (newInterval) => (intervalMs = newInterval)
     };
 };
 exports.debouncedTimeout = debouncedTimeout;
@@ -156,8 +156,7 @@ async function promiseTimeout(ms, promise) {
         })))
             .catch(err => reject(err));
         promise(resolve, reject);
-    })
-        .finally(cancel);
+    }).finally(cancel);
     return p;
 }
 // inspired from whatsmeow code
@@ -185,11 +184,10 @@ function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
         let listener;
         let closeListener;
-        await (promiseTimeout(timeoutMs, (resolve, reject) => {
+        await promiseTimeout(timeoutMs, (resolve, reject) => {
             closeListener = ({ connection, lastDisconnect }) => {
                 if (connection === 'close') {
-                    reject((lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error)
-                        || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
+                    reject((lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error) || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
                 }
             };
             ev.on('connection.update', closeListener);
@@ -199,11 +197,10 @@ function bindWaitForEvent(ev, event) {
                 }
             };
             ev.on(event, listener);
-        })
-            .finally(() => {
+        }).finally(() => {
             ev.off(event, listener);
             ev.off('connection.update', closeListener);
-        }));
+        });
     };
 }
 const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
@@ -276,9 +273,9 @@ const generateMdTagPrefix = () => {
 };
 exports.generateMdTagPrefix = generateMdTagPrefix;
 const STATUS_MAP = {
-    'sender': WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK,
-    'played': WAProto_1.proto.WebMessageInfo.Status.PLAYED,
-    'read': WAProto_1.proto.WebMessageInfo.Status.READ,
+    sender: WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK,
+    played: WAProto_1.proto.WebMessageInfo.Status.PLAYED,
+    read: WAProto_1.proto.WebMessageInfo.Status.READ,
     'read-self': WAProto_1.proto.WebMessageInfo.Status.READ
 };
 /**
@@ -354,8 +351,9 @@ const getCodeFromWSError = (error) => {
     }
     else if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ((_b = error === null || error === void 0 ? void 0 : error.code) === null || _b === void 0 ? void 0 : _b.startsWith('E'))
-        || ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('timed out'))) { // handle ETIMEOUT, ENOTFOUND etc
+    ((_b = error === null || error === void 0 ? void 0 : error.code) === null || _b === void 0 ? void 0 : _b.startsWith('E')) ||
+        ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('timed out'))) {
+        // handle ETIMEOUT, ENOTFOUND etc
         statusCode = 408;
     }
     return statusCode;

package/lib/Utils/history.js

@@ -34,7 +34,12 @@ const processHistoryMessage = (item) => {
         case WAProto_1.proto.HistorySync.HistorySyncType.FULL:
         case WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND:
             for (const chat of item.conversations) {
-                contacts.push({ id: chat.id, name: chat.name || undefined });
+                contacts.push({
+                    id: chat.id,
+                    name: chat.name || undefined,
+                    lid: chat.lidJid || undefined,
+                    jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : undefined
+                });
                 const msgs = chat.messages || [];
                 delete chat.messages;
                 delete chat.archived;
@@ -50,12 +55,12 @@ const processHistoryMessage = (item) => {
                     if (!message.key.fromMe && !chat.lastMessageRecvTimestamp) {
                         chat.lastMessageRecvTimestamp = (0, generics_1.toNumber)(message.messageTimestamp);
                     }
-                    if ((message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP
-                        || message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB)
-                        && ((_b = message.messageStubParameters) === null || _b === void 0 ? void 0 : _b[0])) {
+                    if ((message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP ||
+                        message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB) &&
+                        ((_b = message.messageStubParameters) === null || _b === void 0 ? void 0 : _b[0])) {
                         contacts.push({
                             id: message.key.participant || message.key.remoteJid,
-                            verifiedName: (_c = message.messageStubParameters) === null || _c === void 0 ? void 0 : _c[0],
+                            verifiedName: (_c = message.messageStubParameters) === null || _c === void 0 ? void 0 : _c[0]
                         });
                     }
                 }

package/lib/Utils/link-preview.js

@@ -72,9 +72,9 @@ const getUrlInfo = async (text, opts = {
                 if (retries >= maxRetry) {
                     return false;
                 }
-                if (forwardedURLObj.hostname === urlObj.hostname
-                    || forwardedURLObj.hostname === 'www.' + urlObj.hostname
-                    || 'www.' + forwardedURLObj.hostname === urlObj.hostname) {
+                if (forwardedURLObj.hostname === urlObj.hostname ||
+                    forwardedURLObj.hostname === 'www.' + urlObj.hostname ||
+                    'www.' + forwardedURLObj.hostname === urlObj.hostname) {
                     retries + 1;
                     return true;
                 }
@@ -99,16 +99,12 @@ const getUrlInfo = async (text, opts = {
                     mediaTypeOverride: 'thumbnail-link',
                     options: opts.fetchOpts
                 });
-                urlInfo.jpegThumbnail = (imageMessage === null || imageMessage === void 0 ? void 0 : imageMessage.jpegThumbnail)
-                    ? Buffer.from(imageMessage.jpegThumbnail)
-                    : undefined;
+                urlInfo.jpegThumbnail = (imageMessage === null || imageMessage === void 0 ? void 0 : imageMessage.jpegThumbnail) ? Buffer.from(imageMessage.jpegThumbnail) : undefined;
                 urlInfo.highQualityThumbnail = imageMessage || undefined;
             }
             else {
                 try {
-                    urlInfo.jpegThumbnail = image
-                        ? (await getCompressedJpegThumbnail(image, opts)).buffer
-                        : undefined;
+                    urlInfo.jpegThumbnail = image ? (await getCompressedJpegThumbnail(image, opts)).buffer : undefined;
                 }
                 catch (error) {
                     (_a = opts.logger) === null || _a === void 0 ? void 0 : _a.debug({ err: error.stack, url: previewLink }, 'error in generating thumbnail');

package/lib/Utils/lt-hash.js

@@ -33,12 +33,12 @@ class d {
     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));
+        return r.performPointwiseWithOverflow(await e, n, (e, t) => e + t);
     }
     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));
+        return r.performPointwiseWithOverflow(await e, n, (e, t) => e - t);
     }
     performPointwiseWithOverflow(e, t, r) {
         const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a);

package/lib/Utils/make-mutex.js

@@ -26,7 +26,7 @@ const makeMutex = () => {
             // we replace the existing task, appending the new piece of execution to it
             // so the next task will have to wait for this one to finish
             return task;
-        },
+        }
     };
 };
 exports.makeMutex = makeMutex;

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

@@ -62,13 +62,12 @@ type EncryptedStreamOptions = {
 };
 export declare const encryptedStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
     mediaKey: Buffer<ArrayBufferLike>;
-    encWriteStream: Readable;
-    bodyPath: string | undefined;
+    originalFilePath: string | undefined;
+    encFilePath: string;
     mac: Buffer<ArrayBuffer>;
     fileEncSha256: Buffer<ArrayBufferLike>;
     fileSha256: Buffer<ArrayBufferLike>;
     fileLength: number;
-    didSaveToTmpPath: boolean;
 }>;
 export type MediaDownloadOptions = {
     startByte?: number;

package/lib/Utils/messages-media.js

@@ -60,11 +60,11 @@ 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 Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { });
             return jimp;
         })(),
         (async () => {
-            const sharp = await (Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { }));
+            const sharp = await Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { });
             return sharp;
         })()
     ]);
@@ -95,13 +95,13 @@ async function getMediaKeys(buffer, mediaType) {
     return {
         iv: expandedMediaKey.slice(0, 16),
         cipherKey: expandedMediaKey.slice(16, 48),
-        macKey: expandedMediaKey.slice(48, 80),
+        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) => {
+    (0, child_process_1.exec)(cmd, err => {
         if (err) {
             reject(err);
         }
@@ -119,16 +119,13 @@ const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     if ('sharp' in lib && typeof ((_a = lib.sharp) === null || _a === void 0 ? void 0 : _a.default) === 'function') {
         const img = lib.sharp.default(bufferOrFilePath);
         const dimensions = await img.metadata();
-        const buffer = await img
-            .resize(width)
-            .jpeg({ quality: 50 })
-            .toBuffer();
+        const buffer = await img.resize(width).jpeg({ quality: 50 }).toBuffer();
         return {
             buffer,
             original: {
                 width: dimensions.width,
-                height: dimensions.height,
-            },
+                height: dimensions.height
+            }
         };
     }
     else if ('jimp' in lib && typeof ((_b = lib.jimp) === null || _b === void 0 ? void 0 : _b.read) === 'function') {
@@ -138,10 +135,7 @@ const extractImageThumb = async (bufferOrFilePath, width = 32) => {
             width: jimp.getWidth(),
             height: jimp.getHeight()
         };
-        const buffer = await jimp
-            .quality(50)
-            .resize(width, AUTO, RESIZE_BILINEAR)
-            .getBufferAsync(MIME_JPEG);
+        const buffer = await jimp.quality(50).resize(width, AUTO, RESIZE_BILINEAR).getBufferAsync(MIME_JPEG);
         return {
             buffer,
             original: dimensions
@@ -152,10 +146,7 @@ const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     }
 };
 exports.extractImageThumb = extractImageThumb;
-const encodeBase64EncodedStringForUpload = (b64) => (encodeURIComponent(b64
-    .replace(/\+/g, '-')
-    .replace(/\//g, '_')
-    .replace(/\=+$/, '')));
+const encodeBase64EncodedStringForUpload = (b64) => encodeURIComponent(b64.replace(/\+/g, '-').replace(/\//g, '_').replace(/\=+$/, ''));
 exports.encodeBase64EncodedStringForUpload = encodeBase64EncodedStringForUpload;
 const generateProfilePicture = async (mediaUpload) => {
     var _a, _b;
@@ -172,10 +163,11 @@ const generateProfilePicture = async (mediaUpload) => {
     const lib = await getImageProcessingLibrary();
     let img;
     if ('sharp' in lib && typeof ((_a = lib.sharp) === null || _a === void 0 ? void 0 : _a.default) === 'function') {
-        img = lib.sharp.default(bufferOrFilePath)
+        img = lib.sharp
+            .default(bufferOrFilePath)
             .resize(640, 640)
             .jpeg({
-            quality: 50,
+            quality: 50
         })
             .toBuffer();
     }
@@ -184,16 +176,13 @@ const generateProfilePicture = async (mediaUpload) => {
         const jimp = await read(bufferOrFilePath);
         const min = Math.min(jimp.getWidth(), jimp.getHeight());
         const cropped = jimp.crop(0, 0, min, min);
-        img = cropped
-            .quality(50)
-            .resize(640, 640, RESIZE_BILINEAR)
-            .getBufferAsync(MIME_JPEG);
+        img = cropped.quality(50).resize(640, 640, RESIZE_BILINEAR).getBufferAsync(MIME_JPEG);
     }
     else {
         throw new boom_1.Boom('No image processing library available');
     }
     return {
-        img: await img,
+        img: await img
     };
 };
 exports.generateProfilePicture = generateProfilePicture;
@@ -206,20 +195,17 @@ 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;
 }
@@ -228,7 +214,7 @@ async function getAudioDuration(buffer) {
  */
 async function getAudioWaveform(buffer, logger) {
     try {
-        const { default: decoder } = await eval('import(\'audio-decode\')');
+        const { default: decoder } = await eval("import('audio-decode')");
         let audioData;
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer;
@@ -255,9 +241,9 @@ async function getAudioWaveform(buffer, logger) {
         }
         // 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);
+        const normalizedData = filteredData.map(n => n * multiplier);
         // Generate waveform like WhatsApp
-        const waveform = new Uint8Array(normalizedData.map((n) => Math.floor(100 * n)));
+        const waveform = new Uint8Array(normalizedData.map(n => Math.floor(100 * n)));
         return waveform;
     }
     catch (e) {
@@ -304,7 +290,7 @@ async function generateThumbnail(file, mediaType, options) {
         if (original.width && original.height) {
             originalImageDimensions = {
                 width: original.width,
-                height: original.height,
+                height: original.height
             };
         }
     }
@@ -331,88 +317,85 @@ const getHttpStream = async (url, options = {}) => {
 };
 exports.getHttpStream = getHttpStream;
 const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+    var _a, _b;
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
     const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType);
-    const encWriteStream = new stream_1.Readable({ read: () => { } });
-    let bodyPath;
-    let writeStream;
-    let didSaveToTmpPath = false;
-    if (type === 'file') {
-        bodyPath = media.url.toString();
-    }
-    else if (saveOriginalFileIfRequired) {
-        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
-        writeStream = (0, fs_1.createWriteStream)(bodyPath);
-        didSaveToTmpPath = true;
+    const encFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-enc');
+    const encFileWriteStream = (0, fs_1.createWriteStream)(encFilePath);
+    let originalFileStream;
+    let originalFilePath;
+    if (saveOriginalFileIfRequired) {
+        originalFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-original');
+        originalFileStream = (0, fs_1.createWriteStream)(originalFilePath);
     }
     let fileLength = 0;
     const aes = Crypto.createCipheriv('aes-256-cbc', cipherKey, iv);
-    let hmac = Crypto.createHmac('sha256', macKey).update(iv);
-    let sha256Plain = Crypto.createHash('sha256');
-    let sha256Enc = Crypto.createHash('sha256');
+    const hmac = Crypto.createHmac('sha256', macKey).update(iv);
+    const sha256Plain = Crypto.createHash('sha256');
+    const sha256Enc = Crypto.createHash('sha256');
+    const onChunk = (buff) => {
+        sha256Enc.update(buff);
+        hmac.update(buff);
+        encFileWriteStream.write(buff);
+    };
     try {
         for await (const data of stream) {
             fileLength += data.length;
-            if (type === 'remote'
-                && (opts === null || opts === void 0 ? void 0 : opts.maxContentLength)
-                && fileLength + data.length > opts.maxContentLength) {
+            if (type === 'remote' && (opts === null || opts === void 0 ? void 0 : opts.maxContentLength) && fileLength + data.length > opts.maxContentLength) {
                 throw new boom_1.Boom(`content length exceeded when encrypting "${type}"`, {
                     data: { media, type }
                 });
             }
-            sha256Plain = sha256Plain.update(data);
-            if (writeStream && !writeStream.write(data)) {
-                await (0, events_1.once)(writeStream, 'drain');
+            if (originalFileStream) {
+                if (!originalFileStream.write(data)) {
+                    await (0, events_1.once)(originalFileStream, 'drain');
+                }
             }
+            sha256Plain.update(data);
             onChunk(aes.update(data));
         }
         onChunk(aes.final());
         const mac = hmac.digest().slice(0, 10);
-        sha256Enc = sha256Enc.update(mac);
+        sha256Enc.update(mac);
         const fileSha256 = sha256Plain.digest();
         const fileEncSha256 = sha256Enc.digest();
-        encWriteStream.push(mac);
-        encWriteStream.push(null);
-        writeStream === null || writeStream === void 0 ? void 0 : writeStream.end();
+        encFileWriteStream.write(mac);
+        encFileWriteStream.end();
+        (_a = originalFileStream === null || originalFileStream === void 0 ? void 0 : originalFileStream.end) === null || _a === void 0 ? void 0 : _a.call(originalFileStream);
         stream.destroy();
         logger === null || logger === void 0 ? void 0 : logger.debug('encrypted data successfully');
         return {
             mediaKey,
-            encWriteStream,
-            bodyPath,
+            originalFilePath,
+            encFilePath,
             mac,
             fileEncSha256,
             fileSha256,
-            fileLength,
-            didSaveToTmpPath
+            fileLength
         };
     }
     catch (error) {
         // destroy all streams with error
-        encWriteStream.destroy();
-        writeStream === null || writeStream === void 0 ? void 0 : writeStream.destroy();
+        encFileWriteStream.destroy();
+        (_b = originalFileStream === null || originalFileStream === void 0 ? void 0 : originalFileStream.destroy) === null || _b === void 0 ? void 0 : _b.call(originalFileStream);
         aes.destroy();
         hmac.destroy();
         sha256Plain.destroy();
         sha256Enc.destroy();
         stream.destroy();
-        if (didSaveToTmpPath) {
-            try {
-                await fs_1.promises.unlink(bodyPath);
-            }
-            catch (err) {
-                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to save to tmp path');
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
             }
         }
+        catch (err) {
+            logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed deleting tmp files');
+        }
         throw error;
     }
-    function onChunk(buff) {
-        sha256Enc = sha256Enc.update(buff);
-        hmac = hmac.update(buff);
-        encWriteStream.push(buff);
-    }
 };
 exports.encryptedStream = encryptedStream;
 const DEF_HOST = 'mmg.whatsapp.net';
@@ -447,8 +430,8 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
     }
     const endChunk = endByte ? toSmallestChunkSize(endByte || 0) + AES_CHUNK_SIZE : undefined;
     const headers = {
-        ...(options === null || options === void 0 ? void 0 : options.headers) || {},
-        Origin: Defaults_1.DEFAULT_ORIGIN,
+        ...((options === null || options === void 0 ? void 0 : options.headers) || {}),
+        Origin: Defaults_1.DEFAULT_ORIGIN
     };
     if (startChunk || endChunk) {
         headers.Range = `bytes=${startChunk}-`;
@@ -458,10 +441,10 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
     }
     // download the message
     const fetched = await (0, exports.getHttpStream)(downloadUrl, {
-        ...options || {},
+        ...(options || {}),
         headers,
         maxBodyLength: Infinity,
-        maxContentLength: Infinity,
+        maxContentLength: Infinity
     });
     let remainingBytes = Buffer.from([]);
     let aes;
@@ -511,7 +494,7 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             catch (error) {
                 callback(error);
             }
-        },
+        }
     });
     return fetched.pipe(output, { end: true });
 };
@@ -520,9 +503,7 @@ function extensionForMediaMessage(message) {
     const getExtension = (mimetype) => mimetype.split(';')[0].split('/')[1];
     const type = Object.keys(message)[0];
     let extension;
-    if (type === 'locationMessage' ||
-        type === 'liveLocationMessage' ||
-        type === 'productMessage') {
+    if (type === 'locationMessage' || type === 'liveLocationMessage' || type === 'productMessage') {
         extension = '.jpeg';
     }
     else {
@@ -532,7 +513,7 @@ function extensionForMediaMessage(message) {
     return extension;
 }
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (stream, { mediaType, fileEncSha256B64, timeoutMs }) => {
+    return async (filePath, { mediaType, fileEncSha256B64, timeoutMs }) => {
         var _a, _b;
         // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
@@ -546,18 +527,19 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let result;
             try {
-                const body = await axios_1.default.post(url, stream, {
+                const body = await axios_1.default.post(url, (0, fs_1.createReadStream)(filePath), {
                     ...options,
+                    maxRedirects: 0,
                     headers: {
-                        ...options.headers || {},
+                        ...(options.headers || {}),
                         'Content-Type': 'application/octet-stream',
-                        'Origin': Defaults_1.DEFAULT_ORIGIN
+                        Origin: Defaults_1.DEFAULT_ORIGIN
                     },
                     httpsAgent: fetchAgent,
                     timeout: timeoutMs,
                     responseType: 'json',
                     maxBodyLength: Infinity,
-                    maxContentLength: Infinity,
+                    maxContentLength: Infinity
                 });
                 result = body.data;
                 if ((result === null || result === void 0 ? void 0 : result.url) || (result === null || result === void 0 ? void 0 : result.directPath)) {
@@ -622,7 +604,7 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
                 tag: 'rmr',
                 attrs: {
                     jid: key.remoteJid,
-                    'from_me': (!!key.fromMe).toString(),
+                    from_me: (!!key.fromMe).toString(),
                     // @ts-ignore
                     participant: key.participant || undefined
                 }
@@ -645,7 +627,10 @@ const decodeMediaRetryNode = (node) => {
     const errorNode = (0, WABinary_1.getBinaryNodeChild)(node, 'error');
     if (errorNode) {
         const errorCode = +errorNode.attrs.code;
-        event.error = new boom_1.Boom(`Failed to re-upload media (${errorCode})`, { data: errorNode.attrs, statusCode: (0, exports.getStatusCodeForMediaRetry)(errorCode) });
+        event.error = new boom_1.Boom(`Failed to re-upload media (${errorCode})`, {
+            data: errorNode.attrs,
+            statusCode: (0, exports.getStatusCodeForMediaRetry)(errorCode)
+        });
     }
     else {
         const encryptedInfoNode = (0, WABinary_1.getBinaryNodeChild)(node, 'encrypt');
@@ -673,5 +658,5 @@ const MEDIA_RETRY_STATUS_MAP = {
     [WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS]: 200,
     [WAProto_1.proto.MediaRetryNotification.ResultType.DECRYPTION_ERROR]: 412,
     [WAProto_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
-    [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418,
+    [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418
 };

package/lib/Utils/messages.d.ts

@@ -38,7 +38,7 @@ export declare const extractMessageContent: (content: WAMessageContent | undefin
 /**
  * Returns the device predicted by message ID
  */
-export declare const getDevice: (id: string) => "android" | "unknown" | "web" | "ios" | "desktop";
+export declare const getDevice: (id: string) => "web" | "unknown" | "android" | "ios" | "desktop";
 /** Upserts a receipt in the message */
 export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, "userReceipt">, receipt: MessageUserReceipt) => void;
 /** Update the message with a new reaction */