@neelegirl/baileys 1.5.6 → 1.5.8

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

@@ -1,39 +1,18 @@
-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';
-// Retry configuration for failed decryption
-export const DECRYPTION_RETRY_CONFIG = {
-    maxRetries: 3,
-    baseDelayMs: 100,
-    sessionRecordErrors: ['No session record', 'SessionError: No session record']
-};
-export const NACK_REASONS = {
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const boom_1 = require("@hapi/boom")
+const WAProto_1 = require("../../WAProto")
+const WABinary_1 = require("../WABinary")
+const generics_1 = require("./generics")
+const messages_1 = require("./messages") 
+
+const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node'
+
+const MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled'
+
+const NACK_REASONS = {
     ParsingError: 487,
     UnrecognizedStanza: 488,
     UnrecognizedStanzaClass: 489,
@@ -47,233 +26,228 @@ export const NACK_REASONS = {
     UnsupportedAdminRevoke: 550,
     UnsupportedLIDGroup: 551,
     DBOperationFailed: 552
-};
-export const extractAddressingContext = (stanza) => {
-    let senderAlt;
-    let recipientAlt;
-    const sender = stanza.attrs.participant || stanza.attrs.from;
-    const addressingMode = stanza.attrs.addressing_mode || (sender?.endsWith('lid') ? 'lid' : 'pn');
-    if (addressingMode === 'lid') {
-        // Message is LID-addressed: sender is LID, extract corresponding PN
-        // without device data
-        senderAlt = stanza.attrs.participant_pn || stanza.attrs.sender_pn || stanza.attrs.peer_recipient_pn;
-        recipientAlt = stanza.attrs.recipient_pn;
-        // with device data
-        //if (sender && senderAlt) senderAlt = transferDevice(sender, senderAlt)
-    }
-    else {
-        // Message is PN-addressed: sender is PN, extract corresponding LID
-        // without device data
-        senderAlt = stanza.attrs.participant_lid || stanza.attrs.sender_lid || stanza.attrs.peer_recipient_lid;
-        recipientAlt = stanza.attrs.recipient_lid;
-        //with device data
-        //if (sender && senderAlt) senderAlt = transferDevice(sender, senderAlt)
-    }
-    return {
-        addressingMode,
-        senderAlt,
-        recipientAlt
-    };
-};
+}
+
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
-export function decodeMessageNode(stanza, meId, meLid) {
-    let msgType;
-    let chatId;
-    let author;
-    let fromMe = false;
-    const msgId = stanza.attrs.id;
-    const from = stanza.attrs.from;
-    const participant = stanza.attrs.participant;
-    const recipient = stanza.attrs.recipient;
-    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 });
+function decodeMessageNode(stanza, meId, meLid) {
+    let msgType
+    let chatId
+    let author
+    const msgId = stanza.attrs.id
+    const from = stanza.attrs.from
+    let participant = stanza.attrs.participant 
+     if (participant && participant.endsWith('@lid') && stanza.attrs.participant_pn) {
+        participant = stanza.attrs.participant_pn;
+    }
+    const recipient = stanza.attrs.recipient
+    const isMe = (jid) => WABinary_1.areJidsSameUser(jid, meId)
+    const isMeLid = (jid) => WABinary_1.areJidsSameUser(jid, meLid)
+    if (WABinary_1.isJidUser(from)) {
+        if (recipient) {
+            if (!isMe(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 {
+            chatId = from
+        }
+        msgType = 'chat'
+        author = from
+    }
+    else if (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;
+            chatId = recipient
         }
         else {
-            chatId = from;
+            chatId = from
         }
-        msgType = 'chat';
-        author = from;
+        msgType = 'chat'
+        author = from
     }
-    else if (isJidGroup(from)) {
+    else if (WABinary_1.isJidGroup(from)) {
         if (!participant) {
-            throw new Boom('No participant in group message');
+            throw new boom_1.Boom('No participant in group message')
         }
-        if (isMe(participant) || isMeLid(participant)) {
-            fromMe = true;
-        }
-        msgType = 'group';
-        author = participant;
-        chatId = from;
+        msgType = 'group'
+        author = participant
+        chatId = from
     }
-    else if (isJidBroadcast(from)) {
+    else if (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)) {
-            msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
+        const isParticipantMe = isMe(participant)
+        if (WABinary_1.isJidStatusBroadcast(from)) {
+            msgType = isParticipantMe ? 'direct_peer_status' : 'other_status'
         }
         else {
-            msgType = isParticipantMe ? 'peer_broadcast' : 'other_broadcast';
+            msgType = isParticipantMe ? 'peer_broadcast' : 'other_broadcast'
         }
-        fromMe = isParticipantMe;
-        chatId = from;
-        author = participant;
+        chatId = from
+        author = participant
     }
-    else if (isJidNewsletter(from)) {
-        msgType = 'newsletter';
-        chatId = from;
-        author = from;
-        if (isMe(from) || isMeLid(from)) {
-            fromMe = true;
-        }
+    else if (WABinary_1.isJidNewsletter(from)) {
+        msgType = 'newsletter'
+        chatId = from
+        author = 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 senderJid = stanza.attrs.participant || stanza.attrs.from;
+
+const fromMe = WABinary_1.isJidNewsletter(stanza.attrs.from)
+    ? !!stanza.attrs?.is_sender
+    : WABinary_1.isLidUser(senderJid)
+        ? (0, WABinary_1.areJidsSameUser)(senderJid, meLid)
+        : (0, WABinary_1.areJidsSameUser)(senderJid, meId);
+
+    const pushname = stanza?.attrs?.notify
     const key = {
         remoteJid: chatId,
-        remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
         fromMe,
         id: msgId,
-        participant,
-        participantAlt: isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
-        addressingMode: addressingContext.addressingMode,
-        ...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
-    };
+        ...(participant !== undefined && { participant: fromMe ? meId : participant }),
+        ...(stanza.attrs.participant_pn !== undefined && { participant_pn: fromMe ? meId : stanza.attrs.participant_pn }),
+        ...(stanza.attrs.participant_lid !== undefined && { participant_lid: fromMe ? meLid : stanza.attrs.participant_lid }),
+    }
     const fullMessage = {
         key,
         messageTimestamp: +stanza.attrs.t,
         pushName: pushname,
-        broadcast: isJidBroadcast(from)
-    };
+        broadcast: WABinary_1.isJidBroadcast(from), 
+        newsletter: WABinary_1.isJidNewsletter(from),
+        additionalAttributes: stanza.attrs
+    }
+    if (msgType === 'newsletter') {
+        fullMessage.newsletter_server_id  = +stanza.attrs?.server_id
+    }
     if (key.fromMe) {
-        fullMessage.status = proto.WebMessageInfo.Status.SERVER_ACK;
+        fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK
+    }
+    if (!key.fromMe) {
+        fullMessage.platform = messages_1.getDevice(key.id) 
     }
     return {
         fullMessage,
         author,
         sender: msgType === 'chat' ? author : chatId
-    };
+    }
 }
-export const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
-    const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
+
+const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
+    const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid)
     return {
         fullMessage,
         category: stanza.attrs.category,
         author,
         async decrypt() {
-            let decryptables = 0;
+            let decryptables = 0
             if (Array.isArray(stanza.content)) {
                 for (const { tag, attrs, content } of stanza.content) {
                     if (tag === 'verified_name' && content instanceof Uint8Array) {
-                        const cert = proto.VerifiedNameCertificate.decode(content);
-                        const details = proto.VerifiedNameCertificate.Details.decode(cert.details);
-                        fullMessage.verifiedBizName = details.verifiedName;
+                        const cert = WAProto_1.proto.VerifiedNameCertificate.decode(content)
+                        const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details)
+                        fullMessage.verifiedBizName = details.verifiedName
+                    }
+                    if (tag === 'multicast' && content instanceof Uint8Array) {
+                    	fullMessage.multicast = true
                     }
-                    if (tag === 'unavailable' && attrs.type === 'view_once') {
-                        fullMessage.key.isViewOnce = true; // TODO: remove from here and add a STUB TYPE
+                    if (tag === 'meta' && content instanceof Uint8Array) {
+                        fullMessage.metaInfo = {
+                            targetID: attrs.target_id
+                        }
+                        if (attrs.target_sender_jid) {
+                            fullMessage.metaInfo.targetSender = WABinary_1.jidNormalizedUser(attrs.target_sender_jid)
+                        }
+                    }
+                    if (tag === 'bot' && content instanceof Uint8Array) {
+                    	if (attrs.edit) {
+                    	    fullMessage.botInfo = {
+                    	        editType: attrs.edit, 
+                                editTargetID: attrs.edit_target_id, 
+                                editSenderTimestampMS: attrs.sender_timestamp_ms
+                            }
+                        }
                     }
                     if (tag !== 'enc' && tag !== 'plaintext') {
-                        continue;
+                        continue
                     }
                     if (!(content instanceof Uint8Array)) {
-                        continue;
-                    }
-                    decryptables += 1;
-                    let msgBuffer;
-                    const decryptionJid = await getDecryptionJid(author, repository);
-                    if (tag !== 'plaintext') {
-                        // TODO: Handle hosted devices
-                        await storeMappingFromEnvelope(stanza, author, repository, decryptionJid, logger);
+                        continue
                     }
+                    decryptables += 1
+                    let msgBuffer
                     try {
-                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
+                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type
                         switch (e2eType) {
                             case 'skmsg':
                                 msgBuffer = await repository.decryptGroupMessage({
                                     group: sender,
                                     authorJid: author,
                                     msg: content
-                                });
-                                break;
+                                })
+                                break
                             case 'pkmsg':
                             case 'msg':
+                                const user = WABinary_1.isJidUser(sender) ? sender : author
                                 msgBuffer = await repository.decryptMessage({
-                                    jid: decryptionJid,
+                                    jid: user,
                                     type: e2eType,
                                     ciphertext: content
-                                });
-                                break;
+                                })
+                                break
                             case 'plaintext':
-                                msgBuffer = content;
-                                break;
+                                msgBuffer = content
+                                break
                             default:
-                                throw new Error(`Unknown e2e type: ${e2eType}`);
+                                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' ? generics_1.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');
+                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message')
                             }
                         }
                         if (fullMessage.message) {
-                            Object.assign(fullMessage.message, msg);
+                            Object.assign(fullMessage.message, msg)
                         }
                         else {
-                            fullMessage.message = msg;
+                            fullMessage.message = msg
                         }
                     }
                     catch (err) {
-                        const errorContext = {
-                            key: fullMessage.key,
-                            err,
-                            messageType: tag === 'plaintext' ? 'plaintext' : attrs.type,
-                            sender,
-                            author,
-                            isSessionRecordError: isSessionRecordError(err)
-                        };
-                        logger.error(errorContext, 'failed to decrypt message');
-                        fullMessage.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
-                        fullMessage.messageStubParameters = [err.message.toString()];
+                        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.messageStubType = proto.WebMessageInfo.StubType.CIPHERTEXT;
-                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT];
+                fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT
+                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT]
             }
         }
-    };
-};
-/**
- * Utility function to check if an error is related to missing session record
- */
-function isSessionRecordError(error) {
-    const errorMessage = error?.message || error?.toString() || '';
-    return DECRYPTION_RETRY_CONFIG.sessionRecordErrors.some(errorPattern => errorMessage.includes(errorPattern));
+    }
 }
-//# sourceMappingURL=decode-wa-message.js.map
+
+module.exports = {
+  decodeMessageNode, 
+  decryptMessageNode
+}

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

@@ -1,5 +1,6 @@
-import type { BaileysEventEmitter, BaileysEventMap } from '../Types/index.js';
-import type { ILogger } from './logger.js';
+import { BaileysEventEmitter, BaileysEventMap } from '../Types'
+import { ILogger } from './logger'
+
 /**
  * A map that contains a list of all events that have been triggered
  *
@@ -7,28 +8,32 @@ import type { ILogger } from './logger.js';
  * this can make processing events extremely efficient -- since everything
  * can be done in a single transaction
  */
-type BaileysEventData = Partial<BaileysEventMap>;
+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;
+    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;
-};
+    isBuffering(): boolean
+}
+
 /**
  * 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 {};
-//# sourceMappingURL=event-buffer.d.ts.map
+export declare const makeEventBuffer: (logger: ILogger) => BaileysBufferableEventEmitter
+
+export {}