@ryuu-reinzz/baileys 3.0.0-beta.2 → 3.0.0-beta.21

package/lib/Utils/messages-media.js

@@ -75,7 +75,7 @@ export async 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 = await hkdf(buffer, 112, { info: hkdfInfoKey(mediaType) });
+    const expandedMediaKey = hkdf(buffer, 112, { info: hkdfInfoKey(mediaType) });
     return {
         iv: expandedMediaKey.slice(0, 16),
         cipherKey: expandedMediaKey.slice(16, 48),
@@ -217,7 +217,7 @@ export async function getAudioWaveform(buffer, logger) {
             const blockStart = blockSize * i; // the location of the first sample in the block
             let sum = 0;
             for (let j = 0; j < blockSize; j++) {
-                sum = sum + Math.abs(rawData[blockStart + j]); // find the sum of all the samples in the block
+                sum = sum + Math.abs(rawData[blockStart + j] ?? 0); // find the sum of all the samples in the block
             }
             filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
         }
@@ -324,10 +324,13 @@ export const encryptedStream = async (media, mediaType, { logger, saveOriginalFi
     const hmac = Crypto.createHmac('sha256', macKey).update(iv);
     const sha256Plain = Crypto.createHash('sha256');
     const sha256Enc = Crypto.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) {
@@ -345,17 +348,23 @@ export const encryptedStream = async (media, mediaType, { logger, saveOriginalFi
                 }
             }
             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?.();
         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,
@@ -506,6 +515,117 @@ export function extensionForMediaMessage(message) {
     }
     return extension;
 }
+const isNodeRuntime = () => {
+    return (typeof process !== 'undefined' &&
+        process.versions?.node !== null &&
+        typeof process.versions.bun === 'undefined' &&
+        typeof globalThis.Deno === 'undefined');
+};
+export 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:' ? await import('https') : await import('http');
+    // Get file size for Content-Length header (required for Node.js streaming)
+    const fileStats = await fs.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);
+    }
+};
 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
@@ -513,41 +633,32 @@ export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, opt
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
         fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64);
+        // 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 auth = encodeURIComponent(uploadInfo.auth);
             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 {
-                const stream = createReadStream(filePath);
-                const response = await fetch(url, {
-                    dispatcher: fetchAgent,
-                    method: 'POST',
-                    body: stream,
-                    headers: {
-                        ...(() => {
-                            const hdrs = options?.headers;
-                            if (!hdrs)
-                                return {};
-                            return Array.isArray(hdrs) ? Object.fromEntries(hdrs) : hdrs;
-                        })(),
-                        'Content-Type': 'application/octet-stream',
-                        Origin: DEFAULT_ORIGIN
-                    },
-                    duplex: 'half',
-                    // Note: custom agents/proxy require undici Agent; omitted here.
-                    signal: timeoutMs ? AbortSignal.timeout(timeoutMs) : undefined
-                });
-                let parsed = undefined;
-                try {
-                    parsed = await response.json();
-                }
-                catch {
-                    parsed = undefined;
-                }
-                result = parsed;
-                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,
@@ -579,11 +690,11 @@ const getMediaRetryKey = (mediaKey) => {
 /**
  * Generate a binary node that will request the phone to re-upload the media & return the newly uploaded URL
  */
-export const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
+export const encryptMediaRetryRequest = (key, mediaKey, meId) => {
     const recp = { stanzaId: key.id };
     const recpBuffer = proto.ServerErrorReceipt.encode(recp).finish();
     const iv = Crypto.randomBytes(12);
-    const retryKey = await getMediaRetryKey(mediaKey);
+    const retryKey = getMediaRetryKey(mediaKey);
     const ciphertext = aesEncryptGCM(recpBuffer, retryKey, iv, Buffer.from(key.id));
     const req = {
         tag: 'receipt',
@@ -648,8 +759,8 @@ export const decodeMediaRetryNode = (node) => {
     }
     return event;
 };
-export const decryptMediaRetryData = async ({ ciphertext, iv }, mediaKey, msgId) => {
-    const retryKey = await getMediaRetryKey(mediaKey);
+export const decryptMediaRetryData = ({ ciphertext, iv }, mediaKey, msgId) => {
+    const retryKey = getMediaRetryKey(mediaKey);
     const plaintext = aesDecryptGCM(ciphertext, retryKey, iv, Buffer.from(msgId));
     return proto.MediaRetryNotification.decode(plaintext);
 };

package/lib/Utils/messages.js

@@ -9,6 +9,7 @@ import { isJidGroup, isJidNewsletter, isJidStatusBroadcast, jidNormalizedUser }
 import { sha256 } from './crypto.js';
 import { generateMessageIDV2, getKeyAuthor, unixTimestampSeconds } from './generics.js';
 import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, getRawMediaUploadData } from './messages-media.js';
+import { shouldIncludeReportingToken } from './reporting-utils.js';
 const MIMETYPE_MAP = {
     image: 'image/jpeg',
     video: 'video/mp4',
@@ -259,10 +260,20 @@ export const generateForwardMessageContent = (message, forceForward) => {
     }
     return content;
 };
+export const hasNonNullishProperty = (message, key) => {
+    return (typeof message === 'object' &&
+        message !== null &&
+        key in message &&
+        message[key] !== null &&
+        message[key] !== undefined);
+};
+function hasOptionalProperty(obj, key) {
+    return typeof obj === 'object' && obj !== null && key in obj && obj[key] !== null;
+}
 export const generateWAMessageContent = async (message, options) => {
     var _a, _b;
     let m = {};
-    if ('text' in message) {
+    if (hasNonNullishProperty(message, 'text')) {
         const extContent = { text: message.text };
         let urlInfo = message.linkPreview;
         if (typeof urlInfo === 'undefined') {
@@ -293,7 +304,7 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m.extendedTextMessage = extContent;
     }
-    else if ('contacts' in message) {
+    else if (hasNonNullishProperty(message, 'contacts')) {
         const contactLen = message.contacts.contacts.length;
         if (!contactLen) {
             throw new Boom('require atleast 1 contact', { statusCode: 400 });
@@ -305,25 +316,25 @@ export const generateWAMessageContent = async (message, options) => {
             m.contactsArrayMessage = WAProto.Message.ContactsArrayMessage.create(message.contacts);
         }
     }
-    else if ('location' in message) {
+    else if (hasNonNullishProperty(message, 'location')) {
         m.locationMessage = WAProto.Message.LocationMessage.create(message.location);
     }
-    else if ('react' in message) {
+    else if (hasNonNullishProperty(message, 'react')) {
         if (!message.react.senderTimestampMs) {
             message.react.senderTimestampMs = Date.now();
         }
         m.reactionMessage = WAProto.Message.ReactionMessage.create(message.react);
     }
-    else if ('delete' in message) {
+    else if (hasNonNullishProperty(message, 'delete')) {
         m.protocolMessage = {
             key: message.delete,
             type: WAProto.Message.ProtocolMessage.Type.REVOKE
         };
     }
-    else if ('forward' in message) {
+    else if (hasNonNullishProperty(message, 'forward')) {
         m = generateForwardMessageContent(message.forward, message.force);
     }
-    else if ('disappearingMessagesInChat' in message) {
+    else if (hasNonNullishProperty(message, 'disappearingMessagesInChat')) {
         const exp = typeof message.disappearingMessagesInChat === 'boolean'
             ? message.disappearingMessagesInChat
                 ? WA_DEFAULT_EPHEMERAL
@@ -331,7 +342,7 @@ export const generateWAMessageContent = async (message, options) => {
             : message.disappearingMessagesInChat;
         m = prepareDisappearingMessageSettingContent(exp);
     }
-    else if ('groupInvite' in message) {
+    else if (hasNonNullishProperty(message, 'groupInvite')) {
         m.groupInviteMessage = {};
         m.groupInviteMessage.inviteCode = message.groupInvite.inviteCode;
         m.groupInviteMessage.inviteExpiration = message.groupInvite.inviteExpiration;
@@ -351,7 +362,7 @@ export const generateWAMessageContent = async (message, options) => {
             }
         }
     }
-    else if ('pin' in message) {
+    else if (hasNonNullishProperty(message, 'pin')) {
         m.pinInChatMessage = {};
         m.messageContextInfo = {};
         m.pinInChatMessage.key = message.pin;
@@ -359,7 +370,7 @@ export const generateWAMessageContent = async (message, options) => {
         m.pinInChatMessage.senderTimestampMs = Date.now();
         m.messageContextInfo.messageAddOnDurationInSecs = message.type === 1 ? message.time || 86400 : 0;
     }
-    else if ('buttonReply' in message) {
+    else if (hasNonNullishProperty(message, 'buttonReply')) {
         switch (message.type) {
             case 'template':
                 m.templateButtonReplyMessage = {
@@ -377,11 +388,11 @@ export const generateWAMessageContent = async (message, options) => {
                 break;
         }
     }
-    else if ('ptv' in message && message.ptv) {
+    else if (hasOptionalProperty(message, 'ptv') && message.ptv) {
         const { videoMessage } = await prepareWAMessageMedia({ video: message.video }, options);
         m.ptvMessage = videoMessage;
     }
-    else if ('product' in message) {
+    else if (hasNonNullishProperty(message, 'product')) {
         const { imageMessage } = await prepareWAMessageMedia({ image: message.product.productImage }, options);
         m.productMessage = WAProto.Message.ProductMessage.create({
             ...message,
@@ -391,10 +402,10 @@ export const generateWAMessageContent = async (message, options) => {
             }
         });
     }
-    else if ('listReply' in message) {
+    else if (hasNonNullishProperty(message, 'listReply')) {
         m.listResponseMessage = { ...message.listReply };
     }
-    else if ('event' in message) {
+    else if (hasNonNullishProperty(message, 'event')) {
         m.eventMessage = {};
         const startTime = Math.floor(message.event.startDate.getTime() / 1000);
         if (message.event.call && options.getCallLink) {
@@ -414,7 +425,7 @@ export const generateWAMessageContent = async (message, options) => {
         m.eventMessage.isScheduleCall = message.event.isScheduleCall ?? false;
         m.eventMessage.location = message.event.location;
     }
-    else if ('poll' in message) {
+    else if (hasNonNullishProperty(message, 'poll')) {
         (_a = message.poll).selectableCount || (_a.selectableCount = 0);
         (_b = message.poll).toAnnouncementGroup || (_b.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
@@ -449,15 +460,15 @@ export const generateWAMessageContent = async (message, options) => {
             }
         }
     }
-    else if ('sharePhoneNumber' in message) {
+    else if (hasNonNullishProperty(message, 'sharePhoneNumber')) {
         m.protocolMessage = {
             type: proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
         };
     }
-    else if ('requestPhoneNumber' in message) {
+    else if (hasNonNullishProperty(message, 'requestPhoneNumber')) {
         m.requestPhoneNumberMessage = {};
     }
-    else if ('limitSharing' in message) {
+    else if (hasNonNullishProperty(message, 'limitSharing')) {
         m.protocolMessage = {
             type: proto.Message.ProtocolMessage.Type.LIMIT_SHARING,
             limitSharing: {
@@ -471,10 +482,10 @@ export const generateWAMessageContent = async (message, options) => {
     else {
         m = await prepareWAMessageMedia(message, options);
     }
-    if ('viewOnce' in message && !!message.viewOnce) {
+    if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    if ('mentions' in message && message.mentions?.length) {
+    if (hasOptionalProperty(message, 'mentions') && message.mentions?.length) {
         const messageType = Object.keys(m)[0];
         const key = m[messageType];
         if ('contextInfo' in key && !!key.contextInfo) {
@@ -486,7 +497,7 @@ export const generateWAMessageContent = async (message, options) => {
             };
         }
     }
-    if ('edit' in message) {
+    if (hasOptionalProperty(message, 'edit')) {
         m = {
             protocolMessage: {
                 key: message.edit,
@@ -496,7 +507,7 @@ export const generateWAMessageContent = async (message, options) => {
             }
         };
     }
-    if ('contextInfo' in message && !!message.contextInfo) {
+    if (hasOptionalProperty(message, 'contextInfo') && !!message.contextInfo) {
         const messageType = Object.keys(m)[0];
         const key = m[messageType];
         if ('contextInfo' in key && !!key.contextInfo) {
@@ -506,6 +517,12 @@ export const generateWAMessageContent = async (message, options) => {
             key.contextInfo = message.contextInfo;
         }
     }
+    if (shouldIncludeReportingToken(m)) {
+        m.messageContextInfo = m.messageContextInfo || {};
+        if (!m.messageContextInfo.messageSecret) {
+            m.messageContextInfo.messageSecret = randomBytes(32);
+        }
+    }
     return WAProto.Message.create(m);
 };
 export const generateWAMessageFromContent = (jid, message, options) => {
@@ -614,7 +631,10 @@ export const normalizeMessageContent = (content) => {
             message?.documentWithCaptionMessage ||
             message?.viewOnceMessageV2 ||
             message?.viewOnceMessageV2Extension ||
-            message?.editedMessage);
+            message?.editedMessage ||
+            message?.associatedChildMessage ||
+            message?.groupStatusMessage ||
+            message?.groupStatusMessageV2);
     }
 };
 /**