@dyyxyzz/baileys-mod 6.0.46 → 6.0.49

package/lib/Socket/messages-send.js

@@ -18,76 +18,6 @@ const newsletter_1 = require("./newsletter");
 const WAUSync_1 = require("../WAUSync")
 const kikyy = require('./dugong');
 var ListType = WAProto_1.proto.Message.ListMessage.ListType;
-
-// TAMBAHAN BARU: Helper functions untuk button di newsletter
-const getAdditionalNode = (buttonType) => {
-    const nodes = []
-    
-    switch(buttonType) {
-        case 'list':
-            nodes.push({
-                tag: 'biz',
-                attrs: {},
-                content: [{
-                    tag: 'list_message',
-                    attrs: { v: '2' }
-                }]
-            })
-            break
-            
-        case 'buttons':
-            nodes.push({
-                tag: 'biz',
-                attrs: {},
-                content: [{
-                    tag: 'buttons_message',
-                    attrs: { v: '2' }
-                }]
-            })
-            break
-            
-        case 'interactive':
-        case 'native_flow':
-            nodes.push({
-                tag: 'biz',
-                attrs: {},
-                content: [{
-                    tag: 'native_flow',
-                    attrs: { v: '3' }
-                }]
-            })
-            break
-            
-        case 'review_and_pay':
-        case 'review_order':
-        case 'payment_info':
-        case 'payment_status':
-        case 'payment_method':
-            nodes.push({
-                tag: 'biz',
-                attrs: {},
-                content: [{
-                    tag: 'payment',
-                    attrs: { v: '2' }
-                }]
-            })
-            break
-    }
-    
-    return nodes
-}
-
-const getBinaryNodeFilter = (nodes) => {
-    if (!nodes || !Array.isArray(nodes) || nodes.length === 0) return false
-    
-    return nodes.some(node => 
-        node.tag === 'biz' || 
-        node.tag === 'bot' ||
-        node.tag === 'native_flow' ||
-        node.tag === 'payment'
-    )
-}
-
 const makeMessagesSocket = (config) => {
     const {
         logger,
@@ -361,8 +291,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 = false }) => {
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
@@ -446,6 +375,15 @@ const makeMessagesSocket = (config) => {
                         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)
                 }
@@ -505,32 +443,10 @@ const makeMessagesSocket = (config) => {
 
                 const patched = await patchMessageBeforeSending(message, [])
                 const bytes = Utils_1.encodeNewsletterMessage(patched)
-                
-                // Detect button type dan media type
-                const buttonType = getButtonType(patched)
-                const mediaType = getMediaType(patched)
-                
-                // Set extraAttrs untuk newsletter
-                if (mediaType) {
-                    extraAttrs['mediatype'] = mediaType
-                }
-                
-                if (patched.pinInChatMessage || patched.keepInChatMessage || 
-                    patched.reactionMessage || patched.protocolMessage?.editedMessage) {
-                    extraAttrs['decrypt-fail'] = 'hide'
-                }
-                
-                if (patched.interactiveResponseMessage?.nativeFlowResponseMessage) {
-                    extraAttrs['native_flow_name'] = patched.interactiveResponseMessage?.nativeFlowResponseMessage.name
-                }
-                
-                if (patched.interactiveMessage?.nativeFlowMessage) {
-                    extraAttrs['native_flow_name'] = patched.interactiveMessage?.nativeFlowMessage?.name || 'flow'
-                }
 
                 binaryNodeContent.push({
                     tag: 'plaintext',
-                    attrs: extraAttrs,
+                    attrs: extraAttrs ? extraAttrs : {},
                     content: bytes
                 })
             }
@@ -601,7 +517,6 @@ const makeMessagesSocket = (config) => {
                 },
                 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
@@ -621,7 +536,6 @@ const makeMessagesSocket = (config) => {
             else {
                 stanza.attrs.to = destinationJid;
             }
-            
             if (shouldIncludeDeviceIdentity) {
                 stanza.content.push({
                     tag: 'device-identity',
@@ -631,7 +545,7 @@ const makeMessagesSocket = (config) => {
                 logger.debug({ jid }, 'adding device identity');
             }
      
-            if (AI && isPrivate && !didPushAdditional) {
+            if (AI && isPrivate) {
                 const botNode = {
                     tag: 'bot', 
                     attrs: {
@@ -639,43 +553,31 @@ const makeMessagesSocket = (config) => {
                     }
                 }
 
-                const filteredBizBot = getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
 
-                if (filteredBizBot && additionalNodes) {
+                if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
                     didPushAdditional = true
                 }
+
                 else {
-                    stanza.content.push(botNode)
-                    didPushAdditional = true
+                    stanza.content.push(botNode) 
                 }
             }
             
             if(!isNewsletter && buttonType && !isStatus) {             
-    const content = getAdditionalNode(buttonType)
-    const filteredNode = getBinaryNodeFilter(additionalNodes)
-
-    if (filteredNode && additionalNodes) {
-        stanza.content.push(...additionalNodes)
-        didPushAdditional = true
-    } 
-    else if (content && content.length > 0 && !didPushAdditional) {
-        stanza.content.push(...content)
-        didPushAdditional = true
-    }
-    logger.debug({ jid }, 'adding business node')
-}
-            
-            // KHUSUS NEWSLETTER: Tambah button node
-            if (isNewsletter && buttonType && !didPushAdditional) {
-                const content = getAdditionalNode(buttonType)
+                const content = WABinary_1.getAdditionalNode(buttonType)
+                const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
 
-                if (content && content.length > 0) {
-                    stanza.content.push(...content)
+                if (filteredNode) {
                     didPushAdditional = true
-                    logger.debug({ jid, buttonType }, 'adding button node to newsletter')
+                    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);
@@ -701,10 +603,10 @@ const makeMessagesSocket = (config) => {
         }
 
         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'
         }       
@@ -774,12 +676,6 @@ const makeMessagesSocket = (config) => {
         else if (message.buttonsMessage) {
             return 'buttons'
         }
-        else if (message.viewOnceMessage?.message?.interactiveMessage) {
-            return 'interactive'
-        }
-        else if (message.viewOnceMessageV2?.message?.interactiveMessage) {
-            return 'interactive'
-        }
         else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_and_pay') {
             return 'review_and_pay'
         }
@@ -795,14 +691,13 @@ const makeMessagesSocket = (config) => {
         else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
             return 'payment_method'
         }
+        else if (message.interactiveMessage && message.interactiveMessage?.nativeFlowMessage) {
+            return 'interactive'
+        }
         else if (message.interactiveMessage?.nativeFlowMessage) {
             return 'native_flow'
         }
-        else if (message.interactiveMessage) {
-            return 'interactive'
-        }
     }
-    
     const getPrivacyTokens = async (jids) => {
         const t = Utils_1.unixTimestampSeconds().toString();
         const result = await query({
@@ -829,11 +724,9 @@ const makeMessagesSocket = (config) => {
         });
         return result;
     }  
-    
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
     const rahmi = new kikyy(Utils_1, waUploadToServer, relayMessage);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
-    
     return {
         ...sock,
         getPrivacyTokens,
@@ -901,7 +794,6 @@ const makeMessagesSocket = (config) => {
             const { filter = false, quoted } = options;
             const getParticipantAttr = () => filter ? { participant: { jid } } : {};
             const messageType = rahmi.detectType(content);
-            
             if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
                 const { disappearingMessagesInChat } = content
@@ -912,112 +804,107 @@ const makeMessagesSocket = (config) => {
 
                 await groupToggleEphemeral(jid, value)
             }
+            
             else {
-                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)
+                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()
                         });
-                        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;
+                    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()
+                        });
                 
-                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" 
-                    });
+                    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)
                 }
-                
-                await relayMessage(jid, fullMsg.message, {
-                    messageId: fullMsg.key.id,
-                    cachedGroupMetadata: options.cachedGroupMetadata,
-                    additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
-                    additionalAttributes,
-                    statusJidList: options.statusJidList,
-                    AI: isAiMsg
-                });
-                
-                if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+            }
+            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)
                     });
-                }
-                
-                return fullMsg;
+                    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" 
+                });
+            }
+            
+            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;
             }
         }
     }
 };
-
 exports.makeMessagesSocket = makeMessagesSocket;
-

package/lib/Socket/socket.js

@@ -78,40 +78,36 @@ const makeSocket = (config) => {
         return sendRawMessage(buff);
     };
     
- const toLid = async (pn) => {
-return pn;
-};
+    const toLid = async (pn) => {
+        return pn;
+    };
+
+    const delay = async (ms) => {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    };
 
-const delay = async (ms) => {
-    return new Promise(resolve => setTimeout(resolve, ms));
- }
+    const toPn = async (pn) => {
+        return pn;
+    };
 
-const toPn = async (pn) => {
-    return pn;
-};
     /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
         const message = (err && ((err.stack || err.message) || String(err))).toLowerCase();
-        // auto recover from cryptographic desyncs by re-uploading prekeys
         if (message.includes('bad mac') || (message.includes('mac') && message.includes('invalid'))) {
             try {
                 uploadPreKeysToServerIfRequired(true)
                     .catch(e => logger.warn({ e }, 'failed to re-upload prekeys after bad mac'));
             }
-            catch (_e) {
-                // ignore
-            }
+            catch (_e) {}
         }
-        // gently back off when encountering rate limits (429)
         if (message.includes('429') || message.includes('rate limit')) {
             const wait = Math.min(30000, (config.backoffDelayMs || 5000));
             logger.info({ wait }, 'backing off due to rate limit');
-            setTimeout(() => {
-                // intentionally empty; wait to delay further sends
-            }, wait);
+            setTimeout(() => {}, wait);
         }
     };
+
     /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
         if (!ws.isOpen) {
@@ -138,11 +134,7 @@ const toPn = async (pn) => {
         }
         return result;
     };
-    /**
-     * Wait for a message with a certain tag to be received
-     * @param msgId the message tag to await
-     * @param timeoutMs timeout after which the promise will reject
-     */
+
     const waitForMessage = async (msgId, timeoutMs = defaultQueryTimeoutMs) => {
         let onRecv;
         let onErr;
@@ -153,18 +145,18 @@ const toPn = async (pn) => {
                     reject(err || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
                 };
                 ws.on(`TAG:${msgId}`, onRecv);
-                ws.on('close', onErr); // if the socket closes, you'll never receive the message
+                ws.on('close', onErr);
                 ws.off('error', onErr);
             });
             return result;
         }
         finally {
             ws.off(`TAG:${msgId}`, onRecv);
-            ws.off('close', onErr); // if the socket closes, you'll never receive the message
+            ws.off('close', onErr);
             ws.off('error', onErr);
         }
     };
-    /** send a query, and wait for its response. auto-generates message ID if not provided */
+
     const query = async (node, timeoutMs) => {
         if (!node.attrs.id) {
             node.attrs.id = generateMessageTag();
@@ -179,6 +171,7 @@ const toPn = async (pn) => {
         }
         return result;
     };
+
     /** connection handshake */
     const validateConnection = async () => {
         let helloMsg = {
@@ -210,6 +203,7 @@ const toPn = async (pn) => {
         noise.finishInit();
         startKeepAliveRequest();
     };
+
     const getAvailablePreKeysOnServer = async () => {
         const result = await query({
             tag: 'iq',
@@ -226,7 +220,7 @@ const toPn = async (pn) => {
         const countChild = (0, WABinary_1.getBinaryNodeChild)(result, 'count');
         return +countChild.attrs.value;
     };
-    /** generates and uploads a set of pre-keys to the server */
+
     const uploadPreKeys = async (count = Defaults_1.INITIAL_PREKEY_COUNT) => {
         await keys.transaction(async () => {
             logger.info({ count }, 'uploading pre-keys');
@@ -236,6 +230,7 @@ const toPn = async (pn) => {
             logger.info({ count }, 'uploaded pre-keys');
         });
     };
+
     const uploadPreKeysToServerIfRequired = async () => {
         const preKeyCount = await getAvailablePreKeysOnServer();
         logger.info(`${preKeyCount} pre-keys found on server`);
@@ -243,22 +238,19 @@ const toPn = async (pn) => {
             await uploadPreKeys();
         }
     };
+
     const onMessageReceived = (data) => {
         noise.decodeFrame(data, frame => {
             var _a;
-            // reset ping timeout
             lastDateRecv = new Date();
             let anyTriggered = false;
             anyTriggered = ws.emit('frame', frame);
-            // if it's a binary node
             if (!(frame instanceof Uint8Array)) {
                 const msgId = frame.attrs.id;
                 if (logger.level === 'trace') {
                     logger.trace({ xml: (0, WABinary_1.binaryNodeToString)(frame), msg: 'recv xml' });
                 }
-                /* Check if this is a response to a message we sent */
                 anyTriggered = ws.emit(`${Defaults_1.DEF_TAG_PREFIX}${msgId}`, frame) || anyTriggered;
-                /* Check if this is a response to a message we are expecting */
                 const l0 = frame.tag;
                 const l1 = frame.attrs || {};
                 const l2 = Array.isArray(frame.content) ? (_a = frame.content[0]) === null || _a === void 0 ? void 0 : _a.tag : '';
@@ -275,6 +267,7 @@ const toPn = async (pn) => {
             }
         });
     };
+
     const end = (error) => {
         if (closed) {
             logger.trace({ trace: error === null || error === void 0 ? void 0 : error.stack }, 'connection already closed');
@@ -303,6 +296,7 @@ const toPn = async (pn) => {
         });
         ev.removeAllListeners('connection.update');
     };
+
     const waitForSocketOpen = async () => {
         if (ws.isOpen) {
             return;
@@ -325,20 +319,16 @@ const toPn = async (pn) => {
             ws.off('error', onClose);
         });
     };
+
     const startKeepAliveRequest = () => (keepAliveReq = setInterval(() => {
         if (!lastDateRecv) {
             lastDateRecv = new Date();
         }
         const diff = Date.now() - lastDateRecv.getTime();
-        /*
-            check if it's been a suspicious amount of time since the server responded with our last seen
-            it could be that the network is down
-        */
         if (diff > keepAliveIntervalMs + 5000) {
             end(new boom_1.Boom('Connection was lost', { statusCode: Types_1.DisconnectReason.connectionLost }));
         }
         else if (ws.isOpen) {
-            // if its all good, send a keep alive request
             query({
                 tag: 'iq',
                 attrs: {
@@ -357,7 +347,7 @@ const toPn = async (pn) => {
             logger.warn('keep alive called when WS not open');
         }
     }, keepAliveIntervalMs));
-    /** i have no idea why this exists. pls enlighten me */
+
     const sendPassiveIq = (tag) => (query({
         tag: 'iq',
         attrs: {
@@ -369,7 +359,7 @@ const toPn = async (pn) => {
             { tag, attrs: {} }
         ]
     }));
-    /** logout & invalidate connection */
+
     const logout = async (msg) => {
         var _a;
         const jid = (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id;
@@ -395,7 +385,7 @@ const toPn = async (pn) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    
+
     /** This method was created by snowi, and implemented by KyuuRzy */
     /** hey bro, if you delete this text */
     /** you are the most cursed human being who likes to claim other people's property 😹🙌🏻 */
@@ -412,7 +402,13 @@ const toPn = async (pn) => {
         };
 
         ev.emit('creds.update', authState.creds);
-        
+
+        // ── FIX: Platform ID 1 = Chrome, dikenali WA sebagai companion browser valid ──
+        // Sebelumnya pakai getPlatformId(browser[1]) yang return nilai tidak dikenal
+        // untuk string 'Android' sehingga WA tidak mengirimkan push notif pairing ke HP
+        const PLATFORM_ID = Buffer.from([1]); // 1 = Chrome/Browser companion
+        const PLATFORM_DISPLAY = Buffer.from('Chrome (Linux)', 'utf-8');
+
         await sendNode({
             tag: 'iq',
             attrs: {
@@ -443,25 +439,26 @@ const toPn = async (pn) => {
                         {
                             tag: 'companion_platform_id',
                             attrs: {},
-                            content: (0, Utils_1.getPlatformId)(browser[1])
+                            content: PLATFORM_ID
                         },
                         {
                             tag: 'companion_platform_display',
                             attrs: {},
-                            content: `${browser[1]} (${browser[0]})`
+                            content: PLATFORM_DISPLAY
                         },
                         {
                             tag: 'link_code_pairing_nonce',
                             attrs: {},
-                            content: "0"
+                            content: Buffer.from('0', 'utf-8')
                         }
                     ]
                 }
             ]
         });
-        
+
         return authState.creds.pairingCode;
-    }
+    };
+
     async function generatePairingKey() {
         const salt = (0, crypto_1.randomBytes)(32);
         const randomIv = (0, crypto_1.randomBytes)(16);
@@ -469,6 +466,7 @@ const toPn = async (pn) => {
         const ciphered = (0, Utils_1.aesEncryptCTR)(authState.creds.pairingEphemeralKeyPair.public, key, randomIv);
         return Buffer.concat([salt, randomIv, ciphered]);
     }
+
     const sendWAMBuffer = (wamBuffer) => {
         return query({
             tag: 'iq',
@@ -486,6 +484,7 @@ const toPn = async (pn) => {
             ]
         });
     };
+
     ws.on('message', onMessageReceived);
     ws.on('open', async () => {
         try {
@@ -498,9 +497,8 @@ const toPn = async (pn) => {
     });
     ws.on('error', mapWebSocketError(end));
     ws.on('close', () => end(new boom_1.Boom('Connection Terminated', { statusCode: Types_1.DisconnectReason.connectionClosed })));
-    // the server terminated the connection
     ws.on('CB:xmlstreamend', () => end(new boom_1.Boom('Connection Terminated by Server', { statusCode: Types_1.DisconnectReason.connectionClosed })));
-    // QR gen
+
     ws.on('CB:iq,type:set,pair-device', async (stanza) => {
         const iq = {
             tag: 'iq',
@@ -516,7 +514,7 @@ const toPn = async (pn) => {
         const noiseKeyB64 = Buffer.from(creds.noiseKey.public).toString('base64');
         const identityKeyB64 = Buffer.from(creds.signedIdentityKey.public).toString('base64');
         const advB64 = creds.advSecretKey;
-        let qrMs = qrTimeout || 60000; // time to let a QR live
+        let qrMs = qrTimeout || 60000;
         const genPairQR = () => {
             if (!ws.isOpen) {
                 return;
@@ -530,12 +528,11 @@ const toPn = async (pn) => {
             const qr = [ref, noiseKeyB64, identityKeyB64, advB64].join(',');
             ev.emit('connection.update', { qr });
             qrTimer = setTimeout(genPairQR, qrMs);
-            qrMs = qrTimeout || 20000; // shorter subsequent qrs
+            qrMs = qrTimeout || 20000;
         };
         genPairQR();
     });
-    // device paired for the first time
-    // if device pairs successfully, the server asks to restart the connection
+
     ws.on('CB:iq,,pair-success', async (stanza) => {
         logger.debug('pair success recv');
         try {
@@ -550,13 +547,13 @@ const toPn = async (pn) => {
             end(error);
         }
     });
-    // login complete
+
     ws.on('CB:success', async (node) => {
         try {
             await uploadPreKeysToServerIfRequired();
             await sendPassiveIq('active');
             logger.info('opened connection to WA');
-            clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
+            clearTimeout(qrTimer);
             ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
             ev.emit('connection.update', { connection: 'open' });
         }
@@ -565,19 +562,22 @@ const toPn = async (pn) => {
             end(err);
         }
     });
+
     ws.on('CB:stream:error', (node) => {
         logger.error({ node }, 'stream errored out');
         const { reason, statusCode } = (0, Utils_1.getErrorCodeFromStreamError)(node);
         end(new boom_1.Boom(`Stream Errored (${reason})`, { statusCode, data: node }));
     });
-    // stream fail, possible logout
+
     ws.on('CB:failure', (node) => {
         const reason = +(node.attrs.reason || 500);
         end(new boom_1.Boom('Connection Failure', { statusCode: reason, data: node.attrs }));
     });
+
     ws.on('CB:ib,,downgrade_webclient', () => {
         end(new boom_1.Boom('Multi-device beta not joined', { statusCode: Types_1.DisconnectReason.multideviceMismatch }));
     });
+
     ws.on('CB:ib,,offline_preview', (node) => {
         logger.info('offline preview received', JSON.stringify(node));
         sendNode({
@@ -586,6 +586,7 @@ const toPn = async (pn) => {
             content: [{ tag: 'offline_batch', attrs: { count: '100' } }]
         });
     });
+
     ws.on('CB:ib,,edge_routing', (node) => {
         const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing');
         const routingInfo = (0, WABinary_1.getBinaryNodeChild)(edgeRoutingNode, 'routing_info');
@@ -594,18 +595,17 @@ const toPn = async (pn) => {
             ev.emit('creds.update', authState.creds);
         }
     });
+
     let didStartBuffer = false;
     process.nextTick(() => {
         var _a;
         if ((_a = creds.me) === null || _a === void 0 ? void 0 : _a.id) {
-            // start buffering important events
-            // if we're logged in
             ev.buffer();
             didStartBuffer = true;
         }
         ev.emit('connection.update', { connection: 'connecting', receivedPendingNotifications: false, qr: undefined });
     });
-    // called when all offline notifs are handled
+
     ws.on('CB:ib,,offline', (node) => {
         const child = (0, WABinary_1.getBinaryNodeChild)(node, 'offline');
         const offlineNotifs = +((child === null || child === void 0 ? void 0 : child.attrs.count) || 0);
@@ -616,11 +616,10 @@ const toPn = async (pn) => {
         }
         ev.emit('connection.update', { receivedPendingNotifications: true });
     });
-    // update credentials when required
+
     ev.on('creds.update', update => {
         var _a, _b;
         const name = (_a = update.me) === null || _a === void 0 ? void 0 : _a.name;
-        // if name has just been received
         if (((_b = creds.me) === null || _b === void 0 ? void 0 : _b.name) !== name) {
             logger.debug({ name }, 'updated pushName');
             sendNode({
@@ -633,9 +632,11 @@ const toPn = async (pn) => {
         }
         Object.assign(creds, update);
     });
+
     if (printQRInTerminal) {
         (0, Utils_1.printQRIfNecessaryListener)(ev, logger);
     }
+
     return {
         type: 'md',
         ws,
@@ -663,16 +664,12 @@ const toPn = async (pn) => {
         uploadPreKeys,
         uploadPreKeysToServerIfRequired,
         requestPairingCode,
-        /** Waits for the connection to WA to reach a state */
         waitForConnectionUpdate: (0, Utils_1.bindWaitForConnectionUpdate)(ev),
         sendWAMBuffer,
     };
 };
 exports.makeSocket = makeSocket;
-/**
- * map the websocket error to the right type
- * so it can be retried by the caller
- * */
+
 function mapWebSocketError(handler) {
     return (error) => {
         handler(new boom_1.Boom(`WebSocket Error (${error === null || error === void 0 ? void 0 : error.message})`, { statusCode: (0, Utils_1.getCodeFromWSError)(error), data: error }));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dyyxyzz/baileys-mod",
-    "version": "6.0.46",
+    "version": "6.0.49",
     "description": "WhatsApp API Modification",
     "keywords": [
         "whatsapp",