amiudmodz 4.0.6 → 4.1.2

package/README.md

@@ -0,0 +1,130 @@
+<div align="center">
+
+<img src="https://capsule-render.vercel.app/api?type=waving&color=0:4000ff,50:7c3aed,100:00d4ff&height=220&section=header&text=Baileys%20-%20UDMODZ&fontSize=52&fontColor=ffffff&animation=fadeIn&fontAlignY=35&desc=⚡%20Lightweight%20WhatsApp%20Web%20API&descAlignY=55&descSize=18" width="100%"/>
+
+<br/>
+
+[![Node.js](https://img.shields.io/badge/Node.js-≥20-339933?style=for-the-badge&logo=nodedotjs&logoColor=white)](https://nodejs.org)
+[![TypeScript](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://www.typescriptlang.org/)
+[![WhatsApp](https://img.shields.io/badge/WhatsApp-API-25D366?style=for-the-badge&logo=whatsapp&logoColor=white)](https://web.whatsapp.com)
+
+[![npm version](https://img.shields.io/npm/v/amiudmodz?style=for-the-badge&color=7c3aed&logoColor=white)](https://www.npmjs.com/package/amiudmodz)
+[![License](https://img.shields.io/badge/License-MIT-00d4ff?style=for-the-badge&logoColor=white)](https://github.com/udmodz0)
+[![Status](https://img.shields.io/badge/Status-Active-00ff88?style=for-the-badge&logoColor=white)](https://github.com/udmodz0)
+
+<br/>
+
+```text
+██╗░░░██╗██████╗░███╗░░░███╗░█████╗░██████╗░███████╗
+██║░░░██║██╔══██╗████╗░████║██╔══██╗██╔══██╗╚════██║
+██║░░░██║██║░░██║██╔████╔██║██║░░██║██║░░██║░░███╔═╝
+██║░░░██║██║░░██║██║╚██╔╝██║██║░░██║██║░░██║██╔══╝░░
+╚██████╔╝██████╔╝██║░╚═╝░██║╚█████╔╝██████╔╝███████╗
+░╚═════╝░╚═════╝░╚═╝░░░░░╚═╝░╚════╝░╚═════╝░╚══════╝
+```
+
+</div>
+
+---
+
+<img src="https://user-images.githubusercontent.com/73097560/115834477-dbab4500-a447-11eb-908a-139a6edaec5c.gif" width="100%">
+
+## <img src="https://media.giphy.com/media/iY8CRBdQXODJSCERIr/giphy.gif" width="30"> &nbsp;About
+
+> **Baileys (UDMODZ Edition)** is a lightweight, high-performance WhatsApp Web API library (published as `amiudmodz`). It implements the complete WhatsApp Web socket protocol and enables developers to build custom and powerful WhatsApp bots via Node.js limitlessly. Both authentication types (Pairing Code and QR Code) are natively supported.
+
+<div align="center">
+
+| 🧩 Feature | 📝 Description |
+|:---:|:---|
+| 📡 **Socket Protocol** | Communicates over fast native WebSockets |
+| 🛡️ **End-to-End Encryption** | Fully implements Signal protocol for security |
+| 📱 **Multi-Device Support** | Support for WA Web Multi-Device seamlessly |
+| ⚡ **Lightweight** | Needs very low resources compared to Puppeteer |
+| 📂 **Media Handling** | Download & upload images, videos, audio, documents |
+| 🔑 **Pairing Code** | Easy device linking through Pairing Codes |
+
+</div>
+
+<img src="https://user-images.githubusercontent.com/73097560/115834477-dbab4500-a447-11eb-908a-139a6edaec5c.gif" width="100%">
+
+## 🚀 Installation & Usage
+
+<details>
+<summary><b>📦 1. Install using NPM</b></summary>
+<br/>
+
+```bash
+npm install amiudmodz
+```
+</details>
+
+<details>
+<summary><b>💻 2. Basic Example</b></summary>
+<br/>
+
+```typescript
+import makeWASocket, { useMultiFileAuthState } from 'amiudmodz'
+
+async function connectToWhatsApp () {
+    const { state, saveCreds } = await useMultiFileAuthState('auth_info_baileys')
+    
+    // Connect to WA Socket
+    const sock = makeWASocket({
+        printQRInTerminal: true,
+        auth: state
+    })
+    
+    // Save creds when updated
+    sock.ev.on('creds.update', saveCreds)
+    
+    // Receive messages
+    sock.ev.on('messages.upsert', async m => {
+        console.log(JSON.stringify(m, undefined, 2))
+        
+        console.log('replying to', m.messages[0].key.remoteJid)
+        await sock.sendMessage(m.messages[0].key.remoteJid!, { text: 'Hello there!' })
+    })
+}
+
+connectToWhatsApp()
+```
+</details>
+
+<img src="https://user-images.githubusercontent.com/73097560/115834477-dbab4500-a447-11eb-908a-139a6edaec5c.gif" width="100%">
+
+<div align="center">
+
+## 👨‍💻 Creator
+
+<a href="https://github.com/udmodz0">
+  <img src="https://readme-typing-svg.demolab.com?font=Fira+Code&weight=700&size=28&duration=2500&pause=800&color=7C3AED&center=true&vCenter=true&repeat=true&width=300&height=50&lines=UDMODZ0" alt="UDMODZ0" />
+</a>
+
+<br/>
+
+<a href="https://github.com/udmodz0">
+  <img src="https://img.shields.io/badge/GitHub-udmodz0-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub"/>
+</a>
+
+<br/><br/>
+
+<img src="https://capsule-render.vercel.app/api?type=shark&color=0:4000ff,50:7c3aed,100:00d4ff&height=40&section=footer" width="100%"/>
+
+### ⭐ Star this repo if you found it useful!
+
+<br/>
+
+> 🚫 **This package is provided as-is.**
+> 
+> Made with 💜 by **UDMODZ0**
+
+<br/>
+
+<img src="https://github-readme-activity-graph.vercel.app/graph?username=udmodz0&theme=tokyo-night&hide_border=true&area=true&custom_title=UDMODZ0%20Contribution%20Graph" width="95%"/>
+
+<br/>
+
+<img src="https://capsule-render.vercel.app/api?type=waving&color=0:4000ff,50:7c3aed,100:00d4ff&height=120&section=footer&animation=twinkling" width="100%"/>
+
+</div>

package/lib/Defaults/index.js

@@ -76,11 +76,14 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     browser: Utils_1.Browsers.macOS("Chrome"),
     waWebSocketUrl: "wss://web.whatsapp.com/ws/chat",
     connectTimeoutMs: 2E4,
-    keepAliveIntervalMs: 1.5E4,
+
+    keepAliveIntervalMs: 2.5E4,
     logger: logger_1.default.child({ class: "baileys" }),
     printQRInTerminal: !1,
     emitOwnEvents: !0,
-    defaultQueryTimeoutMs: 6E4,
+
+
+    defaultQueryTimeoutMs: 2E4,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
     maxMsgRetryCount: 5,
@@ -149,8 +152,10 @@ exports.TimeMs = {
 };
 
 exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 300,
+
+    SIGNAL_STORE: 600,
     MSG_RETRY: 3600,
     CALL_OFFER: 300,
-    USER_DEVICES: 300
+
+    USER_DEVICES: 600
 };

package/lib/Socket/Client/web-socket-client.js

@@ -39,6 +39,9 @@ class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
             handshakeTimeout: this.config.connectTimeoutMs,
             timeout: this.config.connectTimeoutMs,
             agent: this.config.agent,
+
+
+            perMessageDeflate: false,
         });
         this.socket.setMaxListeners(0);
         const events = ['close', 'error', 'upgrade', 'message', 'open', 'ping', 'pong', 'unexpected-response'];
@@ -52,6 +55,9 @@ class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
         }
         const closePromise = new Promise((resolve) => {
             this.socket.once('close', resolve);
+
+
+            setTimeout(resolve, 5000);
         });
         this.socket.close();
         await closePromise;
@@ -59,7 +65,8 @@ class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
     }
     send(str, cb) {
         var _a;
-        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(str, cb);
+
+        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(str, { compress: false }, cb);
         return Boolean(this.socket);
     }
 }

package/lib/Socket/groupStatus.js

@@ -10,7 +10,7 @@ class toxic {
         this.waUploadToServer = waUploadToServer;
         this.config = config;
         this.sock = sock;
-        
+
         this.bail = {
             generateWAMessageContent: this.utils.generateWAMessageContent || Utils_1.generateWAMessageContent,
             generateMessageID: Utils_1.generateMessageID,
@@ -71,17 +71,17 @@ class toxic {
             })
         };
     }
-        
+
     async handleProduct(content, jid, quoted) {
         const {
-            title, 
-            description, 
+            title,
+            description,
             thumbnail,
-            productId, 
-            retailerId, 
-            url, 
-            body = "", 
-            footer = "", 
+            productId,
+            retailerId,
+            url,
+            body = "",
+            footer = "",
             buttons = [],
             priceAmount1000 = null,
             currencyCode = "IDR"
@@ -91,13 +91,13 @@ class toxic {
 
         if (Buffer.isBuffer(thumbnail)) {
             const { imageMessage } = await this.utils.generateWAMessageContent(
-                { image: thumbnail }, 
+                { image: thumbnail },
                 { upload: this.waUploadToServer }
             );
             productImage = imageMessage;
         } else if (typeof thumbnail === 'object' && thumbnail.url) {
             const { imageMessage } = await this.utils.generateWAMessageContent(
-                { image: { url: thumbnail.url }}, 
+                { image: { url: thumbnail.url } },
                 { upload: this.waUploadToServer }
             );
             productImage = imageMessage;
@@ -133,7 +133,7 @@ class toxic {
             }
         };
     }
-    
+
     async handleInteractive(content, jid, quoted) {
         const {
             title,
@@ -188,8 +188,8 @@ class toxic {
             }
             mediaType = 'video';
         } else if (document) {
-            let documentPayload = { 
-                document: document 
+            let documentPayload = {
+                document: document
             };
             if (jpegThumbnail) {
                 if (typeof jpegThumbnail === 'object' && jpegThumbnail.url) {
@@ -198,7 +198,7 @@ class toxic {
                     documentPayload.jpegThumbnail = jpegThumbnail;
                 }
             }
-            
+
             media = await this.utils.prepareWAMessageMedia(
                 documentPayload,
                 { upload: this.waUploadToServer }
@@ -228,7 +228,7 @@ class toxic {
         } else if (nativeFlowMessage) {
             interactiveMessage.nativeFlowMessage = nativeFlowMessage;
         }
-        
+
         if (media) {
             interactiveMessage.header = {
                 title: header || "",
@@ -237,11 +237,11 @@ class toxic {
             };
         } else {
             interactiveMessage.header = {
-                title: header || "",        
+                title: header || "",
                 hasMediaAttachment: false
             };
         }
-        
+
         let finalContextInfo = {};
         if (contextInfo) {
             finalContextInfo = {
@@ -251,7 +251,7 @@ class toxic {
                 ...contextInfo
             };
         }
-        
+
         if (externalAdReply) {
             finalContextInfo.externalAdReply = {
                 title: externalAdReply.title || "",
@@ -265,7 +265,7 @@ class toxic {
                 ...externalAdReply
             };
         }
-        
+
         if (Object.keys(finalContextInfo).length > 0) {
             interactiveMessage.contextInfo = finalContextInfo;
         }
@@ -273,7 +273,7 @@ class toxic {
             interactiveMessage: interactiveMessage
         };
     }
-    
+
     async handleAlbum(content, jid, quoted) {
         const array = content.albumMessage;
         const album = await this.utils.generateWAMessageFromContent(jid, {
@@ -289,22 +289,22 @@ class toxic {
             quoted,
             upload: this.waUploadToServer
         });
-        
+
         await this.relayMessage(jid, album.message, {
             messageId: album.key.id,
         });
-        
+
         for (let content of array) {
             const img = await this.utils.generateWAMessage(jid, content, {
                 upload: this.waUploadToServer,
             });
-            
+
             img.message.messageContextInfo = {
                 messageSecret: crypto.randomBytes(32),
                 messageAssociation: {
                     associationType: 1,
                     parentMessageKey: album.key,
-                },    
+                },
                 participant: "0@s.whatsapp.net",
                 remoteJid: "status@broadcast",
                 forwardingScore: 99999,
@@ -332,14 +332,14 @@ class toxic {
                 priority: "high",
                 status: "sent",
             };
-            
+
             img.message.disappearingMode = {
                 initiator: 3,
                 trigger: 4,
                 initiatorDeviceJid: jid,
                 initiatedByExternalService: true,
                 initiatedByUserDevice: true,
-                initiatedBySystem: true,      
+                initiatedBySystem: true,
                 initiatedByServer: true,
                 initiatedByAdmin: true,
                 initiatedByUser: true,
@@ -362,11 +362,11 @@ class toxic {
             });
         }
         return album;
-    }   
+    }
 
     async handleEvent(content, jid, quoted) {
         const eventData = content.eventMessage;
-        
+
         const msg = await this.utils.generateWAMessageFromContent(jid, {
             viewOnceMessage: {
                 message: {
@@ -408,31 +408,31 @@ class toxic {
                 }
             }
         }, { quoted });
-        
+
         await this.relayMessage(jid, msg.message, {
             messageId: msg.key.id
         });
         return msg;
     }
-    
+
     async handlePollResult(content, jid, quoted) {
         const pollData = content.pollResultMessage;
-    
+
         const msg = await this.utils.generateWAMessageFromContent(jid, {
             pollResultSnapshotMessage: {
                 name: pollData.name,
                 pollVotes: pollData.pollVotes.map(vote => ({
                     optionName: vote.optionName,
-                    optionVoteCount: typeof vote.optionVoteCount === 'number' 
-                    ? vote.optionVoteCount.toString() 
-                    : vote.optionVoteCount
+                    optionVoteCount: typeof vote.optionVoteCount === 'number'
+                        ? vote.optionVoteCount.toString()
+                        : vote.optionVoteCount
                 }))
             }
         }, {
             userJid: this.utils.generateMessageID().split('@')[0] + '@s.whatsapp.net',
             quoted
         });
-    
+
         await this.relayMessage(jid, msg.message, {
             messageId: msg.key.id
         });
@@ -443,7 +443,7 @@ class toxic {
     async handleGroupStory(content, jid, quoted) {
         const storyData = content.groupStatusMessage;
         let waMsgContent;
-        
+
         if (storyData.message) {
             waMsgContent = storyData;
         } else {
@@ -466,6 +466,7 @@ class toxic {
             }
         }
 
+        const groupStoryMsgId = this.bail.generateMessageID();
         let msg = {
             message: {
                 groupStatusMessageV2: {
@@ -474,9 +475,18 @@ class toxic {
             }
         };
 
-        return await this.relayMessage(jid, msg.message, {
-            messageId: this.bail.generateMessageID()
+        await this.relayMessage(jid, msg.message, {
+            messageId: groupStoryMsgId
         });
+
+        return {
+            key: {
+                remoteJid: jid,
+                fromMe: true,
+                id: groupStoryMsgId
+            },
+            message: msg.message
+        };
     }
 
     async sendStatusWhatsApp(content, jids = []) {
@@ -534,10 +544,10 @@ class toxic {
 
         let msg;
         let mediaHandle;
-        
+
         try {
             const link_preview_1 = require("../Utils/link-preview");
-            
+
             msg = await Utils_1.generateWAMessage(WABinary_1.STORIES_JID, messageContent, {
                 logger: this.config.logger,
                 userJid,

package/lib/Socket/messages-send.js

@@ -1,7 +1,7 @@
-"use strict"; 
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
-}; 
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesSocket = void 0;
 const boom_1 = require("@hapi/boom");
@@ -18,21 +18,21 @@ const toxic = require('./groupStatus');
 const makeMessagesSocket = (config) => {
     const {
         logger,
-        linkPreviewImageThumbnailWidth, 
+        linkPreviewImageThumbnailWidth,
         generateHighQualityLinkPreview,
         options: axiosOptions,
         patchMessageBeforeSending
     } = config;
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
     const {
-        ev, 
-        authState, 
-        processingMutex, 
-        signalRepository, 
+        ev,
+        authState,
+        processingMutex,
+        signalRepository,
         upsertMessage,
         query,
         fetchPrivacySettings,
-        sendNode, 
+        sendNode,
         groupMetadata,
         groupToggleEphemeral,
         executeUSyncQuery
@@ -246,20 +246,20 @@ const makeMessagesSocket = (config) => {
                 tag: 'to',
                 attrs: { jid },
                 content: [{
-                        tag: 'enc',
-                        attrs: {
-                            v: '2',
-                            type,
-                            ...extraAttrs || {}
-                        },
-                        content: ciphertext
-                    }]
+                    tag: 'enc',
+                    attrs: {
+                        v: '2',
+                        type,
+                        ...extraAttrs || {}
+                    },
+                    content: ciphertext
+                }]
             };
             return node;
         }));
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList }) => {
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList } = {}) => {
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
         let didPushAdditional = false
@@ -485,20 +485,7 @@ const makeMessagesSocket = (config) => {
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
         });
-        message = Types_1.WAProto.Message.fromObject(message)
-        const messageJSON = {
-            key: {
-                remoteJid: jid,
-                fromMe: true,
-                id: msgId
-            },
-            message: message,
-            messageTimestamp: Utils_1.unixTimestampSeconds(new Date()),
-            messageStubParameters: [],
-            participant: WABinary_1.isJidGroup(jid) || WABinary_1.isJidStatusBroadcast(jid) ? meId : undefined,
-            status: Types_1.WAMessageStatus.PENDING
-        }
-        return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON);
+        return msgId;
     };
     const getTypeMessage = (msg) => {
         const message = Utils_1.normalizeMessageContent(msg);
@@ -723,26 +710,33 @@ const makeMessagesSocket = (config) => {
                 let mediaHandle
                 if (messageType) {
                     switch (messageType) {
-                        case 'PAYMENT':
+                        case 'PAYMENT': {
                             const paymentContent = await toxicHandler.handlePayment(content, quoted);
-                            return await relayMessage(jid, paymentContent, {
-                                messageId: Utils_1.generateMessageID(),
+                            const paymentMsgId = Utils_1.generateMessageID();
+                            await relayMessage(jid, paymentContent, {
+                                messageId: paymentMsgId,
                                 ...getParticipantAttr()
                             });
-                        case 'PRODUCT':
+                            return Utils_1.generateWAMessageFromContent(jid, paymentContent, { messageId: paymentMsgId, userJid });
+                        }
+                        case 'PRODUCT': {
                             const productContent = await toxicHandler.handleProduct(content, jid, quoted);
-                            const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                            return await relayMessage(jid, productMsg.message, {
+                            const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted, userJid });
+                            await relayMessage(jid, productMsg.message, {
                                 messageId: productMsg.key.id,
                                 ...getParticipantAttr()
                             });
-                        case 'INTERACTIVE':
+                            return productMsg;
+                        }
+                        case 'INTERACTIVE': {
                             const interactiveContent = await toxicHandler.handleInteractive(content, jid, quoted);
-                            const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
-                            return await relayMessage(jid, interactiveMsg.message, {
+                            const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted, userJid });
+                            await relayMessage(jid, interactiveMsg.message, {
                                 messageId: interactiveMsg.key.id,
                                 ...getParticipantAttr()
                             });
+                            return interactiveMsg;
+                        }
                         case 'ALBUM':
                             return await toxicHandler.handleAlbum(content, jid, quoted)
                         case 'EVENT':
@@ -799,6 +793,7 @@ const makeMessagesSocket = (config) => {
                         processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
                     });
                 }
+
                 return fullMsg;
             }
         }

package/lib/Socket/newsletter.js

@@ -337,7 +337,7 @@ const makeNewsletterSocket = (config) => {
                 targetJid = targetJid + '@newsletter';
             }
 
-            // Available reasons: spam, abuse, scam, inappropriate, fake, other
+
             const validReasons = ['spam', 'abuse', 'scam', 'inappropriate', 'fake', 'other'];
             const pReason = validReasons.includes(reason.toLowerCase()) ? reason.toLowerCase() : 'spam';
 

package/lib/Socket/socket.js

@@ -311,7 +311,12 @@ const makeSocket = (config) => {
         ws.removeAllListeners('message');
         if (!ws.isClosed && !ws.isClosing) {
             try {
-                await ws.close();
+
+
+                await Promise.race([
+                    ws.close(),
+                    new Promise(resolve => setTimeout(resolve, 5000))
+                ]);
             }
             catch (_a) { }
         }
@@ -360,6 +365,8 @@ const makeSocket = (config) => {
         }
         else if (ws.isOpen) {
 
+
+            const PING_TIMEOUT_MS = 10000;
             query({
                 tag: 'iq',
                 attrs: {
@@ -369,7 +376,7 @@ const makeSocket = (config) => {
                     xmlns: 'w:p',
                 },
                 content: [{ tag: 'ping', attrs: {} }]
-            })
+            }, PING_TIMEOUT_MS)
                 .catch(err => {
                     logger.error({ trace: err.stack }, 'error in sending keep alive');
                 });
@@ -628,7 +635,7 @@ const makeSocket = (config) => {
             tag: 'ib',
             attrs: {},
             content: [{ tag: 'offline_batch', attrs: { count: '100' } }]
-        });
+        }).catch(err => logger.warn({ err }, 'failed to send offline_batch response'));
     });
     ws.on('CB:ib,,edge_routing', (node) => {
         const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing');

package/lib/Utils/auth-utils.js

@@ -101,7 +101,8 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
                 return ids.reduce((dict, id) => {
                     var _a;
                     const value = (_a = transactionCache[type]) === null || _a === void 0 ? void 0 : _a[id];
-                    if (value) {
+
+                    if (typeof value !== 'undefined') {
                         dict[id] = value;
                     }
                     return dict;
@@ -141,18 +142,25 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
 
 
                         let tries = maxCommitRetries;
+                        let lastCommitError;
                         while (tries) {
                             tries -= 1;
                             try {
                                 await state.set(mutations);
                                 logger.trace({ dbQueriesInTransaction }, 'committed transaction');
+                                lastCommitError = undefined;
                                 break;
                             }
                             catch (error) {
+                                lastCommitError = error;
                                 logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`);
                                 await (0, generics_1.delay)(delayBetweenTriesMs);
                             }
                         }
+                        if (lastCommitError) {
+
+                            throw lastCommitError;
+                        }
                     }
                     else {
                         logger.trace('no mutations in transaction');

package/lib/Utils/event-buffer.js

@@ -403,10 +403,9 @@ function append(data, historyCache, event, eventData, logger) {
             const groupUpdates = eventData;
             for (const update of groupUpdates) {
                 const id = update.id;
-                const groupUpdate = data.groupUpdates[id] || {};
-                if (!data.groupUpdates[id]) {
-                    data.groupUpdates[id] = Object.assign(groupUpdate, update);
-                }
+
+                const existingGroupUpdate = data.groupUpdates[id] || {};
+                data.groupUpdates[id] = Object.assign(existingGroupUpdate, update);
             }
             break;
         default:
@@ -509,16 +508,14 @@ function consolidateEvents(data) {
 function concatChats(a, b) {
     if (b.unreadCount === null) {
 
-        if (a.unreadCount < 0) {
+        if (typeof a.unreadCount === 'number' && a.unreadCount < 0) {
             a.unreadCount = undefined;
-            b.unreadCount = undefined;
-        }
-    }
-    if (typeof a.unreadCount === 'number' && typeof b.unreadCount === 'number') {
-        b = { ...b };
-        if (b.unreadCount >= 0) {
-            b.unreadCount = Math.max(b.unreadCount, 0) + Math.max(a.unreadCount, 0);
+            b = { ...b, unreadCount: undefined };
         }
+    } else if (typeof a.unreadCount === 'number' && typeof b.unreadCount === 'number'
+        && b.unreadCount >= 0) {
+
+        b = { ...b, unreadCount: Math.max(b.unreadCount, 0) + Math.max(a.unreadCount, 0) };
     }
     return Object.assign(a, b);
 }

package/lib/Utils/make-mutex.js

@@ -3,27 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeKeyedMutex = exports.makeMutex = void 0;
 const makeMutex = () => {
     let task = Promise.resolve();
-    let taskTimeout;
     return {
         mutex(code) {
             task = (async () => {
 
-
                 try {
                     await task;
                 }
                 catch (_a) { }
-                try {
 
-                    const result = await code();
-                    return result;
-                }
-                finally {
-                    clearTimeout(taskTimeout);
-                }
+                return code();
             })();
-
-
             return task;
         },
     };
@@ -34,9 +24,14 @@ const makeKeyedMutex = () => {
     return {
         mutex(key, task) {
             if (!map[key]) {
-                map[key] = (0, exports.makeMutex)();
+                map[key] = makeMutex();
             }
-            return map[key].mutex(task);
+
+            return map[key].mutex(task).finally(() => {
+
+
+                delete map[key];
+            });
         }
     };
 };

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,33 @@ 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) {
 
-            const getBytesSize = () => {
-                if (inBytes.length >= 3) {
-                    return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1);
+                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;
                 }
-            };
-            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);
+
+                let frame = inBytes.subarray(3, size + 3);
+
+                const remaining = inBytes.subarray(size + 3);
+                inChunks = remaining.length > 0 ? [remaining] : [];
+                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');
                 onFrame(frame);
-                size = getBytesSize();
             }
         }
     };

package/package.json

@@ -1,6 +1,16 @@
 {
     "name": "amiudmodz",
-    "version": "4.0.6",
+    "version": "4.1.2",
+    "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": [