@ubedsockets/baileys 1.6.5 → 1.6.7

package/lib/Utils/crypto.js

@@ -1,28 +1,81 @@
-import { createCipheriv, createDecipheriv, createHash, createHmac, randomBytes } from 'crypto';
-import * as curve from 'libsignal/src/curve.js';
-import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
-export { md5, hkdf } from 'whatsapp-rust-bridge';
-// insure browser & node compatibility
-const { subtle } = globalThis.crypto;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
+exports.aesEncryptGCM = aesEncryptGCM;
+exports.aesDecryptGCM = aesDecryptGCM;
+exports.aesEncryptCTR = aesEncryptCTR;
+exports.aesDecryptCTR = aesDecryptCTR;
+exports.aesDecrypt = aesDecrypt;
+exports.aesDecryptWithIV = aesDecryptWithIV;
+exports.aesEncrypt = aesEncrypt;
+exports.aesEncrypWithIV = aesEncrypWithIV;
+exports.hmacSign = hmacSign;
+exports.sha256 = sha256;
+exports.md5 = md5;
+exports.hkdf = hkdf;
+exports.derivePairingCodeKey = derivePairingCodeKey;
+const crypto_1 = require("crypto");
+const libsignal = __importStar(require("libsignal"));
+const Defaults_1 = require("../Defaults");
+
+const webCrypto = globalThis.crypto ? globalThis.crypto : crypto_1.webcrypto;
+const subtle = webCrypto ? webCrypto.subtle : undefined;
+
 /** prefix version byte to the pub keys, required for some curve crypto functions */
-export const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([KEY_BUNDLE_TYPE, pubKey]);
-export const Curve = {
+const generateSignalPubKey = (pubKey) => (pubKey.length === 33
+    ? pubKey
+    : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey]));
+exports.generateSignalPubKey = generateSignalPubKey;
+exports.Curve = {
     generateKeyPair: () => {
-        const { pubKey, privKey } = curve.generateKeyPair();
+        const { pubKey, privKey } = libsignal.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);
+        const shared = libsignal.curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
         return Buffer.from(shared);
     },
-    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
+    sign: (privateKey, buf) => (libsignal.curve.calculateSignature(privateKey, buf)),
     verify: (pubKey, message, signature) => {
         try {
-            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
+            libsignal.curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
             return true;
         }
         catch (error) {
@@ -30,19 +83,20 @@ export const Curve = {
         }
     }
 };
-export const signedKeyPair = (identityKeyPair, keyId) => {
-    const preKey = Curve.generateKeyPair();
-    const pubKey = generateSignalPubKey(preKey.public);
-    const signature = Curve.sign(identityKeyPair.private, pubKey);
+const signedKeyPair = (identityKeyPair, keyId) => {
+    const preKey = exports.Curve.generateKeyPair();
+    const pubKey = (0, exports.generateSignalPubKey)(preKey.public);
+    const signature = exports.Curve.sign(identityKeyPair.private, pubKey);
     return { keyPair: preKey, signature, keyId };
 };
+exports.signedKeyPair = signedKeyPair;
 const GCM_TAG_LENGTH = 128 >> 3;
 /**
  * encrypt AES 256 GCM;
  * where the tag tag is suffixed to the ciphertext
  * */
-export function aesEncryptGCM(plaintext, key, iv, additionalData) {
-    const cipher = createCipheriv('aes-256-gcm', key, iv);
+function aesEncryptGCM(plaintext, key, iv, additionalData) {
+    const cipher = (0, crypto_1.createCipheriv)('aes-256-gcm', key, iv);
     cipher.setAAD(additionalData);
     return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
@@ -50,69 +104,86 @@ export function aesEncryptGCM(plaintext, key, iv, additionalData) {
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
  * */
-export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
-    const decipher = createDecipheriv('aes-256-gcm', key, iv);
-    // decrypt additional adata
+function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+    const decipher = (0, crypto_1.createDecipheriv)('aes-256-gcm', key, iv);
+   
     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);
+function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-export function aesDecryptCTR(ciphertext, key, iv) {
-    const decipher = createDecipheriv('aes-256-ctr', key, iv);
+function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
-export function aesDecrypt(buffer, key) {
-    return aesDecryptWithIV(buffer.subarray(16), key, buffer.subarray(0, 16));
+function aesDecrypt(buffer, key) {
+    return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
 }
 /** decrypt AES 256 CBC */
-export function aesDecryptWithIV(buffer, key, IV) {
-    const aes = createDecipheriv('aes-256-cbc', key, IV);
+function aesDecryptWithIV(buffer, key, IV) {
+    const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
-// encrypt AES 256 CBC; where a random IV is prefixed to the buffer
-export function aesEncrypt(buffer, key) {
-    const IV = randomBytes(16);
-    const aes = createCipheriv('aes-256-cbc', key, IV);
-    return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV 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()]); 
+}
+
+function aesEncrypWithIV(buffer, key, IV) {
+    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
+    return Buffer.concat([aes.update(buffer), aes.final()]); 
+}
+
+function hmacSign(buffer, key, variant = 'sha256') {
+    return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
 }
-// 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
+function sha256(buffer) {
+    return (0, crypto_1.createHash)('sha256').update(buffer).digest();
 }
-// sign HMAC using SHA 256
-export function hmacSign(buffer, key, variant = 'sha256') {
-    return createHmac(variant, key).update(buffer).digest();
+function md5(buffer) {
+    return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
-export function sha256(buffer) {
-    return createHash('sha256').update(buffer).digest();
+
+async function hkdf(buffer, expandedLength, info) {
+    if (!subtle) throw new Error("WebCrypto 'subtle' is not available. Please update your Node.js version.");
+    const inputKeyMaterial = buffer instanceof Uint8Array
+        ? buffer
+        : new Uint8Array(buffer);
+    const salt = info.salt ? new Uint8Array(info.salt) : new Uint8Array(0);
+    const infoBytes = info.info
+        ? new TextEncoder().encode(info.info)
+        : new Uint8Array(0);
+    const importedKey = await subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, ['deriveBits']);
+    const derivedBits = await subtle.deriveBits({
+        name: 'HKDF',
+        hash: 'SHA-256',
+        salt: salt,
+        info: infoBytes
+    }, importedKey, expandedLength * 8 
+    );
+    return Buffer.from(derivedBits);
 }
-export async function derivePairingCodeKey(pairingCode, salt) {
-    // Convert inputs to formats Web Crypto API can work with
+async function derivePairingCodeKey(pairingCode, salt) {
+    if (!subtle) throw new Error("WebCrypto 'subtle' is not available. Please update your Node.js version.");
     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 saltBuffer = salt instanceof Uint8Array ? salt : new Uint8Array(salt);
+    const keyMaterial = await subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, ['deriveBits']);
     const derivedBits = await subtle.deriveBits({
         name: 'PBKDF2',
         salt: saltBuffer,
         iterations: 2 << 16,
         hash: 'SHA-256'
-    }, keyMaterial, 32 * 8 // 32 bytes * 8 = 256 bits
+    }, keyMaterial, 32 * 8 
     );
     return Buffer.from(derivedBits);
 }
-//# sourceMappingURL=crypto.js.map

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

@@ -1,42 +1,14 @@
-import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto/index.js';
-import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidGroup, isJidMetaAI, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser
-//	transferDevice
- } 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,
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decryptMessageNode = exports.NACK_REASONS = exports.MISSING_KEYS_ERROR_TEXT = exports.NO_MESSAGE_FOUND_ERROR_TEXT = void 0;
+exports.decodeMessageNode = decodeMessageNode;
+const boom_1 = require("@hapi/boom");
+const WAProto_1 = require("../../WAProto");
+const WABinary_1 = require("../WABinary");
+const generics_1 = require("./generics");
+exports.NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
+exports.MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled';
+exports.NACK_REASONS = {
     ParsingError: 487,
     UnrecognizedStanza: 488,
     UnrecognizedStanzaClass: 489,
@@ -51,153 +23,90 @@ export const NACK_REASONS = {
     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) {
+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;
-    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)) {
+    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)) {
-                throw new Boom('receipient present, but msg not from me', { data: stanza });
-            }
-            if (isMe(from) || isMeLid(from)) {
-                fromMe = true;
+                throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
             }
             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)) {
+    else if ((0, WABinary_1.isJidGroup)(from)) {
         if (!participant) {
-            throw new Boom('No participant in group message');
-        }
-        if (isMe(participant) || isMeLid(participant)) {
-            fromMe = true;
+            throw new boom_1.Boom('No participant in group message');
         }
         msgType = 'group';
         author = participant;
         chatId = from;
     }
-    else if (isJidBroadcast(from)) {
+    else if ((0, WABinary_1.isJidNewsletter)(from)) {
+        msgType = 'newsletter';
+        author = from;
+        chatId = from;
+    }
+    else if ((0, WABinary_1.isJidBroadcast)(from)) {
         if (!participant) {
-            throw new Boom('No participant in group message');
+            throw new boom_1.Boom('No participant in group message');
         }
         const isParticipantMe = isMe(participant);
-        if (isJidStatusBroadcast(from)) {
+        if ((0, WABinary_1.isJidStatusBroadcast)(from)) {
             msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
         }
         else {
             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 });
+        throw new boom_1.Boom('Unknown message type', { data: stanza });
     }
-    const pushname = stanza?.attrs?.notify;
+    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 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,
+        senderPn,
+        senderLid,
         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 } : {})
+        participantLid,
+        'server_id': (_f = stanza.attrs) === null || _f === void 0 ? void 0 : _f.server_id
     };
     const fullMessage = {
         key,
-        category: stanza.attrs.category,
         messageTimestamp: +stanza.attrs.t,
         pushName: pushname,
-        broadcast: isJidBroadcast(from)
+        broadcast: (0, WABinary_1.isJidBroadcast)(from)
     };
+    if (msgType === 'newsletter') {
+        fullMessage.newsletterServerId = +((_g = stanza.attrs) === null || _g === void 0 ? void 0 : _g.server_id);
+    }
     if (key.fromMe) {
-        fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
+        fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
     }
     return {
         fullMessage,
@@ -205,26 +114,24 @@ export function decodeMessageNode(stanza, meId, meLid) {
         sender: msgType === 'chat' ? author : chatId
     };
 }
-export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
+const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
     const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
     return {
         fullMessage,
         category: stanza.attrs.category,
         author,
         async decrypt() {
+            var _a;
             let decryptables = 0;
             if (Array.isArray(stanza.content)) {
                 for (const { tag, attrs, content } of stanza.content) {
                     if (tag === 'verified_name' && content instanceof Uint8Array) {
-                        const cert = proto.VerifiedNameCertificate.decode(content);
-                        const details = proto.VerifiedNameCertificate.Details.decode(cert.details);
+                        const cert = WAProto_1.proto.VerifiedNameCertificate.decode(content);
+                        const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
                     if (tag === 'unavailable' && attrs.type === 'view_once') {
-                        fullMessage.key.isViewOnce = true; // TODO: remove from here and add a STUB TYPE
-                    }
-                    if (attrs.count && tag === 'enc') {
-                        fullMessage.retryCount = Number(attrs.count);
+                        fullMessage.key.isViewOnce = true;
                     }
                     if (tag !== 'enc' && tag !== 'plaintext') {
                         continue;
@@ -234,11 +141,6 @@ export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     }
                     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) {
@@ -251,8 +153,9 @@ export 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: decryptionJid,
+                                    jid: user,
                                     type: e2eType,
                                     ciphertext: content
                                 });
@@ -260,13 +163,15 @@ export 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 = proto.Message.decode(e2eType !== 'plaintext' ? unpadRandomMax16(msgBuffer) : msgBuffer);
-                        msg = msg.deviceSentMessage?.message || msg;
+                        let msg = WAProto_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
+                        msg = ((_a = msg === null || msg === void 0 ? void 0 : msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
                         if (msg.senderKeyDistributionMessage) {
-                            //eslint-disable-next-line max-depth
                             try {
                                 await repository.processSenderKeyDistributionMessage({
                                     authorJid: author,
@@ -274,7 +179,7 @@ export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                 });
                             }
                             catch (err) {
-                                logger.error({ key: fullMessage.key, err }, 'failed to process sender key distribution message');
+                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
                             }
                         }
                         if (fullMessage.message) {
@@ -285,33 +190,18 @@ export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                         }
                     }
                     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()];
+                        logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
+                        fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                        fullMessage.messageStubParameters = [err.message];
                     }
                 }
             }
             // if nothing was found to decrypt
-            if (!decryptables && !fullMessage.key?.isViewOnce) {
-                fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
-                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT];
+            if (!decryptables) {
+                fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                fullMessage.messageStubParameters = [exports.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));
-}
-//# sourceMappingURL=decode-wa-message.js.map
+exports.decryptMessageNode = decryptMessageNode;