@hbmodsofc/baileys 2.5.0 → 3.0.0

package/lib/Utils/messages-media.js

@@ -15,23 +15,47 @@ 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.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.extractVideoThumb = exports.hkdfInfoKey = void 0;
+exports.getMediaKeys = getMediaKeys;
+exports.uploadFile = uploadFile;
+exports.vid2jpg = vid2jpg;
+exports.getAudioDuration = getAudioDuration;
+exports.getAudioWaveform = getAudioWaveform;
+exports.generateThumbnail = generateThumbnail;
+exports.extensionForMediaMessage = extensionForMediaMessage;
 const boom_1 = require("@hapi/boom");
-const child_process_1 = require("child_process");
+const axios_1 = __importDefault(require("axios"));
+const form_data_1 = __importDefault(require("form-data"));
+const cheerio = __importStar(require("cheerio"));
 const Crypto = __importStar(require("crypto"));
 const events_1 = require("events");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
+const jimp_1 = __importDefault(require("jimp"));
 const stream_1 = require("stream");
+const child_process_1 = require("child_process");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
@@ -41,13 +65,11 @@ const getTmpFilesDirectory = () => (0, os_1.tmpdir)();
 const getImageProcessingLibrary = async () => {
     const [_jimp, sharp] = await Promise.all([
         (async () => {
-            const jimp = await (import('jimp')
-                .catch(() => { }));
+            const jimp = await (Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { }));
             return jimp;
         })(),
         (async () => {
-            const sharp = await (import('sharp')
-                .catch(() => { }));
+            const sharp = await (Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { }));
             return sharp;
         })()
     ]);
@@ -65,8 +87,34 @@ const hkdfInfoKey = (type) => {
     return `WhatsApp ${hkdfInfo} Keys`;
 };
 exports.hkdfInfoKey = hkdfInfoKey;
+   const getRawMediaUploadData = async (media, mediaType, logger) => {
+    const { stream } = await getStream(media);
+    const hasher = Crypto.createHash('sha256');
+    const filePath = join(tmpdir(), mediaType + generateMessageIDV2());
+    const fileWriteStream = createWriteStream(filePath);
+    let fileLength = 0;
+
+    try {
+        for await (const data of stream) {
+            fileLength += data.length;
+            hasher.update(data);
+            if (!fileWriteStream.write(data)) await once(fileWriteStream, 'drain');
+        }
+        fileWriteStream.end();
+        await once(fileWriteStream, 'finish');
+        stream.destroy();
+        logger?.debug('hashed data for raw upload');
+        return { filePath, fileSha256: hasher.digest(), fileLength };
+    } catch (error) {
+        fileWriteStream.destroy();
+        stream.destroy();
+        try { await fs.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,26 +122,183 @@ 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),
     };
 }
-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) => {
-        if (err) {
-            reject(err);
+async function uploadFile(buffer, logger) {
+    const { fromBuffer } = await Promise.resolve().then(() => __importStar(require('file-type')));
+    const fileType = await fromBuffer(buffer);
+    if (!fileType)
+        throw new Error("Failed to detect file type.");
+    const { ext, mime } = fileType;
+    const services = [
+        {
+            name: "catbox",
+            url: "https://catbox.moe/user/api.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("fileToUpload", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                form.append("reqtype", "fileupload");
+                return form;
+            },
+            parseResponse: res => res.data
+        },
+        {
+            name: "pdi.moe",
+            url: "https://scdn.pdi.moe/upload",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("file", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime
+                });
+                return form;
+            },
+            parseResponse: res => res.data.result.url
+        },
+        {
+            name: "qu.ax",
+            url: "https://qu.ax/upload.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("files[]", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                return form;
+            },
+            parseResponse: res => {
+                var _a, _b, _c;
+                if (!((_c = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url))
+                    throw new Error("Failed to get URL from qu.ax");
+                return res.data.files[0].url;
+            }
+        },
+        {
+            name: "uguu.se",
+            url: "https://uguu.se/upload.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("files[]", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                return form;
+            },
+            parseResponse: res => {
+                var _a, _b, _c;
+                if (!((_c = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url))
+                    throw new Error("Failed to get URL from uguu.se");
+                return res.data.files[0].url;
+            }
+        },
+        {
+            name: "tmpfiles",
+            url: "https://tmpfiles.org/api/v1/upload",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("file", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime
+                });
+                return form;
+            },
+            parseResponse: res => {
+                const match = res.data.data.url.match(/https:\/\/tmpfiles\.org\/(.*)/);
+                if (!match)
+                    throw new Error("Failed to parse tmpfiles URL.");
+                return `https://tmpfiles.org/dl/${match[1]}`;
+            }
         }
-        else {
-            resolve();
+    ];
+    for (const service of services) {
+        try {
+            const form = service.buildForm();
+            const res = await axios_1.default.post(service.url, form, {
+                headers: form.getHeaders()
+            });
+            const url = service.parseResponse(res);
+            return url;
+        }
+        catch (error) {
+            logger === null || logger === void 0 ? void 0 : logger.debug(`[${service.name}] eror:`, (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
+    }
+    throw new Error("All upload services failed.");
+}
+async function vid2jpg(videoUrl) {
+    try {
+        const { data } = await axios_1.default.get(`https://ezgif.com/video-to-jpg?url=${encodeURIComponent(videoUrl)}`);
+        const $ = cheerio.load(data);
+        const fileToken = $('input[name="file"]').attr("value");
+        if (!fileToken) {
+            throw new Error("Failed to retrieve file token. The video URL may be invalid or inaccessible.");
+        }
+        const formData = new URLSearchParams();
+        formData.append("file", fileToken);
+        formData.append("end", "1");
+        formData.append("video-to-jpg", "Convert to JPG!");
+        const convert = await axios_1.default.post(`https://ezgif.com/video-to-jpg/${fileToken}`, formData);
+        const $2 = cheerio.load(convert.data);
+        let imageUrl = $2("#output img").first().attr("src");
+        if (!imageUrl) {
+            throw new Error("Could not locate the converted image output.");
+        }
+        if (imageUrl.startsWith("//")) {
+            imageUrl = "https:" + imageUrl;
+        }
+        else if (imageUrl.startsWith("/")) {
+            const cdnMatch = imageUrl.match(/\/(s\d+\..+?)\/.*/);
+            if (cdnMatch) {
+                imageUrl = "https://" + imageUrl.slice(2);
+            }
+            else {
+                imageUrl = "https://ezgif.com" + imageUrl;
+            }
         }
+        return imageUrl;
+    }
+    catch (error) {
+        throw new Error("Failed to convert video to JPG: " + error.message);
+    }
+}
+/**
+ * Extracts video thumbnail using FFmpeg
+ */
+const extractVideoThumb = async (videoPath, time = '00:00:00', size = { width: 256 }) => {
+    return new Promise((resolve, reject) => {
+        const args = [
+            '-ss', time,
+            '-i', videoPath,
+            '-y',
+            '-vf', `scale=${size.width}:-1`,
+            '-vframes', '1',
+            '-f', 'image2',
+            '-vcodec', 'mjpeg',
+            'pipe:1'
+        ];
+        const ffmpeg = (0, child_process_1.spawn)('ffmpeg', args);
+        const chunks = [];
+        let errorOutput = '';
+        ffmpeg.stdout.on('data', chunk => chunks.push(chunk));
+        ffmpeg.stderr.on('data', data => {
+            errorOutput += data.toString();
+        });
+        ffmpeg.on('error', reject);
+        ffmpeg.on('close', code => {
+            if (code === 0) return resolve(Buffer.concat(chunks));
+            reject(new Error(`ffmpeg exited with code ${code}\n${errorOutput}`));
+        });
     });
-});
+};
+exports.extractVideoThumb = extractVideoThumb;
 const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     var _a, _b;
     if (bufferOrFilePath instanceof stream_1.Readable) {
@@ -142,8 +347,8 @@ const encodeBase64EncodedStringForUpload = (b64) => (encodeURIComponent(b64
     .replace(/\=+$/, '')));
 exports.encodeBase64EncodedStringForUpload = encodeBase64EncodedStringForUpload;
 const generateProfilePicture = async (mediaUpload) => {
-    var _a, _b;
     let bufferOrFilePath;
+    let img;
     if (Buffer.isBuffer(mediaUpload)) {
         bufferOrFilePath = mediaUpload;
     }
@@ -153,29 +358,11 @@ const generateProfilePicture = async (mediaUpload) => {
     else {
         bufferOrFilePath = await (0, exports.toBuffer)(mediaUpload.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)
-            .jpeg({
-            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 {
-        throw new boom_1.Boom('No image processing library available');
-    }
+    const jimp = await jimp_1.default.read(bufferOrFilePath);
+    const cropped = jimp.getWidth() > jimp.getHeight() ? jimp.resize(550, -1) : jimp.resize(-1, 650);
+    img = cropped
+        .quality(100)
+        .getBufferAsync(jimp_1.default.MIME_JPEG);
     return {
         img: await img,
     };
@@ -188,138 +375,58 @@ const mediaMessageSHA256B64 = (message) => {
 };
 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;
 async function getAudioWaveform(buffer, logger) {
     try {
-        const { PassThrough } = require('stream');
-        const ff = require('fluent-ffmpeg');
-        
+        const { default: decoder } = await eval('import(\'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);
+        const samples = 64;
+        const blockSize = Math.floor(rawData.length / samples);
+        const filteredData = [];
+        for (let i = 0; i < samples; i++) {
+            const blockStart = blockSize * i;
+            let sum = 0;
+            for (let j = 0; j < blockSize; j++) {
+                sum = sum + Math.abs(rawData[blockStart + j]);
+            }
+            filteredData.push(sum / blockSize);
+        }
+        const multiplier = Math.pow(Math.max(...filteredData), -1);
+        const normalizedData = filteredData.map((n) => n * multiplier);
+        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 === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
     }
 }
-exports.convertToOpusBuffer = convertToOpusBuffer;
 const toReadable = (buffer) => {
     const readable = new stream_1.Readable({ read: () => { } });
     readable.push(buffer);
@@ -337,16 +444,27 @@ const toBuffer = async (stream) => {
 };
 exports.toBuffer = toBuffer;
 const getStream = async (item, opts) => {
-    if (Buffer.isBuffer(item)) {
-        return { stream: (0, exports.toReadable)(item), type: 'buffer' };
-    }
-    if ('stream' in item) {
-        return { stream: item.stream, type: 'readable' };
+    if (!item) throw new Boom('Item is required for getStream', { statusCode: 400 });
+    
+    if (Buffer.isBuffer(item)) return { stream: toReadable(item), type: 'buffer' };
+    if (item?.stream?.pipe) return { stream: item.stream, type: 'readable' };
+    if (item?.pipe) return { stream: item, type: 'readable' };
+    
+    if (item && typeof item === 'object' && 'url' in item) {
+        const urlStr = item.url.toString();
+        if (Buffer.isBuffer(item.url)) return { stream: toReadable(item.url), type: 'buffer' };
+        if (urlStr.startsWith('data:')) return { stream: toReadable(Buffer.from(urlStr.split(',')[1], 'base64')), type: 'buffer' };
+        if (urlStr.startsWith('http')) return { stream: await getHttpStream(item.url, opts), type: 'remote' };
+        return { stream: fs_1.createReadStream(item.url), type: 'file' };
     }
-    if (item.url.toString().startsWith('http://') || item.url.toString().startsWith('https://')) {
-        return { stream: await (0, exports.getHttpStream)(item.url, opts), type: 'remote' };
+    
+    if (typeof item === 'string') {
+        if (item.startsWith('data:')) return { stream: toReadable(Buffer.from(item.split(',')[1], 'base64')), type: 'buffer' };
+        if (item.startsWith('http')) return { stream: await getHttpStream(item, opts), type: 'remote' };
+        return { stream: fs_1.createReadStream(item), type: 'file' };
     }
-    return { stream: (0, fs_1.createReadStream)(item.url), type: 'file' };
+    
+    throw new Boom(`Invalid input type for getStream: ${typeof item}`, { statusCode: 400 });
 };
 exports.getStream = getStream;
 /** generates a thumbnail for a given media, if required */
@@ -365,12 +483,28 @@ async function generateThumbnail(file, mediaType, options) {
         }
     }
     else if (mediaType === 'video') {
-        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);
-            thumbnail = buff.toString('base64');
+            let videoPath = file;
+            if (Buffer.isBuffer(file) || file instanceof stream_1.Readable) {
+                videoPath = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.mp4');
+                const buffer = Buffer.isBuffer(file) ? file : await (0, exports.toBuffer)(file);
+                await fs_1.promises.writeFile(videoPath, buffer);
+            }
+            const thumbnailBuffer = await (0, exports.extractVideoThumb)(videoPath);
+            const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
+            await fs_1.promises.writeFile(imgFilename, thumbnailBuffer);
+            const { buffer: processedThumbnailBuffer, original } = await (0, exports.extractImageThumb)(imgFilename);
+            thumbnail = processedThumbnailBuffer.toString('base64');
+            if (original.width && original.height) {
+                originalImageDimensions = {
+                    width: original.width,
+                    height: original.height,
+                };
+            }
             await fs_1.promises.unlink(imgFilename);
+            if (videoPath !== file) {
+                await fs_1.promises.unlink(videoPath);
+            }
         }
         catch (err) {
             (_a = options.logger) === null || _a === void 0 ? void 0 : _a.debug('could not generate video thumb: ' + err);
@@ -381,10 +515,8 @@ 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;
@@ -399,7 +531,7 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
             bodyPath = media.url;
         }
         else if (saveOriginalFileIfRequired) {
-            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
+            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
             (0, fs_1.writeFileSync)(bodyPath, buffer);
             didSaveToTmpPath = true;
         }
@@ -418,7 +550,6 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
         };
     }
     catch (error) {
-        // destroy all streams with error
         stream.destroy();
         if (didSaveToTmpPath) {
             try {
@@ -432,45 +563,30 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
     }
 };
 exports.prepareStream = prepareStream;
-const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isPtt, forceOpus } = {}) => {
+const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     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 === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
-    const { cipherKey, iv, macKey } = getMediaKeys(mediaKey, mediaType);
+    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;
     }
     else if (saveOriginalFileIfRequired) {
-        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
+        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
         writeStream = (0, fs_1.createWriteStream)(bodyPath);
         didSaveToTmpPath = true;
     }
-    
     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');
-    
     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)
@@ -479,7 +595,6 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                     data: { media, type }
                 });
             }
-            
             sha256Plain = sha256Plain.update(data);
             if (writeStream) {
                 if (!writeStream.write(data)) {
@@ -488,18 +603,16 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
             }
             onChunk(aes.update(data));
         }
-        
         onChunk(aes.final());
         const mac = hmac.digest().slice(0, 10);
         sha256Enc = 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();
-        
+        stream.destroy();
+        logger === null || logger === void 0 ? void 0 : logger.debug('encrypted data successfully');
         return {
             mediaKey,
             encWriteStream,
@@ -518,18 +631,17 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
         hmac.destroy();
         sha256Plain.destroy();
         sha256Enc.destroy();
-        finalStream.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');
             }
         }
         throw error;
     }
-    
     function onChunk(buff) {
         sha256Enc = sha256Enc.update(buff);
         hmac = hmac.update(buff);
@@ -544,21 +656,20 @@ 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 === null || url === void 0 ? void 0 : url.startsWith('https://mmg.whatsapp.net/');
+    const downloadUrl = isValidMediaUrl ? url : (0, exports.getUrlFromDirectPath)(directPath);
+    if (!downloadUrl) {
+        throw new boom_1.Boom('No valid media URL or directPath present in message', { statusCode: 400 });
+    }
+    const keys = await getMediaKeys(mediaKey, type);
     return (0, exports.downloadEncryptedContent)(downloadUrl, keys, opts);
 };
 exports.downloadContentFromMessage = downloadContentFromMessage;
-/**
- * Decrypts and downloads an AES256-CBC encrypted file given the keys.
- * Assumes the SHA256 of the plaintext is appended to the end of the ciphertext
- * */
 const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startByte, endByte, options } = {}) => {
     let bytesFetched = 0;
     let startChunk = 0;
     let firstBlockIsIV = false;
-    // if a start byte is specified -- then we need to fetch the previous chunk as that will form the IV
     if (startByte) {
         const chunk = toSmallestChunkSize(startByte || 0);
         if (chunk) {
@@ -578,7 +689,6 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             headers.Range += endChunk;
         }
     }
-    // download the message
     const fetched = await (0, exports.getHttpStream)(downloadUrl, {
         ...options || {},
         headers,
@@ -611,8 +721,6 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
                     data = data.slice(AES_CHUNK_SIZE);
                 }
                 aes = Crypto.createDecipheriv('aes-256-cbc', cipherKey, ivValue);
-                // if an end byte that is not EOF is specified
-                // stop auto padding (PKCS7) -- otherwise throws an error for decryption
                 if (endByte) {
                     aes.setAutoPadding(false);
                 }
@@ -653,12 +761,9 @@ 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');
-        // 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];
@@ -676,14 +781,14 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         }
         for (const { hostname, maxContentLengthBytes } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
-            const auth = encodeURIComponent(uploadInfo.auth); // the auth token
+            const auth = encodeURIComponent(uploadInfo.auth);
             const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
             let result;
             try {
                 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, reqBody, {
                     ...options,
                     headers: {
                         ...options.headers || {},
@@ -711,7 +816,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 }
             }
             catch (error) {
-                if (axios.isAxiosError(error)) {
+                if (axios_1.default.isAxiosError(error)) {
                     result = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
                 }
                 const isLast = hostname === ((_b = hosts[uploadInfo.hosts.length - 1]) === null || _b === void 0 ? void 0 : _b.hostname);
@@ -728,14 +833,11 @@ exports.getWAUploadToServer = getWAUploadToServer;
 const getMediaRetryKey = (mediaKey) => {
     return (0, crypto_1.hkdf)(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
 };
-/**
- * Generate a binary node that will request the phone to re-upload the media & return the newly uploaded URL
- */
-const encryptMediaRetryRequest = (key, mediaKey, meId) => {
+const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     const recp = { stanzaId: key.id };
     const recpBuffer = WAProto_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',
@@ -745,9 +847,6 @@ const encryptMediaRetryRequest = (key, mediaKey, meId) => {
             type: 'server-error'
         },
         content: [
-            // this encrypt node is actually pretty useless
-            // the media is returned even without this node
-            // keeping it here to maintain parity with WA Web
             {
                 tag: 'encrypt',
                 attrs: {},
@@ -761,7 +860,6 @@ const encryptMediaRetryRequest = (key, mediaKey, meId) => {
                 attrs: {
                     jid: key.remoteJid,
                     'from_me': (!!key.fromMe).toString(),
-                    // @ts-ignore
                     participant: key.participant || undefined
                 }
             }
@@ -799,8 +897,8 @@ 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);
 };
@@ -813,7 +911,3 @@ const MEDIA_RETRY_STATUS_MAP = {
     [WAProto_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
     [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418,
 };
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function __importStar(arg0) {
-    throw new Error('Function not implemented.');
-}