@hansaka02/baileys 7.3.4 → 7.3.6

package/lib/Utils/messages-media.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 
 const { Boom } = require("@hapi/boom")
-const { spawn } = require("child_process")
+const { exec } = require("child_process")
 const { once } = require("events")
 const { 
   createHash, 
@@ -17,13 +17,20 @@ const {
   createReadStream, 
   createWriteStream
 } = require("fs")
+const {
+  parseBuffer, 
+  parseFile, 
+  parseStream
+} = require('music-metadata')
+const { 
+  default: decoder 
+} = require("audio-decode") 
 const { tmpdir } = require("os")
 const { join } = require("path")
 const {
   Readable, 
   Transform
 } = require("stream")
-const axios_1 =  require("axios")
 const { proto } = require("../../WAProto")
 const {
   MEDIA_PATH_MAP, 
@@ -42,24 +49,27 @@ const {
 } = require("./crypto")
 const { generateMessageID } = require("./generics")
 
-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
-        })()
-    ])
+const getTmpFilesDirectory = () => tmpdir()
+
+const getImageProcessingLibrary = () => {
+    let sharp, jimp
+
+    try {
+        sharp = require('sharp')
+    } catch {}
+
     if (sharp) {
         return { sharp }
     }
-    const jimp = _jimp?.default || _jimp
+
+    try {
+        jimp = require('jimp')
+    } catch {}
+
     if (jimp) {
         return { jimp }
     }
+
     throw new Boom('No image processing library available')
 }
 
@@ -74,7 +84,7 @@ const getRawMediaUploadData = async (media, mediaType, logger) => {
     logger?.debug('got stream for raw upload')
     
     const hasher = createHash('sha256')
-    const filePath = join(tmpdir(), mediaType + generateMessageID())
+    const filePath = join(getTmpFilesDirectory(), mediaType + generateMessageID())
     const fileWriteStream = createWriteStream(filePath)
     
     let fileLength = 0
@@ -130,75 +140,50 @@ async function getMediaKeys(buffer, mediaType) {
     return {
         iv: expandedMediaKey.slice(0, 16),
         cipherKey: expandedMediaKey.slice(16, 48),
-        macKey: expandedMediaKey.slice(48, 80),
+        macKey: expandedMediaKey.slice(48, 80)
     }
 }
 
 /** Extracts video thumb using FFMPEG */
-const extractVideoThumb = (videoPath, time = '00:00:00', size = { width: 320 }) => {
-    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 = 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}`))
-        })
+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}`
+    exec(cmd, err => {
+        if (err) {
+            reject(err)
+        }
+        else {
+            resolve()
+        }
     })
-}
+})
 
 const extractImageThumb = async (bufferOrFilePath, width = 32, quality = 50) => {
-    if (typeof bufferOrFilePath === "string" && bufferOrFilePath.startsWith("http")) {
-        const response = await axios_1.default.get(bufferOrFilePath, { responseType: "arraybuffer" })
-        bufferOrFilePath = Buffer.from(response.data)
-    }
+    // 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 lib = await getImageProcessingLibrary()
-    if ('sharp' in lib && typeof lib.sharp?.default === 'function') {
-        const img = lib.sharp.default(bufferOrFilePath)
+    
+    if ('sharp' in lib && typeof lib.sharp === 'function') {
+        const img = lib.sharp(bufferOrFilePath)
         const dimensions = await img.metadata()
-        const buffer = await img
-         .resize({ 
-             width, 
-             height: width, 
-             fit: 'contain', 
-             background: { r: 255, g: 255, b: 255, alpha: 0 } 
-         })
-         .jpeg({ quality }) 
-         .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 lib.jimp?.read === 'function') {
-        const { read, MIME_JPEG, RESIZE_BEZIER, AUTO } = lib.jimp
+    else if ('jimp' in lib && typeof lib.jimp.read === 'function') {
+    	const { read, MIME_JPEG, RESIZE_BEZIER, AUTO } = lib.jimp
         const jimp = await read(bufferOrFilePath)
         const dimensions = {
             width: jimp.getWidth(),
-            height: jimp.getHeight()
+            height: jimp.getHeight() 
         }
         const buffer = await jimp
          .quality(quality) 
@@ -219,52 +204,53 @@ const encodeBase64EncodedStringForUpload = (b64) => (encodeURIComponent(b64
     .replace(/\//g, '_')
     .replace(/\=+$/, '')))
     
-const generateProfilePicture = async (mediaUpload) => {
-    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 toBuffer(mediaUpload.stream)
+        // Use getStream to handle all WAMediaUpload types (Buffer, Stream, URL)
+        const { stream } = await getStream(mediaUpload)
+        // Convert the resulting stream to a buffer
+        buffer = await toBuffer(stream)
     }
     const lib = await getImageProcessingLibrary()
+    
     let img
+    
     if ('sharp' in lib && typeof lib.sharp?.default === 'function') {
-        img = await lib.sharp.default(bufferOrFilePath)
-        .resize(720, 720, {
-            fit: 'inside', 
-        })
-        .jpeg({ quality: 50 })
-        .toBuffer()
+        img = lib.sharp
+            .default(buffer)
+            .resize(w, h)
+            .jpeg({
+            quality: 50
+        }).toBuffer()
     }
     else if ('jimp' in lib && typeof lib.jimp?.read === 'function') {
-    	const { read, MIME_JPEG } = lib.jimp        
-        const image = await read(bufferOrFilePath)
-        const min = image.getWidth()
-        const max = image.getHeight()
-        const cropped = image.crop(0, 0, min, max)
-        img = await cropped.scaleToFit(720, 720).getBufferAsync(MIME_JPEG)
+        const jimp = await lib.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('No image processing library available')
+        throw new Boom('No image processing library available');
     }
     return {
-        img: await img,
+        img: await img
     }
 }
 
-
 /** 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')
 }
 
 async function getAudioDuration(buffer) {
-    const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')))
     const options = {
     	duration: true
     }
@@ -272,15 +258,15 @@ async function getAudioDuration(buffer) {
     let metadata
     
     if (Buffer.isBuffer(buffer)) {
-        metadata = await musicMetadata.parseBuffer(buffer, undefined, options)
+        metadata = await parseBuffer(buffer, undefined, options)
     }
     else if (typeof buffer === 'string') {
-        metadata = await musicMetadata.parseFile(buffer, options) 
+        metadata = await parseFile(buffer, options) 
     }
     else {
-        metadata = await musicMetadata.parseStream(buffer, undefined, options) 
+        metadata = await parseStream(buffer, undefined, options) 
     }
-    return metadata.format.duration
+    return metadata.format?.duration
 }
 
 /**
@@ -288,8 +274,8 @@ async function getAudioDuration(buffer) {
  */
 async function getAudioWaveform(buffer, logger) {
     try {
-        const { default: decoder } = await eval('import(\'audio-decode\')')
         let audioData
+        
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer
         }
@@ -300,11 +286,13 @@ async function getAudioWaveform(buffer, logger) {
         else {
             audioData = await 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
@@ -313,9 +301,11 @@ async function getAudioWaveform(buffer, logger) {
             }
             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
@@ -368,23 +358,31 @@ const getStream = async (item, opts) => {
 async function generateThumbnail(file, mediaType, options) {
     let thumbnail
     let originalImageDimensions
+    
     if (mediaType === 'image') {
-        const { buffer, original } = await extractImageThumb(file, 256, 95)
+        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 = join(getTmpFilesDirectory(), generateMessageID() + '.jpg')
         try {
-            const buff = await extractVideoThumb(file, '00:00:00', { width: 32, height: 32 })
+            await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 })
+            const buff = await promises.readFile(imgFilename)
+            
             thumbnail = buff.toString('base64')
+            
+            await promises.unlink(imgFilename)
         }
         catch (err) {
-            options?.logger?.debug('could not generate video thumb: ' + err)
+            options.logger?.debug('could not generate video thumb: ' + err)
         }
     }
     return {
@@ -394,11 +392,20 @@ async function generateThumbnail(file, mediaType, options) {
 }
 
 const getHttpStream = async (url, options = {}) => {
-    const fetched = await axios_1.default.get(url.toString(), { ...options, responseType: 'stream' })
-    return fetched.data
+    const response = await fetch(url.toString(), {
+        dispatcher: options.dispatcher,
+        method: 'GET',
+        headers: options.headers
+    })
+    
+    if (!response.ok) {
+        throw new Boom(`Failed to fetch stream from ${url}`, { statusCode: response.status, data: { url } })
+    }
+    
+    return response.body instanceof Readable ? response.body : Readable.fromWeb(response.body)
 }
 
-const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+/*const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await getStream(media, opts)
     logger?.debug('fetched media stream')
 
@@ -470,59 +477,90 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
         }
         throw error
     }
-}
+}*/
 
 const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await getStream(media, opts)
+    
     logger?.debug('fetched media stream')
+    
     const mediaKey = randomBytes(32)
     const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType)
-    const encFilePath = join(tmpdir(), mediaType + generateMessageID() + '-enc')
+    const encFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageID() + '-enc')
     const encFileWriteStream = createWriteStream(encFilePath)
-    let originalFileStream
+    
+    let originalFileStream;
     let originalFilePath
+    
     if (saveOriginalFileIfRequired) {
-        originalFilePath = join(tmpdir(), mediaType + generateMessageID() + '-original') 
+        originalFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageID() + '-original')
         originalFileStream = createWriteStream(originalFilePath)
     }
+    
     let fileLength = 0
-    const aes = createCipheriv('aes-256-cbc', cipherKey, iv)
+    
+    const aes = createCipheriv('aes-256-cbc', cipherKey, iv) 
     const hmac = createHmac('sha256', macKey).update(iv)
-    const sha256Plain = createHash('sha256')
+    const sha256Plain = createHash('sha256');
     const sha256Enc = createHash('sha256')
-    const onChunk = (buff) => {
+    
+    const onChunk = async (buff) => {
         sha256Enc.update(buff)
         hmac.update(buff)
-        encFileWriteStream.write(buff)
+        
+        // Handle backpressure: if write returns false, wait for drain
+        if (!encFileWriteStream.write(buff)) {
+            await once(encFileWriteStream, 'drain')
+        }
     }
+    
     try {
         for await (const data of stream) {
             fileLength += data.length
-            if (type === 'remote'
-                && opts?.maxContentLength
-                && fileLength + data.length > opts.maxContentLength) {
+            
+            if (type === 'remote' &&
+                opts?.maxContentLength &&
+                fileLength + data.length > opts.maxContentLength) {
                 throw new Boom(`content length exceeded when encrypting "${type}"`, {
                     data: { media, type }
                 })
             }
+            
             if (originalFileStream) {
                 if (!originalFileStream.write(data)) {
                     await once(originalFileStream, 'drain')
                 }
             }
+            
             sha256Plain.update(data)
-            onChunk(aes.update(data))
+            
+            await onChunk(aes.update(data))
         }
-        onChunk(aes.final())
+        
+        await onChunk(aes.final())
         const mac = hmac.digest().slice(0, 10)
+        
         sha256Enc.update(mac)
+        
         const fileSha256 = sha256Plain.digest()
         const fileEncSha256 = sha256Enc.digest()
+        
         encFileWriteStream.write(mac)
+        
+        const encFinishPromise = once(encFileWriteStream, 'finish')
+        const originalFinishPromise = originalFileStream ? once(originalFileStream, 'finish') : Promise.resolve()
+        
         encFileWriteStream.end()
-        originalFileStream?.end?.call(originalFileStream)
+        originalFileStream?.end?.()
         stream.destroy()
+        
+        // Wait for write streams to fully flush to disk
+        // This helps reduce memory pressure by allowing OS to release buffers
+        await encFinishPromise
+        await originalFinishPromise
+        
         logger?.debug('encrypted data successfully')
+        
         return {
             mediaKey,
             originalFilePath,
@@ -536,14 +574,16 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     catch (error) {
         // destroy all streams with error
         encFileWriteStream.destroy()
-        originalFileStream?.destroy?.call(originalFileStream)
+        originalFileStream?.destroy?.()
         aes.destroy()
         hmac.destroy()
         sha256Plain.destroy()
         sha256Enc.destroy()
         stream.destroy()
+        
         try {
             await promises.unlink(encFilePath)
+            
             if (originalFilePath) {
                 await promises.unlink(originalFilePath)
             }
@@ -584,39 +624,51 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
     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) {
             startChunk = chunk - AES_CHUNK_SIZE
             bytesFetched = chunk
             firstBlockIsIV = true
         }
     }
+    
     const endChunk = endByte ? toSmallestChunkSize(endByte || 0) + AES_CHUNK_SIZE : undefined
+    const headersInit = options?.headers ? options.headers : undefined
     const headers = {
-        ...(options?.headers) || {},
+        ...(headersInit
+            ? Array.isArray(headersInit)
+                ? Object.fromEntries(headersInit)
+                : headersInit
+            : {}),
         Origin: DEFAULT_ORIGIN
     }
+    
     if (startChunk || endChunk) {
         headers.Range = `bytes=${startChunk}-`
+        
         if (endChunk) {
             headers.Range += endChunk
         }
     }
+    
     // download the message
     const fetched = await getHttpStream(downloadUrl, {
-        ...options || {},
-        headers,
-        maxBodyLength: Infinity,
-        maxContentLength: Infinity,
+        ...(options || {}),
+        headers
     })
+    
     let remainingBytes = Buffer.from([])
     let aes
+    
     const pushBytes = (bytes, push) => {
         if (startByte || endByte) {
             const start = bytesFetched >= startByte ? undefined : Math.max(startByte - bytesFetched, 0)
             const end = bytesFetched + bytes.length < endByte ? undefined : Math.max(endByte - bytesFetched, 0)
+            
             push(bytes.slice(start, end))
             bytesFetched += bytes.length
         }
@@ -624,19 +676,26 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             push(bytes)
         }
     }
+    
     const output = new Transform({
         transform(chunk, _, callback) {
             let data = Buffer.concat([remainingBytes, chunk])
+            
             const decryptLength = toSmallestChunkSize(data.length)
+            
             remainingBytes = data.slice(decryptLength)
             data = data.slice(0, decryptLength)
+            
             if (!aes) {
                 let ivValue = iv
+                
                 if (firstBlockIsIV) {
                     ivValue = data.slice(0, AES_CHUNK_SIZE)
                     data = data.slice(AES_CHUNK_SIZE)
                 }
+                
                 aes = 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) {
@@ -659,8 +718,9 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
             catch (error) {
                 callback(error)
             }
-        },
+        }
     })
+    
     return fetched.pipe(output, { end: true })
 }
 
@@ -680,43 +740,176 @@ function extensionForMediaMessage(message) {
     return extension
 }
 
+const isNodeRuntime = () => {
+    return (typeof process !== 'undefined' &&
+        process.versions?.node !== null &&
+        typeof process.versions.bun === 'undefined' &&
+        typeof globalThis.Deno === 'undefined')
+}
+
+const uploadWithNodeHttp = async ({ url, filePath, headers, timeoutMs, agent }, redirectCount = 0) => {
+    if (redirectCount > 5) {
+        throw new Error('Too many redirects')
+    }
+    
+    const parsedUrl = new URL(url)
+    const httpModule = parsedUrl.protocol === 'https:' ? require('https') : require('http')
+    
+    // Get file size for Content-Length header (required for Node.js streaming)
+    const fileStats = await promises.stat(filePath)
+    const fileSize = fileStats.size
+    
+    return new Promise((resolve, reject) => {
+        const req = httpModule.request({
+            hostname: parsedUrl.hostname,
+            port: parsedUrl.port || (parsedUrl.protocol === 'https:' ? 443 : 80),
+            path: parsedUrl.pathname + parsedUrl.search,
+            method: 'POST',
+            headers: {
+                ...headers,
+                'Content-Length': fileSize
+            },
+            agent,
+            timeout: timeoutMs
+        }, res => {
+            // Handle redirects (3xx)
+            if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+                res.resume() // Consume response to free resources
+                
+                const newUrl = new URL(res.headers.location, url).toString()
+                
+                resolve(uploadWithNodeHttp({
+                    url: newUrl,
+                    filePath,
+                    headers,
+                    timeoutMs,
+                    agent
+                }, redirectCount + 1))
+                return
+            }
+            
+            let body = ''
+            
+            res.on('data', chunk => (body += chunk))
+            res.on('end', () => {
+                try {
+                    resolve(JSON.parse(body))
+                }
+                catch {
+                    resolve(undefined)
+                }
+            })
+        })
+        
+        req.on('error', reject)
+        req.on('timeout', () => {
+            req.destroy()
+            reject(new Error('Upload timeout'))
+        })
+        
+        const stream = createReadStream(filePath)
+        
+        stream.pipe(req)
+        stream.on('error', err => {
+            req.destroy()
+            reject(err)
+        })
+    })
+}
+
+const uploadWithFetch = async ({ url, filePath, headers, timeoutMs, agent }) => {
+    // Convert Node.js Readable to Web ReadableStream
+    const nodeStream = createReadStream(filePath)
+    const webStream = Readable.toWeb(nodeStream)
+    const response = await fetch(url, {
+        dispatcher: agent,
+        method: 'POST',
+        body: webStream,
+        headers,
+        duplex: 'half',
+        signal: timeoutMs ? AbortSignal.timeout(timeoutMs) : undefined
+    })
+    
+    try {
+        return (await response.json())
+    }
+    catch {
+        return undefined
+    }
+}
+
+/**
+ * Uploads media to WhatsApp servers.
+ *
+ * ## Why we have two upload implementations:
+ *
+ * Node.js's native `fetch` (powered by undici) has a known bug where it buffers
+ * the entire request body in memory before sending, even when using streams.
+ * This causes memory issues with large files (e.g., 1GB file = 1GB+ memory usage).
+ * See: https://github.com/nodejs/undici/issues/4058
+ *
+ * Other runtimes (Bun, Deno, browsers) correctly stream the request body without
+ * buffering, so we can use the web-standard Fetch API there.
+ *
+ * ## Future considerations:
+ * Once the undici bug is fixed, we can simplify this to use only the Fetch API
+ * across all runtimes. Monitor the GitHub issue for updates.
+ */
+const uploadMedia = async (params, logger) => {
+    if (isNodeRuntime()) {
+        logger?.debug('Using Node.js https module for upload (avoids undici buffering bug)')
+        return uploadWithNodeHttp(params)
+    }
+    else {
+        logger?.debug('Using web-standard Fetch API for upload');
+        return uploadWithFetch(params)
+    }
+}
+
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (filePath, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
+    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
-        let media = MEDIA_PATH_MAP[mediaType]
+        
         const hosts = [...customUploadHosts, ...uploadInfo.hosts]
+        
         fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64)
-        if (newsletter) {
-            media = media?.replace('/mms/', '/newsletter/newsletter-')
+        
+        // Prepare common headers
+        const customHeaders = (() => {
+            const hdrs = options?.headers;
+            if (!hdrs)
+                return {};
+            return Array.isArray(hdrs) ? Object.fromEntries(hdrs) : hdrs
+        })()
+        
+        const headers = {
+            ...customHeaders,
+            'Content-Type': 'application/octet-stream',
+            Origin: DEFAULT_ORIGIN
         }
+        
         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}`
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            
+            const auth = encodeURIComponent(uploadInfo.auth)
+            const url = `https://${hostname}${MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`
+            
             let result
+            
             try {
-                const body = await axios_1.default.post(url, createReadStream(filePath), {
-                    ...options,
-                    maxRedirects: 0,
-                    headers: {
-                        ...options.headers || {},
-                        'Content-Type': 'application/octet-stream',
-                        'Origin': DEFAULT_ORIGIN
-                    },
-                    httpsAgent: fetchAgent,
-                    timeout: timeoutMs,
-                    responseType: 'json',
-                    maxBodyLength: Infinity,
-                    maxContentLength: Infinity,
-                })
-                result = body.data
-                if (result?.url || result?.directPath) {
+                result = await uploadMedia({
+                    url,
+                    filePath,
+                    headers,
+                    timeoutMs,
+                    agent: fetchAgent
+                }, logger);
+                if (result?.url || result?.direct_path) {
                     urls = {
                         mediaUrl: result.url,
-                        directPath: result.direct_path, 
+                        directPath: result.direct_path,
                         meta_hmac: result.meta_hmac,
                         fbid: result.fbid,
                         ts: result.ts
@@ -729,16 +922,15 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 }
             }
             catch (error) {
-                if (axios_1.default.isAxiosError(error)) {
-                    result = error.response?.data
-                }
                 const isLast = hostname === hosts[uploadInfo.hosts.length - 1]?.hostname
-                logger.warn({ trace: error.stack, uploadResult: result }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`)
+                logger.warn({ trace: error?.stack, uploadResult: result }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`)
             }
         }
+        
         if (!urls) {
             throw new Boom('Media upload failed on all hosts', { statusCode: 500 })
         }
+        
         return urls
     }
 }
@@ -778,8 +970,7 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
                 tag: 'rmr',
                 attrs: {
                     jid: key.remoteJid,
-                    'from_me': (!!key.fromMe).toString(),
-                    // @ts-ignore
+                    from_me: (!!key.fromMe).toString(),
                     participant: key.participant || undefined
                 }
             }
@@ -847,12 +1038,13 @@ module.exports = {
   getStream, 
   generateThumbnail, 
   getHttpStream, 
-  prepareStream, 
+  //prepareStream, 
   encryptedStream, 
   getUrlFromDirectPath, 
   downloadContentFromMessage, 
   downloadEncryptedContent, 
   extensionForMediaMessage, 
+  uploadWithNodeHttp, 
   getRawMediaUploadData, 
   getWAUploadToServer, 
   getMediaRetryKey,