@d0v3riz/baileys 6.7.18 → 6.7.19

package/lib/Types/Message.d.ts

@@ -217,7 +217,7 @@ export type MiscMessageGenerationOptions = MinimalRelayOptions & {
 export type MessageGenerationOptionsFromContent = MiscMessageGenerationOptions & {
     userJid: string;
 };
-export type WAMediaUploadFunction = (readStream: Readable, opts: {
+export type WAMediaUploadFunction = (encFilePath: string, opts: {
     fileEncSha256B64: string;
     mediaType: MediaType;
     timeoutMs?: number;

package/lib/Utils/business.js

@@ -4,7 +4,11 @@ exports.uploadingNecessaryImages = exports.parseProductNode = exports.toProductN
 exports.uploadingNecessaryImagesOfProduct = uploadingNecessaryImagesOfProduct;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
 const WABinary_1 = require("../WABinary");
+const generics_1 = require("./generics");
 const messages_media_1 = require("./messages-media");
 const parseCatalogNode = (node) => {
     const catalogNode = (0, WABinary_1.getBinaryNodeChild)(node, 'product_catalog');
@@ -202,17 +206,21 @@ const uploadingNecessaryImages = async (images, waUploadToServer, timeoutMs = 30
         }
         const { stream } = await (0, messages_media_1.getStream)(img);
         const hasher = (0, crypto_1.createHash)('sha256');
-        const contentBlocks = [];
+        const filePath = (0, path_1.join)((0, os_1.tmpdir)(), 'img' + (0, generics_1.generateMessageIDV2)());
+        const encFileWriteStream = (0, fs_1.createWriteStream)(filePath);
         for await (const block of stream) {
             hasher.update(block);
-            contentBlocks.push(block);
+            encFileWriteStream.write(block);
         }
         const sha = hasher.digest('base64');
-        const { directPath } = await waUploadToServer((0, messages_media_1.toReadable)(Buffer.concat(contentBlocks)), {
+        const { directPath } = await waUploadToServer(filePath, {
             mediaType: 'product-catalog-image',
             fileEncSha256B64: sha,
             timeoutMs
         });
+        await fs_1.promises
+            .unlink(filePath)
+            .catch(err => console.log('Error deleting temp file ', err));
         return { url: (0, messages_media_1.getUrlFromDirectPath)(directPath) };
     }));
     return results;

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

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

package/lib/Utils/messages-media.js

@@ -331,27 +331,29 @@ const getHttpStream = async (url, options = {}) => {
 };
 exports.getHttpStream = getHttpStream;
 const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+    var _a, _b;
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
     const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType);
-    const encWriteStream = new stream_1.Readable({ read: () => { } });
-    let bodyPath;
-    let writeStream;
-    let didSaveToTmpPath = false;
-    if (type === 'file') {
-        bodyPath = media.url.toString();
-    }
-    else if (saveOriginalFileIfRequired) {
-        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
-        writeStream = (0, fs_1.createWriteStream)(bodyPath);
-        didSaveToTmpPath = true;
+    const encFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-enc');
+    const encFileWriteStream = (0, fs_1.createWriteStream)(encFilePath);
+    let originalFileStream;
+    let originalFilePath;
+    if (saveOriginalFileIfRequired) {
+        originalFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-original');
+        originalFileStream = (0, fs_1.createWriteStream)(originalFilePath);
     }
     let fileLength = 0;
     const aes = Crypto.createCipheriv('aes-256-cbc', cipherKey, iv);
-    let hmac = Crypto.createHmac('sha256', macKey).update(iv);
-    let sha256Plain = Crypto.createHash('sha256');
-    let sha256Enc = Crypto.createHash('sha256');
+    const hmac = Crypto.createHmac('sha256', macKey).update(iv);
+    const sha256Plain = Crypto.createHash('sha256');
+    const sha256Enc = Crypto.createHash('sha256');
+    const onChunk = (buff) => {
+        sha256Enc.update(buff);
+        hmac.update(buff);
+        encFileWriteStream.write(buff);
+    };
     try {
         for await (const data of stream) {
             fileLength += data.length;
@@ -362,57 +364,54 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                     data: { media, type }
                 });
             }
-            sha256Plain = sha256Plain.update(data);
-            if (writeStream && !writeStream.write(data)) {
-                await (0, events_1.once)(writeStream, 'drain');
+            if (originalFileStream) {
+                if (!originalFileStream.write(data)) {
+                    await (0, events_1.once)(originalFileStream, 'drain');
+                }
             }
+            sha256Plain.update(data);
             onChunk(aes.update(data));
         }
         onChunk(aes.final());
         const mac = hmac.digest().slice(0, 10);
-        sha256Enc = sha256Enc.update(mac);
+        sha256Enc.update(mac);
         const fileSha256 = sha256Plain.digest();
         const fileEncSha256 = sha256Enc.digest();
-        encWriteStream.push(mac);
-        encWriteStream.push(null);
-        writeStream === null || writeStream === void 0 ? void 0 : writeStream.end();
+        encFileWriteStream.write(mac);
+        encFileWriteStream.end();
+        (_a = originalFileStream === null || originalFileStream === void 0 ? void 0 : originalFileStream.end) === null || _a === void 0 ? void 0 : _a.call(originalFileStream);
         stream.destroy();
         logger === null || logger === void 0 ? void 0 : logger.debug('encrypted data successfully');
         return {
             mediaKey,
-            encWriteStream,
-            bodyPath,
+            originalFilePath,
+            encFilePath,
             mac,
             fileEncSha256,
             fileSha256,
-            fileLength,
-            didSaveToTmpPath
+            fileLength
         };
     }
     catch (error) {
         // destroy all streams with error
-        encWriteStream.destroy();
-        writeStream === null || writeStream === void 0 ? void 0 : writeStream.destroy();
+        encFileWriteStream.destroy();
+        (_b = originalFileStream === null || originalFileStream === void 0 ? void 0 : originalFileStream.destroy) === null || _b === void 0 ? void 0 : _b.call(originalFileStream);
         aes.destroy();
         hmac.destroy();
         sha256Plain.destroy();
         sha256Enc.destroy();
         stream.destroy();
-        if (didSaveToTmpPath) {
-            try {
-                await fs_1.promises.unlink(bodyPath);
-            }
-            catch (err) {
-                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to save to tmp path');
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
             }
         }
+        catch (err) {
+            logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed deleting tmp files');
+        }
         throw error;
     }
-    function onChunk(buff) {
-        sha256Enc = sha256Enc.update(buff);
-        hmac = hmac.update(buff);
-        encWriteStream.push(buff);
-    }
 };
 exports.encryptedStream = encryptedStream;
 const DEF_HOST = 'mmg.whatsapp.net';
@@ -532,7 +531,7 @@ function extensionForMediaMessage(message) {
     return extension;
 }
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (stream, { mediaType, fileEncSha256B64, timeoutMs }) => {
+    return async (filePath, { mediaType, fileEncSha256B64, timeoutMs }) => {
         var _a, _b;
         // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
@@ -546,8 +545,9 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let result;
             try {
-                const body = await axios_1.default.post(url, stream, {
+                const body = await axios_1.default.post(url, (0, fs_1.createReadStream)(filePath), {
                     ...options,
+                    maxRedirects: 0,
                     headers: {
                         ...options.headers || {},
                         'Content-Type': 'application/octet-stream',

package/lib/Utils/messages.js

@@ -111,7 +111,7 @@ const prepareWAMessageMedia = async (message, options) => {
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
@@ -120,14 +120,14 @@ const prepareWAMessageMedia = async (message, options) => {
     const fileEncSha256B64 = fileEncSha256.toString('base64');
     const [{ mediaUrl, directPath }] = await Promise.all([
         (async () => {
-            const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
+            const result = await options.upload(encFilePath, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
             logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
             return result;
         })(),
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(bodyPath, mediaType, options);
+                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(originalFilePath, mediaType, options);
                     uploadData.jpegThumbnail = thumbnail;
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
@@ -137,11 +137,11 @@ const prepareWAMessageMedia = async (message, options) => {
                     logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
                 }
                 if (requiresDurationComputation) {
-                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
+                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(originalFilePath);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
                 }
                 if (requiresWaveformProcessing) {
-                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(originalFilePath, logger);
                     logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
                 }
                 if (requiresAudioBackground) {
@@ -155,17 +155,15 @@ const prepareWAMessageMedia = async (message, options) => {
         })(),
     ])
         .finally(async () => {
-        encWriteStream.destroy();
-        // remove tmp files
-        if (didSaveToTmpPath && bodyPath) {
-            try {
-                await fs_1.promises.access(bodyPath);
-                await fs_1.promises.unlink(bodyPath);
-                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
-            }
-            catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
             }
+            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+        }
+        catch (error) {
+            logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
         }
     });
     const obj = Types_1.WAProto.Message.fromObject({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d0v3riz/baileys",
-  "version": "6.7.18",
+  "version": "6.7.19",
   "description": "A WebSockets library for interacting with WhatsApp Web",
   "keywords": [
     "whatsapp",