@alannxd/baileys 6.0.5 → 6.0.6

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

@@ -1,203 +1,101 @@
-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,
-    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
-    };
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+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
  */
-export function decodeMessageNode(stanza, meId, meLid) {
+function decodeMessageNode(stanza, meId, meLid) {
+    var _a, _b;
     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;
+    const isMe = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meId);
+    const isMeLid = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meLid);
+    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 {
-            // 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 ((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;
+        }
+        else {
             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.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)) {
+    else if ((0, WABinary_1.isJidNewsLetter)(from)) {
         msgType = 'newsletter';
-        chatId = from;
         author = from;
-        if (isMe(from) || isMeLid(from)) {
-            fromMe = true;
-        }
+        chatId = from;
     }
     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) ? !!((_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,
-        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 } : {})
+        participant
     };
     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 = +((_b = stanza.attrs) === null || _b === void 0 ? void 0 : _b.server_id);
+    }
     if (key.fromMe) {
-        fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
+        fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
     }
     return {
         fullMessage,
@@ -205,28 +103,44 @@ export function decodeMessageNode(stanza, meId, meLid) {
         sender: msgType === 'chat' ? author : chatId
     };
 }
-export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
+exports.decodeMessageNode = decodeMessageNode;
+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)) {
+            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 = 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);
-                    }
-                    if (tag !== 'enc' && tag !== 'plaintext') {
+                    if (tag !== 'enc') {
                         continue;
                     }
                     if (!(content instanceof Uint8Array)) {
@@ -234,13 +148,8 @@ 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;
+                        const e2eType = attrs.type;
                         switch (e2eType) {
                             case 'skmsg':
                                 msgBuffer = await repository.decryptGroupMessage({
@@ -251,32 +160,19 @@ 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
                                 });
                                 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');
-                            }
-                        }
+                        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);
                         }
@@ -285,33 +181,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 = [NO_MESSAGE_FOUND_ERROR_TEXT, JSON.stringify(stanza, generics_1.BufferJSON.replacer)];
             }
         }
     };
 };
-/**
- * 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;

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

@@ -1,5 +1,5 @@
-import type { BaileysEventEmitter, BaileysEventMap } from '../Types/index.js';
-import type { ILogger } from './logger.js';
+import { Logger } from 'pino';
+import { BaileysEventEmitter, BaileysEventMap } from '../Types';
 /**
  * A map that contains a list of all events that have been triggered
  *
@@ -10,27 +10,26 @@ import type { ILogger } from './logger.js';
 type BaileysEventData = Partial<BaileysEventMap>;
 type BaileysBufferableEventEmitter = BaileysEventEmitter & {
     /** Use to process events in a batch */
-    process(handler: (events: BaileysEventData) => void | Promise<void>): () => void;
+    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>;
+    createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): ((...args: A) => Promise<T>);
     /**
      * flushes all buffered events
+     * @param force if true, will flush all data regardless of any pending buffers
      * @returns returns true if the flush actually happened, otherwise false
      */
-    flush(): boolean;
+    flush(force?: boolean): boolean;
     /** is there an ongoing buffer */
     isBuffering(): boolean;
-    /** destroy the event buffer, clearing all resources */
-    destroy(): void;
 };
 /**
  * The event buffer logically consolidates different events into a single event
  * 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 {};
-//# sourceMappingURL=event-buffer.d.ts.map