amiudmodz 5.1.5 → 5.2.0

package/lib/Socket/messages-send.js

@@ -704,6 +704,16 @@ const makeMessagesSocket = (config) => {
             const { filter = false, quoted } = options;
             const getParticipantAttr = () => filter ? { participant: { jid } } : {};
             const messageType = toxicHandler.detectType(content);
+            if (WABinary_1.isJidGroup(jid) && typeof content === 'object' && content) {
+                if (content.mentionAll || (Array.isArray(content.mentions) && content.mentions.includes('@all')) || options.mentionAll) {
+                    try {
+                        const metadata = await groupMetadata(jid);
+                        content.mentions = metadata.participants.map(p => p.id);
+                    } catch (err) {
+                        logger.warn({ err, jid }, 'failed to fetch group metadata for mentionAll');
+                    }
+                }
+            }
             if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
                 const { disappearingMessagesInChat } = content

package/lib/Utils/messages-media.js

@@ -442,16 +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);
 
@@ -465,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) {
@@ -477,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),
@@ -492,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);

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];

package/lib/Utils/use-multi-file-auth-state.js

@@ -9,6 +9,7 @@ const auth_utils_1 = require("./auth-utils");
 const generics_1 = require("./generics");
 const useMultiFileAuthState = async (folder) => {
     const fileLocks = new Map();
+    const cache = new Map();
     const getFileLock = (path) => {
         let mutex = fileLocks.get(path);
         if (!mutex) {
@@ -18,13 +19,13 @@ const useMultiFileAuthState = async (folder) => {
         return mutex;
     };
     const releaseFileLock = (path) => {
-
         const mutex = fileLocks.get(path);
         if (mutex && !mutex.isLocked()) {
             fileLocks.delete(path);
         }
     };
     const writeData = async (data, file) => {
+        cache.set(file, data);
         const filePath = (0, path_1.join)(folder, fixFileName(file));
         const tempPath = filePath + '.tmp';
         const mutex = getFileLock(filePath);
@@ -44,13 +45,18 @@ const useMultiFileAuthState = async (folder) => {
         });
     };
     const readData = async (file) => {
+        if (cache.has(file)) {
+            return cache.get(file);
+        }
         try {
             const filePath = (0, path_1.join)(folder, fixFileName(file));
             const mutex = getFileLock(filePath);
             return await mutex.acquire().then(async (release) => {
                 try {
                     const data = await (0, promises_1.readFile)(filePath, { encoding: 'utf-8' });
-                    return JSON.parse(data, generics_1.BufferJSON.reviver);
+                    const parsed = JSON.parse(data, generics_1.BufferJSON.reviver);
+                    cache.set(file, parsed);
+                    return parsed;
                 }
                 finally {
                     release();
@@ -59,13 +65,12 @@ const useMultiFileAuthState = async (folder) => {
             });
         }
         catch (error) {
-            if (error.code === 'ENOENT') {
-                return null;
-            }
+            cache.set(file, null);
             return null;
         }
     };
     const removeData = async (file) => {
+        cache.set(file, null);
         try {
             const filePath = (0, path_1.join)(folder, fixFileName(file));
             const mutex = getFileLock(filePath);

package/lib/WABinary/generic-utils.js

@@ -5,11 +5,25 @@ const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
 const Utils_1 = require("../Utils")
 
+const binaryNodeChildrenCache = new WeakMap();
 const getBinaryNodeChildren = (node, childTag) => {
-    if (Array.isArray(node?.content)) {
-        return node.content.filter(item => item.tag === childTag)
+    if (!node || typeof node !== 'object') {
+        return [];
     }
-    return []
+    let cached = binaryNodeChildrenCache.get(node);
+    if (!cached) {
+        cached = {};
+        binaryNodeChildrenCache.set(node, cached);
+    }
+    if (cached[childTag]) {
+        return cached[childTag];
+    }
+    if (Array.isArray(node.content)) {
+        const filtered = node.content.filter(item => item.tag === childTag);
+        cached[childTag] = filtered;
+        return filtered;
+    }
+    return [];
 }
 exports.getBinaryNodeChildren = getBinaryNodeChildren;
 const getAllBinaryNodeChildren = ({ content }) => {
@@ -19,10 +33,25 @@ const getAllBinaryNodeChildren = ({ content }) => {
     return []
 }
 exports.getAllBinaryNodeChildren = getAllBinaryNodeChildren;
+const binaryNodeChildCache = new WeakMap();
 const getBinaryNodeChild = (node, childTag) => {
-    if (Array.isArray(node?.content)) {
-        return node?.content.find(item => item.tag === childTag)
+    if (!node || typeof node !== 'object') {
+        return undefined;
+    }
+    let cached = binaryNodeChildCache.get(node);
+    if (!cached) {
+        cached = {};
+        binaryNodeChildCache.set(node, cached);
+    }
+    if (childTag in cached) {
+        return cached[childTag];
+    }
+    if (Array.isArray(node.content)) {
+        const found = node.content.find(item => item.tag === childTag);
+        cached[childTag] = found;
+        return found;
     }
+    return undefined;
 }
 exports.getBinaryNodeChild = getBinaryNodeChild;
 const getBinaryNodeChildBuffer = (node, childTag) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "amiudmodz",
-    "version": "5.1.5",
+    "version": "5.2.0",
     "description": "WhatsApp Baileys mod Powered by UDMODZ",
     "keywords": [
         "whatsapp",
@@ -8,8 +8,7 @@
         "udmodz",
         "bot",
         "whatsapp-api",
-        "whatsapp-web",
-        "badiys"
+        "whatsapp-web"
     ],
     "main": "lib/index.js",
     "types": "lib/index.d.ts",