@realvare/based 2.7.3 → 2.7.4

package/lib/Socket/groups.js

@@ -320,8 +320,8 @@ const extractGroupMetadata = (result) => {
         participants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').map(({ attrs }) => {
             return {
                 id: attrs.jid,
-                jid: attrs.phone_number || attrs.jid,
-                lid: attrs.lid || attrs.jid,
+                jid: attrs.phone_number || (0, WABinary_1.lidToJid)(attrs.jid),
+                lid: attrs.lid || ((0, WABinary_1.isLid)(attrs.jid) ? attrs.jid : undefined),
                 admin: (attrs.type || null),
             };
         }),

package/lib/Socket/messages-recv.js

@@ -35,6 +35,12 @@ const makeMessagesRecvSocket = (config) => {
         useClones: false
     });
     let sendActiveReceipts = false;
+    const resolveJid = (jid) => {
+        if (typeof jid === 'string' && jid.endsWith('@lid')) {
+            return (0, WABinary_1.lidToJid)(jid);
+        }
+        return jid;
+    };
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         const stanza = {
             tag: 'ack',
@@ -354,22 +360,28 @@ const makeMessagesRecvSocket = (config) => {
             default:
             // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
-        // Resolve LIDs to real JIDs for all messageStubParameters
-        if (msg.messageStubParameters) {
-            const metadata = await groupMetadata(groupJid);
-            msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => {
-                if (typeof param === 'string' && param.endsWith('@lid')) {
-                    const found = metadata.participants.find(p => p.id === param);
-                    return found?.jid || (0, WABinary_1.lidToJid)(param);
-                }
-                return param;
-            }));
-        }
-        // Also resolve key.participant if needed
-        if (msg.key?.participant && msg.key.participant.endsWith('@lid')) {
+        const needsResolving = (msg.messageStubParameters && msg.messageStubParameters.some(p => typeof p === 'string' && (0, WABinary_1.isLid)(p))) ||
+                               (participant && (0, WABinary_1.isLid)(participant)) ||
+                               (msg.key?.participant && (0, WABinary_1.isLid)(msg.key.participant));
+        if(needsResolving) {
             const metadata = await groupMetadata(groupJid);
-            const found = metadata.participants.find(p => p.id === msg.key.participant);
-            msg.key.participant = found?.jid || (0, WABinary_1.lidToJid)(msg.key.participant);
+            if (msg.messageStubParameters) {
+                msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => {
+                    if (typeof param === 'string' && (0, WABinary_1.isLid)(param)) {
+                        const found = metadata.participants.find(p => p.id === param);
+                        return found?.jid || (0, WABinary_1.lidToJid)(param);
+                    }
+                    return param;
+                }));
+            }
+            if(participant && (0, WABinary_1.isLid)(participant)) {
+                const found = metadata.participants.find(p => p.id === participant);
+                msg.participant = found?.jid || (0, WABinary_1.lidToJid)(participant);
+            }
+            if (msg.key?.participant && (0, WABinary_1.isLid)(msg.key.participant)) {
+                const found = metadata.participants.find(p => p.id === msg.key.participant);
+                msg.key.participant = found?.jid || (0, WABinary_1.lidToJid)(msg.key.participant);
+            }
         }
     };
     const handleNewsletterNotification = (id, node) => {
@@ -421,12 +433,12 @@ const makeMessagesRecvSocket = (config) => {
         const result = {};
         const [child] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
         const nodeType = node.attrs.type;
-        const from = (0, WABinary_1.jidNormalizedUser)(node.attrs.from);
+        const from = resolveJid((0, WABinary_1.jidNormalizedUser)(node.attrs.from));
         switch (nodeType) {
             case 'privacy_token':
                 const tokenList = (0, WABinary_1.getBinaryNodeChildren)(child, 'token');
                 for (const { attrs, content } of tokenList) {
-                    const jid = attrs.jid;
+                    const jid = resolveJid(attrs.jid);
                     ev.emit('chats.update', [
                         {
                             id: jid,
@@ -455,7 +467,7 @@ const makeMessagesRecvSocket = (config) => {
             case 'devices':
                 const devices = (0, WABinary_1.getBinaryNodeChildren)(child, 'device');
                 if ((0, WABinary_1.areJidsSameUser)(child.attrs.jid, authState.creds.me.id)) {
-                    const deviceJids = devices.map(d => d.attrs.jid);
+                    const deviceJids = devices.map(d => resolveJid(d.attrs.jid));
                     logger.info({ deviceJids }, 'got my own devices');
                 }
                 break;
@@ -470,7 +482,7 @@ const makeMessagesRecvSocket = (config) => {
                 const setPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'set');
                 const delPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'delete');
                 ev.emit('contacts.update', [{
-                        id: from || ((_b = (_a = (setPicture || delPicture)) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.hash) || '',
+                        id: resolveJid(from) || ((_b = (_a = (setPicture || delPicture)) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.hash) || '',
                         imgUrl: setPicture ? 'changed' : 'removed'
                     }]);
                 if ((0, WABinary_1.isJidGroup)(from)) {
@@ -484,6 +496,15 @@ const makeMessagesRecvSocket = (config) => {
                         ...result.key || {},
                         participant: setPicture === null || setPicture === void 0 ? void 0 : setPicture.attrs.author
                     };
+                    const metadata = await groupMetadata(from);
+                    if (result.participant && result.participant.endsWith('@lid')) {
+                        const found = metadata.participants.find(p => p.id === result.participant);
+                        result.participant = found?.jid || (0, WABinary_1.lidToJid)(result.participant);
+                    }
+                    if (result.key?.participant && result.key.participant.endsWith('@lid')) {
+                        const found = metadata.participants.find(p => p.id === result.key.participant);
+                        result.key.participant = found?.jid || (0, WABinary_1.lidToJid)(result.key.participant);
+                    }
                 }
                 break;
             case 'account_sync':
@@ -504,7 +525,7 @@ const makeMessagesRecvSocket = (config) => {
                 else if (child.tag === 'blocklist') {
                     const blocklists = (0, WABinary_1.getBinaryNodeChildren)(child, 'item');
                     for (const { attrs } of blocklists) {
-                        const blocklist = [attrs.jid];
+                        const blocklist = [resolveJid(attrs.jid)];
                         const type = (attrs.action === 'block') ? 'add' : 'remove';
                         ev.emit('blocklist.update', { blocklist, type });
                     }
@@ -635,14 +656,14 @@ const makeMessagesRecvSocket = (config) => {
         var _a, _b;
         const { attrs, content } = node;
         const isLid = attrs.from.includes('lid');
-        const isNodeFromMe = (0, WABinary_1.areJidsSameUser)(attrs.participant || attrs.from, isLid ? (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.lid : (_b = authState.creds.me) === null || _b === void 0 ? void 0 : _b.id);
-        const remoteJid = !isNodeFromMe || (0, WABinary_1.isJidGroup)(attrs.from) ? attrs.from : attrs.recipient;
+        const isNodeFromMe = (0, WABinary_1.areJidsSameUser)(resolveJid(attrs.participant) || resolveJid(attrs.from), isLid ? (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.lid : (_b = authState.creds.me) === null || _b === void 0 ? void 0 : _b.id);
+        const remoteJid = !isNodeFromMe || (0, WABinary_1.isJidGroup)(attrs.from) ? resolveJid(attrs.from) : attrs.recipient;
         const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender') && isNodeFromMe);
         const key = {
             remoteJid,
             id: '',
             fromMe,
-            participant: attrs.participant
+            participant: resolveJid(attrs.participant)
         };
         if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid }, 'ignoring receipt from jid');
@@ -670,7 +691,7 @@ const makeMessagesRecvSocket = (config) => {
                                 ev.emit('message-receipt.update', ids.map(id => ({
                                     key: { ...key, id },
                                     receipt: {
-                                        userJid: (0, WABinary_1.jidNormalizedUser)(attrs.participant),
+                                        userJid: (0, WABinary_1.jidNormalizedUser)(resolveJid(attrs.participant)),
                                         [updateKey]: +attrs.t
                                     }
                                 })));
@@ -725,7 +746,7 @@ const makeMessagesRecvSocket = (config) => {
         }
     };
     const handleNotification = async (node) => {
-        const remoteJid = node.attrs.from;
+        const remoteJid = resolveJid(node.attrs.from);
         if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification');
             await sendMessageAck(node);
@@ -737,15 +758,15 @@ const makeMessagesRecvSocket = (config) => {
                     var _a;
                     const msg = await processNotification(node);
                     if (msg) {
-                        const fromMe = (0, WABinary_1.areJidsSameUser)(node.attrs.participant || remoteJid, authState.creds.me.id);
-                        msg.key = {
-                            remoteJid,
-                            fromMe,
-                            participant: node.attrs.participant,
-                            id: node.attrs.id,
-                            ...(msg.key || {})
-                        };
-                        (_a = msg.participant) !== null && _a !== void 0 ? _a : (msg.participant = node.attrs.participant);
+                        const participant = msg.participant || resolveJid(node.attrs.participant);
+                        const fromMe = (0, WABinary_1.areJidsSameUser)(participant || remoteJid, authState.creds.me.id);
+                        const key = msg.key || {};
+                        key.remoteJid = remoteJid;
+                        key.fromMe = fromMe;
+                        key.id = node.attrs.id;
+                        key.participant = key.participant || participant;
+                        msg.key = key;
+                        msg.participant = participant;
                         msg.messageTimestamp = +node.attrs.t;
                         const fullMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg);
                         await upsertMessage(fullMsg, 'append');
@@ -916,10 +937,10 @@ const makeMessagesRecvSocket = (config) => {
         const { attrs } = node;
         const [infoChild] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
         const callId = infoChild.attrs['call-id'];
-        const from = infoChild.attrs.from || infoChild.attrs['call-creator'];
+        const from = resolveJid(infoChild.attrs.from || infoChild.attrs['call-creator']);
         const status = (0, Utils_1.getCallStatusFromNode)(infoChild);
         const call = {
-            chatId: attrs.from,
+            chatId: resolveJid(attrs.from),
             from,
             id: callId,
             date: new Date(+attrs.t * 1000),
@@ -929,7 +950,7 @@ const makeMessagesRecvSocket = (config) => {
         if (status === 'offer') {
             call.isVideo = !!(0, WABinary_1.getBinaryNodeChild)(infoChild, 'video');
             call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid'];
-            call.groupJid = infoChild.attrs['group-jid'];
+            call.groupJid = resolveJid(infoChild.attrs['group-jid']);
             callOfferCache.set(call.id, call);
         }
         const existingCall = callOfferCache.get(call.id);
@@ -1055,7 +1076,6 @@ const makeMessagesRecvSocket = (config) => {
             .catch(error => onUnexpectedError(error, 'handling bad ack'));
     });
     ev.on('call', ([call]) => {
-        // missed call + group call notification message generation
         if (call.status === 'timeout' || (call.status === 'offer' && call.isGroup)) {
             const msg = {
                 key: {
@@ -1093,20 +1113,17 @@ const makeMessagesRecvSocket = (config) => {
         } else if (connection === 'open') {
             sendActiveReceipts = true;
         }
-        // Update sendActiveReceipts based on connection status
         if (typeof update.isOnline !== 'undefined') {
             sendActiveReceipts = update.isOnline;
             logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`);
         }
     });
-    // Enhanced retry logic for stuck pending messages with anti-ban delays
     ev.on('messages.update', (updates) => {
         const config = (0, performance_config_1.getPerformanceConfig)();
         updates.forEach(update => {
             if (update.update.status === WAProto_1.proto.WebMessageInfo.Status.PENDING &&
-                Date.now() - (update.update.timestamp || 0) > 30000) { // 30 seconds
+                Date.now() - (update.update.timestamp || 0) > 30000) {
                 logger.debug({ key: update.key }, 'retrying stuck pending message with anti-ban delay');
-                // Apply anti-ban delay before retry
                 setTimeout(async () => {
                     try {
                         const msg = await getMessage(update.key);

package/lib/Utils/messages.js

@@ -1194,49 +1194,4 @@ const assertMediaContent = (content) => {
     return mediaContent;
 };
 exports.assertMediaContent = assertMediaContent;
-const getNormalizedJid = (jid) => {
-    if (!jid) return jid;
-    return (0, WABinary_1.jidNormalizedUser)(jid);
-};
-exports.getNormalizedJid = getNormalizedJid;
-
-const isLidFormat = (jid) => {
-    return (0, WABinary_1.isLidUser)(jid);
-};
-exports.isLidFormat = isLidFormat;
 
-// Legacy compatibility functions - deprecated, use native APIs
-const toJid = (id) => {
-    console.warn('toJid is deprecated. Use getNormalizedJid instead.');
-    return getNormalizedJid(id);
-};
-exports.toJid = toJid;
-
-const getSenderLid = (message) => {
-    const sender = message?.key?.participant || message?.key?.remoteJid;
-    if (!sender) return null;
-
-    const normalized = getNormalizedJid(sender);
-    return {
-        jid: sender,
-        lid: normalized,
-        isValid: true,
-        user: (0, WABinary_1.jidDecode)(normalized)?.user || 'unknown'
-    };
-};
-exports.getSenderLid = getSenderLid;
-
-const validateJid = (jid) => {
-    console.warn('validateJid is deprecated. Use native Baileys validation.');
-    if (!jid || typeof jid !== 'string') {
-        return { isValid: false, error: 'Invalid JID: must be a non-empty string' };
-    }
-
-    try {
-        const decoded = (0, WABinary_1.jidDecode)(jid);
-        return { isValid: !!decoded };
-    } catch {
-        return { isValid: false, error: 'Invalid JID format' };
-    }
-};
-exports.validateJid = validateJid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "whatsapp api by sam",
   "keywords": [
     "baileys",
@@ -52,7 +52,7 @@
     "gradient-string": "^2.0.2",
     "jimp": "^1.6.0",
     "libphonenumber-js": "^1.12.31",
-    "libsignal": "github:whiskeysockets/libsignal-node",
+    "libsignal": "npm:@newfadel/libsignal-node",
     "lodash": "^4.17.21",
     "music-metadata": "^11.7.0",
     "pino": "^10.1.0",