@ryuu-reinzz/baileys 3.0.0-beta.2 → 3.0.0-beta.21

package/lib/Socket/messages-send.js

@@ -3,15 +3,6 @@ import haruka from "@ryuu-reinzz/haruka-lib";
 import {
     Boom
 } from '@hapi/boom';
-import {
-    proto,
-    generateWAMessageFromContent,
-    jidDecode,
-    downloadContentFromMessage,
-    prepareWAMessageMedia,
-    generateMessageID,
-    generateWAMessage
-} from '@ryuu-reinzz/baileys';
 import {
     proto
 } from '../../WAProto/index.js';
@@ -40,12 +31,22 @@ import {
     parseAndInjectE2ESessions,
     unixTimestampSeconds
 } from '../Utils/index.js';
+import {
+    generateWAMessageFromContent,
+    downloadContentFromMessage,
+    prepareWAMessageMedia,
+    generateMessageID
+} from '@ryuu-reinzz/baileys';
 import {
     getUrlInfo
 } from '../Utils/link-preview.js';
 import {
     makeKeyedMutex
 } from '../Utils/make-mutex.js';
+import {
+    getMessageReportingToken,
+    shouldIncludeReportingToken
+} from '../Utils/reporting-utils.js';
 import {
     areJidsSameUser,
     getBinaryNodeChild,
@@ -92,7 +93,7 @@ export const makeMessagesSocket = (config) => {
     const {
         ev,
         authState,
-        processingMutex,
+        messageMutex,
         signalRepository,
         upsertMessage,
         query,
@@ -374,6 +375,29 @@ export const makeMessagesSocket = (config) => {
         }
         return deviceResults;
     };
+    /**
+     * Update Member Label
+     */
+    const updateMemberLabel = (jid, memberLabel) => {
+        return relayMessage(jid, {
+            protocolMessage: {
+                type: proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE,
+                memberLabel: {
+                    label: memberLabel?.slice(0, 30),
+                    labelTimestamp: unixTimestampSeconds()
+                }
+            }
+        }, {
+            additionalNodes: [{
+                tag: 'meta',
+                attrs: {
+                    tag_reason: 'user_update',
+                    appdata: 'member_tag'
+                },
+                content: undefined
+            }]
+        });
+    };
     const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
         const uniqueJids = [...new Set(jids)]; // Deduplicate JIDs
@@ -490,59 +514,72 @@ export const makeMessagesSocket = (config) => {
             recipientJid: jid,
             message: patchedMessage
         }) => {
-            if (!jid)
-                return null;
-            let msgToEncrypt = patchedMessage;
-            if (dsmMessage) {
-                const {
-                    user: targetUser
-                } = jidDecode(jid);
-                const {
-                    user: ownPnUser
-                } = jidDecode(meId);
-                const ownLidUser = meLidUser;
-                const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser);
-                const isExactSenderDevice = jid === meId || (meLid && jid === meLid);
-                if (isOwnUser && !isExactSenderDevice) {
-                    msgToEncrypt = dsmMessage;
-                    logger.debug({
-                        jid,
-                        targetUser
-                    }, 'Using DSM for own device');
-                }
-            }
-            const bytes = encodeWAMessage(msgToEncrypt);
-            const mutexKey = jid;
-            const node = await encryptionMutex.mutex(mutexKey, async () => {
-                const {
-                    type,
-                    ciphertext
-                } = await signalRepository.encryptMessage({
-                    jid,
-                    data: bytes
-                });
-                if (type === 'pkmsg') {
-                    shouldIncludeDeviceIdentity = true;
+            try {
+                if (!jid)
+                    return null;
+                let msgToEncrypt = patchedMessage;
+                if (dsmMessage) {
+                    const {
+                        user: targetUser
+                    } = jidDecode(jid);
+                    const {
+                        user: ownPnUser
+                    } = jidDecode(meId);
+                    const ownLidUser = meLidUser;
+                    const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser);
+                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid);
+                    if (isOwnUser && !isExactSenderDevice) {
+                        msgToEncrypt = dsmMessage;
+                        logger.debug({
+                            jid,
+                            targetUser
+                        }, 'Using DSM for own device');
+                    }
                 }
-                return {
-                    tag: 'to',
-                    attrs: {
-                        jid
-                    },
-                    content: [{
-                        tag: 'enc',
+                const bytes = encodeWAMessage(msgToEncrypt);
+                const mutexKey = jid;
+                const node = await encryptionMutex.mutex(mutexKey, async () => {
+                    const {
+                        type,
+                        ciphertext
+                    } = await signalRepository.encryptMessage({
+                        jid,
+                        data: bytes
+                    });
+                    if (type === 'pkmsg') {
+                        shouldIncludeDeviceIdentity = true;
+                    }
+                    return {
+                        tag: 'to',
                         attrs: {
-                            v: '2',
-                            type,
-                            ...(extraAttrs || {})
+                            jid
                         },
-                        content: ciphertext
-                    }]
-                };
-            });
-            return node;
+                        content: [{
+                            tag: 'enc',
+                            attrs: {
+                                v: '2',
+                                type,
+                                ...(extraAttrs || {})
+                            },
+                            content: ciphertext
+                        }]
+                    };
+                });
+                return node;
+            } catch (err) {
+                logger.error({
+                    jid,
+                    err
+                }, 'Failed to encrypt for recipient');
+                return null;
+            }
         });
         const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null);
+        if (recipientJids.length > 0 && nodes.length === 0) {
+            throw new Boom('All encryptions failed', {
+                statusCode: 500
+            });
+        }
         return {
             nodes,
             shouldIncludeDeviceIdentity
@@ -579,6 +616,7 @@ export const makeMessagesSocket = (config) => {
         const destinationJid = !isStatus ? finalJid : statusJid;
         const binaryNodeContent = [];
         const devices = [];
+        let reportingMessage;
         const meMsg = {
             deviceSentMessage: {
                 destinationJid,
@@ -633,7 +671,7 @@ export const makeMessagesSocket = (config) => {
                 await sendNode(stanza);
                 return;
             }
-            if (normalizeMessageContent(message)?.pinInChatMessage) {
+            if (normalizeMessageContent(message)?.pinInChatMessage || normalizeMessageContent(message)?.reactionMessage) {
                 extraAttrs['decrypt-fail'] = 'hide'; // todo: expand for reactions and other types
             }
             if (isGroupOrStatus && !isRetryResend) {
@@ -683,6 +721,7 @@ export const makeMessagesSocket = (config) => {
                     throw new Boom('Per-jid patching is not supported in groups');
                 }
                 const bytes = encodeWAMessage(patched);
+                reportingMessage = patched;
                 const groupAddressingMode = additionalAttributes?.['addressing_mode'] || groupData?.addressingMode || 'lid';
                 const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId;
                 const {
@@ -756,6 +795,12 @@ export const makeMessagesSocket = (config) => {
                 const {
                     user: ownUser
                 } = jidDecode(ownId);
+                if (!participant) {
+                    const patchedForReporting = await patchMessageBeforeSending(message, [jid]);
+                    reportingMessage = Array.isArray(patchedForReporting) ?
+                        patchedForReporting.find(item => item.recipientJid === jid) || patchedForReporting[0] :
+                        patchedForReporting;
+                }
                 if (!isRetryResend) {
                     const targetUserServer = isLid ? 'lid' : 's.whatsapp.net';
                     devices.push({
@@ -920,6 +965,33 @@ export const makeMessagesSocket = (config) => {
                     jid
                 }, 'adding device identity');
             }
+            if (!isNewsletter &&
+                !isRetryResend &&
+                reportingMessage?.messageContextInfo?.messageSecret &&
+                shouldIncludeReportingToken(reportingMessage)) {
+                try {
+                    const encoded = encodeWAMessage(reportingMessage);
+                    const reportingKey = {
+                        id: msgId,
+                        fromMe: true,
+                        remoteJid: destinationJid,
+                        participant: participant?.jid
+                    };
+                    const reportingNode = await getMessageReportingToken(encoded, reportingMessage, reportingKey);
+                    if (reportingNode) {
+                        ;
+                        stanza.content.push(reportingNode);
+                        logger.trace({
+                            jid
+                        }, 'added reporting token to message');
+                    }
+                } catch (error) {
+                    logger.warn({
+                        jid,
+                        trace: error?.stack
+                    }, 'failed to attach reporting token');
+                }
+            }
             const contactTcTokenData = !isGroup && !isRetryResend && !isStatus ? await authState.keys.get('tctoken', [destinationJid]) : {};
             const tcTokenBuffer = contactTcTokenData[destinationJid]?.token;
             if (tcTokenBuffer) {
@@ -946,13 +1018,22 @@ export const makeMessagesSocket = (config) => {
         return msgId;
     };
     const getMessageType = (message) => {
-        if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
+        const normalizedMessage = normalizeMessageContent(message);
+        if (!normalizedMessage)
+            return 'text';
+        if (normalizedMessage.reactionMessage || normalizedMessage.encReactionMessage) {
+            return 'reaction';
+        }
+        if (normalizedMessage.pollCreationMessage ||
+            normalizedMessage.pollCreationMessageV2 ||
+            normalizedMessage.pollCreationMessageV3 ||
+            normalizedMessage.pollUpdateMessage) {
             return 'poll';
         }
-        if (message.eventMessage) {
+        if (normalizedMessage.eventMessage) {
             return 'event';
         }
-        if (getMediaType(message) !== '') {
+        if (getMediaType(normalizedMessage) !== '') {
             return 'media';
         }
         return 'text';
@@ -1016,27 +1097,28 @@ export const makeMessagesSocket = (config) => {
         return result;
     };
     const waUploadToServer = getWAUploadToServer(config, refreshMediaConn);
-    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update');
+    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update');    
+    sock.waUploadToServer = waUploadToServer;
+    sock.relayMessage = relayMessage;    
     return {
         ...sock,
         getPrivacyTokens,
         assertSessions,
-        relayMessage,
         sendReceipt,
         sendReceipts,
         readMessages,
         refreshMediaConn,
-        waUploadToServer,
         fetchPrivacySettings,
         sendPeerDataOperationMessage,
         createParticipantNodes,
         getUSyncDevices,
         messageRetryManager,
+        updateMemberLabel,
         updateMediaMessage: async (message) => {
             const content = assertMediaContent(message.message);
             const mediaKey = content.mediaKey;
             const meId = authState.creds.me.id;
-            const node = await encryptMediaRetryRequest(message.key, mediaKey, meId);
+            const node = encryptMediaRetryRequest(message.key, mediaKey, meId);
             let error = undefined;
             await Promise.all([
                 sendNode(node),
@@ -1047,7 +1129,7 @@ export const makeMessagesSocket = (config) => {
                             error = result.error;
                         } else {
                             try {
-                                const media = await decryptMediaRetryData(result.media, mediaKey, result.key.id);
+                                const media = decryptMediaRetryData(result.media, mediaKey, result.key.id);
                                 if (media.result !== proto.MediaRetryNotification.ResultType.SUCCESS) {
                                     const resultStr = proto.MediaRetryNotification.ResultType[media.result];
                                     throw new Boom(`Media re-upload failed by device (${resultStr})`, {
@@ -1081,92 +1163,92 @@ export const makeMessagesSocket = (config) => {
             return message;
         },
         sendMessage: async (jid, content, options = {}) => {
-            if (Array.isArray(content.buttons)) {
-                await sock.sendButton(jid, content = {}, options = {});
-            } else {
-                const userJid = authState.creds.me.id;
-                if (typeof content === 'object' &&
-                    'disappearingMessagesInChat' in content &&
-                    typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                    isJidGroup(jid)) {
-                    const {
-                        disappearingMessagesInChat
-                    } = content;
-                    const value = typeof disappearingMessagesInChat === 'boolean' ?
-                        disappearingMessagesInChat ?
-                        WA_DEFAULT_EPHEMERAL :
-                        0 :
-                        disappearingMessagesInChat;
-                    await groupToggleEphemeral(jid, value);
+        if (Array.isArray(content.buttons)) {
+                    return await sock.sendButton(jid, content, options);
                 } else {
-                    const fullMsg = await generateWAMessage(jid, content, {
+            const userJid = authState.creds.me.id;
+            if (typeof content === 'object' &&
+                'disappearingMessagesInChat' in content &&
+                typeof content['disappearingMessagesInChat'] !== 'undefined' &&
+                isJidGroup(jid)) {
+                const {
+                    disappearingMessagesInChat
+                } = content;
+                const value = typeof disappearingMessagesInChat === 'boolean' ?
+                    disappearingMessagesInChat ?
+                    WA_DEFAULT_EPHEMERAL :
+                    0 :
+                    disappearingMessagesInChat;
+                await groupToggleEphemeral(jid, value);
+            } else {
+                const fullMsg = await generateWAMessage(jid, content, {
+                    logger,
+                    userJid,
+                    getUrlInfo: text => getUrlInfo(text, {
+                        thumbnailWidth: linkPreviewImageThumbnailWidth,
+                        fetchOpts: {
+                            timeout: 3000,
+                            ...(httpRequestOptions || {})
+                        },
                         logger,
-                        userJid,
-                        getUrlInfo: text => getUrlInfo(text, {
-                            thumbnailWidth: linkPreviewImageThumbnailWidth,
-                            fetchOpts: {
-                                timeout: 3000,
-                                ...(httpRequestOptions || {})
-                            },
-                            logger,
-                            uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                        }),
-                        //TODO: CACHE
-                        getProfilePicUrl: sock.profilePictureUrl,
-                        getCallLink: sock.createCallLink,
-                        upload: waUploadToServer,
-                        mediaCache: config.mediaCache,
-                        options: config.options,
-                        messageId: generateMessageIDV2(sock.user?.id),
-                        ...options
+                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+                    }),
+                    //TODO: CACHE
+                    getProfilePicUrl: sock.profilePictureUrl,
+                    getCallLink: sock.createCallLink,
+                    upload: waUploadToServer,
+                    mediaCache: config.mediaCache,
+                    options: config.options,
+                    messageId: generateMessageIDV2(sock.user?.id),
+                    ...options
+                });
+                const isEventMsg = 'event' in content && !!content.event;
+                const isDeleteMsg = 'delete' in content && !!content.delete;
+                const isEditMsg = 'edit' in content && !!content.edit;
+                const isPinMsg = 'pin' in content && !!content.pin;
+                const isPollMessage = 'poll' in content && !!content.poll;
+                const additionalAttributes = {};
+                const additionalNodes = [];
+                // required for delete
+                if (isDeleteMsg) {
+                    // if the chat is a group, and I am not the author, then delete the message as an admin
+                    if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) {
+                        additionalAttributes.edit = '8';
+                    } else {
+                        additionalAttributes.edit = '7';
+                    }
+                } else if (isEditMsg) {
+                    additionalAttributes.edit = '1';
+                } else if (isPinMsg) {
+                    additionalAttributes.edit = '2';
+                } else if (isPollMessage) {
+                    additionalNodes.push({
+                        tag: 'meta',
+                        attrs: {
+                            polltype: 'creation'
+                        }
                     });
-                    const isEventMsg = 'event' in content && !!content.event;
-                    const isDeleteMsg = 'delete' in content && !!content.delete;
-                    const isEditMsg = 'edit' in content && !!content.edit;
-                    const isPinMsg = 'pin' in content && !!content.pin;
-                    const isPollMessage = 'poll' in content && !!content.poll;
-                    const additionalAttributes = {};
-                    const additionalNodes = [];
-                    // required for delete
-                    if (isDeleteMsg) {
-                        // if the chat is a group, and I am not the author, then delete the message as an admin
-                        if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) {
-                            additionalAttributes.edit = '8';
-                        } else {
-                            additionalAttributes.edit = '7';
+                } else if (isEventMsg) {
+                    additionalNodes.push({
+                        tag: 'meta',
+                        attrs: {
+                            event_type: 'creation'
                         }
-                    } else if (isEditMsg) {
-                        additionalAttributes.edit = '1';
-                    } else if (isPinMsg) {
-                        additionalAttributes.edit = '2';
-                    } else if (isPollMessage) {
-                        additionalNodes.push({
-                            tag: 'meta',
-                            attrs: {
-                                polltype: 'creation'
-                            }
-                        });
-                    } else if (isEventMsg) {
-                        additionalNodes.push({
-                            tag: 'meta',
-                            attrs: {
-                                event_type: 'creation'
-                            }
-                        });
-                    }
-                    await relayMessage(jid, fullMsg.message, {
-                        messageId: fullMsg.key.id,
-                        useCachedGroupMetadata: options.useCachedGroupMetadata,
-                        additionalAttributes,
-                        statusJidList: options.statusJidList,
-                        additionalNodes
                     });
-                    if (config.emitOwnEvents) {
-                        process.nextTick(async () => {
-                            await processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
-                        });
-                    }
-                    return fullMsg;
+                }
+                await relayMessage(jid, fullMsg.message, {
+                    messageId: fullMsg.key.id,
+                    useCachedGroupMetadata: options.useCachedGroupMetadata,
+                    additionalAttributes,
+                    statusJidList: options.statusJidList,
+                    additionalNodes
+                });
+                if (config.emitOwnEvents) {
+                    process.nextTick(async () => {
+                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    });
+                }
+                return fullMsg;
                 }
             }
         }