@devil-fight/baileys 1.0.4 → 1.0.5

package/lib/Socket/messages-send.js

@@ -8,13 +8,15 @@ const boom_1 = require("@hapi/boom");
 const node_cache_1 = __importDefault(require("node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
-const Types_1 = require("../Types");
+const axios_1 = require("axios")
+const Types_1 = require("../Types")
 const Utils_1 = require("../Utils");
 const link_preview_1 = require("../Utils/link-preview");
 const WABinary_1 = require("../WABinary");
 const newsletter_1 = require("./newsletter");
-const WAUSync_1 = require("../WAUSync");
+const WAUSync_1 = require("../WAUSync")
 const kikyy = require('./dugong');
+var ListType = WAProto_1.proto.Message.ListMessage.ListType;
 const makeMessagesSocket = (config) => {
     const {
         logger,
@@ -32,6 +34,7 @@ const makeMessagesSocket = (config) => {
         upsertMessage,
         query,
         fetchPrivacySettings,
+        generateMessageTag,
         sendNode, 
         groupMetadata,
         groupToggleEphemeral,
@@ -71,6 +74,10 @@ const makeMessagesSocket = (config) => {
         }
         return mediaConn;
     };
+    /**
+     * generic send receipt function
+     * used for receipts of phone call, read, delivery etc.
+     * */
     const sendReceipt = async (jid, participant, messageIds, type) => {
         const node = {
             tag: 'receipt',
@@ -111,63 +118,84 @@ const makeMessagesSocket = (config) => {
         logger.debug({ attrs: node.attrs, messageIds }, 'sending receipt for messages');
         await sendNode(node);
     };
+    /** Correctly bulk send receipts to multiple chats, participants */
     const sendReceipts = async (keys, type) => {
         const recps = (0, Utils_1.aggregateMessageKeysNotFromMe)(keys);
         for (const { jid, participant, messageIds } of recps) {
             await sendReceipt(jid, participant, messageIds, type);
         }
     };
+    /** Bulk read messages. Keys can be from different chats & participants */
     const readMessages = async (keys) => {
         const privacySettings = await fetchPrivacySettings();
+        // based on privacy settings, we have to change the read type
         const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
         await sendReceipts(keys, readType);
     };
+    /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
         const deviceResults = []
+
         if (!useCache) {
             logger.debug('not using cache for devices')
         }
+
         const toFetch = []
+
         jids = Array.from(new Set(jids))
+
         for (let jid of jids) {
             const user = WABinary_1.jidDecode(jid)?.user
+
             jid = WABinary_1.jidNormalizedUser(jid)
+
             if (useCache) {
                 const devices = userDevicesCache.get(user)
+
                 if (devices) {
                     deviceResults.push(...devices)
                     logger.trace({ user }, 'using cache for devices')
                 }
+
                 else {
                     toFetch.push(jid)
                 }
             }
+
             else {
                 toFetch.push(jid)
             }
         }
+
         if (!toFetch.length) {
             return deviceResults
         }
+
         const query = new WAUSync_1.USyncQuery()
             .withContext('message')
             .withDeviceProtocol()
+
         for (const jid of toFetch) {
             query.withUser(new WAUSync_1.USyncUser().withId(jid))
         }
+
         const result = await executeUSyncQuery(query)
+
         if (result) {
             const extracted = Utils_1.extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
             const deviceMap = {}
+
             for (const item of extracted) {
                 deviceMap[item.user] = deviceMap[item.user] || []
                 deviceMap[item.user].push(item)
                 deviceResults.push(item)
             }
+
             for (const key in deviceMap) {
                 userDevicesCache.set(key, deviceMap[key])
             }
         }
+
         return deviceResults
     }
     const assertSessions = async (jids, force) => {
@@ -213,10 +241,13 @@ const makeMessagesSocket = (config) => {
         }
         return didFetchNewSession;
     };
+    
+ 
     const sendPeerDataOperationMessage = async (pdoMessage) => {
         if (!authState.creds.me?.id) {
             throw new boom_1.Boom('Not authenticated')
         }
+        
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
@@ -227,6 +258,7 @@ const makeMessagesSocket = (config) => {
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
                 category: 'peer',
+                // eslint-disable-next-line camelcase
                 push_priority: 'high_force',
             },
         });
@@ -258,7 +290,7 @@ const makeMessagesSocket = (config) => {
             return node;
         }));
         return { nodes, shouldIncludeDeviceIdentity };
-    };
+    }; //apela
     const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList, AI = true }) => {
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
@@ -284,9 +316,12 @@ const makeMessagesSocket = (config) => {
             }
         };
         const extraAttrs = {}
-        const messages = Utils_1.normalizeMessageContent(message);
+        const messages = Utils_1.normalizeMessageContent(message)  
         const buttonType = getButtonType(messages);
         if (participant) {
+            // when the retry request is not for a group
+            // only send to the specific device that asked for a retry
+            // otherwise the message is sent out to every device that should be a recipient
             if (!isGroup && !isStatus) {
                 additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
             }
@@ -295,15 +330,19 @@ const makeMessagesSocket = (config) => {
         }
         await authState.keys.transaction(async () => {
             const mediaType = getMediaType(messages);
+            
             if (mediaType) {
                 extraAttrs['mediatype'] = mediaType
             }
+            
             if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) {
                 extraAttrs['decrypt-fail'] = 'hide'
-            }
+            } 
+            
             if (messages.interactiveResponseMessage?.nativeFlowResponseMessage) {
                 extraAttrs['native_flow_name'] = messages.interactiveResponseMessage?.nativeFlowResponseMessage.name
             }
+            
             if (isGroup || isStatus) {
                 const [groupData, senderKeyMap] = await Promise.all([
                     (async () => {
@@ -311,9 +350,11 @@ const makeMessagesSocket = (config) => {
                         if (groupData) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
+
                         else if (!isStatus) {
                             groupData = await groupMetadata(jid)
                         }
+                        
                         return groupData;
                     })(),
                     (async () => {
@@ -321,32 +362,51 @@ const makeMessagesSocket = (config) => {
                             const result = await authState.keys.get('sender-key-memory', [jid])
                             return result[jid] || {}
                         }
+
                         return {}
-                    })()
+
+                    })()         
                 ]);
                 if (!participant) {
                     const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
+
                     if (isStatus && statusJidList) {
                         participantsList.push(...statusJidList)
                     }
+
+                 //   if (!isStatus) {
+                 //       const expiration = await getEphemeralGroup(jid)
+                 //       additionalAttributes = {
+                 //           ...additionalAttributes, 
+                 //           addressing_mode: 'pn',
+                 //           ...expiration ? { expiration: expiration.toString() } : null
+                 //       }
+                 //   }
+
                     const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
                     devices.push(...additionalDevices)
                 }
+                
                 const patched = await patchMessageBeforeSending(message, devices.map(d => WABinary_1.jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)));
                 const bytes = Utils_1.encodeWAMessage(patched);
+                
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
                     meId,
                 });
                 const senderKeyJids = [];
+                
                 for (const { user, device } of devices) {
                     const jid = WABinary_1.jidEncode(user, (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) === 'lid' ? 'lid' : 's.whatsapp.net', device);
                     if (!senderKeyMap[jid] || !!participant) {
                         senderKeyJids.push(jid);
+                        // store that this person has had the sender keys sent to them
                         senderKeyMap[jid] = true;
                     }
                 }
+                // if there are some participants with whom the session has not been established
+                // if there are, we re-send the senderkey
                 if (senderKeyJids.length) {
                     logger.debug({ senderKeyJids }, 'sending new sender key');
                     const senderKeyMsg = {
@@ -368,16 +428,21 @@ const makeMessagesSocket = (config) => {
                 await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
             }
             else if (isNewsletter) {
+                // Message edit
                 if (message.protocolMessage?.editedMessage) {
                     msgId = message.protocolMessage.key?.id
                     message = message.protocolMessage.editedMessage
                 }
+
+                // Message delete
                 if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
                     msgId = message.protocolMessage.key?.id
                     message = {}
                 }
+
                 const patched = await patchMessageBeforeSending(message, [])
                 const bytes = Utils_1.encodeNewsletterMessage(patched)
+
                 binaryNodeContent.push({
                     tag: 'plaintext',
                     attrs: extraAttrs ? extraAttrs : {},
@@ -391,8 +456,10 @@ const makeMessagesSocket = (config) => {
                     if (user !== meUser) {
                         devices.push({ user: meUser })
                     }
+
                     if (additionalAttributes?.['category'] !== 'peer') {
                         const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true)
+
                         devices.push(...additionalDevices)
                     }
                 }
@@ -402,12 +469,15 @@ const makeMessagesSocket = (config) => {
                 for (const { user, device } of devices) {
                     const isMe = user === meUser
                     const jid = WABinary_1.jidEncode(isMe && isLid ? authState.creds?.me?.lid?.split(':')[0] || user : user, isLid ? 'lid' : 's.whatsapp.net', device)
+
                     if (isMe) {
                         meJids.push(jid)
                     }
+
                     else {
                         otherJids.push(jid)
                     }
+
                     allJids.push(jid)
                 }
                 await assertSessions(allJids, false);
@@ -422,10 +492,12 @@ const makeMessagesSocket = (config) => {
             if (participants.length) {
                 if (additionalAttributes?.['category'] === 'peer') {
                     const peerNode = participants[0]?.content?.[0]
+
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode)
+                        binaryNodeContent.push(peerNode) // push only enc
                     }
                 }
+
                 else {
                     binaryNodeContent.push({
                         tag: 'participants',
@@ -434,15 +506,19 @@ const makeMessagesSocket = (config) => {
                     })
                 }
             }
+
             const stanza = {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    type: getTypeMessage(messages),
+                    type: getTypeMessage(messages), 
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
             }
+            // if the participant to send to is explicitly specified (generally retry recp)
+            // ensure the message is only sent to that person
+            // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
             if (participant) {
                 if (WABinary_1.isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid;
@@ -467,46 +543,56 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
+     
             if (AI && isPrivate) {
                 const botNode = {
-                    tag: 'bot',
+                    tag: 'bot', 
                     attrs: {
                         biz_bot: '1'
                     }
                 }
-                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : [])
+
+                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+
                 if (filteredBizBot) {
-                    stanza.content.push(...additionalNodes)
+                    stanza.content.push(...additionalNodes) 
                     didPushAdditional = true
                 }
+
                 else {
-                    stanza.content.push(botNode)
+                    stanza.content.push(botNode) 
                 }
             }
-            if (!isNewsletter && buttonType && !isStatus) {
+            
+            if(!isNewsletter && buttonType && !isStatus) {             
                 const content = WABinary_1.getAdditionalNode(buttonType)
                 const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
+
                 if (filteredNode) {
                     didPushAdditional = true
                     stanza.content.push(...additionalNodes)
-                }
+                } 
                 else {
                     stanza.content.push(...content)
                 }
                 logger.debug({ jid }, 'adding business node')
-            }
+            }         
+
             if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
             }
+            
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
         });
+        
         message = Types_1.WAProto.Message.fromObject(message)
+    
         const messageJSON = {
             key: {
-                remoteJid: jid,
-                fromMe: true,
-                id: msgId
+               remoteJid: jid,
+               fromMe: true,
+               id: msgId
             },
             message: message,
             messageTimestamp: Utils_1.unixTimestampSeconds(new Date()),
@@ -514,20 +600,23 @@ const makeMessagesSocket = (config) => {
             participant: WABinary_1.isJidGroup(jid) || WABinary_1.isJidStatusBroadcast(jid) ? meId : undefined,
             status: Types_1.WAMessageStatus.PENDING
         }
-        return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON);
+
+        return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON)
+     //   return msgId;
     };
     const getTypeMessage = (msg) => {
-        const message = Utils_1.normalizeMessageContent(msg);
+            const message = Utils_1.normalizeMessageContent(msg)  
         if (message.reactionMessage) {
             return 'reaction'
-        }
+        }       
         else if (getMediaType(message)) {
             return 'media'
-        }
+        }        
         else {
             return 'text'
         }
     }
+
     const getMediaType = (message) => {
         if (message.imageMessage) {
             return 'image'
@@ -578,6 +667,7 @@ const makeMessagesSocket = (config) => {
             return 'productlink'
         }
     }
+ 
     const getButtonType = (message) => {
         if (message.listMessage) {
             return 'list'
@@ -632,9 +722,9 @@ const makeMessagesSocket = (config) => {
             ]
         });
         return result;
-    }
+    }  
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
-    const rahmi = new kikyy(Utils_1, waUploadToServer, relayMessage, config, sock);
+    const rahmi = new kikyy(Utils_1, waUploadToServer, relayMessage);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
@@ -690,37 +780,13 @@ const makeMessagesSocket = (config) => {
             ev.emit('messages.update', [
                 {
                     key: message.key,
-                    update: {
+                    update: { 
                         message: message.message
                     }
                 }
             ]);
             return message;
         },
-        setLabelGroup: async (id, text) => {
-            await relayMessage(id, {
-                protocolMessage: {
-                    type: 30,
-                    memberLabel: {
-                        label: text.slice(0, 30)
-                    }
-                }
-            }, {
-                additionalNodes: [
-                    {
-                        tag: "meta",
-                        attrs: {
-                            tag_reason: "user_update",
-                            appdata: "member_tag"
-                        },
-                        content: undefined
-                    }
-                ]
-            })
-        },
-        sendStatusMention: async (content, jids = []) => {
-            return await rahmi.sendStatusWhatsApp(content, jids);
-        },
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;
             delete options.ephemeralExpiration
@@ -730,100 +796,112 @@ const makeMessagesSocket = (config) => {
             if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
                 const { disappearingMessagesInChat } = content
+
                 const value = typeof disappearingMessagesInChat === 'boolean' ?
                     (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
                     disappearingMessagesInChat
+
                 await groupToggleEphemeral(jid, value)
             }
+            
             else {
                 let mediaHandle
-                if (messageType) {
-                    switch (messageType) {
-                        case 'PAYMENT':
-                            const paymentContent = await rahmi.handlePayment(content, quoted);
-                            return await relayMessage(jid, paymentContent, {
-                                messageId: Utils_1.generateMessageID(),
-                                ...getParticipantAttr()
-                            });
-                        case 'PRODUCT':
-                            const productContent = await rahmi.handleProduct(content, jid, quoted);
-                            const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                            return await relayMessage(jid, productMsg.message, {
-                                messageId: productMsg.key.id,
-                                ...getParticipantAttr()
-                            });
-                        case 'INTERACTIVE':
-                            const interactiveContent = await rahmi.handleInteractive(content, jid, quoted);
-                            const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
-                            return await relayMessage(jid, interactiveMsg.message, {
-                                messageId: interactiveMsg.key.id,
-                                ...getParticipantAttr()
-                            });
-                        case 'ALBUM':
-                            return await rahmi.handleAlbum(content, jid, quoted)
-                        case 'EVENT':
-                            return await rahmi.handleEvent(content, jid, quoted)
-                        case 'POLL_RESULT':
-                            return await rahmi.handlePollResult(content, jid, quoted)
-                        case 'GROUP_STORY':
-                            return await rahmi.handleGroupStory(content, jid, quoted)
-                    }
-                }
-                const fullMsg = await Utils_1.generateWAMessage(jid, content, {
-                    logger,
-                    userJid,
-                    quoted,
-                    getUrlInfo: text => link_preview_1.getUrlInfo(text, {
-                        thumbnailWidth: linkPreviewImageThumbnailWidth,
-                        fetchOpts: {
-                            timeout: 3000,
-                            ...axiosOptions || {}
-                        },
-                        logger,
-                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                    }),
-                    upload: async (readStream, opts) => {
-                        const up = await waUploadToServer(readStream, {
-                            ...opts,
-                            newsletter: WABinary_1.isJidNewsLetter(jid)
+
+   
+            if (messageType) {
+                switch(messageType) {
+                    case 'PAYMENT':
+                        const paymentContent = await rahmi.handlePayment(content, quoted);
+                        return await relayMessage(jid, paymentContent, {
+                            messageId: Utils_1.generateMessageID(),
+                            ...getParticipantAttr()
+                        });
+                
+                    case 'PRODUCT':
+                        const productContent = await rahmi.handleProduct(content, jid, quoted);
+                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
+                        return await relayMessage(jid, productMsg.message, {
+                            messageId: productMsg.key.id,
+                            ...getParticipantAttr()
                         });
-                        return up;
+                
+                    case 'INTERACTIVE':
+                        const interactiveContent = await rahmi.handleInteractive(content, jid, quoted);
+                        const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
+                        return await relayMessage(jid, interactiveMsg.message, {
+                            messageId: interactiveMsg.key.id,
+                            ...getParticipantAttr()
+                        });
+                    case 'ALBUM':
+                        return await rahmi.handleAlbum(content, jid, quoted)
+                    case 'EVENT':
+                        return await rahmi.handleEvent(content, jid, quoted)
+                    case 'POLL_RESULT':
+                        return await rahmi.handlePollResult(content, jid, quoted)
+                    case 'GROUP_STORY':
+                        return await rahmi.handleGroupStory(content, jid, quoted)
+                }
+            }
+            const fullMsg = await Utils_1.generateWAMessage(jid, content, {
+                logger,
+                userJid,
+                quoted,
+                getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+                    thumbnailWidth: linkPreviewImageThumbnailWidth,
+                    fetchOpts: {
+                        timeout: 3000,
+                        ...axiosOptions || {}
                     },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    ...options
-                });
-                const isDeleteMsg = 'delete' in content && !!content.delete;
-                const isEditMsg = 'edit' in content && !!content.edit;
-                const isAiMsg = 'ai' in content && !!content.ai;
-                const additionalAttributes = {};
-                const additionalNodes = [];
-                if (isDeleteMsg) {
-                    const fromMe = content.delete?.fromMe;
-                    const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
-                    additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
-                } else if (isEditMsg) {
-                    additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
-                } else if (isAiMsg) {
-                    additionalNodes.push({
-                        attrs: {
-                            biz_bot: '1'
-                        }, tag: "bot"
+                    logger,
+                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+                }),
+                upload: async (readStream, opts) => {
+                    const up = await waUploadToServer(readStream, {
+                        ...opts,
+                        newsletter: WABinary_1.isJidNewsLetter(jid)
                     });
-                }
-                await relayMessage(jid, fullMsg.message, {
-                    messageId: fullMsg.key.id,
-                    cachedGroupMetadata: options.cachedGroupMetadata,
-                    additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
-                    additionalAttributes,
-                    statusJidList: options.statusJidList
+                    return up;
+                },
+                mediaCache: config.mediaCache,
+                options: config.options,
+                ...options
+            });
+            
+            const isDeleteMsg = 'delete' in content && !!content.delete;
+            const isEditMsg = 'edit' in content && !!content.edit;
+            const isAiMsg = 'ai' in content && !!content.ai;
+            
+            const additionalAttributes = {};
+            const additionalNodes = [];
+
+            if (isDeleteMsg) {
+                const fromMe = content.delete?.fromMe;
+                const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
+                additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
+            } else if (isEditMsg) {
+                additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
+            } else if (isAiMsg) {
+                additionalNodes.push({
+                    attrs: { 
+                        biz_bot: '1' 
+                    }, tag: "bot" 
                 });
-                if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
-                    });
-                }
-                return fullMsg;
+            }
+            
+            await relayMessage(jid, fullMsg.message, {
+                messageId: fullMsg.key.id,
+                cachedGroupMetadata: options.cachedGroupMetadata,
+                additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
+                additionalAttributes,
+                statusJidList: options.statusJidList
+            });
+            
+            if (config.emitOwnEvents) {
+                process.nextTick(() => {
+                    processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                });
+            }
+            return fullMsg;
             }
         }
     }