@japofc/baileys 2.1.0

package/lib/Utils/companion-reg-client-utils.d.ts

@@ -0,0 +1,4 @@
+export const CompanionWebClientType: any;
+export function getCompanionWebClientType([os, browserName]: [any, any]): any;
+export function getCompanionPlatformId(browser: any): any;
+export function buildPairingQRData(ref: any, noiseKeyB64: any, identityKeyB64: any, advB64: any, browser: any): string;

package/lib/Utils/companion-reg-client-utils.js

@@ -0,0 +1,39 @@
+export var CompanionWebClientType;
+(function (CompanionWebClientType) {
+    CompanionWebClientType[CompanionWebClientType["UNKNOWN"] = 0] = "UNKNOWN";
+    CompanionWebClientType[CompanionWebClientType["CHROME"] = 1] = "CHROME";
+    CompanionWebClientType[CompanionWebClientType["EDGE"] = 2] = "EDGE";
+    CompanionWebClientType[CompanionWebClientType["FIREFOX"] = 3] = "FIREFOX";
+    CompanionWebClientType[CompanionWebClientType["IE"] = 4] = "IE";
+    CompanionWebClientType[CompanionWebClientType["OPERA"] = 5] = "OPERA";
+    CompanionWebClientType[CompanionWebClientType["SAFARI"] = 6] = "SAFARI";
+    CompanionWebClientType[CompanionWebClientType["ELECTRON"] = 7] = "ELECTRON";
+    CompanionWebClientType[CompanionWebClientType["UWP"] = 8] = "UWP";
+    CompanionWebClientType[CompanionWebClientType["OTHER_WEB_CLIENT"] = 9] = "OTHER_WEB_CLIENT";
+})(CompanionWebClientType || (CompanionWebClientType = {}));
+const BROWSER_TO_COMPANION_WEB_CLIENT = {
+    Chrome: CompanionWebClientType.CHROME,
+    Edge: CompanionWebClientType.EDGE,
+    Firefox: CompanionWebClientType.FIREFOX,
+    IE: CompanionWebClientType.IE,
+    Opera: CompanionWebClientType.OPERA,
+    Safari: CompanionWebClientType.SAFARI
+};
+export const getCompanionWebClientType = ([os, browserName]) => {
+    if (browserName === 'Desktop') {
+        return os === 'Windows' ? CompanionWebClientType.UWP : CompanionWebClientType.ELECTRON;
+    }
+    return BROWSER_TO_COMPANION_WEB_CLIENT[browserName] || CompanionWebClientType.OTHER_WEB_CLIENT;
+};
+export const getCompanionPlatformId = (browser) => {
+    return getCompanionWebClientType(browser).toString();
+};
+export const buildPairingQRData = (ref, noiseKeyB64, identityKeyB64, advB64, browser) => {
+    return 'https://wa.me/settings/linked_devices#' + [
+        ref,
+        noiseKeyB64,
+        identityKeyB64,
+        advB64,
+        getCompanionPlatformId(browser)
+    ].join(',');
+};

package/lib/Utils/crypto.d.ts

@@ -0,0 +1,41 @@
+/**
+ * encrypt AES 256 GCM;
+ * where the tag tag is suffixed to the ciphertext
+ * */
+export function aesEncryptGCM(plaintext: any, key: any, iv: any, additionalData: any): any;
+/**
+ * decrypt AES 256 GCM;
+ * where the auth tag is suffixed to the ciphertext
+ * */
+export function aesDecryptGCM(ciphertext: any, key: any, iv: any, additionalData: any): any;
+export function aesEncryptCTR(plaintext: any, key: any, iv: any): any;
+export function aesDecryptCTR(ciphertext: any, key: any, iv: any): any;
+/** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
+export function aesDecrypt(buffer: any, key: any): any;
+/** decrypt AES 256 CBC */
+export function aesDecryptWithIV(buffer: any, key: any, IV: any): any;
+export function aesEncrypt(buffer: any, key: any): any;
+export function aesEncrypWithIV(buffer: any, key: any, IV: any): any;
+export function hmacSign(buffer: any, key: any, variant?: string): any;
+export function sha256(buffer: any): any;
+export function derivePairingCodeKey(pairingCode: any, salt: any): Promise<any>;
+export function generateSignalPubKey(pubKey: any): any;
+export namespace Curve {
+    function generateKeyPair(): {
+        private: any;
+        public: any;
+    };
+    function sharedKey(privateKey: any, publicKey: any): any;
+    function sign(privateKey: any, buf: any): any;
+    function verify(pubKey: any, message: any, signature: any): boolean;
+}
+export function signedKeyPair(identityKeyPair: any, keyId: any): {
+    keyPair: {
+        private: any;
+        public: any;
+    };
+    signature: any;
+    keyId: any;
+};
+export let md5: any;
+export let hkdf: any;

package/lib/Utils/crypto.js

@@ -0,0 +1,147 @@
+import { createCipheriv, createDecipheriv, createHash, createHmac, randomBytes } from 'crypto';
+import * as curve from 'libsignal/src/curve.js';
+import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
+
+// JAP@Fix (bug 36): whatsapp-rust-bridge is a native module — crashes on ARM musl/Alpine/Termux.
+// Wrap in try-catch and fall back to pure JS implementations.
+let md5, hkdf;
+try {
+    const rustBridge = await import('whatsapp-rust-bridge');
+    md5 = rustBridge.md5;
+    hkdf = rustBridge.hkdf;
+} catch {
+    // Pure JS fallback for md5
+    md5 = (buf) => createHash('md5').update(buf).digest();
+    // Pure JS fallback for hkdf (HKDF-SHA256)
+    hkdf = (key, length, { salt, info } = {}) => {
+        const hashLen = 32; // SHA-256
+        const prk = salt
+            ? createHmac('sha256', salt).update(key).digest()
+            : createHmac('sha256', Buffer.alloc(hashLen)).update(key).digest();
+        const infoBuffer = info ? (typeof info === 'string' ? Buffer.from(info) : Buffer.from(info)) : Buffer.alloc(0);
+        const blocks = Math.ceil(length / hashLen);
+        let prev = Buffer.alloc(0);
+        const output = [];
+        for (let i = 1; i <= blocks; i++) {
+            prev = createHmac('sha256', prk)
+                .update(Buffer.concat([prev, infoBuffer, Buffer.from([i])]))
+                .digest();
+            output.push(prev);
+        }
+        return Buffer.concat(output).subarray(0, length);
+    };
+}
+export { md5, hkdf };
+// 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 = {
+    generateKeyPair: () => {
+        const { pubKey, privKey } = curve.generateKeyPair();
+        return {
+            private: Buffer.from(privKey),
+            // remove version byte
+            public: Buffer.from(pubKey.slice(1))
+        };
+    },
+    sharedKey: (privateKey, publicKey) => {
+        const shared = curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
+        return Buffer.from(shared);
+    },
+    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
+    verify: (pubKey, message, signature) => {
+        try {
+            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+};
+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 };
+};
+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);
+    cipher.setAAD(additionalData);
+    return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
+}
+/**
+ * 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);
+    // decrypt additional adata
+    const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH);
+    const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH);
+    // set additional data
+    decipher.setAAD(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);
+    return Buffer.concat([cipher.update(plaintext), cipher.final()]);
+}
+export function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = 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) {
+    return aesDecryptWithIV(buffer.subarray(16), key, buffer.subarray(0, 16));
+}
+/** decrypt AES 256 CBC */
+export function aesDecryptWithIV(buffer, key, IV) {
+    const aes = 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);
+    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);
+    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();
+}
+export function sha256(buffer) {
+    return createHash('sha256').update(buffer).digest();
+}
+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 = new Uint8Array(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);
+}

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

@@ -0,0 +1,83 @@
+/**
+ * Decode the received node as a message.
+ * @note this will only parse the message, not decrypt it
+ */
+export function decodeMessageNode(stanza: any, meId: any, meLid: any): {
+    fullMessage: {
+        key: {
+            server_id?: any;
+            remoteJid: any;
+            remoteJidAlt: any;
+            remoteJidUsername: any;
+            fromMe: boolean;
+            id: any;
+            participant: any;
+            participantAlt: any;
+            participantUsername: any;
+            addressingMode: any;
+        };
+        category: any;
+        messageTimestamp: number;
+        pushName: any;
+        broadcast: any;
+    };
+    author: any;
+    sender: any;
+};
+export function getDecryptionJid(sender: any, repository: any): Promise<any>;
+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 ACCOUNT_RESTRICTED_TEXT: "Your account has been restricted";
+export namespace DECRYPTION_RETRY_CONFIG {
+    let maxRetries: number;
+    let baseDelayMs: number;
+    let sessionRecordErrors: string[];
+}
+export namespace NACK_REASONS {
+    let SenderReachoutTimelocked: number;
+    let ParsingError: number;
+    let UnrecognizedStanza: number;
+    let UnrecognizedStanzaClass: number;
+    let UnrecognizedStanzaType: number;
+    let InvalidProtobuf: number;
+    let InvalidHostedCompanionStanza: number;
+    let MissingMessageSecret: number;
+    let SignalErrorOldCounter: number;
+    let MessageDeletedOnPeer: number;
+    let UnhandledError: number;
+    let UnsupportedAdminRevoke: number;
+    let UnsupportedLIDGroup: number;
+    let DBOperationFailed: number;
+}
+export namespace SERVER_ERROR_CODES {
+    let MessageAccountRestriction: string;
+    let SmaxInvalid: string;
+}
+export function extractAddressingContext(stanza: any): {
+    addressingMode: any;
+    senderAlt: any;
+    recipientAlt: any;
+};
+export function decryptMessageNode(stanza: any, meId: any, meLid: any, repository: any, logger: any): {
+    fullMessage: {
+        key: {
+            server_id?: any;
+            remoteJid: any;
+            remoteJidAlt: any;
+            remoteJidUsername: any;
+            fromMe: boolean;
+            id: any;
+            participant: any;
+            participantAlt: any;
+            participantUsername: any;
+            addressingMode: any;
+        };
+        category: any;
+        messageTimestamp: number;
+        pushName: any;
+        broadcast: any;
+    };
+    category: any;
+    author: any;
+    decrypt(): Promise<void>;
+};

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

@@ -0,0 +1,316 @@
+import { Boom } from '@hapi/boom';
+import { proto } from '../../WAProto/index.js';
+import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidGroup, isJidMetaAI, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser } from '../WABinary/index.js';
+import { unpadRandomMax16 } from './generics.js';
+export const getDecryptionJid = async (sender, repository) => {
+    if (isLidUser(sender) || isHostedLidUser(sender)) {
+        return sender;
+    }
+    const mapped = await repository.lidMapping.getLIDForPN(sender);
+    return mapped || sender;
+};
+const storeMappingFromEnvelope = async (stanza, sender, repository, decryptionJid, logger) => {
+    // TODO: Handle hosted IDs
+    const { senderAlt } = extractAddressingContext(stanza);
+    if (senderAlt && isLidUser(senderAlt) && isPnUser(sender) && decryptionJid === sender) {
+        try {
+            await repository.lidMapping.storeLIDPNMappings([{ lid: senderAlt, pn: sender }]);
+            await repository.migrateSession(sender, senderAlt);
+            logger.debug({ sender, senderAlt }, 'Stored LID mapping from envelope');
+        }
+        catch (error) {
+            logger.warn({ sender, senderAlt, error }, 'Failed to store LID mapping');
+        }
+    }
+};
+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 ACCOUNT_RESTRICTED_TEXT = 'Your account has been restricted';
+// Retry configuration for failed decryption
+export const DECRYPTION_RETRY_CONFIG = {
+    maxRetries: 3,
+    baseDelayMs: 100,
+    sessionRecordErrors: ['No session record', 'SessionError: No session record']
+};
+/** NACK reason codes we send to the server (client → server) */
+export const NACK_REASONS = {
+    SenderReachoutTimelocked: 463,
+    ParsingError: 487,
+    UnrecognizedStanza: 488,
+    UnrecognizedStanzaClass: 489,
+    UnrecognizedStanzaType: 490,
+    InvalidProtobuf: 491,
+    InvalidHostedCompanionStanza: 493,
+    MissingMessageSecret: 495,
+    SignalErrorOldCounter: 496,
+    MessageDeletedOnPeer: 499,
+    UnhandledError: 500,
+    UnsupportedAdminRevoke: 550,
+    UnsupportedLIDGroup: 551,
+    DBOperationFailed: 552
+};
+/**
+ * Server-side error codes returned in ack stanzas (server → client) that we
+ * currently have dedicated handlers for. Extend as more handlers are added.
+ * Distinct from the client-side NackReason enum (WAWebCreateNackFromStanza).
+ */
+export const SERVER_ERROR_CODES = {
+    /**
+     * 1:1 message missing privacy token (tctoken). Usually means the account is
+     * restricted: WhatsApp blocks starting new chats but preserves existing ones,
+     * since established chats already carry a tctoken.
+     */
+    MessageAccountRestriction: '463',
+    /** Stanza validation failure (SMAX_INVALID) — likely stale device session */
+    SmaxInvalid: '479'
+};
+export const extractAddressingContext = (stanza) => {
+    let senderAlt;
+    let recipientAlt;
+    const sender = stanza.attrs.participant || stanza.attrs.from;
+    const addressingMode = stanza.attrs.addressing_mode || (sender?.endsWith('lid') ? 'lid' : 'pn');
+    if (addressingMode === 'lid') {
+        // Message is LID-addressed: sender is LID, extract corresponding PN
+        // without device data
+        senderAlt = stanza.attrs.participant_pn || stanza.attrs.sender_pn || stanza.attrs.peer_recipient_pn;
+        recipientAlt = stanza.attrs.recipient_pn;
+        // with device data
+        //if (sender && senderAlt) senderAlt = transferDevice(sender, senderAlt)
+    }
+    else {
+        // Message is PN-addressed: sender is PN, extract corresponding LID
+        // without device data
+        senderAlt = stanza.attrs.participant_lid || stanza.attrs.sender_lid || stanza.attrs.peer_recipient_lid;
+        recipientAlt = stanza.attrs.recipient_lid;
+        //with device data
+        //if (sender && senderAlt) senderAlt = transferDevice(sender, senderAlt)
+    }
+    return {
+        addressingMode,
+        senderAlt,
+        recipientAlt
+    };
+};
+/**
+ * Decode the received node as a message.
+ * @note this will only parse the message, not decrypt it
+ */
+export function decodeMessageNode(stanza, meId, meLid) {
+    let msgType;
+    let chatId;
+    let author;
+    let fromMe = false;
+    const msgId = stanza.attrs.id;
+    const from = stanza.attrs.from;
+    const participant = stanza.attrs.participant;
+    const recipient = stanza.attrs.recipient;
+    if (!msgId) {
+        throw new Boom('Invalid message stanza: missing id attribute', { data: stanza });
+    }
+    if (!from) {
+        throw new Boom('Invalid message stanza: missing from attribute', { data: stanza });
+    }
+    const addressingContext = extractAddressingContext(stanza);
+    const isMe = (jid) => areJidsSameUser(jid, meId);
+    const isMeLid = (jid) => areJidsSameUser(jid, meLid);
+    if (isPnUser(from) || isLidUser(from) || isHostedLidUser(from) || isHostedPnUser(from)) {
+        if (recipient && !isJidMetaAI(recipient)) {
+            if (!isMe(from) && !isMeLid(from)) {
+                throw new Boom('receipient present, but msg not from me', { data: stanza });
+            }
+            if (isMe(from) || isMeLid(from)) {
+                fromMe = true;
+            }
+            chatId = recipient;
+        }
+        else {
+            // Peer-routed self stanzas (history sync, app-state sync, etc.) arrive
+            // with `from` set to our own device but no `recipient` attribute —
+            // still mark as fromMe so self-only protocolMessage handlers run.
+            if (isMe(from) || isMeLid(from)) {
+                fromMe = true;
+            }
+            chatId = from;
+        }
+        msgType = 'chat';
+        author = from;
+    }
+    else if (isJidGroup(from)) {
+        if (!participant) {
+            throw new Boom('No participant in group message');
+        }
+        if (isMe(participant) || isMeLid(participant)) {
+            fromMe = true;
+        }
+        msgType = 'group';
+        author = participant;
+        chatId = from;
+    }
+    else if (isJidBroadcast(from)) {
+        if (!participant) {
+            throw new Boom('No participant in group message');
+        }
+        const isParticipantMe = isMe(participant);
+        if (isJidStatusBroadcast(from)) {
+            msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
+        }
+        else {
+            msgType = isParticipantMe ? 'peer_broadcast' : 'other_broadcast';
+        }
+        fromMe = isParticipantMe;
+        chatId = from;
+        author = participant;
+    }
+    else if (isJidNewsletter(from)) {
+        msgType = 'newsletter';
+        chatId = from;
+        author = from;
+        if (isMe(from) || isMeLid(from)) {
+            fromMe = true;
+        }
+    }
+    else {
+        throw new Boom('Unknown message type', { data: stanza });
+    }
+    const pushname = stanza?.attrs?.notify;
+    const key = {
+        remoteJid: chatId,
+        remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
+        remoteJidUsername: !isJidGroup(chatId)
+            ? stanza.attrs.peer_recipient_username || stanza.attrs.recipient_username
+            : undefined,
+        fromMe,
+        id: msgId,
+        participant,
+        participantAlt: isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
+        participantUsername: stanza.attrs.participant ? stanza.attrs.participant_username : undefined,
+        addressingMode: addressingContext.addressingMode,
+        ...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
+    };
+    const fullMessage = {
+        key,
+        category: stanza.attrs.category,
+        messageTimestamp: +stanza.attrs.t,
+        pushName: pushname,
+        broadcast: isJidBroadcast(from)
+    };
+    if (key.fromMe) {
+        fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
+    }
+    return {
+        fullMessage,
+        author,
+        sender: msgType === 'chat' ? author : chatId
+    };
+}
+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() {
+            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);
+                        fullMessage.verifiedBizName = details.verifiedName;
+                    }
+                    if (tag === 'unavailable' && attrs.type === 'view_once') {
+                        // JAP@Fix (bug 48): was injected into key (wrong place) — store as top-level flag on message instead
+                        fullMessage.isViewOnce = true;
+                        fullMessage.key.isViewOnce = true; // keep for backward compat with existing code that checks key.isViewOnce
+                    }
+                    if (attrs.count && tag === 'enc') {
+                        fullMessage.retryCount = Number(attrs.count);
+                    }
+                    if (tag !== 'enc' && tag !== 'plaintext') {
+                        continue;
+                    }
+                    if (!(content instanceof Uint8Array)) {
+                        continue;
+                    }
+                    decryptables += 1;
+                    let msgBuffer;
+                    const decryptionJid = await getDecryptionJid(author, repository);
+                    if (tag !== 'plaintext') {
+                        // TODO: Handle hosted devices
+                        await storeMappingFromEnvelope(stanza, author, repository, decryptionJid, logger);
+                    }
+                    try {
+                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
+                        switch (e2eType) {
+                            case 'skmsg':
+                                msgBuffer = await repository.decryptGroupMessage({
+                                    group: sender,
+                                    authorJid: author,
+                                    msg: content
+                                });
+                                break;
+                            case 'pkmsg':
+                            case 'msg':
+                                msgBuffer = await repository.decryptMessage({
+                                    jid: decryptionJid,
+                                    type: e2eType,
+                                    ciphertext: content
+                                });
+                                break;
+                            case 'plaintext':
+                                msgBuffer = content;
+                                break;
+                            default:
+                                throw new Error(`Unknown e2e type: ${e2eType}`);
+                        }
+                        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,
+                                    item: msg.senderKeyDistributionMessage
+                                });
+                            }
+                            catch (err) {
+                                logger.error({ key: fullMessage.key, err }, 'failed to process sender key distribution message');
+                            }
+                        }
+                        if (fullMessage.message) {
+                            Object.assign(fullMessage.message, msg);
+                        }
+                        else {
+                            fullMessage.message = msg;
+                        }
+                    }
+                    catch (err) {
+                        const errorContext = {
+                            key: fullMessage.key,
+                            err,
+                            messageType: tag === 'plaintext' ? 'plaintext' : attrs.type,
+                            sender,
+                            author,
+                            isSessionRecordError: isSessionRecordError(err)
+                        };
+                        logger.error(errorContext, 'failed to decrypt message');
+                        fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
+                        fullMessage.messageStubParameters = [err.message.toString()];
+                    }
+                }
+            }
+            // if nothing was found to decrypt
+            if (!decryptables && !fullMessage.key?.isViewOnce) {
+                fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
+                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT];
+            }
+        }
+    };
+};
+/**
+ * Utility function to check if an error is related to missing session record
+ */
+function isSessionRecordError(error) {
+    const errorMessage = error?.message || error?.toString() || '';
+    return DECRYPTION_RETRY_CONFIG.sessionRecordErrors.some(errorPattern => errorMessage.includes(errorPattern));
+}

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

@@ -0,0 +1,12 @@
+export function makeEventBuffer(logger: any, timeoutMs: any): {
+    process(handler: any): () => void;
+    emit(event: any, evData: any): any;
+    isBuffering(): boolean;
+    buffer: () => void;
+    flush: () => boolean;
+    createBufferedFunction(work: any): (...args: any[]) => Promise<any>;
+    on: (...args: any[]) => any;
+    off: (...args: any[]) => any;
+    removeAllListeners: (...args: any[]) => any;
+    destroy(): void;
+};