@baileys-md/baileys 10.1.0 → 11.0.0

package/lib/Utils/messages-media.js

@@ -1,108 +1,81 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+import { Boom } from '@hapi/boom';
+import axios, {} from 'axios';
+import { exec } from 'child_process';
+import * as Crypto from 'crypto';
+import { once } from 'events';
+import { createReadStream, createWriteStream, promises as fs, WriteStream } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { Readable, Transform } from 'stream';
+import { URL } from 'url';
+import { proto } from '../../WAProto/index.js';
+import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP } from '../Defaults/index.js';
+import { getBinaryNodeChild, getBinaryNodeChildBuffer, jidNormalizedUser } from '../WABinary/index.js';
+import { aesDecryptGCM, aesEncryptGCM, hkdf } from './crypto.js';
+import { generateMessageIDV2 } from './generics.js';
+const getTmpFilesDirectory = () => tmpdir();
+export const hkdfInfoKey = (type) => {
+    const hkdfInfo = MEDIA_HKDF_KEY_MAPPING[type];
+    return `WhatsApp ${hkdfInfo} Keys`;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.hkdfInfoKey = void 0;
-exports.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");
-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 WAProto_1 = require("../../WAProto");
-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 (Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { }));
-            return jimp;
-        })(),
-        (async () => {
-            const sharp = await (Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { }));
-            return sharp;
-        })()
-    ]);
-    if (sharp) {
-        return { sharp };
+export const getRawMediaUploadData = async (media, mediaType, logger) => {
+    const { stream } = await getStream(media);
+    logger?.debug('got stream for raw upload');
+    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();
+        const fileSha256 = hasher.digest();
+        logger?.debug('hashed data for raw upload');
+        return {
+            filePath: filePath,
+            fileSha256,
+            fileLength
+        };
     }
-    const jimp = (_jimp === null || _jimp === void 0 ? void 0 : _jimp.default) || _jimp;
-    if (jimp) {
-        return { jimp };
+    catch (error) {
+        fileWriteStream.destroy();
+        stream.destroy();
+        try {
+            await fs.unlink(filePath);
+        }
+        catch {
+            //
+        }
+        throw error;
     }
-    throw new boom_1.Boom('No image processing library available');
 };
-const hkdfInfoKey = (type) => {
-    const hkdfInfo = Defaults_1.MEDIA_HKDF_KEY_MAPPING[type];
-    return `WhatsApp ${hkdfInfo} Keys`;
-};
-exports.hkdfInfoKey = hkdfInfoKey;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
-async function getMediaKeys(buffer, mediaType) {
+export async function getMediaKeys(buffer, mediaType) {
     if (!buffer) {
-        throw new boom_1.Boom('Cannot derive from empty media key');
+        throw new Boom('Cannot derive from empty media key');
     }
     if (typeof buffer === 'string') {
         buffer = Buffer.from(buffer.replace('data:;base64,', ''), 'base64');
     }
     // expand using HKDF to 112 bytes, also pass in the relevant app info
-    const expandedMediaKey = await (0, crypto_1.hkdf)(buffer, 112, { info: (0, exports.hkdfInfoKey)(mediaType) });
+    const expandedMediaKey = await hkdf(buffer, 112, { info: hkdfInfoKey(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) => {
+    exec(cmd, err => {
         if (err) {
             reject(err);
         }
@@ -111,117 +84,83 @@ const extractVideoThumb = async (path, destPath, time, size) => new Promise((res
         }
     });
 });
-const extractImageThumb = async (bufferOrFilePath, width = 32) => {
-    var _a, _b;
-    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') {
-        const img = lib.sharp.default(bufferOrFilePath);
-        const dimensions = await img.metadata();
-        const buffer = await img
-            .resize(width)
-            .jpeg({ quality: 50 })
-            .toBuffer();
-        return {
-            buffer,
-            original: {
-                width: dimensions.width,
-                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);
-        const dimensions = {
-            width: jimp.getWidth(),
-            height: jimp.getHeight()
-        };
-        const buffer = await jimp
-            .quality(50)
-            .resize(width, AUTO, RESIZE_BILINEAR)
-            .getBufferAsync(MIME_JPEG);
-        return {
-            buffer,
-            original: dimensions
-        };
-    }
-    else {
-        throw new boom_1.Boom('No image processing library available');
-    }
+export const extractImageThumb = async (bufferOrFilePath, width = 32) => {
+    // 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 Readable) {
+        bufferOrFilePath = await toBuffer(bufferOrFilePath);
+    }    
+    const Jimp = await (await import('jimp')).default  
+    const jimp = Jimp.read(bufferOrFilePath);
+    const dimensions = {
+        width: jimp.width,
+        height: jimp.height
+    };
+    const buffer = await jimp
+        .resize({ w: width, mode: lib.jimp.ResizeStrategy.BILINEAR })
+        .getBuffer('image/jpeg', { quality: 100 });
+    return {
+        buffer,
+        original: dimensions
+    };
 };
-exports.extractImageThumb = extractImageThumb;
-const encodeBase64EncodedStringForUpload = (b64) => (encodeURIComponent(b64
-    .replace(/\+/g, '-')
-    .replace(/\//g, '_')
-    .replace(/\=+$/, '')));
-exports.encodeBase64EncodedStringForUpload = encodeBase64EncodedStringForUpload;
-const generateProfilePicture = async (mediaUpload) => {
-    let bufferOrFilePath;
-    let img;
+export const encodeBase64EncodedStringForUpload = (b64) => encodeURIComponent(b64.replace(/\+/g, '-').replace(/\//g, '_').replace(/\=+$/, ''));
+export const generateProfilePicture = async (mediaUpload) => {
+    let buffer;
     if (Buffer.isBuffer(mediaUpload)) {
-        bufferOrFilePath = mediaUpload;
-    }
-    else if ('url' in mediaUpload) {
-        bufferOrFilePath = mediaUpload.url.toString();
-    }
-    else {
-        bufferOrFilePath = await (0, exports.toBuffer)(mediaUpload.stream);
-    }
-    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);
+        buffer = mediaUpload;
+    } else {
+        const { stream } = await getStream(mediaUpload);
+        buffer = await toBuffer(stream);
+    }
+    const Jimp = (await import('jimp')).default;
+    const jimp = await Jimp.read(mediaUpload);
+    const min = await jimp.getWidth();
+    const max = await jimp.getHeight();
+    const cropped = await jimp.crop(0, 0, min, max);    
     return {
-        img: await img,
+        img: await cropped.scaleToFit(720, 720).getBufferAsync(Jimp.MIME_JPEG),
     };
 };
-exports.generateProfilePicture = generateProfilePicture;
 /** gets the SHA256 of the given media message */
-const mediaMessageSHA256B64 = (message) => {
+export 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) {
-    const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
+export async function getAudioDuration(buffer) {
+    const musicMetadata = await import('music-metadata');
     let metadata;
+    const options = {
+        duration: true
+    };
     if (Buffer.isBuffer(buffer)) {
-        metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseBuffer(buffer, undefined, options);
     }
     else if (typeof buffer === 'string') {
-        const rStream = (0, fs_1.createReadStream)(buffer);
-        try {
-            metadata = await musicMetadata.parseStream(rStream, undefined, { duration: true });
-        }
-        finally {
-            rStream.destroy();
-        }
+        metadata = await musicMetadata.parseFile(buffer, options);
     }
     else {
-        metadata = await musicMetadata.parseStream(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseStream(buffer, undefined, options);
     }
     return metadata.format.duration;
 }
 /**
   referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
  */
-async function getAudioWaveform(buffer, logger) {
+export async function getAudioWaveform(buffer, logger) {
     try {
-        const { default: decoder } = await eval('import(\'audio-decode\')');
+        // @ts-ignore
+        const { default: decoder } = await import('audio-decode');
         let audioData;
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer;
         }
         else if (typeof buffer === 'string') {
-            const rStream = (0, fs_1.createReadStream)(buffer);
-            audioData = await (0, exports.toBuffer)(rStream);
+            const rStream = createReadStream(buffer);
+            audioData = await toBuffer(rStream);
         }
         else {
-            audioData = await (0, exports.toBuffer)(buffer);
+            audioData = await toBuffer(buffer);
         }
         const audioBuffer = await decoder(audioData);
         const rawData = audioBuffer.getChannelData(0); // We only need to work with one channel of data
@@ -238,23 +177,22 @@ 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) {
-        logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
+        logger?.debug('Failed to generate waveform: ' + e);
     }
 }
-const toReadable = (buffer) => {
-    const readable = new stream_1.Readable({ read: () => { } });
+export const toReadable = (buffer) => {
+    const readable = new Readable({ read: () => { } });
     readable.push(buffer);
     readable.push(null);
     return readable;
 };
-exports.toReadable = toReadable;
-const toBuffer = async (stream) => {
+export const toBuffer = async (stream) => {
     const chunks = [];
     for await (const chunk of stream) {
         chunks.push(chunk);
@@ -262,45 +200,47 @@ const toBuffer = async (stream) => {
     stream.destroy();
     return Buffer.concat(chunks);
 };
-exports.toBuffer = toBuffer;
-const getStream = async (item, opts) => {
+export const getStream = async (item, opts) => {
     if (Buffer.isBuffer(item)) {
-        return { stream: (0, exports.toReadable)(item), type: 'buffer' };
+        return { stream: toReadable(item), type: 'buffer' };
     }
     if ('stream' in item) {
         return { stream: item.stream, type: 'readable' };
     }
-    if (item.url.toString().startsWith('http://') || item.url.toString().startsWith('https://')) {
-        return { stream: await (0, exports.getHttpStream)(item.url, opts), type: 'remote' };
+    const urlStr = item.url.toString();
+    if (urlStr.startsWith('data:')) {
+        const buffer = Buffer.from(urlStr.split(',')[1], 'base64');
+        return { stream: toReadable(buffer), type: 'buffer' };
+    }
+    if (urlStr.startsWith('http://') || urlStr.startsWith('https://')) {
+        return { stream: await getHttpStream(item.url, opts), type: 'remote' };
     }
-    return { stream: (0, fs_1.createReadStream)(item.url), type: 'file' };
+    return { stream: createReadStream(item.url), type: 'file' };
 };
-exports.getStream = getStream;
 /** generates a thumbnail for a given media, if required */
-async function generateThumbnail(file, mediaType, options) {
-    var _a;
+export async function generateThumbnail(file, mediaType, options) {
     let thumbnail;
     let originalImageDimensions;
     if (mediaType === 'image') {
-        const { buffer, original } = await (0, exports.extractImageThumb)(file);
+        const { buffer, original } = await extractImageThumb(file);
         thumbnail = buffer.toString('base64');
         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.generateMessageIDV2)() + '.jpg');
+        const imgFilename = join(getTmpFilesDirectory(), generateMessageIDV2() + '.jpg');
         try {
             await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 });
-            const buff = await fs_1.promises.readFile(imgFilename);
+            const buff = await fs.readFile(imgFilename);
             thumbnail = buff.toString('base64');
-            await fs_1.promises.unlink(imgFilename);
+            await fs.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 {
@@ -308,160 +248,110 @@ async function generateThumbnail(file, mediaType, options) {
         originalImageDimensions
     };
 }
-const getHttpStream = async (url, options = {}) => {
-    const fetched = await axios_1.default.get(url.toString(), { ...options, responseType: 'stream' });
+export const getHttpStream = async (url, options = {}) => {
+    const fetched = await axios.get(url.toString(), { ...options, responseType: 'stream' });
     return fetched.data;
 };
-exports.getHttpStream = getHttpStream;
-const prepareStream = 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.generateMessageIDV2)());
-            (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 } = {}) => {
-    const { stream, type } = await (0, exports.getStream)(media, opts);
-    logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
+export const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+    const { stream, type } = await getStream(media, opts);
+    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;
-    }
-    else if (saveOriginalFileIfRequired) {
-        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
-        writeStream = (0, fs_1.createWriteStream)(bodyPath);
-        didSaveToTmpPath = true;
+    const encFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageIDV2() + '-enc');
+    const encFileWriteStream = createWriteStream(encFilePath);
+    let originalFileStream;
+    let originalFilePath;
+    if (saveOriginalFileIfRequired) {
+        originalFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageIDV2() + '-original');
+        originalFileStream = 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) {
-                throw new boom_1.Boom(`content length exceeded when encrypting "${type}"`, {
+            if (type === 'remote' && opts?.maxContentLength && fileLength + data.length > opts.maxContentLength) {
+                throw new 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 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();
+        originalFileStream?.end?.();
         stream.destroy();
-        logger === null || logger === void 0 ? void 0 : logger.debug('encrypted data successfully');
+        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();
+        originalFileStream?.destroy?.();
         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.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs.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';
 const AES_CHUNK_SIZE = 16;
 const toSmallestChunkSize = (num) => {
     return Math.floor(num / AES_CHUNK_SIZE) * AES_CHUNK_SIZE;
 };
-const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
-exports.getUrlFromDirectPath = getUrlFromDirectPath;
-const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
-    const downloadUrl = url || (0, exports.getUrlFromDirectPath)(directPath);
+export const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
+export const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
+    const isValidMediaUrl = url?.startsWith('https://mmg.whatsapp.net/');
+    const downloadUrl = isValidMediaUrl ? url : getUrlFromDirectPath(directPath);
+    if (!downloadUrl) {
+        throw new 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);
+    return 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 } = {}) => {
+export const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startByte, endByte, options } = {}) => {
     let bytesFetched = 0;
     let startChunk = 0;
     let firstBlockIsIV = false;
@@ -476,8 +366,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: DEFAULT_ORIGIN
     };
     if (startChunk || endChunk) {
         headers.Range = `bytes=${startChunk}-`;
@@ -486,11 +376,11 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
         }
     }
     // download the message
-    const fetched = await (0, exports.getHttpStream)(downloadUrl, {
-        ...options || {},
+    const fetched = await getHttpStream(downloadUrl, {
+        ...(options || {}),
         headers,
         maxBodyLength: Infinity,
-        maxContentLength: Infinity,
+        maxContentLength: Infinity
     });
     let remainingBytes = Buffer.from([]);
     let aes;
@@ -505,7 +395,7 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             push(bytes);
         }
     };
-    const output = new stream_1.Transform({
+    const output = new Transform({
         transform(chunk, _, callback) {
             let data = Buffer.concat([remainingBytes, chunk]);
             const decryptLength = toSmallestChunkSize(data.length);
@@ -540,18 +430,15 @@ 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];
+export 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 {
@@ -560,53 +447,39 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
-const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
-        var _a, _b;
+export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
+    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) {
+        fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64);
+        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}${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_1.default.post(url, reqBody, {
+                const body = await axios.post(url, createReadStream(filePath), {
                     ...options,
+                    maxRedirects: 0,
                     headers: {
-                        ...options.headers || {},
+                        ...(options.headers || {}),
                         'Content-Type': 'application/octet-stream',
-                        'Origin': Defaults_1.DEFAULT_ORIGIN
+                        Origin: 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
+                        directPath: result.direct_path
                     };
                     break;
                 }
@@ -616,37 +489,36 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 }
             }
             catch (error) {
-                if (axios_1.default.isAxiosError(error)) {
-                    result = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
+                if (axios.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...'}`);
             }
         }
         if (!urls) {
-            throw new boom_1.Boom('Media upload failed on all hosts', { statusCode: 500 });
+            throw new Boom('Media upload failed on all hosts', { statusCode: 500 });
         }
         return urls;
     };
 };
-exports.getWAUploadToServer = getWAUploadToServer;
 const getMediaRetryKey = (mediaKey) => {
-    return (0, crypto_1.hkdf)(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
+    return hkdf(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
 };
 /**
  * Generate a binary node that will request the phone to re-upload the media & return the newly uploaded URL
  */
-const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
+export const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     const recp = { stanzaId: key.id };
-    const recpBuffer = WAProto_1.proto.ServerErrorReceipt.encode(recp).finish();
+    const recpBuffer = proto.ServerErrorReceipt.encode(recp).finish();
     const iv = Crypto.randomBytes(12);
     const retryKey = await getMediaRetryKey(mediaKey);
-    const ciphertext = (0, crypto_1.aesEncryptGCM)(recpBuffer, retryKey, iv, Buffer.from(key.id));
+    const ciphertext = aesEncryptGCM(recpBuffer, retryKey, iv, Buffer.from(key.id));
     const req = {
         tag: 'receipt',
         attrs: {
             id: key.id,
-            to: (0, WABinary_1.jidNormalizedUser)(meId),
+            to: jidNormalizedUser(meId),
             type: 'server-error'
         },
         content: [
@@ -665,7 +537,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
                 }
@@ -674,9 +546,8 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     };
     return req;
 };
-exports.encryptMediaRetryRequest = encryptMediaRetryRequest;
-const decodeMediaRetryNode = (node) => {
-    const rmrNode = (0, WABinary_1.getBinaryNodeChild)(node, 'rmr');
+export const decodeMediaRetryNode = (node) => {
+    const rmrNode = getBinaryNodeChild(node, 'rmr');
     const event = {
         key: {
             id: node.attrs.id,
@@ -685,40 +556,37 @@ const decodeMediaRetryNode = (node) => {
             participant: rmrNode.attrs.participant
         }
     };
-    const errorNode = (0, WABinary_1.getBinaryNodeChild)(node, 'error');
+    const errorNode = 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(`Failed to re-upload media (${errorCode})`, {
+            data: errorNode.attrs,
+            statusCode: getStatusCodeForMediaRetry(errorCode)
+        });
     }
     else {
-        const encryptedInfoNode = (0, WABinary_1.getBinaryNodeChild)(node, 'encrypt');
-        const ciphertext = (0, WABinary_1.getBinaryNodeChildBuffer)(encryptedInfoNode, 'enc_p');
-        const iv = (0, WABinary_1.getBinaryNodeChildBuffer)(encryptedInfoNode, 'enc_iv');
+        const encryptedInfoNode = getBinaryNodeChild(node, 'encrypt');
+        const ciphertext = getBinaryNodeChildBuffer(encryptedInfoNode, 'enc_p');
+        const iv = getBinaryNodeChildBuffer(encryptedInfoNode, 'enc_iv');
         if (ciphertext && iv) {
             event.media = { ciphertext, iv };
         }
         else {
-            event.error = new boom_1.Boom('Failed to re-upload media (missing ciphertext)', { statusCode: 404 });
+            event.error = new Boom('Failed to re-upload media (missing ciphertext)', { statusCode: 404 });
         }
     }
     return event;
 };
-exports.decodeMediaRetryNode = decodeMediaRetryNode;
-const decryptMediaRetryData = async ({ ciphertext, iv }, mediaKey, msgId) => {
+export 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);
+    const plaintext = aesDecryptGCM(ciphertext, retryKey, iv, Buffer.from(msgId));
+    return proto.MediaRetryNotification.decode(plaintext);
 };
-exports.decryptMediaRetryData = decryptMediaRetryData;
-const getStatusCodeForMediaRetry = (code) => MEDIA_RETRY_STATUS_MAP[code];
-exports.getStatusCodeForMediaRetry = getStatusCodeForMediaRetry;
+export const getStatusCodeForMediaRetry = (code) => MEDIA_RETRY_STATUS_MAP[code];
 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,
+    [proto.MediaRetryNotification.ResultType.SUCCESS]: 200,
+    [proto.MediaRetryNotification.ResultType.DECRYPTION_ERROR]: 412,
+    [proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
+    [proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418
 };
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function __importStar(arg0) {
-    throw new Error('Function not implemented.');
-}
+//# sourceMappingURL=messages-media.js.map