@baileys-md/baileys 10.1.0 → 11.0.0

package/lib/Utils/crypto.js

@@ -1,42 +1,10 @@
-"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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.derivePairingCodeKey = exports.hkdf = exports.md5 = exports.sha256 = exports.hmacSign = exports.aesEncrypWithIV = exports.aesEncrypt = exports.aesDecryptWithIV = exports.aesDecrypt = exports.aesDecryptCTR = exports.aesEncryptCTR = exports.aesDecryptGCM = exports.aesEncryptGCM = exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
-const crypto_1 = require("crypto");
-const futoin_hkdf_1 = __importDefault(require("futoin-hkdf"));
-const libsignal = __importStar(require("libsignal"));
-const Defaults_1 = require("../Defaults");
+import { createCipheriv, createDecipheriv, createHash, createHmac, randomBytes, subtle } from 'crypto';
+/* @ts-ignore */
+import * as libsignal from 'libsignal';
+import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
 /** prefix version byte to the pub keys, required for some curve crypto functions */
-const generateSignalPubKey = (pubKey) => (pubKey.length === 33
-    ? pubKey
-    : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey]));
-exports.generateSignalPubKey = generateSignalPubKey;
-exports.Curve = {
+export const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([KEY_BUNDLE_TYPE, pubKey]);
+export const Curve = {
     generateKeyPair: () => {
         const { pubKey, privKey } = libsignal.curve.generateKeyPair();
         return {
@@ -46,13 +14,13 @@ exports.Curve = {
         };
     },
     sharedKey: (privateKey, publicKey) => {
-        const shared = libsignal.curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
+        const shared = libsignal.curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
         return Buffer.from(shared);
     },
-    sign: (privateKey, buf) => (libsignal.curve.calculateSignature(privateKey, buf)),
+    sign: (privateKey, buf) => libsignal.curve.calculateSignature(privateKey, buf),
     verify: (pubKey, message, signature) => {
         try {
-            libsignal.curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
+            libsignal.curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
             return true;
         }
         catch (error) {
@@ -60,30 +28,28 @@ exports.Curve = {
         }
     }
 };
-const signedKeyPair = (identityKeyPair, keyId) => {
-    const preKey = exports.Curve.generateKeyPair();
-    const pubKey = (0, exports.generateSignalPubKey)(preKey.public);
-    const signature = exports.Curve.sign(identityKeyPair.private, pubKey);
+export const signedKeyPair = (identityKeyPair, keyId) => {
+    const preKey = Curve.generateKeyPair();
+    const pubKey = generateSignalPubKey(preKey.public);
+    const signature = 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
  * */
-function aesEncryptGCM(plaintext, key, iv, additionalData) {
-    const cipher = (0, crypto_1.createCipheriv)('aes-256-gcm', key, iv);
+export function aesEncryptGCM(plaintext, key, iv, additionalData) {
+    const cipher = createCipheriv('aes-256-gcm', key, iv);
     cipher.setAAD(additionalData);
     return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
-exports.aesEncryptGCM = aesEncryptGCM;
 /**
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
  * */
-function aesDecryptGCM(ciphertext, key, iv, additionalData) {
-    const decipher = (0, crypto_1.createDecipheriv)('aes-256-gcm', key, iv);
+export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+    const decipher = 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);
@@ -92,60 +58,79 @@ function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
-exports.aesDecryptGCM = aesDecryptGCM;
-function aesEncryptCTR(plaintext, key, iv) {
-    const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
+export function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = createCipheriv('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-exports.aesEncryptCTR = aesEncryptCTR;
-function aesDecryptCTR(ciphertext, key, iv) {
-    const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
+export function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = createDecipheriv('aes-256-ctr', key, iv);
     return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
-exports.aesDecryptCTR = aesDecryptCTR;
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
-function aesDecrypt(buffer, key) {
+export function aesDecrypt(buffer, key) {
     return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
 }
-exports.aesDecrypt = aesDecrypt;
 /** decrypt AES 256 CBC */
-function aesDecryptWithIV(buffer, key, IV) {
-    const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
+export function aesDecryptWithIV(buffer, key, IV) {
+    const aes = createDecipheriv('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
-exports.aesDecryptWithIV = aesDecryptWithIV;
 // encrypt AES 256 CBC; where a random IV is prefixed to the buffer
-function aesEncrypt(buffer, key) {
-    const IV = (0, crypto_1.randomBytes)(16);
-    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
+export function aesEncrypt(buffer, key) {
+    const IV = randomBytes(16);
+    const aes = createCipheriv('aes-256-cbc', key, IV);
     return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-exports.aesEncrypt = aesEncrypt;
 // encrypt AES 256 CBC with a given IV
-function aesEncrypWithIV(buffer, key, IV) {
-    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
+export function aesEncrypWithIV(buffer, key, IV) {
+    const aes = createCipheriv('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-exports.aesEncrypWithIV = aesEncrypWithIV;
 // sign HMAC using SHA 256
-function hmacSign(buffer, key, variant = 'sha256') {
-    return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
+export function hmacSign(buffer, key, variant = 'sha256') {
+    return createHmac(variant, key).update(buffer).digest();
 }
-exports.hmacSign = hmacSign;
-function sha256(buffer) {
-    return (0, crypto_1.createHash)('sha256').update(buffer).digest();
+export function sha256(buffer) {
+    return createHash('sha256').update(buffer).digest();
 }
-exports.sha256 = sha256;
-function md5(buffer) {
-    return (0, crypto_1.createHash)('md5').update(buffer).digest();
+export function md5(buffer) {
+    return createHash('md5').update(buffer).digest();
 }
-exports.md5 = md5;
 // HKDF key expansion
-function hkdf(buffer, expandedLength, info) {
-    return (0, futoin_hkdf_1.default)(!Buffer.isBuffer(buffer) ? Buffer.from(buffer) : buffer, expandedLength, info);
+export 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
+    const salt = info.salt ? new Uint8Array(info.salt) : new Uint8Array(0);
+    const infoBytes = info.info ? new TextEncoder().encode(info.info) : new Uint8Array(0);
+    // Import the input key material
+    const importedKey = await subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, ['deriveBits']);
+    // Derive bits using HKDF
+    const derivedBits = await subtle.deriveBits({
+        name: 'HKDF',
+        hash: 'SHA-256',
+        salt: salt,
+        info: infoBytes
+    }, importedKey, expandedLength * 8 // Convert bytes to bits
+    );
+    return Buffer.from(derivedBits);
 }
-exports.hkdf = hkdf;
-function derivePairingCodeKey(pairingCode, salt) {
-    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
+export async function derivePairingCodeKey(pairingCode, salt) {
+    // Convert inputs to formats Web Crypto API can work with
+    const encoder = new TextEncoder();
+    const pairingCodeBuffer = encoder.encode(pairingCode);
+    const saltBuffer = salt instanceof Uint8Array ? salt : new Uint8Array(salt);
+    // Import the pairing code as key material
+    const keyMaterial = await subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, ['deriveBits']);
+    // Derive bits using PBKDF2 with the same parameters
+    // 2 << 16 = 131,072 iterations
+    const derivedBits = await subtle.deriveBits({
+        name: 'PBKDF2',
+        salt: saltBuffer,
+        iterations: 2 << 16,
+        hash: 'SHA-256'
+    }, keyMaterial, 32 * 8 // 32 bytes * 8 = 256 bits
+    );
+    return Buffer.from(derivedBits);
 }
-exports.derivePairingCodeKey = derivePairingCodeKey;
+//# sourceMappingURL=crypto.js.map

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

@@ -1,14 +1,10 @@
-"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 = {
+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 = {
     ParsingError: 487,
     UnrecognizedStanza: 488,
     UnrecognizedStanzaClass: 489,
@@ -27,8 +23,7 @@ exports.NACK_REASONS = {
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
-function decodeMessageNode(stanza, meId, meLid) {
-    var _a, _b, _c, _d;
+export function decodeMessageNode(stanza, meId, meLid) {
     let msgType;
     let chatId;
     let author;
@@ -36,12 +31,12 @@ function decodeMessageNode(stanza, meId, meLid) {
     const from = stanza.attrs.from;
     const participant = stanza.attrs.participant;
     const recipient = stanza.attrs.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)) {
+    const isMe = (jid) => areJidsSameUser(jid, meId);
+    const isMeLid = (jid) => areJidsSameUser(jid, meLid);
+    if (isJidUser(from) || isLidUser(from)) {
+        if (recipient && !isJidMetaIa(recipient)) {
             if (!isMe(from) && !isMeLid(from)) {
-                throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
+                throw new Boom('receipient present, but msg not from me', { data: stanza });
             }
             chatId = recipient;
         }
@@ -51,25 +46,20 @@ function decodeMessageNode(stanza, meId, meLid) {
         msgType = 'chat';
         author = from;
     }
-    else if ((0, WABinary_1.isJidGroup)(from)) {
+    else if (isJidGroup(from)) {
         if (!participant) {
-            throw new boom_1.Boom('No participant in group message');
+            throw new Boom('No participant in group message');
         }
         msgType = 'group';
         author = participant;
         chatId = from;
     }
-    else if ((0, WABinary_1.isJidNewsletter)(from)) {
-        msgType = 'newsletter';
-        author = from;
-        chatId = from;
-    }
-    else if ((0, WABinary_1.isJidBroadcast)(from)) {
+    else if (isJidBroadcast(from)) {
         if (!participant) {
-            throw new boom_1.Boom('No participant in group message');
+            throw new Boom('No participant in group message');
         }
         const isParticipantMe = isMe(participant);
-        if ((0, WABinary_1.isJidStatusBroadcast)(from)) {
+        if (isJidStatusBroadcast(from)) {
             msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
         }
         else {
@@ -78,29 +68,35 @@ function decodeMessageNode(stanza, meId, meLid) {
         chatId = from;
         author = participant;
     }
+    else if (isJidNewsletter(from)) {
+        msgType = 'newsletter';
+        chatId = from;
+        author = from;
+    }
     else {
-        throw new boom_1.Boom('Unknown message type', { data: stanza });
+        throw new Boom('Unknown message type', { data: stanza });
     }
-    const fromMe = (0, WABinary_1.isJidNewsletter)(from) ? !!((_a = stanza.attrs) === null || _a === void 0 ? void 0 : _a.is_sender) || false : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
-    const pushname = (_b = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _b === void 0 ? void 0 : _b.notify;
+    const fromMe = (isLidUser(from) ? isMeLid : isMe)((stanza.attrs.participant || stanza.attrs.from));
+    const pushname = stanza?.attrs?.notify;
     const key = {
         remoteJid: chatId,
         fromMe,
         id: msgId,
+        senderLid: stanza?.attrs?.sender_lid,
+        senderPn: stanza?.attrs?.sender_pn,
         participant,
-        server_id: (_c = stanza.attrs) === null || _c === void 0 ? void 0 : _c.server_id
+        participantPn: stanza?.attrs?.participant_pn,
+        participantLid: stanza?.attrs?.participant_lid,
+        ...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
     };
     const fullMessage = {
         key,
         messageTimestamp: +stanza.attrs.t,
         pushName: pushname,
-        broadcast: (0, WABinary_1.isJidBroadcast)(from)
+        broadcast: isJidBroadcast(from)
     };
-    if (msgType === 'newsletter') {
-        fullMessage.newsletterServerId = +((_d = stanza.attrs) === null || _d === void 0 ? void 0 : _d.server_id);
-    }
     if (key.fromMe) {
-        fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
+        fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
     }
     return {
         fullMessage,
@@ -108,22 +104,24 @@ function decodeMessageNode(stanza, meId, meLid) {
         sender: msgType === 'chat' ? author : chatId
     };
 }
-const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
+export 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 = WAProto_1.proto.VerifiedNameCertificate.decode(content);
-                        const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
+                        const cert = proto.VerifiedNameCertificate.decode(content);
+                        const details = proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
+                    if (tag === 'unavailable' && attrs.type === 'view_once') {
+                        fullMessage.key.isViewOnce = true;
+                    }
                     if (tag !== 'enc' && tag !== 'plaintext') {
                         continue;
                     }
@@ -144,7 +142,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                 break;
                             case 'pkmsg':
                             case 'msg':
-                                const user = (0, WABinary_1.isJidUser)(sender) ? sender : author;
+                                const user = isJidUser(sender) ? sender : author;
                                 msgBuffer = await repository.decryptMessage({
                                     jid: user,
                                     type: e2eType,
@@ -154,15 +152,13 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                             case 'plaintext':
                                 msgBuffer = content;
                                 break;
-                            case undefined:
-                                msgBuffer = content;
-                                break;
                             default:
                                 throw new Error(`Unknown e2e type: ${e2eType}`);
                         }
-                        let msg = WAProto_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
-                        msg = ((_a = msg === null || msg === void 0 ? void 0 : msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
+                        let msg = proto.Message.decode(e2eType !== 'plaintext' ? unpadRandomMax16(msgBuffer) : msgBuffer);
+                        msg = msg.deviceSentMessage?.message || msg;
                         if (msg.senderKeyDistributionMessage) {
+                            //eslint-disable-next-line max-depth
                             try {
                                 await repository.processSenderKeyDistributionMessage({
                                     authorJid: author,
@@ -182,17 +178,17 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     }
                     catch (err) {
                         logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
-                        fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                        fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
                         fullMessage.messageStubParameters = [err.message];
                     }
                 }
             }
             // if nothing was found to decrypt
             if (!decryptables) {
-                fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
-                fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
+                fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
+                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT];
             }
         }
     };
 };
-exports.decryptMessageNode = decryptMessageNode;
+//# sourceMappingURL=decode-wa-message.js.map

package/lib/Utils/event-buffer.js

@@ -1,14 +1,9 @@
-"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 { 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';
 const BUFFERABLE_EVENT = [
     'messaging-history.set',
     'chats.upsert',
@@ -21,7 +16,7 @@ const BUFFERABLE_EVENT = [
     'messages.delete',
     'messages.reaction',
     'message-receipt.update',
-    'groups.update',
+    'groups.update'
 ];
 const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT);
 /**
@@ -29,8 +24,8 @@ const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT);
  * making the data processing more efficient.
  * @param ev the baileys event emitter
  */
-const makeEventBuffer = (logger) => {
-    const ev = new events_1.default();
+export const makeEventBuffer = (logger) => {
+    const ev = new EventEmitter();
     const historyCache = new Set();
     let data = makeBufferData();
     let buffersInProgress = 0;
@@ -112,10 +107,9 @@ const makeEventBuffer = (logger) => {
         },
         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: {
@@ -138,8 +132,9 @@ 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) {
@@ -156,7 +151,7 @@ function append(data, historyCache, event, eventData, logger) {
             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}`;
@@ -185,7 +180,7 @@ function append(data, historyCache, event, eventData, logger) {
             for (const chat of eventData) {
                 let upsert = data.chatUpserts[chat.id];
                 if (!upsert) {
-                    upsert = data.historySets[chat.id];
+                    upsert = data.historySets.chats[chat.id];
                     if (upsert) {
                         logger.debug({ chatId: chat.id }, 'absorbed chat upsert in chat set');
                     }
@@ -259,14 +254,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];
                 }
             }
@@ -291,7 +286,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 +307,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 +316,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);
                     }
                 }
@@ -367,12 +360,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;
@@ -382,12 +374,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;
@@ -426,10 +417,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) {
@@ -502,12 +493,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 };
@@ -518,3 +507,4 @@ 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