violetics 7.0.0-alpha → 7.0.2-alpha

package/lib/Utils/event-buffer.js

@@ -1,14 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeEventBuffer = void 0;
-const events_1 = __importDefault(require("events"));
-const Types_1 = require("../Types");
-const generics_1 = require("./generics");
-const messages_1 = require("./messages");
-const process_message_1 = require("./process-message");
+import EventEmitter from 'events';
+import { WAMessageStatus } from '../Types/index.js';
+import { trimUndefined } from './generics.js';
+import { updateMessageWithReaction, updateMessageWithReceipt } from './messages.js';
+import { isRealMessage, shouldIncrementChatUnread } from './process-message.js';
 const BUFFERABLE_EVENT = [
     'messaging-history.set',
     'chats.upsert',
@@ -21,20 +15,23 @@ const BUFFERABLE_EVENT = [
     'messages.delete',
     'messages.reaction',
     'message-receipt.update',
-    'groups.update',
+    'groups.update'
 ];
 const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT);
 /**
  * The event buffer logically consolidates different events into a single event
  * making the data processing more efficient.
- * @param ev the baileys event emitter
  */
-const makeEventBuffer = (logger) => {
-    const ev = new events_1.default();
-    ev.setMaxListeners(0);
+export const makeEventBuffer = (logger) => {
+    const ev = new EventEmitter();
     const historyCache = new Set();
     let data = makeBufferData();
-    let buffersInProgress = 0;
+    let isBuffering = false;
+    let bufferTimeout = null;
+    let flushPendingTimeout = null; // Add a specific timer for the debounced flush to prevent leak
+    let bufferCount = 0;
+    const MAX_HISTORY_CACHE_SIZE = 10000; // Limit the history cache size to prevent memory bloat
+    const BUFFER_TIMEOUT_MS = 30000; // 30 seconds
     // take the generic event and fire it as a baileys event
     ev.on('event', (map) => {
         for (const event in map) {
@@ -42,25 +39,46 @@ const makeEventBuffer = (logger) => {
         }
     });
     function buffer() {
-        buffersInProgress += 1;
+        if (!isBuffering) {
+            logger.debug('Event buffer activated');
+            isBuffering = true;
+            bufferCount = 0;
+            if (bufferTimeout) {
+                clearTimeout(bufferTimeout);
+            }
+            bufferTimeout = setTimeout(() => {
+                if (isBuffering) {
+                    logger.warn('Buffer timeout reached, auto-flushing');
+                    flush();
+                }
+            }, BUFFER_TIMEOUT_MS);
+        }
+        // Always increment count when requested
+        bufferCount++;
     }
-    function flush(force = false) {
-        // no buffer going on
-        if (!buffersInProgress) {
+    function flush() {
+        if (!isBuffering) {
             return false;
         }
-        if (!force) {
-            // reduce the number of buffers in progress
-            buffersInProgress -= 1;
-            // if there are still some buffers going on
-            // then we don't flush now
-            if (buffersInProgress) {
-                return false;
-            }
+        logger.debug({ bufferCount }, 'Flushing event buffer');
+        isBuffering = false;
+        bufferCount = 0;
+        // Clear timeout
+        if (bufferTimeout) {
+            clearTimeout(bufferTimeout);
+            bufferTimeout = null;
+        }
+        if (flushPendingTimeout) {
+            clearTimeout(flushPendingTimeout);
+            flushPendingTimeout = null;
+        }
+        // Clear history cache if it exceeds the max size
+        if (historyCache.size > MAX_HISTORY_CACHE_SIZE) {
+            logger.debug({ cacheSize: historyCache.size }, 'Clearing history cache');
+            historyCache.clear();
         }
         const newData = makeBufferData();
         const chatUpdates = Object.values(data.chatUpdates);
-        // gather the remaining conditional events so we re-queue them
         let conditionalChatUpdatesLeft = 0;
         for (const update of chatUpdates) {
             if (update.conditional) {
@@ -79,8 +97,8 @@ const makeEventBuffer = (logger) => {
     }
     return {
         process(handler) {
-            const listener = (map) => {
-                handler(map);
+            const listener = async (map) => {
+                await handler(map);
             };
             ev.on('event', listener);
             return () => {
@@ -88,14 +106,35 @@ const makeEventBuffer = (logger) => {
             };
         },
         emit(event, evData) {
-            if (buffersInProgress && BUFFERABLE_EVENT_SET.has(event)) {
+            // Check if this is a messages.upsert with a different type than what's buffered
+            // If so, flush the buffered messages first to avoid type overshadowing
+            if (event === 'messages.upsert') {
+                const { type } = evData;
+                const existingUpserts = Object.values(data.messageUpserts);
+                if (existingUpserts.length > 0) {
+                    const bufferedType = existingUpserts[0].type;
+                    if (bufferedType !== type) {
+                        logger.debug({ bufferedType, newType: type }, 'messages.upsert type mismatch, emitting buffered messages');
+                        // Emit the buffered messages with their correct type
+                        ev.emit('event', {
+                            'messages.upsert': {
+                                messages: existingUpserts.map(m => m.message),
+                                type: bufferedType
+                            }
+                        });
+                        // Clear the message upserts from the buffer
+                        data.messageUpserts = {};
+                    }
+                }
+            }
+            if (isBuffering && BUFFERABLE_EVENT_SET.has(event)) {
                 append(data, historyCache, event, evData, logger);
                 return true;
             }
             return ev.emit('event', { [event]: evData });
         },
         isBuffering() {
-            return buffersInProgress > 0;
+            return isBuffering;
         },
         buffer,
         flush,
@@ -104,19 +143,35 @@ const makeEventBuffer = (logger) => {
                 buffer();
                 try {
                     const result = await work(...args);
+                    // If this is the only buffer, flush after a small delay
+                    if (bufferCount === 1) {
+                        setTimeout(() => {
+                            if (isBuffering && bufferCount === 1) {
+                                flush();
+                            }
+                        }, 100); // Small delay to allow nested buffers
+                    }
                     return result;
                 }
+                catch (error) {
+                    throw error;
+                }
                 finally {
-                    flush();
+                    bufferCount = Math.max(0, bufferCount - 1);
+                    if (bufferCount === 0) {
+                        // Only schedule ONE timeout, not 10,000
+                        if (!flushPendingTimeout) {
+                            flushPendingTimeout = setTimeout(flush, 100);
+                        }
+                    }
                 }
             };
         },
         on: (...args) => ev.on(...args),
         off: (...args) => ev.off(...args),
-        removeAllListeners: (...args) => ev.removeAllListeners(...args),
+        removeAllListeners: (...args) => ev.removeAllListeners(...args)
     };
 };
-exports.makeEventBuffer = makeEventBuffer;
 const makeBufferData = () => {
     return {
         historySets: {
@@ -139,25 +194,27 @@ const makeBufferData = () => {
         groupUpdates: {}
     };
 };
-function append(data, historyCache, event, eventData, logger) {
-    var _a, _b, _c;
+function append(data, historyCache, event, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+eventData, logger) {
     switch (event) {
         case 'messaging-history.set':
             for (const chat of eventData.chats) {
-                const existingChat = data.historySets.chats[chat.id];
+                const id = chat.id || '';
+                const existingChat = data.historySets.chats[id];
                 if (existingChat) {
                     existingChat.endOfHistoryTransferType = chat.endOfHistoryTransferType;
                 }
-                if (!existingChat && !historyCache.has(chat.id)) {
-                    data.historySets.chats[chat.id] = chat;
-                    historyCache.add(chat.id);
+                if (!existingChat && !historyCache.has(id)) {
+                    data.historySets.chats[id] = chat;
+                    historyCache.add(id);
                     absorbingChatUpdate(chat);
                 }
             }
             for (const contact of eventData.contacts) {
                 const existingContact = data.historySets.contacts[contact.id];
                 if (existingContact) {
-                    Object.assign(existingContact, (0, generics_1.trimUndefined)(contact));
+                    Object.assign(existingContact, trimUndefined(contact));
                 }
                 else {
                     const historyContactId = `c:${contact.id}`;
@@ -177,15 +234,19 @@ function append(data, historyCache, event, eventData, logger) {
                 }
             }
             data.historySets.empty = false;
+            data.historySets.syncType = eventData.syncType;
+            data.historySets.progress = eventData.progress;
+            data.historySets.peerDataRequestSessionId = eventData.peerDataRequestSessionId;
             data.historySets.isLatest = eventData.isLatest || data.historySets.isLatest;
             break;
         case 'chats.upsert':
             for (const chat of eventData) {
-                let upsert = data.chatUpserts[chat.id];
-                if (!upsert) {
-                    upsert = data.historySets[chat.id];
+                const id = chat.id || '';
+                let upsert = data.chatUpserts[id];
+                if (id && !upsert) {
+                    upsert = data.historySets.chats[id];
                     if (upsert) {
-                        logger.debug({ chatId: chat.id }, 'absorbed chat upsert in chat set');
+                        logger.debug({ chatId: id }, 'absorbed chat upsert in chat set');
                     }
                 }
                 if (upsert) {
@@ -193,11 +254,11 @@ function append(data, historyCache, event, eventData, logger) {
                 }
                 else {
                     upsert = chat;
-                    data.chatUpserts[chat.id] = upsert;
+                    data.chatUpserts[id] = upsert;
                 }
                 absorbingChatUpdate(upsert);
-                if (data.chatDeletes.has(chat.id)) {
-                    data.chatDeletes.delete(chat.id);
+                if (data.chatDeletes.has(id)) {
+                    data.chatDeletes.delete(id);
                 }
             }
             break;
@@ -257,14 +318,14 @@ function append(data, historyCache, event, eventData, logger) {
                     }
                 }
                 if (upsert) {
-                    upsert = Object.assign(upsert, (0, generics_1.trimUndefined)(contact));
+                    upsert = Object.assign(upsert, trimUndefined(contact));
                 }
                 else {
                     upsert = contact;
                     data.contactUpserts[contact.id] = upsert;
                 }
                 if (data.contactUpdates[contact.id]) {
-                    upsert = Object.assign(data.contactUpdates[contact.id], (0, generics_1.trimUndefined)(contact));
+                    upsert = Object.assign(data.contactUpdates[contact.id], trimUndefined(contact));
                     delete data.contactUpdates[contact.id];
                 }
             }
@@ -289,7 +350,7 @@ function append(data, historyCache, event, eventData, logger) {
             const { messages, type } = eventData;
             for (const message of messages) {
                 const key = stringifyMessageKey(message.key);
-                let existing = (_a = data.messageUpserts[key]) === null || _a === void 0 ? void 0 : _a.message;
+                let existing = data.messageUpserts[key]?.message;
                 if (!existing) {
                     existing = data.historySets.messages[key];
                     if (existing) {
@@ -310,9 +371,7 @@ function append(data, historyCache, event, eventData, logger) {
                 else {
                     data.messageUpserts[key] = {
                         message,
-                        type: type === 'notify' || ((_b = data.messageUpserts[key]) === null || _b === void 0 ? void 0 : _b.type) === 'notify'
-                            ? 'notify'
-                            : type
+                        type: type === 'notify' || data.messageUpserts[key]?.type === 'notify' ? 'notify' : type
                     };
                 }
             }
@@ -321,13 +380,13 @@ function append(data, historyCache, event, eventData, logger) {
             const msgUpdates = eventData;
             for (const { key, update } of msgUpdates) {
                 const keyStr = stringifyMessageKey(key);
-                const existing = data.historySets.messages[keyStr] || ((_c = data.messageUpserts[keyStr]) === null || _c === void 0 ? void 0 : _c.message);
+                const existing = data.historySets.messages[keyStr] || data.messageUpserts[keyStr]?.message;
                 if (existing) {
                     Object.assign(existing, update);
                     // if the message was received & read by us
                     // the chat counter must have been incremented
                     // so we need to decrement it
-                    if (update.status === Types_1.WAMessageStatus.READ && !key.fromMe) {
+                    if (update.status === WAMessageStatus.READ && !key.fromMe) {
                         decrementChatReadCounterIfMsgDidUnread(existing);
                     }
                 }
@@ -365,12 +424,11 @@ function append(data, historyCache, event, eventData, logger) {
                 const keyStr = stringifyMessageKey(key);
                 const existing = data.messageUpserts[keyStr];
                 if (existing) {
-                    (0, messages_1.updateMessageWithReaction)(existing.message, reaction);
+                    updateMessageWithReaction(existing.message, reaction);
                 }
                 else {
-                    data.messageReactions[keyStr] = data.messageReactions[keyStr]
-                        || { key, reactions: [] };
-                    (0, messages_1.updateMessageWithReaction)(data.messageReactions[keyStr], reaction);
+                    data.messageReactions[keyStr] = data.messageReactions[keyStr] || { key, reactions: [] };
+                    updateMessageWithReaction(data.messageReactions[keyStr], reaction);
                 }
             }
             break;
@@ -380,12 +438,11 @@ function append(data, historyCache, event, eventData, logger) {
                 const keyStr = stringifyMessageKey(key);
                 const existing = data.messageUpserts[keyStr];
                 if (existing) {
-                    (0, messages_1.updateMessageWithReceipt)(existing.message, receipt);
+                    updateMessageWithReceipt(existing.message, receipt);
                 }
                 else {
-                    data.messageReceipts[keyStr] = data.messageReceipts[keyStr]
-                        || { key, userReceipt: [] };
-                    (0, messages_1.updateMessageWithReceipt)(data.messageReceipts[keyStr], receipt);
+                    data.messageReceipts[keyStr] = data.messageReceipts[keyStr] || { key, userReceipt: [] };
+                    updateMessageWithReceipt(data.messageReceipts[keyStr], receipt);
                 }
             }
             break;
@@ -403,7 +460,7 @@ function append(data, historyCache, event, eventData, logger) {
             throw new Error(`"${event}" cannot be buffered`);
     }
     function absorbingChatUpdate(existing) {
-        const chatId = existing.id;
+        const chatId = existing.id || '';
         const update = data.chatUpdates[chatId];
         if (update) {
             const conditionMatches = update.conditional ? update.conditional(data) : true;
@@ -424,10 +481,10 @@ function append(data, historyCache, event, eventData, logger) {
         // if the message has already been marked read by us
         const chatId = message.key.remoteJid;
         const chat = data.chatUpdates[chatId] || data.chatUpserts[chatId];
-        if ((0, process_message_1.isRealMessage)(message, '')
-            && (0, process_message_1.shouldIncrementChatUnread)(message)
-            && typeof (chat === null || chat === void 0 ? void 0 : chat.unreadCount) === 'number'
-            && chat.unreadCount > 0) {
+        if (isRealMessage(message) &&
+            shouldIncrementChatUnread(message) &&
+            typeof chat?.unreadCount === 'number' &&
+            chat.unreadCount > 0) {
             logger.debug({ chatId: chat.id }, 'decrementing chat counter');
             chat.unreadCount -= 1;
             if (chat.unreadCount === 0) {
@@ -443,7 +500,10 @@ function consolidateEvents(data) {
             chats: Object.values(data.historySets.chats),
             messages: Object.values(data.historySets.messages),
             contacts: Object.values(data.historySets.contacts),
-            isLatest: data.historySets.isLatest
+            syncType: data.historySets.syncType,
+            progress: data.historySets.progress,
+            isLatest: data.historySets.isLatest,
+            peerDataRequestSessionId: data.historySets.peerDataRequestSessionId
         };
     }
     const chatUpsertList = Object.values(data.chatUpserts);
@@ -497,12 +557,10 @@ function consolidateEvents(data) {
     return map;
 }
 function concatChats(a, b) {
-    if (b.unreadCount === null) {
-        // neutralize unread counter
-        if (a.unreadCount < 0) {
-            a.unreadCount = undefined;
-            b.unreadCount = undefined;
-        }
+    if (b.unreadCount === null && // neutralize unread counter
+        a.unreadCount < 0) {
+        a.unreadCount = undefined;
+        b.unreadCount = undefined;
     }
     if (typeof a.unreadCount === 'number' && typeof b.unreadCount === 'number') {
         b = { ...b };
@@ -512,4 +570,4 @@ function concatChats(a, b) {
     }
     return Object.assign(a, b);
 }
-const stringifyMessageKey = (key) => `${key.remoteJid},${key.id},${key.fromMe ? '1' : '0'}`;
+const stringifyMessageKey = (key) => `${key.remoteJid},${key.id},${key.fromMe ? '1' : '0'}`;