@hbmodsofc/baileys 1.5.2 → 1.7.7

package/lib/Utils/messages-media.js

@@ -15,16 +15,35 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-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 __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 __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.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;
+exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.getRawMediaUploadData = exports.hkdfInfoKey = void 0;
+exports.getMediaKeys = getMediaKeys;
+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 Crypto = __importStar(require("crypto"));
 const events_1 = require("events");
@@ -32,29 +51,18 @@ const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
 const stream_1 = require("stream");
-const WAProto_1 = require("../../WAProto");
+const index_js_1 = require("../../WAProto/index.js");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
 const crypto_1 = require("./crypto");
 const generics_1 = require("./generics");
 const getTmpFilesDirectory = () => (0, os_1.tmpdir)();
 const getImageProcessingLibrary = async () => {
-    const [_jimp, sharp] = await Promise.all([
-        (async () => {
-            const jimp = await (import('jimp')
-                .catch(() => { }));
-            return jimp;
-        })(),
-        (async () => {
-            const sharp = await (import('sharp')
-                .catch(() => { }));
-            return sharp;
-        })()
-    ]);
+    //@ts-ignore
+    const [jimp, sharp] = await Promise.all([Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { }), Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { })]);
     if (sharp) {
         return { sharp };
     }
-    const jimp = (_jimp === null || _jimp === void 0 ? void 0 : _jimp.default) || _jimp;
     if (jimp) {
         return { jimp };
     }
@@ -65,8 +73,47 @@ const hkdfInfoKey = (type) => {
     return `WhatsApp ${hkdfInfo} Keys`;
 };
 exports.hkdfInfoKey = hkdfInfoKey;
+const getRawMediaUploadData = async (media, mediaType, logger) => {
+    const { stream } = await (0, exports.getStream)(media);
+    logger?.debug('got stream for raw upload');
+    const hasher = Crypto.createHash('sha256');
+    const filePath = (0, path_1.join)((0, os_1.tmpdir)(), mediaType + (0, generics_1.generateMessageIDV2)());
+    const fileWriteStream = (0, fs_1.createWriteStream)(filePath);
+    let fileLength = 0;
+    try {
+        for await (const data of stream) {
+            fileLength += data.length;
+            hasher.update(data);
+            if (!fileWriteStream.write(data)) {
+                await (0, events_1.once)(fileWriteStream, 'drain');
+            }
+        }
+        fileWriteStream.end();
+        await (0, events_1.once)(fileWriteStream, 'finish');
+        stream.destroy();
+        const fileSha256 = hasher.digest();
+        logger?.debug('hashed data for raw upload');
+        return {
+            filePath: filePath,
+            fileSha256,
+            fileLength
+        };
+    }
+    catch (error) {
+        fileWriteStream.destroy();
+        stream.destroy();
+        try {
+            await fs_1.promises.unlink(filePath);
+        }
+        catch {
+            //
+        }
+        throw error;
+    }
+};
+exports.getRawMediaUploadData = getRawMediaUploadData;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
-function getMediaKeys(buffer, mediaType) {
+async function getMediaKeys(buffer, mediaType) {
     if (!buffer) {
         throw new boom_1.Boom('Cannot derive from empty media key');
     }
@@ -74,18 +121,17 @@ function getMediaKeys(buffer, mediaType) {
         buffer = Buffer.from(buffer.replace('data:;base64,', ''), 'base64');
     }
     // expand using HKDF to 112 bytes, also pass in the relevant app info
-    const expandedMediaKey = (0, crypto_1.hkdf)(buffer, 112, { info: (0, exports.hkdfInfoKey)(mediaType) });
+    const expandedMediaKey = await (0, crypto_1.hkdf)(buffer, 112, { info: (0, exports.hkdfInfoKey)(mediaType) });
     return {
         iv: expandedMediaKey.slice(0, 16),
         cipherKey: expandedMediaKey.slice(16, 48),
-        macKey: expandedMediaKey.slice(48, 80),
+        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}`;
-    (0, child_process_1.exec)(cmd, (err) => {
+    (0, child_process_1.exec)(cmd, err => {
         if (err) {
             reject(err);
         }
@@ -95,37 +141,33 @@ const extractVideoThumb = async (path, destPath, time, size) => new Promise((res
     });
 });
 const extractImageThumb = async (bufferOrFilePath, width = 32) => {
-    var _a, _b;
+    // TODO: Move entirely to sharp, removing jimp as it supports readable streams
+    // This will have positive speed and performance impacts as well as minimizing RAM usage.
     if (bufferOrFilePath instanceof stream_1.Readable) {
         bufferOrFilePath = await (0, exports.toBuffer)(bufferOrFilePath);
     }
     const lib = await getImageProcessingLibrary();
-    if ('sharp' in lib && typeof ((_a = lib.sharp) === null || _a === void 0 ? void 0 : _a.default) === 'function') {
+    if ('sharp' in lib && typeof lib.sharp?.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') {
-        const { read, MIME_JPEG, RESIZE_BILINEAR, AUTO } = lib.jimp;
-        const jimp = await read(bufferOrFilePath);
+    else if ('jimp' in lib && typeof lib.jimp?.Jimp === 'object') {
+        const jimp = await lib.jimp.Jimp.read(bufferOrFilePath);
         const dimensions = {
-            width: jimp.getWidth(),
-            height: jimp.getHeight()
+            width: jimp.width,
+            height: jimp.height
         };
         const buffer = await jimp
-            .quality(50)
-            .resize(width, AUTO, RESIZE_BILINEAR)
-            .getBufferAsync(MIME_JPEG);
+            .resize({ w: width, mode: lib.jimp.ResizeStrategy.BILINEAR })
+            .getBuffer('image/jpeg', { quality: 50 });
         return {
             buffer,
             original: dimensions
@@ -136,190 +178,110 @@ 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;
-    let bufferOrFilePath;
+const generateProfilePicture = async (mediaUpload, dimensions) => {
+    let buffer;
+    const { width: w = 640, height: h = 640 } = dimensions || {};
     if (Buffer.isBuffer(mediaUpload)) {
-        bufferOrFilePath = mediaUpload;
-    }
-    else if ('url' in mediaUpload) {
-        bufferOrFilePath = mediaUpload.url.toString();
+        buffer = mediaUpload;
     }
     else {
-        bufferOrFilePath = await (0, exports.toBuffer)(mediaUpload.stream);
+        // Use getStream to handle all WAMediaUpload types (Buffer, Stream, URL)
+        const { stream } = await (0, exports.getStream)(mediaUpload);
+        // Convert the resulting stream to a buffer
+        buffer = await (0, exports.toBuffer)(stream);
     }
     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)
-            .resize(640, 640)
+    if ('sharp' in lib && typeof lib.sharp?.default === 'function') {
+        img = lib.sharp
+            .default(buffer)
+            .resize(w, h)
             .jpeg({
-            quality: 50,
+            quality: 50
         })
             .toBuffer();
     }
-    else if ('jimp' in lib && typeof ((_b = lib.jimp) === null || _b === void 0 ? void 0 : _b.read) === 'function') {
-        const { read, MIME_JPEG, RESIZE_BILINEAR } = lib.jimp;
-        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);
+    else if ('jimp' in lib && typeof lib.jimp?.Jimp === 'object') {
+        const jimp = await lib.jimp.Jimp.read(buffer);
+        const min = Math.min(jimp.width, jimp.height);
+        const cropped = jimp.crop({ x: 0, y: 0, w: min, h: min });
+        img = cropped.resize({ w, h, mode: lib.jimp.ResizeStrategy.BILINEAR }).getBuffer('image/jpeg', { quality: 50 });
     }
     else {
         throw new boom_1.Boom('No image processing library available');
     }
     return {
-        img: await img,
+        img: await img
     };
 };
 exports.generateProfilePicture = generateProfilePicture;
 /** gets the SHA256 of the given media message */
 const mediaMessageSHA256B64 = (message) => {
     const media = Object.values(message)[0];
-    return (media === null || media === void 0 ? void 0 : media.fileSha256) && Buffer.from(media.fileSha256).toString('base64');
+    return media?.fileSha256 && Buffer.from(media.fileSha256).toString('base64');
 };
 exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
-    try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
-        return await new Promise((resolve, reject) => {
-            const inputStream = new PassThrough();
-            inputStream.end(buffer);
-            
-            ff(inputStream)
-                .ffprobe((err, data) => {
-                    if (err) reject(err);
-                    else resolve(data.format.duration);
-                });
-        });
-    } catch (error) {
-        const musicMetadata = await import('music-metadata');
-        let metadata;
-        if (Buffer.isBuffer(buffer)) {
-            metadata = await musicMetadata.parseBuffer(buffer, undefined, { 
-                duration: true 
-            });
-        } else if (typeof buffer === 'string') {
-            const rStream = (0, fs_1.createReadStream)(buffer);
-            try {
-                metadata = await musicMetadata.parseStream(rStream, undefined, { 
-                    duration: true 
-                });
-            } finally {
-                rStream.destroy();
-            }
-        } else {
-            metadata = await musicMetadata.parseStream(buffer, undefined, { 
-                duration: true 
-            });
-        }
-        return metadata.format.duration;
+    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, options);
+    }
+    else if (typeof buffer === 'string') {
+        metadata = await musicMetadata.parseFile(buffer, options);
     }
+    else {
+        metadata = await musicMetadata.parseStream(buffer, undefined, options);
+    }
+    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
+ */
 async function getAudioWaveform(buffer, logger) {
     try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
+        // @ts-ignore
+        const { default: decoder } = await Promise.resolve().then(() => __importStar(require('audio-decode')));
         let audioData;
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer;
-        } else if (typeof buffer === 'string') {
-            const rStream = require('fs').createReadStream(buffer);
-            audioData = await exports.toBuffer(rStream);
-        } else {
-            audioData = await exports.toBuffer(buffer);
         }
-
-        return await new Promise((resolve, reject) => {
-            const inputStream = new PassThrough();
-            inputStream.end(audioData);
-            const chunks = [];
-            const bars = 64;
-            
-            ff(inputStream)
-                .audioChannels(1)
-                .audioFrequency(16000)
-                .format('s16le')
-                .on('error', reject)
-                .on('end', () => {
-                    const rawData = Buffer.concat(chunks);
-                    const samples = rawData.length / 2;
-                    const amplitudes = [];
-                    
-                    for (let i = 0; i < samples; i++) {
-                        amplitudes.push(Math.abs(rawData.readInt16LE(i * 2)) / 32768);
-                    }
-                    
-                    const blockSize = Math.floor(amplitudes.length / bars);
-                    const avg = [];
-                    for (let i = 0; i < bars; i++) {
-                        const block = amplitudes.slice(i * blockSize, (i + 1) * blockSize);
-                        avg.push(block.reduce((a, b) => a + b, 0) / block.length);
-                    }
-                    
-                    const max = Math.max(...avg);
-                    const normalized = avg.map(v => Math.floor((v / max) * 100));
-                    resolve(new Uint8Array(normalized));
-                })
-                .pipe()
-                .on('data', chunk => chunks.push(chunk));
-        });
-    } catch (e) {
-        logger?.debug(e);
+        else if (typeof buffer === 'string') {
+            const rStream = (0, fs_1.createReadStream)(buffer);
+            audioData = await (0, exports.toBuffer)(rStream);
+        }
+        else {
+            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 filteredData = [];
+        for (let i = 0; i < samples; i++) {
+            const blockStart = blockSize * i; // the location of the first sample in the block
+            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
+            }
+            filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
+        }
+        // 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;
     }
-}
-exports.getAudioWaveform = getAudioWaveform;
-async function convertToOpusBuffer(buffer, logger) {
-    try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
-        return await new Promise((resolve, reject) => {
-            const inStream = new PassThrough();
-            const outStream = new PassThrough();
-            const chunks = [];
-            inStream.end(buffer);
-            
-            ff(inStream)
-                .noVideo()
-                .audioCodec('libopus')
-                .format('ogg')
-                .audioBitrate('48k')
-                .audioChannels(1)
-                .audioFrequency(48000)
-                .outputOptions([
-                    '-vn',
-                    '-b:a 64k',
-                    '-ac 2',
-                    '-ar 48000',
-                    '-map_metadata', '-1',
-                    '-application', 'voip'
-                ])
-                .on('error', reject)
-                .on('end', () => resolve(Buffer.concat(chunks)))
-                .pipe(outStream, {
-                end: true 
-            });       
-            outStream.on('data', c => chunks.push(c));
-        });
-    } catch (e) {
-        logger?.debug(e);
-        throw e;
+    catch (e) {
+        logger?.debug('Failed to generate waveform: ' + e);
     }
 }
-exports.convertToOpusBuffer = convertToOpusBuffer;
 const toReadable = (buffer) => {
     const readable = new stream_1.Readable({ read: () => { } });
     readable.push(buffer);
@@ -343,7 +305,12 @@ const getStream = async (item, opts) => {
     if ('stream' in item) {
         return { stream: item.stream, type: 'readable' };
     }
-    if (item.url.toString().startsWith('http://') || item.url.toString().startsWith('https://')) {
+    const urlStr = item.url.toString();
+    if (urlStr.startsWith('data:')) {
+        const buffer = Buffer.from(urlStr.split(',')[1], 'base64');
+        return { stream: (0, exports.toReadable)(buffer), type: 'buffer' };
+    }
+    if (urlStr.startsWith('http://') || urlStr.startsWith('https://')) {
         return { stream: await (0, exports.getHttpStream)(item.url, opts), type: 'remote' };
     }
     return { stream: (0, fs_1.createReadStream)(item.url), type: 'file' };
@@ -351,7 +318,6 @@ const getStream = async (item, opts) => {
 exports.getStream = getStream;
 /** generates a thumbnail for a given media, if required */
 async function generateThumbnail(file, mediaType, options) {
-    var _a;
     let thumbnail;
     let originalImageDimensions;
     if (mediaType === 'image') {
@@ -360,12 +326,12 @@ async function generateThumbnail(file, mediaType, options) {
         if (original.width && original.height) {
             originalImageDimensions = {
                 width: original.width,
-                height: original.height,
+                height: original.height
             };
         }
     }
     else if (mediaType === 'video') {
-        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageID)() + '.jpg');
+        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);
@@ -373,7 +339,7 @@ async function generateThumbnail(file, mediaType, options) {
             await fs_1.promises.unlink(imgFilename);
         }
         catch (err) {
-            (_a = options.logger) === null || _a === void 0 ? void 0 : _a.debug('could not generate video thumb: ' + err);
+            options.logger?.debug('could not generate video thumb: ' + err);
         }
     }
     return {
@@ -381,160 +347,90 @@ async function generateThumbnail(file, mediaType, options) {
         originalImageDimensions
     };
 }
-exports.generateThumbnail = generateThumbnail;
 const getHttpStream = async (url, options = {}) => {
-    const { default: axios } = await import('axios');
-    const fetched = await axios.get(url.toString(), { ...options, responseType: 'stream' });
+    const fetched = await axios_1.default.get(url.toString(), { ...options, responseType: 'stream' });
     return fetched.data;
 };
 exports.getHttpStream = getHttpStream;
-const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await (0, exports.getStream)(media, opts);
-    logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
-    let bodyPath;
-    let didSaveToTmpPath = false;
-    try {
-        const buffer = await (0, exports.toBuffer)(stream);
-        if (type === 'file') {
-            bodyPath = media.url;
-        }
-        else if (saveOriginalFileIfRequired) {
-            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
-            (0, fs_1.writeFileSync)(bodyPath, buffer);
-            didSaveToTmpPath = true;
-        }
-        const fileLength = buffer.length;
-        const fileSha256 = Crypto.createHash('sha256').update(buffer).digest();
-        stream === null || stream === void 0 ? void 0 : stream.destroy();
-        logger === null || logger === void 0 ? void 0 : logger.debug('prepare stream data successfully');
-        return {
-            mediaKey: undefined,
-            encWriteStream: buffer,
-            fileLength,
-            fileSha256,
-            fileEncSha256: undefined,
-            bodyPath,
-            didSaveToTmpPath
-        };
-    }
-    catch (error) {
-        // destroy all streams with error
-        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');
-            }
-        }
-        throw error;
-    }
-};
-exports.prepareStream = prepareStream;
-const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isPtt, forceOpus } = {}) => {
-    const { stream, type } = await (0, exports.getStream)(media, opts);
-    
-    let finalStream = stream;  
-    if (mediaType === 'audio' && (isPtt === true || forceOpus === true)) {
-        try {
-            const buffer = await (0, exports.toBuffer)(stream);
-            const opusBuffer = await exports.convertToOpusBuffer(buffer, logger);
-            finalStream = (0, exports.toReadable)(opusBuffer);
-        } catch (error) {
-            const { stream: newStream } = await (0, exports.getStream)(media, opts);
-            finalStream = newStream;
-        }
-    }
-
+    logger?.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
-    const { cipherKey, iv, macKey } = getMediaKeys(mediaKey, mediaType);
-    const encWriteStream = new stream_1.Readable({ read: () => { } });
-    let bodyPath;
-    let writeStream;
-    let didSaveToTmpPath = false;
-    
-    if (type === 'file') {
-        bodyPath = media.url;
-    }
-    else if (saveOriginalFileIfRequired) {
-        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
-        writeStream = (0, fs_1.createWriteStream)(bodyPath);
-        didSaveToTmpPath = true;
-    }
-    
+    const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType);
+    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 finalStream) {
+        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?.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) {
-                if (!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();
-        finalStream.destroy();
-        
+        encFileWriteStream.write(mac);
+        encFileWriteStream.end();
+        originalFileStream?.end?.();
+        stream.destroy();
+        logger?.debug('encrypted data successfully');
         return {
             mediaKey,
-            encWriteStream,
-            bodyPath,
+            originalFilePath,
+            encFilePath,
             mac,
             fileEncSha256,
             fileSha256,
-            fileLength,
-            didSaveToTmpPath
+            fileLength
         };
     }
     catch (error) {
-        encWriteStream.destroy();
-        writeStream === null || writeStream === void 0 ? void 0 : writeStream.destroy();
+        // destroy all streams with error
+        encFileWriteStream.destroy();
+        originalFileStream?.destroy?.();
         aes.destroy();
         hmac.destroy();
         sha256Plain.destroy();
         sha256Enc.destroy();
-        finalStream.destroy();
-        
-        if (didSaveToTmpPath) {
-            try {
-                await fs_1.promises.unlink(bodyPath);
-            }
-            catch (err) {
+        stream.destroy();
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
             }
         }
+        catch (err) {
+            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';
@@ -544,9 +440,13 @@ const toSmallestChunkSize = (num) => {
 };
 const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
 exports.getUrlFromDirectPath = getUrlFromDirectPath;
-const downloadContentFromMessage = ({ mediaKey, directPath, url }, type, opts = {}) => {
-    const downloadUrl = url || (0, exports.getUrlFromDirectPath)(directPath);
-    const keys = getMediaKeys(mediaKey, type);
+const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
+    const isValidMediaUrl = 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;
@@ -569,8 +469,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?.headers || {}),
+        Origin: Defaults_1.DEFAULT_ORIGIN
     };
     if (startChunk || endChunk) {
         headers.Range = `bytes=${startChunk}-`;
@@ -580,10 +480,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;
@@ -633,18 +533,16 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             catch (error) {
                 callback(error);
             }
-        },
+        }
     });
     return fetched.pipe(output, { end: true });
 };
 exports.downloadEncryptedContent = downloadEncryptedContent;
 function extensionForMediaMessage(message) {
-    const getExtension = (mimetype) => mimetype.split(';')[0].split('/')[1];
+    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 {
@@ -653,55 +551,42 @@ 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;
-        const { default: axios } = await import('axios');
+    return async (filePath, { mediaType, fileEncSha256B64, timeoutMs }) => {
         // 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];
-        const chunks = [];
-        if (!Buffer.isBuffer(stream)) {
-            for await (const chunk of stream) {
-                chunks.push(chunk);
-            }
-        }
-        const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks);
         fileEncSha256B64 = (0, exports.encodeBase64EncodedStringForUpload)(fileEncSha256B64);
-        let media = Defaults_1.MEDIA_PATH_MAP[mediaType];
-        if (newsletter) {
-            media = media === null || media === void 0 ? void 0 : media.replace('/mms/', '/newsletter/newsletter-');
-        }
-        for (const { hostname, maxContentLengthBytes } of hosts) {
+        for (const { hostname } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
             const auth = encodeURIComponent(uploadInfo.auth); // the auth token
-            const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
+            const url = `https://${hostname}${Defaults_1.MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let result;
             try {
-                if (maxContentLengthBytes && reqBody.length > maxContentLengthBytes) {
-                    throw new boom_1.Boom(`Body too large for "${hostname}"`, { statusCode: 413 });
-                }
-                const body = await axios.post(url, reqBody, {
+                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)) {
+                if (result?.url || result?.directPath) {
                     urls = {
                         mediaUrl: result.url,
                         directPath: result.direct_path,
-                        handle: result.handle
+                        meta_hmac: result.meta_hmac,
+                        fbid: result.fbid,
+                        ts: result.ts
                     };
                     break;
                 }
@@ -711,10 +596,10 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 }
             }
             catch (error) {
-                if (axios.isAxiosError(error)) {
-                    result = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
+                if (axios_1.default.isAxiosError(error)) {
+                    result = error.response?.data;
                 }
-                const isLast = hostname === ((_b = hosts[uploadInfo.hosts.length - 1]) === null || _b === void 0 ? void 0 : _b.hostname);
+                const isLast = hostname === hosts[uploadInfo.hosts.length - 1]?.hostname;
                 logger.warn({ trace: error.stack, uploadResult: result }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`);
             }
         }
@@ -731,11 +616,11 @@ const getMediaRetryKey = (mediaKey) => {
 /**
  * Generate a binary node that will request the phone to re-upload the media & return the newly uploaded URL
  */
-const encryptMediaRetryRequest = (key, mediaKey, meId) => {
+const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     const recp = { stanzaId: key.id };
-    const recpBuffer = WAProto_1.proto.ServerErrorReceipt.encode(recp).finish();
+    const recpBuffer = index_js_1.proto.ServerErrorReceipt.encode(recp).finish();
     const iv = Crypto.randomBytes(12);
-    const retryKey = getMediaRetryKey(mediaKey);
+    const retryKey = await getMediaRetryKey(mediaKey);
     const ciphertext = (0, crypto_1.aesEncryptGCM)(recpBuffer, retryKey, iv, Buffer.from(key.id));
     const req = {
         tag: 'receipt',
@@ -760,7 +645,7 @@ const encryptMediaRetryRequest = (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
                 }
@@ -783,7 +668,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');
@@ -799,21 +687,17 @@ const decodeMediaRetryNode = (node) => {
     return event;
 };
 exports.decodeMediaRetryNode = decodeMediaRetryNode;
-const decryptMediaRetryData = ({ ciphertext, iv }, mediaKey, msgId) => {
-    const retryKey = getMediaRetryKey(mediaKey);
+const decryptMediaRetryData = async ({ ciphertext, iv }, mediaKey, msgId) => {
+    const retryKey = await getMediaRetryKey(mediaKey);
     const plaintext = (0, crypto_1.aesDecryptGCM)(ciphertext, retryKey, iv, Buffer.from(msgId));
-    return WAProto_1.proto.MediaRetryNotification.decode(plaintext);
+    return index_js_1.proto.MediaRetryNotification.decode(plaintext);
 };
 exports.decryptMediaRetryData = decryptMediaRetryData;
 const getStatusCodeForMediaRetry = (code) => MEDIA_RETRY_STATUS_MAP[code];
 exports.getStatusCodeForMediaRetry = getStatusCodeForMediaRetry;
 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,
+    [index_js_1.proto.MediaRetryNotification.ResultType.SUCCESS]: 200,
+    [index_js_1.proto.MediaRetryNotification.ResultType.DECRYPTION_ERROR]: 412,
+    [index_js_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
+    [index_js_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.');
-}