amiudmodz 4.0.6 → 4.1.0

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,
+    // Reduced from 15s: 25s matches actual WA Web behavior and reduces unnecessary pings
+    keepAliveIntervalMs: 2.5E4,
     logger: logger_1.default.child({ class: "baileys" }),
     printQRInTerminal: !1,
     emitOwnEvents: !0,
-    defaultQueryTimeoutMs: 6E4,
+    // Reduced from 60s: 20s prevents MaxListenersExceeded warnings from stale query listeners.
+    // Use explicit timeoutMs overrides for operations that legitimately need longer (e.g. media upload)
+    defaultQueryTimeoutMs: 2E4,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
     maxMsgRetryCount: 5,
@@ -149,8 +152,10 @@ exports.TimeMs = {
 };
 
 exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 300,
+    // Increased from 300s to 600s: better cache hit rate for Signal key lookups
+    SIGNAL_STORE: 600,
     MSG_RETRY: 3600,
     CALL_OFFER: 300,
-    USER_DEVICES: 300
+    // Increased from 300s to 600s: reduces repeated multi-device USync lookups
+    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,
+            // Disable per-message deflate compression: reduces CPU usage and latency
+            // WhatsApp messages are already encrypted binary which doesn't compress well
+            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);
+            // Guard: if the remote end never sends CLOSE frame, resolve after 5s
+            // to prevent hanging the reconnection flow indefinitely
+            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);
+        // Pass compress:false to skip per-message compression for lower latency
+        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(str, { compress: false }, cb);
         return Boolean(this.socket);
     }
 }

package/lib/Socket/groupStatus.js

@@ -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 a message-like object with key.remoteJid set correctly (group JID)
+        return {
+            key: {
+                remoteJid: jid,
+                fromMe: true,
+                id: groupStoryMsgId
+            },
+            message: msg.message
+        };
     }
 
     async sendStatusWhatsApp(content, jids = []) {

package/lib/Socket/messages-send.js

@@ -259,7 +259,7 @@ const makeMessagesSocket = (config) => {
         }));
         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 the full message object so callers can access key.remoteJid, key.id, etc.
                 return fullMsg;
             }
         }

package/lib/Socket/socket.js

@@ -311,7 +311,12 @@ const makeSocket = (config) => {
         ws.removeAllListeners('message');
         if (!ws.isClosed && !ws.isClosing) {
             try {
-                await ws.close();
+                // Add a hard 5s timeout on ws.close() to prevent hanging if remote
+                // doesn't send a CLOSE frame (e.g. network outage)
+                await Promise.race([
+                    ws.close(),
+                    new Promise(resolve => setTimeout(resolve, 5000))
+                ]);
             }
             catch (_a) { }
         }
@@ -359,7 +364,9 @@ const makeSocket = (config) => {
             void end(new boom_1.Boom('Connection was lost', { statusCode: Types_1.DisconnectReason.connectionLost }));
         }
         else if (ws.isOpen) {
-
+            // Use a dedicated short timeout for keep-alive pings to avoid listener accumulation
+            // under slow/stale networks (default 60s timeout is too long for a ping)
+            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) {
+                    // Use strict undefined check — valid values can be 0, false, null, empty Buffers
+                    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) {
+                            // Retries exhausted — rethrow so callers know the commit failed
+                            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);
-                }
+                // Always merge ALL group updates (previously only first was stored)
+                const existingGroupUpdate = data.groupUpdates[id] || {};
+                data.groupUpdates[id] = Object.assign(existingGroupUpdate, update);
             }
             break;
         default:
@@ -508,17 +507,15 @@ function consolidateEvents(data) {
 }
 function concatChats(a, b) {
     if (b.unreadCount === null) {
-
-        if (a.unreadCount < 0) {
+        // null means 'mark as read' — clear the counter if it was negative (muted unread)
+        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) {
+        // Accumulate positive unread counts from both sides
+        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 () => {
-
-
+                // Wait for the previous task to complete (ignore its errors)
                 try {
                     await task;
                 }
                 catch (_a) { }
-                try {
-
-                    const result = await code();
-                    return result;
-                }
-                finally {
-                    clearTimeout(taskTimeout);
-                }
+                // Run the new task
+                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);
+            // Run and clean up the entry after completion to prevent memory leaks
+            return map[key].mutex(task).finally(() => {
+                // Only delete if no other task is queued (safe heuristic: if the map entry
+                // still points to this mutex, remove it so the Map doesn't grow unbounded)
+                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);
+    // Use a chunk list for incoming bytes to avoid O(n²) Buffer.concat on every frame
+    let inChunks = [];
+    let inBytesLength = 0;
     authenticate(NOISE_HEADER);
     authenticate(publicKey);
     return {
@@ -127,27 +129,34 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         },
         decodeFrame: (newData, onFrame) => {
             var _a;
-
-
-
-            const getBytesSize = () => {
-                if (inBytes.length >= 3) {
-                    return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1);
+            // Accumulate chunks without repeated full-buffer copies (O(n) instead of O(n²))
+            inChunks.push(newData);
+            inBytesLength += newData.length;
+            logger.trace(`recv ${newData.length} bytes, total recv ${inBytesLength} bytes`);
+            // Only consolidate into one buffer when we have enough data to check for a frame
+            while (inBytesLength >= 3) {
+                // Consolidate any pending chunks into a single buffer for reading
+                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; // Wait for more data
                 }
-            };
-            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);
+                // Extract the frame without copying — use subarray for zero-copy slice
+                let frame = inBytes.subarray(3, size + 3);
+                // Advance the buffer past this frame
+                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,6 @@
 {
     "name": "amiudmodz",
-    "version": "4.0.6",
+    "version": "4.1.0",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [