jagproject 26.3.23 → 26.3.26

package/lib/Utils/crypto.d.ts

@@ -0,0 +1,37 @@
+import type { KeyPair } from '../Types/index.js';
+export { md5, hkdf } from './bridge-runtime.js';
+/** prefix version byte to the pub keys, required for some curve crypto functions */
+export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array<ArrayBufferLike> | Buffer<ArrayBufferLike>;
+export declare const Curve: {
+    generateKeyPair: () => KeyPair;
+    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => Buffer<ArrayBuffer>;
+    sign: (privateKey: Uint8Array, buf: Uint8Array) => Uint8Array<ArrayBufferLike>;
+    verify: (pubKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
+};
+export declare const signedKeyPair: (identityKeyPair: KeyPair, keyId: number) => {
+    keyPair: KeyPair;
+    signature: Uint8Array<ArrayBufferLike>;
+    keyId: number;
+};
+/**
+ * encrypt AES 256 GCM;
+ * where the tag tag is suffixed to the ciphertext
+ * */
+export declare function aesEncryptGCM(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer<ArrayBuffer>;
+/**
+ * decrypt AES 256 GCM;
+ * where the auth tag is suffixed to the ciphertext
+ * */
+export declare function aesDecryptGCM(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesEncryptCTR(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesDecryptCTR(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer<ArrayBuffer>;
+/** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
+export declare function aesDecrypt(buffer: Uint8Array, key: Uint8Array): Buffer<ArrayBuffer>;
+/** decrypt AES 256 CBC */
+export declare function aesDecryptWithIV(buffer: Uint8Array, key: Uint8Array, IV: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesEncrypt(buffer: Uint8Array, key: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer<ArrayBuffer>;
+export declare function hmacSign(buffer: Buffer | Uint8Array, key: Buffer | Uint8Array, variant?: 'sha256' | 'sha512'): NonSharedBuffer;
+export declare function sha256(buffer: Buffer): NonSharedBuffer;
+export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<Buffer>;
+//# sourceMappingURL=crypto.d.ts.map

package/lib/Utils/crypto.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
+exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = exports.hkdf = exports.md5 = void 0;
 exports.aesEncryptGCM = aesEncryptGCM;
 exports.aesDecryptGCM = aesDecryptGCM;
 exports.aesEncryptCTR = aesEncryptCTR;
@@ -44,22 +44,21 @@ 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");
+const curve = __importStar(require("libsignal/src/curve.js"));
+const index_js_1 = require("../Defaults/index.js");
+var bridge_runtime_js_1 = require("./bridge-runtime.js");
+Object.defineProperty(exports, "md5", { enumerable: true, get: function () { return bridge_runtime_js_1.md5; } });
+Object.defineProperty(exports, "hkdf", { enumerable: true, get: function () { return bridge_runtime_js_1.hkdf; } });
 // insure browser & node compatibility
 const { subtle } = globalThis.crypto;
 /** 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]));
+const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([index_js_1.KEY_BUNDLE_TYPE, pubKey]);
 exports.generateSignalPubKey = generateSignalPubKey;
 exports.Curve = {
     generateKeyPair: () => {
-        const { pubKey, privKey } = libsignal.curve.generateKeyPair();
+        const { pubKey, privKey } = curve.generateKeyPair();
         return {
             private: Buffer.from(privKey),
             // remove version byte
@@ -67,13 +66,13 @@ exports.Curve = {
         };
     },
     sharedKey: (privateKey, publicKey) => {
-        const shared = libsignal.curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
+        const shared = curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
         return Buffer.from(shared);
     },
-    sign: (privateKey, buf) => (libsignal.curve.calculateSignature(privateKey, buf)),
+    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
     verify: (pubKey, message, signature) => {
         try {
-            libsignal.curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
+            curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
             return true;
         }
         catch (error) {
@@ -122,7 +121,7 @@ function aesDecryptCTR(ciphertext, key, iv) {
 }
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
 function aesDecrypt(buffer, key) {
-    return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
+    return aesDecryptWithIV(buffer.subarray(16), key, buffer.subarray(0, 16));
 }
 /** decrypt AES 256 CBC */
 function aesDecryptWithIV(buffer, key, IV) {
@@ -147,39 +146,15 @@ function hmacSign(buffer, key, variant = 'sha256') {
 function sha256(buffer) {
     return (0, crypto_1.createHash)('sha256').update(buffer).digest();
 }
-function md5(buffer) {
-    return (0, crypto_1.createHash)('md5').update(buffer).digest();
-}
-// HKDF key expansion
-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);
-}
 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);
+    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']);
+    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({

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

@@ -0,0 +1,48 @@
+import type { WAMessage } from '../Types/index.js';
+import type { SignalRepositoryWithLIDStore } from '../Types/Signal.js';
+import { type BinaryNode } from '../WABinary/index.js';
+import type { ILogger } from './logger.js';
+export declare const getDecryptionJid: (sender: string, repository: SignalRepositoryWithLIDStore) => Promise<string>;
+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 DECRYPTION_RETRY_CONFIG: {
+    maxRetries: number;
+    baseDelayMs: number;
+    sessionRecordErrors: string[];
+};
+export declare const NACK_REASONS: {
+    ParsingError: number;
+    UnrecognizedStanza: number;
+    UnrecognizedStanzaClass: number;
+    UnrecognizedStanzaType: number;
+    InvalidProtobuf: number;
+    InvalidHostedCompanionStanza: number;
+    MissingMessageSecret: number;
+    SignalErrorOldCounter: number;
+    MessageDeletedOnPeer: number;
+    UnhandledError: number;
+    UnsupportedAdminRevoke: number;
+    UnsupportedLIDGroup: number;
+    DBOperationFailed: number;
+};
+export declare const extractAddressingContext: (stanza: BinaryNode) => {
+    addressingMode: string;
+    senderAlt: string | undefined;
+    recipientAlt: string | undefined;
+};
+/**
+ * Decode the received node as a message.
+ * @note this will only parse the message, not decrypt it
+ */
+export declare function decodeMessageNode(stanza: BinaryNode, meId: string, meLid: string): {
+    fullMessage: WAMessage;
+    author: string;
+    sender: string;
+};
+export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepositoryWithLIDStore, logger: ILogger) => {
+    fullMessage: WAMessage;
+    category: string | undefined;
+    author: string;
+    decrypt(): Promise<void>;
+};
+//# sourceMappingURL=decode-wa-message.d.ts.map

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

@@ -1,13 +1,41 @@
 "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.decryptMessageNode = exports.extractAddressingContext = exports.NACK_REASONS = exports.DECRYPTION_RETRY_CONFIG = exports.MISSING_KEYS_ERROR_TEXT = exports.NO_MESSAGE_FOUND_ERROR_TEXT = exports.getDecryptionJid = 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");
+const index_js_1 = require("../../WAProto/index.js");
+const index_js_2 = require("../WABinary/index.js");
+const generics_js_1 = require("./generics.js");
+const getDecryptionJid = async (sender, repository) => {
+    if ((0, index_js_2.isLidUser)(sender) || (0, index_js_2.isHostedLidUser)(sender)) {
+        return sender;
+    }
+    const mapped = await repository.lidMapping.getLIDForPN(sender);
+    return mapped || sender;
+};
+exports.getDecryptionJid = getDecryptionJid;
+const storeMappingFromEnvelope = async (stanza, sender, repository, decryptionJid, logger) => {
+    // TODO: Handle hosted IDs
+    const { senderAlt } = (0, exports.extractAddressingContext)(stanza);
+    if (senderAlt && (0, index_js_2.isLidUser)(senderAlt) && (0, index_js_2.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');
+        }
+    }
+};
 exports.NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
 exports.MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled';
+// Retry configuration for failed decryption
+exports.DECRYPTION_RETRY_CONFIG = {
+    maxRetries: 3,
+    baseDelayMs: 100,
+    sessionRecordErrors: ['No session record', 'SessionError: No session record']
+};
 exports.NACK_REASONS = {
     ParsingError: 487,
     UnrecognizedStanza: 488,
@@ -23,29 +51,58 @@ exports.NACK_REASONS = {
     UnsupportedLIDGroup: 551,
     DBOperationFailed: 552
 };
+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
+    };
+};
+exports.extractAddressingContext = extractAddressingContext;
 /**
  * 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, _e, _f, _g;
     let msgType;
     let chatId;
     let author;
+    let fromMe = false;
     const msgId = stanza.attrs.id;
     const from = stanza.attrs.from;
-    const senderPn = (_a = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _a === void 0 ? void 0 : _a.sender_pn;
-    const senderLid = (_b = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _b === void 0 ? void 0 : _b.sender_lid;
     const participant = stanza.attrs.participant;
-    const participantLid = (_c = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _c === void 0 ? void 0 : _c.participant_lid;
     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.isJidMetaAi)(recipient)) {
+    const addressingContext = (0, exports.extractAddressingContext)(stanza);
+    const isMe = (jid) => (0, index_js_2.areJidsSameUser)(jid, meId);
+    const isMeLid = (jid) => (0, index_js_2.areJidsSameUser)(jid, meLid);
+    if ((0, index_js_2.isPnUser)(from) || (0, index_js_2.isLidUser)(from) || (0, index_js_2.isHostedLidUser)(from) || (0, index_js_2.isHostedPnUser)(from)) {
+        if (recipient && !(0, index_js_2.isJidMetaAI)(recipient)) {
             if (!isMe(from) && !isMeLid(from)) {
                 throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
             }
+            if (isMe(from) || isMeLid(from)) {
+                fromMe = true;
+            }
             chatId = recipient;
         }
         else {
@@ -54,59 +111,63 @@ function decodeMessageNode(stanza, meId, meLid) {
         msgType = 'chat';
         author = from;
     }
-    else if ((0, WABinary_1.isJidGroup)(from)) {
+    else if ((0, index_js_2.isJidGroup)(from)) {
         if (!participant) {
             throw new boom_1.Boom('No participant in group message');
         }
+        if (isMe(participant) || isMeLid(participant)) {
+            fromMe = true;
+        }
         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 ((0, index_js_2.isJidBroadcast)(from)) {
         if (!participant) {
             throw new boom_1.Boom('No participant in group message');
         }
         const isParticipantMe = isMe(participant);
-        if ((0, WABinary_1.isJidStatusBroadcast)(from)) {
+        if ((0, index_js_2.isJidStatusBroadcast)(from)) {
             msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
         }
         else {
             msgType = isParticipantMe ? 'peer_broadcast' : 'other_broadcast';
         }
+        fromMe = isParticipantMe;
         chatId = from;
         author = participant;
     }
+    else if ((0, index_js_2.isJidNewsletter)(from)) {
+        msgType = 'newsletter';
+        chatId = from;
+        author = from;
+        if (isMe(from) || isMeLid(from)) {
+            fromMe = true;
+        }
+    }
     else {
         throw new boom_1.Boom('Unknown message type', { data: stanza });
     }
-    const fromMe = (0, WABinary_1.isJidNewsletter)(from) ? !!((_d = stanza.attrs) === null || _d === void 0 ? void 0 : _d.is_sender) || false : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
-    const pushname = (_e = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _e === void 0 ? void 0 : _e.notify;
+    const pushname = stanza?.attrs?.notify;
     const key = {
         remoteJid: chatId,
+        remoteJidAlt: !(0, index_js_2.isJidGroup)(chatId) ? addressingContext.senderAlt : undefined,
         fromMe,
         id: msgId,
-        senderPn,
-        senderLid,
         participant,
-        participantLid,
-        'server_id': (_f = stanza.attrs) === null || _f === void 0 ? void 0 : _f.server_id
+        participantAlt: (0, index_js_2.isJidGroup)(chatId) ? addressingContext.senderAlt : 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: (0, WABinary_1.isJidBroadcast)(from)
+        broadcast: (0, index_js_2.isJidBroadcast)(from)
     };
-    if (msgType === 'newsletter') {
-        fullMessage.newsletterServerId = +((_g = stanza.attrs) === null || _g === void 0 ? void 0 : _g.server_id);
-    }
     if (key.fromMe) {
-        fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
+        fullMessage.status = index_js_1.proto.WebMessageInfo.Status.SERVER_ACK;
     }
     return {
         fullMessage,
@@ -121,17 +182,19 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
         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 = index_js_1.proto.VerifiedNameCertificate.decode(content);
+                        const details = index_js_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
                     if (tag === 'unavailable' && attrs.type === 'view_once') {
-                        fullMessage.key.isViewOnce = true;
+                        fullMessage.key.isViewOnce = true; // TODO: remove from here and add a STUB TYPE
+                    }
+                    if (attrs.count && tag === 'enc') {
+                        fullMessage.retryCount = Number(attrs.count);
                     }
                     if (tag !== 'enc' && tag !== 'plaintext') {
                         continue;
@@ -141,6 +204,11 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     }
                     decryptables += 1;
                     let msgBuffer;
+                    const decryptionJid = await (0, exports.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) {
@@ -153,9 +221,8 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                 break;
                             case 'pkmsg':
                             case 'msg':
-                                const user = (0, WABinary_1.isJidUser)(sender) ? sender : author;
                                 msgBuffer = await repository.decryptMessage({
-                                    jid: user,
+                                    jid: decryptionJid,
                                     type: e2eType,
                                     ciphertext: content
                                 });
@@ -163,15 +230,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 = index_js_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_js_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
+                        msg = msg.deviceSentMessage?.message || msg;
                         if (msg.senderKeyDistributionMessage) {
+                            //eslint-disable-next-line max-depth
                             try {
                                 await repository.processSenderKeyDistributionMessage({
                                     authorJid: author,
@@ -179,7 +244,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                 });
                             }
                             catch (err) {
-                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
+                                logger.error({ key: fullMessage.key, err }, 'failed to process sender key distribution message');
                             }
                         }
                         if (fullMessage.message) {
@@ -190,18 +255,33 @@ 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.messageStubParameters = [err.message];
+                        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 = index_js_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                        fullMessage.messageStubParameters = [err.message.toString()];
                     }
                 }
             }
             // if nothing was found to decrypt
-            if (!decryptables) {
-                fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+            if (!decryptables && !fullMessage.key?.isViewOnce) {
+                fullMessage.messageStubType = index_js_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
                 fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
             }
         }
     };
 };
 exports.decryptMessageNode = decryptMessageNode;
+/**
+ * Utility function to check if an error is related to missing session record
+ */
+function isSessionRecordError(error) {
+    const errorMessage = error?.message || error?.toString() || '';
+    return exports.DECRYPTION_RETRY_CONFIG.sessionRecordErrors.some(errorPattern => errorMessage.includes(errorPattern));
+}

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

@@ -0,0 +1,34 @@
+import type { BaileysEventEmitter, BaileysEventMap } from '../Types/index.js';
+import type { ILogger } from './logger.js';
+/**
+ * A map that contains a list of all events that have been triggered
+ *
+ * Note, this can contain different type of events
+ * this can make processing events extremely efficient -- since everything
+ * can be done in a single transaction
+ */
+type BaileysEventData = Partial<BaileysEventMap>;
+type BaileysBufferableEventEmitter = BaileysEventEmitter & {
+    /** Use to process events in a batch */
+    process(handler: (events: BaileysEventData) => void | Promise<void>): () => void;
+    /**
+     * starts buffering events, call flush() to release them
+     * */
+    buffer(): void;
+    /** buffers all events till the promise completes */
+    createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
+    /**
+     * flushes all buffered events
+     * @returns returns true if the flush actually happened, otherwise false
+     */
+    flush(): boolean;
+    /** is there an ongoing buffer */
+    isBuffering(): boolean;
+};
+/**
+ * The event buffer logically consolidates different events into a single event
+ * making the data processing more efficient.
+ */
+export declare const makeEventBuffer: (logger: ILogger) => BaileysBufferableEventEmitter;
+export {};
+//# sourceMappingURL=event-buffer.d.ts.map