amiudmodz 5.1.1 → 5.1.5

package/lib/Utils/messages-media.js

@@ -444,6 +444,7 @@ const getHttpStream = async (url, options = {}) => {
 exports.getHttpStream = getHttpStream;
 const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await (0, exports.getStream)(media, opts);
+    media = undefined; // Help GC
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     let bodyPath;
     let didSaveToTmpPath = false;
@@ -515,6 +516,7 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
 exports.prepareStream = prepareStream;
 const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isPtt, forceOpus } = {}) => {
     const { stream, type, spilledPath } = await (0, exports.getStream)(media, opts);
+    media = undefined; // Help GC
     let finalStream = stream;
     let opusConverted = false;
     let opusSpillPath;
@@ -587,11 +589,12 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     let sha256Plain = Crypto.createHash('sha256');
     let sha256Enc = Crypto.createHash('sha256');
     try {
+        let plainLength = 0;
         for await (const data of finalStream) {
-            fileLength += data.length;
+            plainLength += data.length;
             if (type === 'remote'
                 && (opts?.maxContentLength)
-                && fileLength > opts.maxContentLength) {
+                && plainLength > opts.maxContentLength) {
                 throw new boom_1.Boom(`content length exceeded when encrypting "${type}"`, {
                     data: { media, type }
                 });
@@ -603,6 +606,7 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                 }
             }
             const encrypted = aes.update(data);
+            fileLength += encrypted.length;
             sha256Enc = sha256Enc.update(encrypted);
             hmac = hmac.update(encrypted);
             if (!encTempWriteStream.write(encrypted)) {
@@ -610,6 +614,7 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
             }
         }
         const finalEnc = aes.final();
+        fileLength += finalEnc.length;
         sha256Enc = sha256Enc.update(finalEnc);
         hmac = hmac.update(finalEnc);
         if (!encTempWriteStream.write(finalEnc)) {
@@ -617,6 +622,7 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
         }
 
         const mac = hmac.digest().slice(0, 10);
+        fileLength += mac.length;
         sha256Enc = sha256Enc.update(mac);
         if (!encTempWriteStream.write(mac)) {
             await (0, events_1.once)(encTempWriteStream, 'drain');
@@ -822,11 +828,14 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
 
 
 
+            if (streamPath && stream && typeof stream.destroy === 'function') {
+                stream.destroy();
+            }
             const reqBody = streamPath ? createReadStream(streamPath) : stream;
 
             let result;
             try {
-                const bodyLength = fileLength || (Buffer.isBuffer(reqBody) ? reqBody.length : 0);
+                const bodyLength = fileLength || (streamPath ? (await fs_1.promises.stat(streamPath)).size : (Buffer.isBuffer(reqBody) ? reqBody.length : (stream.size || 0)));
                 if (maxContentLengthBytes && bodyLength > maxContentLengthBytes) {
                     throw new boom_1.Boom(`Body too large for "${hostname}" (${bodyLength} > ${maxContentLengthBytes})`, { statusCode: 413 });
                 }
@@ -836,7 +845,8 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                         ...options.headers || {},
                         'Content-Type': 'application/octet-stream',
                         'Content-Length': bodyLength.toString(),
-                        'Origin': Defaults_1.DEFAULT_ORIGIN
+                        'Origin': Defaults_1.DEFAULT_ORIGIN,
+                        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
                     },
                     httpsAgent: fetchAgent,
                     timeout: timeoutMs || Defaults_1.UPLOAD_TIMEOUT,
@@ -863,8 +873,8 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 if (axios.isAxiosError(error)) {
                     result = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
                 }
-                const isLast = hostname === ((_b = hosts[uploadInfo.hosts.length - 1]) === null || _b === void 0 ? void 0 : _b.hostname);
-                logger.warn({ trace: error.stack, uploadResult: result }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`);
+                const isLast = hostname === ((_b = hosts[hosts.length - 1]) === null || _b === void 0 ? void 0 : _b.hostname);
+                logger.warn({ trace: error.stack, uploadResult: result, message: error.message, statusCode: error.response?.status }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`);
             }
         }
         if (!urls) {

package/lib/Utils/messages.js

@@ -149,7 +149,10 @@ const prepareWAMessageMedia = async (message, options) => {
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
 
-    const { mediaKey, encWriteStream, bodyPath, streamPath, spilledPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, opusConverted } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const media = uploadData.media;
+    uploadData.media = undefined;
+
+    const { mediaKey, encWriteStream, bodyPath, streamPath, spilledPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, opusConverted } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options,
@@ -157,9 +160,6 @@ const prepareWAMessageMedia = async (message, options) => {
         forceOpus: (mediaType === "audio" && uploadData.mimetype && uploadData.mimetype.includes('opus'))
     });
 
-    // Nullify the media reference to help GC free the memory if it's a large Buffer
-    uploadData.media = undefined;
-
     if (mediaType === 'audio' && opusConverted) {
         uploadData.mimetype = 'audio/ogg; codecs=opus';
     }

package/lib/WABinary/jid-utils.js

@@ -22,7 +22,8 @@ const jidDecode = (jid) => {
     return {
         server,
         user,
-        domainType: server === 'lid' ? 1 : 0,
+
+        domainType: (server === 'lid' || server === 'hosted.lid') ? 1 : 0,
         device: device ? +device : undefined
     };
 };
@@ -36,8 +37,8 @@ exports.areJidsSameUser = areJidsSameUser;
 /** is the jid a user */
 const isJidUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@s.whatsapp.net'));
 exports.isJidUser = isJidUser;
-/** is the jid a group */
-const isLidUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@lid'));
+/** is the jid a user */
+const isLidUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@lid') || jid.endsWith('@hosted.lid'));
 exports.isLidUser = isLidUser;
 /** is the jid a broadcast */
 const isJidBroadcast = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@broadcast'));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "amiudmodz",
-    "version": "5.1.1",
+    "version": "5.1.5",
     "description": "WhatsApp Baileys mod Powered by UDMODZ",
     "keywords": [
         "whatsapp",
@@ -44,7 +44,7 @@
         "chalk": "^4.1.2",
         "futoin-hkdf": "^1.5.1",
         "libphonenumber-js": "^1.10.20",
-        "libsignal": "git+https://github.com/xhclintohn/libsignal-node",
+        "libsignal": "git+https://github.com/xhclintohn/libsignal-node.git",
         "lodash": "^4.17.21",
         "lru-cache": "^11.1.0",
         "music-metadata": "^11.12.3",
@@ -106,4 +106,4 @@
     "engines": {
         "node": ">=20.0.0"
     }
-}
+}