alipclutch-baileys 8.5.3 → 8.5.5

package/lib/Utils/chat-utils.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSyncAction = exports.chatModificationToAppPatch = exports.decodePatches = exports.decodeSyncdSnapshot = exports.downloadExternalPatch = exports.downloadExternalBlob = exports.extractSyncdPatches = exports.decodeSyncdPatch = exports.decodeSyncdMutations = exports.encodeSyncdPatch = exports.newLTHashState = void 0;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
-const WABinary_1 = require("../WABinary");
 const LabelAssociation_1 = require("../Types/LabelAssociation");
+const WABinary_1 = require("../WABinary");
 const crypto_1 = require("./crypto");
 const generics_1 = require("./generics");
 const lt_hash_1 = require("./lt-hash");
 const messages_media_1 = require("./messages-media");
-const mutationKeys = async (keydata) => {
-    const expanded = await (0, crypto_1.hkdf)(keydata, 160, { info: 'WhatsApp Mutation Keys' });
+const mutationKeys = (keydata) => {
+    const expanded = (0, crypto_1.hkdf)(keydata, 160, { info: 'WhatsApp Mutation Keys' });
     return {
         indexKey: expanded.slice(0, 32),
         valueEncryptionKey: expanded.slice(32, 64),
@@ -69,9 +69,9 @@ const makeLtHashGenerator = ({ indexValueMap, hash }) => {
                 subBuffs.push(new Uint8Array(prevOp.valueMac).buffer);
             }
         },
-        finish: async () => {
+        finish: () => {
             const hashArrayBuffer = new Uint8Array(hash).buffer;
-            const result = await lt_hash_1.LT_HASH_ANTI_TAMPERING.subtractThenAdd(hashArrayBuffer, addBuffs, subBuffs);
+            const result = lt_hash_1.LT_HASH_ANTI_TAMPERING.subtractThenAdd(hashArrayBuffer, addBuffs, subBuffs);
             const buffer = Buffer.from(result);
             return {
                 hash: buffer,
@@ -114,14 +114,14 @@ const encodeSyncdPatch = async ({ type, index, syncAction, apiVersion, operation
         version: apiVersion
     });
     const encoded = WAProto_1.proto.SyncActionData.encode(dataProto).finish();
-    const keyValue = await mutationKeys(key.keyData);
+    const keyValue = mutationKeys(key.keyData);
     const encValue = (0, crypto_1.aesEncrypt)(encoded, keyValue.valueEncryptionKey);
     const valueMac = generateMac(operation, encValue, encKeyId, keyValue.valueMacKey);
     const indexMac = (0, crypto_1.hmacSign)(indexBuffer, keyValue.indexKey);
     // update LT hash
     const generator = makeLtHashGenerator(state);
     generator.mix({ indexMac, valueMac, operation });
-    Object.assign(state, await generator.finish());
+    Object.assign(state, generator.finish());
     state.version += 1;
     const snapshotMac = generateSnapshotMac(state.hash, state.version, type, keyValue.snapshotMacKey);
     const patch = {
@@ -184,7 +184,7 @@ const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncK
             operation: operation
         });
     }
-    return await ltGenerator.finish();
+    return ltGenerator.finish();
     async function getKey(keyId) {
         const base64Key = Buffer.from(keyId).toString('base64');
         const keyEnc = await getAppStateSyncKey(base64Key);
@@ -202,7 +202,7 @@ const decodeSyncdPatch = async (msg, name, initialState, getAppStateSyncKey, onM
         if (!mainKeyObj) {
             throw new boom_1.Boom(`failed to find key "${base64Key}" to decode patch`, { statusCode: 404, data: { msg } });
         }
-        const mainKey = await mutationKeys(mainKeyObj.keyData);
+        const mainKey = mutationKeys(mainKeyObj.keyData);
         const mutationmacs = msg.mutations.map(mutation => mutation.record.value.blob.slice(-32));
         const patchMac = generatePatchMac(msg.snapshotMac, mutationmacs, (0, generics_1.toNumber)(msg.version.version), name, mainKey.patchMacKey);
         if (Buffer.compare(patchMac, msg.patchMac) !== 0) {
@@ -286,7 +286,7 @@ const decodeSyncdSnapshot = async (name, snapshot, getAppStateSyncKey, minimumVe
         if (!keyEnc) {
             throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`);
         }
-        const result = await mutationKeys(keyEnc.keyData);
+        const result = mutationKeys(keyEnc.keyData);
         const computedSnapshotMac = generateSnapshotMac(newState.hash, newState.version, name, result.snapshotMacKey);
         if (Buffer.compare(snapshot.mac, computedSnapshotMac) !== 0) {
             throw new boom_1.Boom(`failed to verify LTHash at ${newState.version} of ${name} from snapshot`);
@@ -332,7 +332,7 @@ const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options,
             if (!keyEnc) {
                 throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`);
             }
-            const result = await mutationKeys(keyEnc.keyData);
+            const result = mutationKeys(keyEnc.keyData);
             const computedSnapshotMac = generateSnapshotMac(newState.hash, newState.version, name, result.snapshotMacKey);
             if (Buffer.compare(snapshotMac, computedSnapshotMac) !== 0) {
                 throw new boom_1.Boom(`failed to verify LTHash at ${newState.version} of ${name}`);
@@ -418,31 +418,25 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET
         };
     }
-    else if ('deleteForMe' in mod) {
-        const { timestamp, key, deleteMedia } = mod.deleteForMe;
-        patch = {
-            syncAction: {
-                deleteMessageForMeAction: {
-                    deleteMedia,
-                    messageTimestamp: timestamp
-                }
-            },
-            index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
-            type: 'regular_high',
-            apiVersion: 3,
-            operation: OP.SET
-        };
-    }
     else if ('clear' in mod) {
-        patch = {
-            syncAction: {
-                clearChatAction: {} // add message range later
-            },
-            index: ['clearChat', jid, '1' /*the option here is 0 when keep starred messages is enabled*/, '0'],
-            type: 'regular_high',
-            apiVersion: 6,
-            operation: OP.SET
-        };
+        if (mod.clear === 'all') {
+            throw new boom_1.Boom('not supported');
+        }
+        else {
+            const key = mod.clear.messages[0];
+            patch = {
+                syncAction: {
+                    deleteMessageForMeAction: {
+                        deleteMedia: false,
+                        messageTimestamp: key.timestamp
+                    }
+                },
+                index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
+                type: 'regular_high',
+                apiVersion: 3,
+                operation: OP.SET
+            };
+        }
     }
     else if ('pin' in mod) {
         patch = {
@@ -639,7 +633,12 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
         });
     }
     else if (action === null || action === void 0 ? void 0 : action.contactAction) {
-        ev.emit('contacts.upsert', [{ id, name: action.contactAction.fullName, lid: action.contactAction.lidJid || undefined, jid: (0, WABinary_1.isJidUser)(id) ? id : action.contactAction.pnJid }]);
+        ev.emit('contacts.upsert', [{ 
+            id: id,
+            name: action.contactAction.fullName,
+            lid: action.contactAction.lidJid || undefined,
+            jid: (0, WABinary_1.isJidUser)(id) ? id : undefined
+        }]);
     }
     else if (action === null || action === void 0 ? void 0 : action.pushNameSetting) {
         const name = (_b = action === null || action === void 0 ? void 0 : action.pushNameSetting) === null || _b === void 0 ? void 0 : _b.name;

package/lib/Utils/crypto.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="node" />
 import { KeyPair } from '../Types';
 /** 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 generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array | Buffer;
 export declare const Curve: {
     generateKeyPair: () => KeyPair;
-    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => Buffer<any>;
+    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => Buffer;
     sign: (privateKey: Uint8Array, buf: Uint8Array) => any;
     verify: (pubKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
 };
@@ -16,25 +17,25 @@ export declare const signedKeyPair: (identityKeyPair: KeyPair, 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>;
+export declare function aesEncryptGCM(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer;
 /**
  * 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>;
+export declare function aesDecryptGCM(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer;
+export declare function aesEncryptCTR(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer;
+export declare function aesDecryptCTR(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer;
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
-export declare function aesDecrypt(buffer: Buffer, key: Buffer): Buffer<ArrayBuffer>;
+export declare function aesDecrypt(buffer: Buffer, key: Buffer): Buffer;
 /** decrypt AES 256 CBC */
-export declare function aesDecryptWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer<ArrayBuffer>;
-export declare function aesEncrypt(buffer: Buffer | Uint8Array, key: Buffer): 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'): Buffer<ArrayBufferLike>;
-export declare function sha256(buffer: Buffer): Buffer<ArrayBufferLike>;
-export declare function md5(buffer: Buffer): Buffer<ArrayBufferLike>;
+export declare function aesDecryptWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer;
+export declare function aesEncrypt(buffer: Buffer | Uint8Array, key: Buffer): Buffer;
+export declare function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer;
+export declare function hmacSign(buffer: Buffer | Uint8Array, key: Buffer | Uint8Array, variant?: 'sha256' | 'sha512'): Buffer;
+export declare function sha256(buffer: Buffer): Buffer;
+export declare function md5(buffer: Buffer): Buffer;
 export declare function hkdf(buffer: Uint8Array | Buffer, expandedLength: number, info: {
     salt?: Buffer;
     info?: string;
-}): Promise<Buffer>;
-export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<Buffer>;
+}): Buffer;
+export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Buffer;

package/lib/Utils/crypto.js

@@ -15,43 +15,22 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-    };
-})();
+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.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;
+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");
-// 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
@@ -98,6 +77,7 @@ function aesEncryptGCM(plaintext, key, iv, additionalData) {
     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
@@ -112,82 +92,60 @@ 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);
     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);
     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) {
     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);
     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);
     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);
     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();
 }
+exports.hmacSign = hmacSign;
 function sha256(buffer) {
     return (0, crypto_1.createHash)('sha256').update(buffer).digest();
 }
+exports.sha256 = sha256;
 function md5(buffer) {
     return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
+exports.md5 = md5;
 // 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);
+function hkdf(buffer, expandedLength, info) {
+    return (0, futoin_hkdf_1.default)(!Buffer.isBuffer(buffer) ? Buffer.from(buffer) : buffer, expandedLength, info);
 }
-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.hkdf = hkdf;
+function derivePairingCodeKey(pairingCode, salt) {
+    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
 }
+exports.derivePairingCodeKey = derivePairingCodeKey;

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

@@ -1,34 +1,18 @@
-import { ILogger } from './logger';
-import { SignalRepository, WAMessage } from '../Types';
+import { Logger } from 'pino';
+import { proto } from '../../WAProto';
+import { SignalRepository } from '../Types';
 import { BinaryNode } from '../WABinary';
-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: {
-    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;
-};
 /**
  * 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;
+    fullMessage: proto.IWebMessageInfo;
     author: string;
     sender: string;
 };
-export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepository, logger: ILogger) => {
-    fullMessage: WAMessage;
+export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepository, logger: Logger) => {
+    fullMessage: proto.IWebMessageInfo;
     category: string;
     author: string;
     decrypt(): Promise<void>;

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

@@ -1,49 +1,42 @@
 "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;
+exports.decryptMessageNode = exports.decodeMessageNode = void 0;
 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,
-    UnrecognizedStanzaType: 490,
-    InvalidProtobuf: 491,
-    InvalidHostedCompanionStanza: 493,
-    MissingMessageSecret: 495,
-    SignalErrorOldCounter: 496,
-    MessageDeletedOnPeer: 499,
-    UnhandledError: 500,
-    UnsupportedAdminRevoke: 550,
-    UnsupportedLIDGroup: 551,
-    DBOperationFailed: 552
-};
+const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
 /**
  * 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;
+    var _a, _b;
     let msgType;
     let chatId;
     let author;
     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)) {
-            if (!isMe(from) && !isMeLid(from)) {
+    if ((0, WABinary_1.isJidUser)(from)) {
+        if (recipient) {
+            if (!isMe(from)) {
+                throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
+            }
+            chatId = recipient;
+        }
+        else {
+            chatId = from;
+        }
+        msgType = 'chat';
+        author = from;
+    }
+    else if ((0, WABinary_1.isLidUser)(from)) {
+        if (recipient) {
+            if (!isMeLid(from)) {
                 throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
             }
             chatId = recipient;
@@ -62,11 +55,6 @@ function decodeMessageNode(stanza, meId, meLid) {
         author = participant;
         chatId = from;
     }
-    else if ((0, WABinary_1.isJidNewsletter)(from)) {
-        msgType = 'newsletter';
-        author = from;
-        chatId = from;
-    }
     else if ((0, WABinary_1.isJidBroadcast)(from)) {
         if (!participant) {
             throw new boom_1.Boom('No participant in group message');
@@ -81,20 +69,21 @@ function decodeMessageNode(stanza, meId, meLid) {
         chatId = from;
         author = participant;
     }
+    else if ((0, WABinary_1.isJidNewsLetter)(from)) {
+        msgType = 'newsletter';
+        author = from;
+        chatId = from;
+    }
     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 fromMe = (0, WABinary_1.isJidNewsLetter)(from) ? !!((_a = stanza.attrs) === null || _a === void 0 ? void 0 : _a.is_sender) : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
+    const pushname = stanza.attrs.notify;
     const key = {
         remoteJid: chatId,
         fromMe,
         id: msgId,
-        senderPn,
-        senderLid,
-        participant,
-        participantLid,
-        'server_id': (_f = stanza.attrs) === null || _f === void 0 ? void 0 : _f.server_id
+        participant
     };
     const fullMessage = {
         key,
@@ -103,7 +92,7 @@ function decodeMessageNode(stanza, meId, meLid) {
         broadcast: (0, WABinary_1.isJidBroadcast)(from)
     };
     if (msgType === 'newsletter') {
-        fullMessage.newsletterServerId = +((_g = stanza.attrs) === null || _g === void 0 ? void 0 : _g.server_id);
+        fullMessage.newsletterServerId = +((_b = stanza.attrs) === null || _b === void 0 ? void 0 : _b.server_id);
     }
     if (key.fromMe) {
         fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
@@ -114,6 +103,7 @@ function decodeMessageNode(stanza, meId, meLid) {
         sender: msgType === 'chat' ? author : chatId
     };
 }
+exports.decodeMessageNode = decodeMessageNode;
 const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
     const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
     return {
@@ -123,17 +113,34 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
         async decrypt() {
             var _a;
             let decryptables = 0;
-            if (Array.isArray(stanza.content)) {
+            async function processSenderKeyDistribution(msg) {
+                if (msg.senderKeyDistributionMessage) {
+                    try {
+                        await repository.processSenderKeyDistributionMessage({
+                            authorJid: author,
+                            item: msg.senderKeyDistributionMessage
+                        });
+                    }
+                    catch (err) {
+                        logger.error({ key: fullMessage.key, err }, 'failed to process senderKeyDistribution');
+                    }
+                }
+            }
+            if ((0, WABinary_1.isJidNewsLetter)(fullMessage.key.remoteJid)) {
+                const node = (0, WABinary_1.getBinaryNodeChild)(stanza, 'plaintext');
+                const msg = WAProto_1.proto.Message.decode(node === null || node === void 0 ? void 0 : node.content);
+                await processSenderKeyDistribution(msg);
+                fullMessage.message = msg;
+                decryptables += 1;
+            }
+            else 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);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
-                    if (tag === 'unavailable' && attrs.type === 'view_once') {
-                        fullMessage.key.isViewOnce = true;
-                    }
-                    if (tag !== 'enc' && tag !== 'plaintext') {
+                    if (tag !== 'enc') {
                         continue;
                     }
                     if (!(content instanceof Uint8Array)) {
@@ -142,7 +149,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     decryptables += 1;
                     let msgBuffer;
                     try {
-                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
+                        const e2eType = attrs.type;
                         switch (e2eType) {
                             case 'skmsg':
                                 msgBuffer = await repository.decryptGroupMessage({
@@ -160,28 +167,12 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                     ciphertext: content
                                 });
                                 break;
-                            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;
-                        if (msg.senderKeyDistributionMessage) {
-                            try {
-                                await repository.processSenderKeyDistributionMessage({
-                                    authorJid: author,
-                                    item: msg.senderKeyDistributionMessage
-                                });
-                            }
-                            catch (err) {
-                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
-                            }
-                        }
+                        let msg = WAProto_1.proto.Message.decode((0, generics_1.unpadRandomMax16)(msgBuffer));
+                        msg = ((_a = msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
+                        await processSenderKeyDistribution(msg);
                         if (fullMessage.message) {
                             Object.assign(fullMessage.message, msg);
                         }
@@ -199,7 +190,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
             // 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.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT, JSON.stringify(stanza, generics_1.BufferJSON.replacer)];
             }
         }
     };

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

@@ -1,5 +1,5 @@
+import { Logger } from 'pino';
 import { BaileysEventEmitter, BaileysEventMap } from '../Types';
-import { ILogger } from './logger';
 /**
  * A map that contains a list of all events that have been triggered
  *
@@ -31,5 +31,5 @@ type BaileysBufferableEventEmitter = BaileysEventEmitter & {
  * making the data processing more efficient.
  * @param ev the baileys event emitter
  */
-export declare const makeEventBuffer: (logger: ILogger) => BaileysBufferableEventEmitter;
+export declare const makeEventBuffer: (logger: Logger) => BaileysBufferableEventEmitter;
 export {};