amiudmodz 5.1.2 → 5.1.6

package/lib/Utils/messages-media.js

@@ -442,15 +442,61 @@ const getHttpStream = async (url, options = {}) => {
     return fetched.data;
 };
 exports.getHttpStream = getHttpStream;
-const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isPtt, forceOpus } = {}) => {
     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 finalStream = stream;
+    let opusConverted = false;
+    let opusSpillPath;
+    if (mediaType === 'audio' && (isPtt === true || forceOpus === true)) {
+        try {
+            const audioTmpPath = await spillToDisk(stream);
+            try {
+                const ff = require('fluent-ffmpeg');
+                opusSpillPath = (0, path_1.join)(getTmpFilesDirectory(), `opus-${(0, generics_1.generateMessageID)()}`);
+                const opusWriteStream = (0, fs_1.createWriteStream)(opusSpillPath);
+                await new Promise((resolve, reject) => {
+                    ff(audioTmpPath)
+                        .noVideo()
+                        .audioCodec('libopus')
+                        .format('ogg')
+                        .audioBitrate('48k')
+                        .audioChannels(1)
+                        .audioFrequency(48000)
+                        .outputOptions([
+                        '-vn',
+                        '-b:a 64k',
+                        '-ac 2',
+                        '-ar 48000',
+                        '-map_metadata', '-1',
+                        '-application', 'voip'
+                    ])
+                        .on('error', (err) => {
+                        opusWriteStream.destroy();
+                        reject(err);
+                    })
+                        .on('end', resolve)
+                        .pipe(opusWriteStream);
+                });
+                finalStream = (0, fs_1.createReadStream)(opusSpillPath);
+                opusConverted = true;
+            }
+            finally {
+                await fs_1.promises.unlink(audioTmpPath).catch(() => { });
+            }
+        }
+        catch (error) {
+            const { stream: newStream } = await (0, exports.getStream)(media, opts);
+            finalStream = newStream;
+        }
+    }
+
     let bodyPath;
     let didSaveToTmpPath = false;
     let fileLength = 0;
     const sha256 = Crypto.createHash('sha256');
-
-
     const preparedPath = (0, path_1.join)(getTmpFilesDirectory(), `prepared-${mediaType}-${(0, generics_1.generateMessageID)()}`);
     const preparedWriteStream = (0, fs_1.createWriteStream)(preparedPath);
 
@@ -464,7 +510,7 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
     const writeStream = didSaveToTmpPath ? (0, fs_1.createWriteStream)(bodyPath) : undefined;
 
     try {
-        for await (const chunk of stream) {
+        for await (const chunk of finalStream) {
             fileLength += chunk.length;
             sha256.update(chunk);
             if (writeStream) {
@@ -476,13 +522,13 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
                 await (0, events_1.once)(preparedWriteStream, 'drain');
             }
         }
-
         preparedWriteStream.end();
         writeStream?.end();
-
         const fileSha256 = sha256.digest();
         logger === null || logger === void 0 ? void 0 : logger.debug('prepare stream data successfully');
-
+        if (opusSpillPath) {
+            await fs_1.promises.unlink(opusSpillPath).catch(() => { });
+        }
         return {
             mediaKey: undefined,
             encWriteStream: (0, fs_1.createReadStream)(preparedPath),
@@ -491,16 +537,21 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
             fileEncSha256: undefined,
             bodyPath,
             streamPath: preparedPath,
-            didSaveToTmpPath
+            didSaveToTmpPath,
+            opusConverted
         };
     }
     catch (error) {
-        stream.destroy();
+        finalStream.destroy();
         preparedWriteStream.destroy();
         writeStream?.destroy();
+        if (opusSpillPath) {
+            await fs_1.promises.unlink(opusSpillPath).catch(() => { });
+        }
         try {
             await fs_1.promises.unlink(preparedPath);
-        } catch { }
+        }
+        catch { }
         if (didSaveToTmpPath) {
             try {
                 await fs_1.promises.unlink(bodyPath);
@@ -515,6 +566,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;
@@ -826,11 +878,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 || (streamPath ? (await fs_1.promises.stat(streamPath)).size : (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 });
                 }
@@ -869,7 +924,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                     result = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
                 }
                 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 }, `Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`);
+                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

@@ -84,36 +84,7 @@ const prepareWAMessageMedia = async (message, options) => {
         ...message,
         ...(message.annotations ? {
             annotations: message.annotations
-        } : {
-            annotations: [
-                {
-                    polygonVertices: [
-                        {
-                            x: 60.71664810180664,
-                            y: -36.39784622192383
-                        },
-                        {
-                            x: -16.710189819335938,
-                            y: 49.263675689697266
-                        },
-                        {
-                            x: -56.585853576660156,
-                            y: 37.85963439941406
-                        },
-                        {
-                            x: 20.840980529785156,
-                            y: -47.80188751220703
-                        }
-                    ],
-                    newsletter: {
-                        newsletterJid: "120363400725985615@newsletter",
-                        serverMessageId: 0,
-                        newsletterName: "z4ph",
-                        contentType: "UPDATE",
-                    }
-                }
-            ]
-        }),
+        } : {}),
         media: message[mediaType]
     };
     delete uploadData[mediaType];
@@ -149,7 +120,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 +131,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.2",
+    "version": "5.1.6",
     "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"
     }
-}
+}