jagproject 26.3.22 → 26.3.25

package/lib/Utils/event-buffer.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (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");
+const index_js_1 = require("../Types/index.js");
+const generics_js_1 = require("./generics.js");
+const messages_js_1 = require("./messages.js");
+const process_message_js_1 = require("./process-message.js");
 const BUFFERABLE_EVENT = [
     'messaging-history.set',
     'chats.upsert',
@@ -21,45 +21,70 @@ 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 wileys event emitter
  */
 const makeEventBuffer = (logger) => {
     const ev = new events_1.default();
     const historyCache = new Set();
     let data = makeBufferData();
-    let buffersInProgress = 0;
-    // take the generic event and fire it as a wileys event
+    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) {
             ev.emit(event, map[event]);
         }
     });
     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) {
@@ -78,8 +103,8 @@ const makeEventBuffer = (logger) => {
     }
     return {
         process(handler) {
-            const listener = (map) => {
-                handler(map);
+            const listener = async (map) => {
+                await handler(map);
             };
             ev.on('event', listener);
             return () => {
@@ -87,14 +112,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,
@@ -103,16 +149,33 @@ 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;
@@ -138,25 +201,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, (0, generics_js_1.trimUndefined)(contact));
                 }
                 else {
                     const historyContactId = `c:${contact.id}`;
@@ -183,11 +248,12 @@ function append(data, historyCache, event, eventData, logger) {
             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) {
@@ -195,11 +261,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;
@@ -259,14 +325,14 @@ function append(data, historyCache, event, eventData, logger) {
                     }
                 }
                 if (upsert) {
-                    upsert = Object.assign(upsert, (0, generics_1.trimUndefined)(contact));
+                    upsert = Object.assign(upsert, (0, generics_js_1.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], (0, generics_js_1.trimUndefined)(contact));
                     delete data.contactUpdates[contact.id];
                 }
             }
@@ -291,7 +357,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) {
@@ -312,9 +378,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
                     };
                 }
             }
@@ -323,13 +387,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 === index_js_1.WAMessageStatus.READ && !key.fromMe) {
                         decrementChatReadCounterIfMsgDidUnread(existing);
                     }
                 }
@@ -367,12 +431,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);
+                    (0, messages_js_1.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: [] };
+                    (0, messages_js_1.updateMessageWithReaction)(data.messageReactions[keyStr], reaction);
                 }
             }
             break;
@@ -382,12 +445,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);
+                    (0, messages_js_1.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: [] };
+                    (0, messages_js_1.updateMessageWithReceipt)(data.messageReceipts[keyStr], receipt);
                 }
             }
             break;
@@ -405,7 +467,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;
@@ -426,10 +488,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 ((0, process_message_js_1.isRealMessage)(message) &&
+            (0, process_message_js_1.shouldIncrementChatUnread)(message) &&
+            typeof chat?.unreadCount === 'number' &&
+            chat.unreadCount > 0) {
             logger.debug({ chatId: chat.id }, 'decrementing chat counter');
             chat.unreadCount -= 1;
             if (chat.unreadCount === 0) {

package/lib/Utils/generics.d.ts

@@ -0,0 +1,91 @@
+import { proto } from '../../WAProto/index.js';
+import type { BaileysEventEmitter, BaileysEventMap, ConnectionState, WACallUpdateType, WAMessageKey, WAVersion } from '../Types/index.js';
+import { type BinaryNode } from '../WABinary/index.js';
+export declare const BufferJSON: {
+    replacer: (k: any, value: any) => any;
+    reviver: (_: any, value: any) => any;
+};
+export declare const getKeyAuthor: (key: WAMessageKey | undefined | null, meId?: string) => string;
+export declare const isStringNullOrEmpty: (value: string | null | undefined) => value is null | undefined | "";
+export declare const writeRandomPadMax16: (msg: Uint8Array) => Buffer<ArrayBuffer>;
+export declare const unpadRandomMax16: (e: Uint8Array | Buffer) => Uint8Array<ArrayBuffer>;
+export declare const generateParticipantHashV2: (participants: string[]) => string;
+export declare const encodeWAMessage: (message: proto.IMessage) => Buffer<ArrayBuffer>;
+export declare const generateRegistrationId: () => number;
+export declare const encodeBigEndian: (e: number, t?: number) => Uint8Array<ArrayBuffer>;
+export declare const toNumber: (t: Long | number | null | undefined) => number;
+/** unix timestamp of a date in seconds */
+export declare const unixTimestampSeconds: (date?: Date) => number;
+export type DebouncedTimeout = ReturnType<typeof debouncedTimeout>;
+export declare const debouncedTimeout: (intervalMs?: number, task?: () => void) => {
+    start: (newIntervalMs?: number, newTask?: () => void) => void;
+    cancel: () => void;
+    setTask: (newTask: () => void) => () => void;
+    setInterval: (newInterval: number) => number;
+};
+export declare const delay: (ms: number) => Promise<void>;
+export declare const delayCancellable: (ms: number) => {
+    delay: Promise<void>;
+    cancel: () => void;
+};
+export declare function promiseTimeout<T>(ms: number | undefined, promise: (resolve: (v: T) => void, reject: (error: any) => void) => void): Promise<T>;
+export declare const generateMessageIDV2: (userId?: string) => string;
+export declare const generateMessageID: () => string;
+export declare function bindWaitForEvent<T extends keyof BaileysEventMap>(ev: BaileysEventEmitter, event: T): (check: (u: BaileysEventMap[T]) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
+export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
+/**
+ * utility that fetches latest baileys version from the master branch.
+ * Use to ensure your WA connection is always on the latest version
+ */
+export declare const fetchLatestBaileysVersion: (options?: RequestInit) => Promise<{
+    version: WAVersion;
+    isLatest: boolean;
+    error?: undefined;
+} | {
+    version: WAVersion;
+    isLatest: boolean;
+    error: unknown;
+}>;
+/**
+ * A utility that fetches the latest web version of whatsapp.
+ * Use to ensure your WA connection is always on the latest version
+ */
+export declare const fetchLatestWaWebVersion: (options?: RequestInit) => Promise<{
+    version: WAVersion;
+    isLatest: boolean;
+    error?: undefined;
+} | {
+    version: WAVersion;
+    isLatest: boolean;
+    error: unknown;
+}>;
+/** unique message tag prefix for MD clients */
+export declare const generateMdTagPrefix: () => string;
+/**
+ * Given a type of receipt, returns what the new status of the message should be
+ * @param type type from receipt
+ */
+export declare const getStatusFromReceiptType: (type: string | undefined) => proto.WebMessageInfo.Status | undefined;
+/**
+ * Stream errors generally provide a reason, map that to a baileys DisconnectReason
+ * @param reason the string reason given, eg. "conflict"
+ */
+export declare const getErrorCodeFromStreamError: (node: BinaryNode) => {
+    reason: string;
+    statusCode: number;
+};
+export declare const getCallStatusFromNode: ({ tag, attrs }: BinaryNode) => WACallUpdateType;
+export declare const getCodeFromWSError: (error: Error) => number;
+/**
+ * Is the given platform WA business
+ * @param platform AuthenticationCreds.platform
+ */
+export declare const isWABusinessPlatform: (platform: string) => platform is "smba" | "smbi";
+export declare function trimUndefined(obj: {
+    [_: string]: any;
+}): {
+    [_: string]: any;
+};
+export declare function bytesToCrockford(buffer: Buffer): string;
+export declare function encodeNewsletterMessage(message: proto.IMessage): Uint8Array;
+//# sourceMappingURL=generics.d.ts.map