@realvare/based 2.7.1 → 2.7.3

package/lib/Socket/messages-recv.js

@@ -62,6 +62,16 @@ const makeMessagesRecvSocket = (config) => {
         logger.debug({ recv: { tag, attrs }, sent: stanza.attrs }, 'sent ack');
         await sendNode(stanza);
     };
+
+    // Add withAck wrapper for guaranteed acknowledgments
+    const withAck = (processFn) => async (node) => {
+        try {
+            await processFn(node);
+        } finally {
+            // Always send ack even on failure to allow potential retry
+            await sendMessageAck(node);
+        }
+    };
     const offerCall = async (toJid, isVideo = false) => {
         const callId = (0, crypto_1.randomBytes)(16).toString('hex').toUpperCase().substring(0, 64);
         const offerContent = [];
@@ -235,12 +245,22 @@ const makeMessagesRecvSocket = (config) => {
             }
         }
     };
-    const handleGroupNotification = (participant, child, msg) => {
+    const handleGroupNotification = async (participant, child, groupJid, msg) => {
         var _a, _b, _c, _d;
-        const participantJid = WABinary_1.lidToJid(((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant);
+        const participantJid = (((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant);
         switch (child === null || child === void 0 ? void 0 : child.tag) {
             case 'create':
-                const metadata = (0, groups_1.extractGroupMetadata)(child);
+                let metadata = (0, groups_1.extractGroupMetadata)(child);
+                const fullMetadata = await groupMetadata(groupJid);
+                if (metadata.owner && metadata.owner.endsWith('@lid')) {
+                    const found = fullMetadata.participants.find(p => p.id === metadata.owner);
+                    metadata.owner = found?.jid || (0, WABinary_1.lidToJid)(metadata.owner);
+                }
+                let resolvedAuthor = participant;
+                if (participant.endsWith('@lid')) {
+                    const found = fullMetadata.participants.find(p => p.id === participant);
+                    resolvedAuthor = found?.jid || (0, WABinary_1.lidToJid)(participant);
+                }
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE;
                 msg.messageStubParameters = [metadata.subject];
                 msg.key = { participant: metadata.owner };
@@ -251,7 +271,7 @@ const makeMessagesRecvSocket = (config) => {
                     }]);
                 ev.emit('groups.upsert', [{
                         ...metadata,
-                        author: participant
+                        author: resolvedAuthor
                     }]);
                 break;
             case 'ephemeral':
@@ -265,7 +285,7 @@ const makeMessagesRecvSocket = (config) => {
                 break;
             case 'modify':
                 const oldNumber = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
-                msg.messageStubParameters = oldNumber.map(j => WABinary_1.lidToJid(j)) || [];
+                msg.messageStubParameters = oldNumber || [];
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
                 break;
             case 'promote':
@@ -283,7 +303,7 @@ const makeMessagesRecvSocket = (config) => {
                     child.tag === 'remove') {
                     msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
                 }
-                msg.messageStubParameters = participants.map(j => WABinary_1.lidToJid(j));
+                msg.messageStubParameters = participants;
                 break;
             case 'subject':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT;
@@ -331,10 +351,26 @@ const makeMessagesRecvSocket = (config) => {
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
                 msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
                 break;
-                break;
             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 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);
+        }
     };
     const handleNewsletterNotification = (id, node) => {
         const messages = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
@@ -407,7 +443,7 @@ const makeMessagesRecvSocket = (config) => {
                 handleMexNewsletterNotification(node.attrs.from, child);
                 break;
             case 'w:gp2':
-                handleGroupNotification(node.attrs.participant, child, result);
+                await handleGroupNotification(node.attrs.participant, child, from, result);
                 break;
             case 'mediaretry':
                 const event = (0, Utils_1.decodeMediaRetryNode)(node);
@@ -659,7 +695,6 @@ const makeMessagesRecvSocket = (config) => {
                             update: { status: WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK }
                         })));
                     }
-
                     if (attrs.type === 'retry') {
                         // correctly set who is asking for the retry
                         key.participant = key.participant || attrs.from;
@@ -722,23 +757,20 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
         }
     };
-    const handleMessage = async (node) => {
+    const handleMessage = withAck(async (node) => {
         var _a, _b, _c;
         if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
             logger.debug({ key: node.attrs.key }, 'ignored message');
-            await sendMessageAck(node);
             return;
         }
         const encNode = (0, WABinary_1.getBinaryNodeChild)(node, 'enc');
         // TODO: temporary fix for crashes and issues resulting of failed msmsg decryption
         if (encNode && encNode.attrs.type === 'msmsg') {
             logger.debug({ key: node.attrs.key }, 'ignored msmsg');
-            await sendMessageAck(node);
             return;
         }
         let response;
         if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable') && !encNode) {
-            await sendMessageAck(node);
             const { key } = (0, Utils_1.decodeMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage;
             response = await requestPlaceholderResend(key);
             if (response === 'RESOLVED') {
@@ -824,7 +856,6 @@ const makeMessagesRecvSocket = (config) => {
                         }
                     }
                     (0, Utils_1.cleanMessage)(msg, authState.creds.me.id);
-                    await sendMessageAck(node);
                     await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
                 })
             ]);
@@ -832,7 +863,7 @@ const makeMessagesRecvSocket = (config) => {
         catch (error) {
             logger.error({ error, node }, 'error in handling message');
         }
-    };
+    });
     const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
         var _a;
         if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
@@ -1051,11 +1082,9 @@ const makeMessagesRecvSocket = (config) => {
     });
     ev.on('connection.update', (update) => {
         const { connection, lastDisconnect } = update;
-
         if (connection === 'close') {
             const statusCode = lastDisconnect?.error?.output?.statusCode;
             const shouldReconnect = statusCode !== Types_1.DisconnectReason.loggedOut;
-
             if (shouldReconnect) {
                 logger.info('Connection closed, will handle reconnection automatically');
             } else {
@@ -1064,14 +1093,12 @@ 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)();
@@ -1079,7 +1106,6 @@ const makeMessagesRecvSocket = (config) => {
             if (update.update.status === WAProto_1.proto.WebMessageInfo.Status.PENDING &&
                 Date.now() - (update.update.timestamp || 0) > 30000) { // 30 seconds
                 logger.debug({ key: update.key }, 'retrying stuck pending message with anti-ban delay');
-
                 // Apply anti-ban delay before retry
                 setTimeout(async () => {
                     try {
@@ -1104,4 +1130,4 @@ const makeMessagesRecvSocket = (config) => {
         requestPlaceholderResend,
     };
 };
-exports.makeMessagesRecvSocket = makeMessagesRecvSocket;
+exports.makeMessagesRecvSocket = makeMessagesRecvSocket;

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

@@ -29,11 +29,20 @@ exports.NACK_REASONS = {
  */
 function decodeMessageNode(stanza, meId, meLid) {
     var _a, _b, _c, _d, _e, _f, _g;
+    if (!stanza || !stanza.attrs) {
+        throw new boom_1.Boom('Invalid stanza or missing attributes', { statusCode: 400 });
+    }
     let msgType;
     let chatId;
     let author;
     const msgId = stanza.attrs.id;
+    if (!msgId) {
+        throw new boom_1.Boom('Missing message ID', { statusCode: 400 });
+    }
     const from = stanza.attrs.from;
+    if (!from) {
+        throw new boom_1.Boom('Missing sender JID', { statusCode: 400 });
+    }
     const senderPn = (_a = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _a === void 0 ? void 0 : _a.sender_pn;
     const senderLid = (_b = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _b === void 0 ? void 0 : _b.sender_lid;
     const participant = stanza.attrs.participant;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.01",
+  "version": "2.7.3",
   "description": "whatsapp api by sam",
   "keywords": [
     "baileys",
@@ -9,7 +9,8 @@
     "whatsapp-web",
     "whatsapp-bot",
     "automation",
-    "multi-device"
+    "multi-device",
+    "based"
   ],
   "homepage": "https://github.com/realvare/based.git",
   "repository": {
@@ -44,20 +45,20 @@
     "@cacheable/node-cache": "^1.4.0",
     "@hapi/boom": "^10.0.1",
     "async-mutex": "^0.5.0",
-    "axios": "^1.7.0",
-    "cache-manager": "^5.7.6",
+    "axios": "^1.13.2",
+    "cache-manager": "^7.2.5",
     "chalk": "^4.1.2",
-    "cheerio": "^1.0.0-rc.12",
+    "cheerio": "^1.1.2",
     "gradient-string": "^2.0.2",
-    "jimp": "^0.22.10",
-    "libphonenumber-js": "^1.10.58",
-    "libsignal": "github:NaufalYupra/libsignal-node",
+    "jimp": "^1.6.0",
+    "libphonenumber-js": "^1.12.31",
+    "libsignal": "github:whiskeysockets/libsignal-node",
     "lodash": "^4.17.21",
-    "music-metadata": "^7.12.3",
-    "pino": "^9.6",
-    "protobufjs": "^7.2.5",
-    "uuid": "^10.0.0",
-    "ws": "^8.18.0"
+    "music-metadata": "^11.7.0",
+    "pino": "^10.1.0",
+    "protobufjs": "^7.5.4",
+    "uuid": "^13.0.0",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
     "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
@@ -69,7 +70,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "jimp": "^0.22.10",
+    "jimp": "^1.6.0",
     "json": "^11.0.0",
     "link-preview-js": "^3.0.0",
     "open": "^10.1.0",
@@ -79,7 +80,7 @@
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typedoc": "^0.25.12",
-    "typescript": "^5.6.0"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",