@d0v3riz/baileys 6.7.21 → 6.7.22

package/lib/Utils/crypto.js

@@ -1,12 +1,61 @@
-import { createCipheriv, createDecipheriv, createHash, createHmac, randomBytes } from 'crypto';
-/* @ts-ignore */
-import * as libsignal from 'libsignal';
-import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
+exports.aesEncryptGCM = aesEncryptGCM;
+exports.aesDecryptGCM = aesDecryptGCM;
+exports.aesEncryptCTR = aesEncryptCTR;
+exports.aesDecryptCTR = aesDecryptCTR;
+exports.aesDecrypt = aesDecrypt;
+exports.aesDecryptWithIV = aesDecryptWithIV;
+exports.aesEncrypt = aesEncrypt;
+exports.aesEncrypWithIV = aesEncrypWithIV;
+exports.hmacSign = hmacSign;
+exports.sha256 = sha256;
+exports.md5 = md5;
+exports.hkdf = hkdf;
+exports.derivePairingCodeKey = derivePairingCodeKey;
+const crypto_1 = require("crypto");
+const libsignal = __importStar(require("libsignal"));
+const Defaults_1 = require("../Defaults");
 // insure browser & node compatibility
 const { subtle } = globalThis.crypto;
 /** prefix version byte to the pub keys, required for some curve crypto functions */
-export const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([KEY_BUNDLE_TYPE, pubKey]);
-export const Curve = {
+const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey]);
+exports.generateSignalPubKey = generateSignalPubKey;
+exports.Curve = {
     generateKeyPair: () => {
         const { pubKey, privKey } = libsignal.curve.generateKeyPair();
         return {
@@ -16,13 +65,13 @@ export const Curve = {
         };
     },
     sharedKey: (privateKey, publicKey) => {
-        const shared = libsignal.curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
+        const shared = libsignal.curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
         return Buffer.from(shared);
     },
     sign: (privateKey, buf) => libsignal.curve.calculateSignature(privateKey, buf),
     verify: (pubKey, message, signature) => {
         try {
-            libsignal.curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
+            libsignal.curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
             return true;
         }
         catch (error) {
@@ -30,19 +79,20 @@ export const Curve = {
         }
     }
 };
-export const signedKeyPair = (identityKeyPair, keyId) => {
-    const preKey = Curve.generateKeyPair();
-    const pubKey = generateSignalPubKey(preKey.public);
-    const signature = Curve.sign(identityKeyPair.private, pubKey);
+const signedKeyPair = (identityKeyPair, keyId) => {
+    const preKey = exports.Curve.generateKeyPair();
+    const pubKey = (0, exports.generateSignalPubKey)(preKey.public);
+    const signature = exports.Curve.sign(identityKeyPair.private, pubKey);
     return { keyPair: preKey, signature, keyId };
 };
+exports.signedKeyPair = signedKeyPair;
 const GCM_TAG_LENGTH = 128 >> 3;
 /**
  * encrypt AES 256 GCM;
  * where the tag tag is suffixed to the ciphertext
  * */
-export function aesEncryptGCM(plaintext, key, iv, additionalData) {
-    const cipher = createCipheriv('aes-256-gcm', key, iv);
+function aesEncryptGCM(plaintext, key, iv, additionalData) {
+    const cipher = (0, crypto_1.createCipheriv)('aes-256-gcm', key, iv);
     cipher.setAAD(additionalData);
     return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
@@ -50,8 +100,8 @@ export function aesEncryptGCM(plaintext, key, iv, additionalData) {
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
  * */
-export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
-    const decipher = createDecipheriv('aes-256-gcm', key, iv);
+function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+    const decipher = (0, crypto_1.createDecipheriv)('aes-256-gcm', key, iv);
     // decrypt additional adata
     const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH);
     const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH);
@@ -60,46 +110,46 @@ export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
-export function aesEncryptCTR(plaintext, key, iv) {
-    const cipher = createCipheriv('aes-256-ctr', key, iv);
+function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-export function aesDecryptCTR(ciphertext, key, iv) {
-    const decipher = createDecipheriv('aes-256-ctr', key, iv);
+function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
-export function aesDecrypt(buffer, key) {
+function aesDecrypt(buffer, key) {
     return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
 }
 /** decrypt AES 256 CBC */
-export function aesDecryptWithIV(buffer, key, IV) {
-    const aes = createDecipheriv('aes-256-cbc', key, IV);
+function aesDecryptWithIV(buffer, key, IV) {
+    const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
 // encrypt AES 256 CBC; where a random IV is prefixed to the buffer
-export function aesEncrypt(buffer, key) {
-    const IV = randomBytes(16);
-    const aes = createCipheriv('aes-256-cbc', key, IV);
+function aesEncrypt(buffer, key) {
+    const IV = (0, crypto_1.randomBytes)(16);
+    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
 // encrypt AES 256 CBC with a given IV
-export function aesEncrypWithIV(buffer, key, IV) {
-    const aes = createCipheriv('aes-256-cbc', key, IV);
+function aesEncrypWithIV(buffer, key, IV) {
+    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
 // sign HMAC using SHA 256
-export function hmacSign(buffer, key, variant = 'sha256') {
-    return createHmac(variant, key).update(buffer).digest();
+function hmacSign(buffer, key, variant = 'sha256') {
+    return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
 }
-export function sha256(buffer) {
-    return createHash('sha256').update(buffer).digest();
+function sha256(buffer) {
+    return (0, crypto_1.createHash)('sha256').update(buffer).digest();
 }
-export function md5(buffer) {
-    return createHash('md5').update(buffer).digest();
+function md5(buffer) {
+    return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
 // HKDF key expansion
-export async function hkdf(buffer, expandedLength, info) {
+async function hkdf(buffer, expandedLength, info) {
     // Ensure we have a Uint8Array for the key material
     const inputKeyMaterial = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
     // Set default values if not provided
@@ -117,7 +167,7 @@ export async function hkdf(buffer, expandedLength, info) {
     );
     return Buffer.from(derivedBits);
 }
-export async function derivePairingCodeKey(pairingCode, salt) {
+async function derivePairingCodeKey(pairingCode, salt) {
     // Convert inputs to formats Web Crypto API can work with
     const encoder = new TextEncoder();
     const pairingCodeBuffer = encoder.encode(pairingCode);
@@ -135,4 +185,3 @@ export async function derivePairingCodeKey(pairingCode, salt) {
     );
     return Buffer.from(derivedBits);
 }
-//# sourceMappingURL=crypto.js.map

package/lib/Utils/decode-wa-message.d.ts

@@ -1,6 +1,6 @@
-import type { SignalRepository, WAMessage } from '../Types/index.js';
-import { type BinaryNode } from '../WABinary/index.js';
-import type { ILogger } from './logger.js';
+import { SignalRepository, WAMessage } from '../Types';
+import { BinaryNode } from '../WABinary';
+import { ILogger } from './logger';
 export declare const NO_MESSAGE_FOUND_ERROR_TEXT = "Message absent from node";
 export declare const MISSING_KEYS_ERROR_TEXT = "Key used already or never filled";
 export declare const NACK_REASONS: {
@@ -29,8 +29,7 @@ export declare function decodeMessageNode(stanza: BinaryNode, meId: string, meLi
 };
 export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepository, logger: ILogger) => {
     fullMessage: WAMessage;
-    category: string | undefined;
+    category: string;
     author: string;
     decrypt(): Promise<void>;
 };
-//# sourceMappingURL=decode-wa-message.d.ts.map

package/lib/Utils/decode-wa-message.js

@@ -1,10 +1,14 @@
-import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto/index.js';
-import { areJidsSameUser, isJidBroadcast, isJidGroup, isJidMetaIa, isJidNewsletter, isJidStatusBroadcast, isJidUser, isLidUser } from '../WABinary/index.js';
-import { unpadRandomMax16 } from './generics.js';
-export const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
-export const MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled';
-export const NACK_REASONS = {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decryptMessageNode = exports.NACK_REASONS = exports.MISSING_KEYS_ERROR_TEXT = exports.NO_MESSAGE_FOUND_ERROR_TEXT = void 0;
+exports.decodeMessageNode = decodeMessageNode;
+const boom_1 = require("@hapi/boom");
+const WAProto_1 = require("../../WAProto");
+const WABinary_1 = require("../WABinary");
+const generics_1 = require("./generics");
+exports.NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
+exports.MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled';
+exports.NACK_REASONS = {
     ParsingError: 487,
     UnrecognizedStanza: 488,
     UnrecognizedStanzaClass: 489,
@@ -23,7 +27,8 @@ export const NACK_REASONS = {
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
-export function decodeMessageNode(stanza, meId, meLid) {
+function decodeMessageNode(stanza, meId, meLid) {
+    var _a, _b, _c, _d, _e;
     let msgType;
     let chatId;
     let author;
@@ -31,12 +36,12 @@ export function decodeMessageNode(stanza, meId, meLid) {
     const from = stanza.attrs.from;
     const participant = stanza.attrs.participant;
     const recipient = stanza.attrs.recipient;
-    const isMe = (jid) => areJidsSameUser(jid, meId);
-    const isMeLid = (jid) => areJidsSameUser(jid, meLid);
-    if (isJidUser(from) || isLidUser(from)) {
-        if (recipient && !isJidMetaIa(recipient)) {
+    const isMe = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meId);
+    const isMeLid = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meLid);
+    if ((0, WABinary_1.isJidUser)(from) || (0, WABinary_1.isLidUser)(from)) {
+        if (recipient && !(0, WABinary_1.isJidMetaIa)(recipient)) {
             if (!isMe(from) && !isMeLid(from)) {
-                throw new Boom('receipient present, but msg not from me', { data: stanza });
+                throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
             }
             chatId = recipient;
         }
@@ -46,20 +51,20 @@ export function decodeMessageNode(stanza, meId, meLid) {
         msgType = 'chat';
         author = from;
     }
-    else if (isJidGroup(from)) {
+    else if ((0, WABinary_1.isJidGroup)(from)) {
         if (!participant) {
-            throw new Boom('No participant in group message');
+            throw new boom_1.Boom('No participant in group message');
         }
         msgType = 'group';
         author = participant;
         chatId = from;
     }
-    else if (isJidBroadcast(from)) {
+    else if ((0, WABinary_1.isJidBroadcast)(from)) {
         if (!participant) {
-            throw new Boom('No participant in group message');
+            throw new boom_1.Boom('No participant in group message');
         }
         const isParticipantMe = isMe(participant);
-        if (isJidStatusBroadcast(from)) {
+        if ((0, WABinary_1.isJidStatusBroadcast)(from)) {
             msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
         }
         else {
@@ -68,35 +73,35 @@ export function decodeMessageNode(stanza, meId, meLid) {
         chatId = from;
         author = participant;
     }
-    else if (isJidNewsletter(from)) {
+    else if ((0, WABinary_1.isJidNewsletter)(from)) {
         msgType = 'newsletter';
         chatId = from;
         author = from;
     }
     else {
-        throw new Boom('Unknown message type', { data: stanza });
+        throw new boom_1.Boom('Unknown message type', { data: stanza });
     }
-    const fromMe = (isLidUser(from) ? isMeLid : isMe)((stanza.attrs.participant || stanza.attrs.from));
-    const pushname = stanza?.attrs?.notify;
+    const fromMe = ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
+    const pushname = (_a = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _a === void 0 ? void 0 : _a.notify;
     const key = {
         remoteJid: chatId,
         fromMe,
         id: msgId,
-        senderLid: stanza?.attrs?.sender_lid,
-        senderPn: stanza?.attrs?.sender_pn,
+        senderLid: (_b = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _b === void 0 ? void 0 : _b.sender_lid,
+        senderPn: (_c = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _c === void 0 ? void 0 : _c.sender_pn,
         participant,
-        participantPn: stanza?.attrs?.participant_pn,
-        participantLid: stanza?.attrs?.participant_lid,
+        participantPn: (_d = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _d === void 0 ? void 0 : _d.participant_pn,
+        participantLid: (_e = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _e === void 0 ? void 0 : _e.participant_lid,
         ...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
     };
     const fullMessage = {
         key,
         messageTimestamp: +stanza.attrs.t,
         pushName: pushname,
-        broadcast: isJidBroadcast(from)
+        broadcast: (0, WABinary_1.isJidBroadcast)(from)
     };
     if (key.fromMe) {
-        fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
+        fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
     }
     return {
         fullMessage,
@@ -104,19 +109,20 @@ export function decodeMessageNode(stanza, meId, meLid) {
         sender: msgType === 'chat' ? author : chatId
     };
 }
-export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
+const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
     const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
     return {
         fullMessage,
         category: stanza.attrs.category,
         author,
         async decrypt() {
+            var _a;
             let decryptables = 0;
             if (Array.isArray(stanza.content)) {
                 for (const { tag, attrs, content } of stanza.content) {
                     if (tag === 'verified_name' && content instanceof Uint8Array) {
-                        const cert = proto.VerifiedNameCertificate.decode(content);
-                        const details = proto.VerifiedNameCertificate.Details.decode(cert.details);
+                        const cert = WAProto_1.proto.VerifiedNameCertificate.decode(content);
+                        const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
                     if (tag === 'unavailable' && attrs.type === 'view_once') {
@@ -142,7 +148,7 @@ export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                 break;
                             case 'pkmsg':
                             case 'msg':
-                                const user = isJidUser(sender) ? sender : author;
+                                const user = (0, WABinary_1.isJidUser)(sender) ? sender : author;
                                 msgBuffer = await repository.decryptMessage({
                                     jid: user,
                                     type: e2eType,
@@ -155,8 +161,8 @@ export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                             default:
                                 throw new Error(`Unknown e2e type: ${e2eType}`);
                         }
-                        let msg = proto.Message.decode(e2eType !== 'plaintext' ? unpadRandomMax16(msgBuffer) : msgBuffer);
-                        msg = msg.deviceSentMessage?.message || msg;
+                        let msg = WAProto_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
+                        msg = ((_a = msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
                         if (msg.senderKeyDistributionMessage) {
                             //eslint-disable-next-line max-depth
                             try {
@@ -178,17 +184,17 @@ export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     }
                     catch (err) {
                         logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
-                        fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
+                        fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
                         fullMessage.messageStubParameters = [err.message];
                     }
                 }
             }
             // if nothing was found to decrypt
             if (!decryptables) {
-                fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
-                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT];
+                fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
             }
         }
     };
 };
-//# sourceMappingURL=decode-wa-message.js.map
+exports.decryptMessageNode = decryptMessageNode;

package/lib/Utils/event-buffer.d.ts

@@ -1,5 +1,5 @@
-import type { BaileysEventEmitter, BaileysEventMap } from '../Types/index.js';
-import type { ILogger } from './logger.js';
+import { BaileysEventEmitter, BaileysEventMap } from '../Types';
+import { ILogger } from './logger';
 /**
  * A map that contains a list of all events that have been triggered
  *
@@ -19,9 +19,10 @@ type BaileysBufferableEventEmitter = BaileysEventEmitter & {
     createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
     /**
      * flushes all buffered events
+     * @param force if true, will flush all data regardless of any pending buffers
      * @returns returns true if the flush actually happened, otherwise false
      */
-    flush(): boolean;
+    flush(force?: boolean): boolean;
     /** is there an ongoing buffer */
     isBuffering(): boolean;
 };
@@ -32,4 +33,3 @@ type BaileysBufferableEventEmitter = BaileysEventEmitter & {
  */
 export declare const makeEventBuffer: (logger: ILogger) => BaileysBufferableEventEmitter;
 export {};
-//# sourceMappingURL=event-buffer.d.ts.map

package/lib/Utils/event-buffer.js

@@ -1,9 +1,14 @@
-import EventEmitter from 'events';
-import { proto } from '../../WAProto/index.js';
-import { WAMessageStatus } from '../Types/index.js';
-import { trimUndefined } from './generics.js';
-import { updateMessageWithReaction, updateMessageWithReceipt } from './messages.js';
-import { isRealMessage, shouldIncrementChatUnread } from './process-message.js';
+"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");
 const BUFFERABLE_EVENT = [
     'messaging-history.set',
     'chats.upsert',
@@ -24,11 +29,11 @@ const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT);
  * making the data processing more efficient.
  * @param ev the baileys event emitter
  */
-export const makeEventBuffer = (logger) => {
-    const ev = new EventEmitter();
+const makeEventBuffer = (logger) => {
+    const ev = new events_1.default();
     const historyCache = new Set();
     let data = makeBufferData();
-    let isBuffering = false;
+    let buffersInProgress = 0;
     // take the generic event and fire it as a baileys event
     ev.on('event', (map) => {
         for (const event in map) {
@@ -36,19 +41,25 @@ export const makeEventBuffer = (logger) => {
         }
     });
     function buffer() {
-        if (!isBuffering) {
-            logger.info('Event buffer activated');
-            isBuffering = true;
-        }
+        buffersInProgress += 1;
     }
-    function flush() {
-        if (!isBuffering) {
+    function flush(force = false) {
+        // no buffer going on
+        if (!buffersInProgress) {
             return false;
         }
-        logger.info('Flushing event buffer');
-        isBuffering = 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;
+            }
+        }
         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) {
@@ -76,14 +87,14 @@ export const makeEventBuffer = (logger) => {
             };
         },
         emit(event, evData) {
-            if (isBuffering && BUFFERABLE_EVENT_SET.has(event)) {
+            if (buffersInProgress && BUFFERABLE_EVENT_SET.has(event)) {
                 append(data, historyCache, event, evData, logger);
                 return true;
             }
             return ev.emit('event', { [event]: evData });
         },
         isBuffering() {
-            return isBuffering;
+            return buffersInProgress > 0;
         },
         buffer,
         flush,
@@ -91,10 +102,11 @@ export const makeEventBuffer = (logger) => {
             return async (...args) => {
                 buffer();
                 try {
-                    return await work(...args);
+                    const result = await work(...args);
+                    return result;
                 }
                 finally {
-                    // Flushing is now controlled centrally by the state machine.
+                    flush();
                 }
             };
         },
@@ -103,6 +115,7 @@ export const makeEventBuffer = (logger) => {
         removeAllListeners: (...args) => ev.removeAllListeners(...args)
     };
 };
+exports.makeEventBuffer = makeEventBuffer;
 const makeBufferData = () => {
     return {
         historySets: {
@@ -128,6 +141,7 @@ const makeBufferData = () => {
 function append(data, historyCache, event, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 eventData, logger) {
+    var _a, _b, _c;
     switch (event) {
         case 'messaging-history.set':
             for (const chat of eventData.chats) {
@@ -144,7 +158,7 @@ eventData, logger) {
             for (const contact of eventData.contacts) {
                 const existingContact = data.historySets.contacts[contact.id];
                 if (existingContact) {
-                    Object.assign(existingContact, trimUndefined(contact));
+                    Object.assign(existingContact, (0, generics_1.trimUndefined)(contact));
                 }
                 else {
                     const historyContactId = `c:${contact.id}`;
@@ -173,7 +187,7 @@ eventData, logger) {
             for (const chat of eventData) {
                 let upsert = data.chatUpserts[chat.id];
                 if (!upsert) {
-                    upsert = data.historySets.chats[chat.id];
+                    upsert = data.historySets[chat.id];
                     if (upsert) {
                         logger.debug({ chatId: chat.id }, 'absorbed chat upsert in chat set');
                     }
@@ -247,14 +261,14 @@ eventData, logger) {
                     }
                 }
                 if (upsert) {
-                    upsert = Object.assign(upsert, trimUndefined(contact));
+                    upsert = Object.assign(upsert, (0, generics_1.trimUndefined)(contact));
                 }
                 else {
                     upsert = contact;
                     data.contactUpserts[contact.id] = upsert;
                 }
                 if (data.contactUpdates[contact.id]) {
-                    upsert = Object.assign(data.contactUpdates[contact.id], trimUndefined(contact));
+                    upsert = Object.assign(data.contactUpdates[contact.id], (0, generics_1.trimUndefined)(contact));
                     delete data.contactUpdates[contact.id];
                 }
             }
@@ -279,7 +293,7 @@ eventData, logger) {
             const { messages, type } = eventData;
             for (const message of messages) {
                 const key = stringifyMessageKey(message.key);
-                let existing = data.messageUpserts[key]?.message;
+                let existing = (_a = data.messageUpserts[key]) === null || _a === void 0 ? void 0 : _a.message;
                 if (!existing) {
                     existing = data.historySets.messages[key];
                     if (existing) {
@@ -300,7 +314,7 @@ eventData, logger) {
                 else {
                     data.messageUpserts[key] = {
                         message,
-                        type: type === 'notify' || data.messageUpserts[key]?.type === 'notify' ? 'notify' : type
+                        type: type === 'notify' || ((_b = data.messageUpserts[key]) === null || _b === void 0 ? void 0 : _b.type) === 'notify' ? 'notify' : type
                     };
                 }
             }
@@ -309,13 +323,13 @@ eventData, logger) {
             const msgUpdates = eventData;
             for (const { key, update } of msgUpdates) {
                 const keyStr = stringifyMessageKey(key);
-                const existing = data.historySets.messages[keyStr] || data.messageUpserts[keyStr]?.message;
+                const existing = data.historySets.messages[keyStr] || ((_c = data.messageUpserts[keyStr]) === null || _c === void 0 ? void 0 : _c.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 === WAMessageStatus.READ && !key.fromMe) {
+                    if (update.status === Types_1.WAMessageStatus.READ && !key.fromMe) {
                         decrementChatReadCounterIfMsgDidUnread(existing);
                     }
                 }
@@ -353,11 +367,11 @@ eventData, logger) {
                 const keyStr = stringifyMessageKey(key);
                 const existing = data.messageUpserts[keyStr];
                 if (existing) {
-                    updateMessageWithReaction(existing.message, reaction);
+                    (0, messages_1.updateMessageWithReaction)(existing.message, reaction);
                 }
                 else {
                     data.messageReactions[keyStr] = data.messageReactions[keyStr] || { key, reactions: [] };
-                    updateMessageWithReaction(data.messageReactions[keyStr], reaction);
+                    (0, messages_1.updateMessageWithReaction)(data.messageReactions[keyStr], reaction);
                 }
             }
             break;
@@ -367,11 +381,11 @@ eventData, logger) {
                 const keyStr = stringifyMessageKey(key);
                 const existing = data.messageUpserts[keyStr];
                 if (existing) {
-                    updateMessageWithReceipt(existing.message, receipt);
+                    (0, messages_1.updateMessageWithReceipt)(existing.message, receipt);
                 }
                 else {
                     data.messageReceipts[keyStr] = data.messageReceipts[keyStr] || { key, userReceipt: [] };
-                    updateMessageWithReceipt(data.messageReceipts[keyStr], receipt);
+                    (0, messages_1.updateMessageWithReceipt)(data.messageReceipts[keyStr], receipt);
                 }
             }
             break;
@@ -410,9 +424,9 @@ 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 (isRealMessage(message, '') &&
-            shouldIncrementChatUnread(message) &&
-            typeof chat?.unreadCount === 'number' &&
+        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) {
             logger.debug({ chatId: chat.id }, 'decrementing chat counter');
             chat.unreadCount -= 1;
@@ -500,4 +514,3 @@ function concatChats(a, b) {
     return Object.assign(a, b);
 }
 const stringifyMessageKey = (key) => `${key.remoteJid},${key.id},${key.fromMe ? '1' : '0'}`;
-//# sourceMappingURL=event-buffer.js.map