amiudmodz 4.0.6 → 5.0.0

package/lib/Utils/noise-handler.js

@@ -68,7 +68,9 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
     let writeCounter = 0;
     let isFinished = false;
     let sentIntro = false;
-    let inBytes = Buffer.alloc(0);
+
+    let inChunks = [];
+    let inBytesLength = 0;
     authenticate(NOISE_HEADER);
     authenticate(publicKey);
     return {
@@ -128,26 +130,38 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         decodeFrame: (newData, onFrame) => {
             var _a;
 
+            inChunks.push(newData);
+            inBytesLength += newData.length;
+            logger.trace(`recv ${newData.length} bytes, total recv ${inBytesLength} bytes`);
+
+            while (inBytesLength >= 3) {
+                // Only concat when necessary
+                if (inChunks.length > 1) {
+                    const combined = Buffer.concat(inChunks);
+                    inChunks = [combined];
+                }
+                const inBytes = inChunks[0];
+                const size = (inBytes.readUInt8(0) << 16) | inBytes.readUInt16BE(1);
+                if (inBytesLength < size + 3) {
+                    break;
+                }
 
+                let frame = inBytes.subarray(3, size + 3);
 
-            const getBytesSize = () => {
-                if (inBytes.length >= 3) {
-                    return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1);
+                const remaining = inBytes.subarray(size + 3);
+                // Reuse existing buffer reference when possible
+                if (remaining.length > 0) {
+                    inChunks = [remaining];
+                } else {
+                    inChunks = [];
                 }
-            };
-            inBytes = Buffer.concat([inBytes, newData]);
-            logger.trace(`recv ${newData.length} bytes, total recv ${inBytes.length} bytes`);
-            let size = getBytesSize();
-            while (size && inBytes.length >= size + 3) {
-                let frame = inBytes.slice(3, size + 3);
-                inBytes = inBytes.slice(size + 3);
+                inBytesLength -= (size + 3);
                 if (isFinished) {
                     const result = decrypt(frame);
                     frame = (0, WABinary_1.decodeBinaryNode)(result);
                 }
-                logger.trace({ msg: (_a = frame === null || frame === void 0 ? void 0 : frame.attrs) === null || _a === void 0 ? void 0 : _a.id }, 'recv frame');
+                logger.trace({ msg: (_a = frame?.attrs)?.id }, 'recv frame');
                 onFrame(frame);
-                size = getBytesSize();
             }
         }
     };

package/lib/Utils/process-message.js

@@ -154,6 +154,9 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                     await keyStore.transaction(async () => {
                         const newKeys = [];
                         for (const { keyData, keyId } of keys) {
+                            if (!keyId?.keyId) {
+                                continue;
+                            }
                             const strKeyId = Buffer.from(keyId.keyId).toString('base64');
                             newKeys.push(strKeyId);
                             await keyStore.set({ 'app-state-sync-key': { [strKeyId]: keyData } });
@@ -284,30 +287,35 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             const pollCreatorJid = (0, generics_1.getKeyAuthor)(creationMsgKey, meIdNormalised);
             const voterJid = (0, generics_1.getKeyAuthor)(message.key, meIdNormalised);
             const pollEncKey = (_k = pollMsg.messageContextInfo) === null || _k === void 0 ? void 0 : _k.messageSecret;
-            try {
-                const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
-                    pollEncKey,
-                    pollCreatorJid,
-                    pollMsgId: creationMsgKey.id,
-                    voterJid,
-                });
-                ev.emit('messages.update', [
-                    {
-                        key: creationMsgKey,
-                        update: {
-                            pollUpdates: [
-                                {
-                                    pollUpdateMessageKey: message.key,
-                                    vote: voteMsg,
-                                    senderTimestampMs: content.pollUpdateMessage.senderTimestampMs.toNumber(),
-                                }
-                            ]
+            if (pollEncKey) {
+                try {
+                    const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
+                        pollEncKey,
+                        pollCreatorJid,
+                        pollMsgId: creationMsgKey.id,
+                        voterJid,
+                    });
+                    ev.emit('messages.update', [
+                        {
+                            key: creationMsgKey,
+                            update: {
+                                pollUpdates: [
+                                    {
+                                        pollUpdateMessageKey: message.key,
+                                        vote: voteMsg,
+                                        senderTimestampMs: content.pollUpdateMessage.senderTimestampMs.toNumber(),
+                                    }
+                                ]
+                            }
                         }
-                    }
-                ]);
+                    ]);
+                }
+                catch (err) {
+                    logger === null || logger === void 0 ? void 0 : logger.warn({ err, creationMsgKey }, 'failed to decrypt poll vote');
+                }
             }
-            catch (err) {
-                logger === null || logger === void 0 ? void 0 : logger.warn({ err, creationMsgKey }, 'failed to decrypt poll vote');
+            else {
+                logger === null || logger === void 0 ? void 0 : logger.warn({ creationMsgKey }, 'poll secret key not found, cannot decrypt update');
             }
         }
         else {

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

@@ -17,6 +17,13 @@ const useMultiFileAuthState = async (folder) => {
         }
         return mutex;
     };
+    const releaseFileLock = (path) => {
+        // Clean up mutex if no more waiters to prevent memory leak
+        const mutex = fileLocks.get(path);
+        if (mutex && !mutex.isLocked()) {
+            fileLocks.delete(path);
+        }
+    };
     const writeData = async (data, file) => {
         const filePath = (0, path_1.join)(folder, fixFileName(file));
         const tempPath = filePath + '.tmp';
@@ -27,12 +34,12 @@ const useMultiFileAuthState = async (folder) => {
                 await (0, promises_1.rename)(tempPath, filePath);
             }
             catch (error) {
-
                 await (0, promises_1.unlink)(tempPath).catch(() => { });
                 throw error;
             }
             finally {
                 release();
+                releaseFileLock(filePath);
             }
         });
     };
@@ -47,6 +54,7 @@ const useMultiFileAuthState = async (folder) => {
                 }
                 finally {
                     release();
+                    releaseFileLock(filePath);
                 }
             });
         }
@@ -54,10 +62,6 @@ const useMultiFileAuthState = async (folder) => {
             if (error.code === 'ENOENT') {
                 return null;
             }
-
-
-
-
             return null;
         }
     };
@@ -73,6 +77,7 @@ const useMultiFileAuthState = async (folder) => {
                 }
                 finally {
                     release();
+                    releaseFileLock(filePath);
                 }
             });
         }

package/lib/WABinary/decode.js

@@ -65,10 +65,19 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     const readInt = (n, littleEndian = false) => {
         checkEOS(n);
         let val = 0;
-        for (let i = 0; i < n; i++) {
-            const shift = littleEndian ? i : n - 1 - i;
-            val |= next() << (shift * 8);
+        if (n === 4) {
+            val = littleEndian ? buffer.readUInt32LE(indexRef.index) : buffer.readUInt32BE(indexRef.index);
+        } else if (n === 2) {
+            val = littleEndian ? buffer.readUInt16LE(indexRef.index) : buffer.readUInt16BE(indexRef.index);
+        } else if (n === 1) {
+            val = buffer[indexRef.index];
+        } else {
+            for (let i = 0; i < n; i++) {
+                const shift = littleEndian ? i : n - 1 - i;
+                val |= buffer[indexRef.index + i] << (shift * 8);
+            }
         }
+        indexRef.index += n;
         return val;
     };
     const readInt20 = () => {
@@ -109,16 +118,17 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     };
     const readPacked8 = (tag) => {
         const startByte = readByte();
-        let value = '';
-        for (let i = 0; i < (startByte & 127); i++) {
+        const length = startByte & 127;
+        const charCount = (length * 2) - (startByte >> 7 !== 0 ? 1 : 0);
+        const chars = new Array(charCount);
+        for (let i = 0; i < length; i++) {
             const curByte = readByte();
-            value += String.fromCharCode(unpackByte(tag, (curByte & 0xf0) >> 4));
-            value += String.fromCharCode(unpackByte(tag, curByte & 0x0f));
-        }
-        if (startByte >> 7 !== 0) {
-            value = value.slice(0, -1);
+            chars[i * 2] = String.fromCharCode(unpackByte(tag, (curByte & 0xf0) >> 4));
+            if (i * 2 + 1 < charCount) {
+                chars[i * 2 + 1] = String.fromCharCode(unpackByte(tag, curByte & 0x0f));
+            }
         }
-        return value;
+        return chars.join('');
     };
     const isListTag = (tag) => {
         return tag === TAGS.LIST_EMPTY || tag === TAGS.LIST_8 || tag === TAGS.LIST_16;

package/lib/WABinary/encode.js

@@ -47,8 +47,12 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
     }
 
     const pushBytes = (bytes) => {
-        for (const b of bytes) {
-            buffer.push(b)
+        if (bytes.length < 1000) {
+            buffer.push(...bytes);
+        } else {
+            for (let i = 0; i < bytes.length; i++) {
+                buffer.push(bytes[i]);
+            }
         }
     }
 
@@ -143,16 +147,12 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         }
         pushByte(roundedLength)
         const packFunction = type === 'nibble' ? packNibble : packHex
-        const packBytePair = (v1, v2) => {
-            const result = (packFunction(v1) << 4) | packFunction(v2)
-            return result
-        }
         const strLengthHalf = Math.floor(str.length / 2)
         for (let i = 0; i < strLengthHalf; i++) {
-            pushByte(packBytePair(str[2 * i], str[2 * i + 1]))
+            buffer.push((packFunction(str[2 * i]) << 4) | packFunction(str[2 * i + 1]))
         }
         if (str.length % 2 !== 0) {
-            pushByte(packBytePair(str[str.length - 1], '\x00'))
+            buffer.push((packFunction(str[str.length - 1]) << 4) | 15)
         }
     }
 

package/package.json

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