@realvare/based 2.7.56 → 2.7.58

package/lib/Defaults/index.js

@@ -43,7 +43,7 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     defaultQueryTimeoutMs: 60000,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
-    maxMsgRetryCount: 10,
+    maxMsgRetryCount: 5,
     fireInitQueries: true,
     auth: undefined,
     markOnlineOnConnect: false,
@@ -59,7 +59,7 @@ exports.DEFAULT_CONNECTION_CONFIG = {
         patch: false,
         snapshot: false,
     },
-    countryCode: 'IT',
+    countryCode: 'US',
     getMessage: async () => undefined,
     cachedGroupMetadata: async () => undefined,
     makeSignalRepository: libsignal_1.makeLibSignalRepository

package/lib/Socket/chats.js

@@ -32,6 +32,12 @@ const makeChatsSocket = (config) => {
     if (!config.placeholderResendCache) {
         config.placeholderResendCache = placeholderResendCache;
     }
+    const resolveJid = (jid) => {
+        if (typeof jid === 'string' && jid.endsWith('@lid')) {
+            return (0, WABinary_1.lidToJid)(jid);
+        }
+        return jid;
+    };
     /** helper function to fetch the given app state sync key */
     const getAppStateSyncKey = async (keyId) => {
         const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
@@ -136,7 +142,7 @@ const makeChatsSocket = (config) => {
             if (section.attrs.type === 'all') {
                 for (const bot of (0, WABinary_1.getBinaryNodeChildren)(section, 'bot')) {
                     botList.push({
-                        jid: bot.attrs.jid,
+                        jid: resolveJid(bot.attrs.jid),
                         personaId: bot.attrs['persona_id']
                     });
                 }
@@ -149,15 +155,20 @@ const makeChatsSocket = (config) => {
             .withContactProtocol()
             .withLIDProtocol();
         for (const jid of jids) {
-            const phone = `+${jid.replace('+', '').split('@')[0].split(':')[0]}`;
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone));
+            if (jid.includes('@')) {
+                usyncQuery.withUser(new WAUSync_1.USyncUser().withId(resolveJid(jid)));
+            } else {
+                const phone = `+${jid}`;
+                usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone));
+            }
         }
         const results = await sock.executeUSyncQuery(usyncQuery);
         if (results) {
-            return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid }));
+            return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: resolveJid(id), exists: contact, lid }));
         }
     };
     const fetchStatus = async (...jids) => {
+        jids = jids.map(resolveJid);
         const usyncQuery = new WAUSync_1.USyncQuery()
             .withStatusProtocol();
         for (const jid of jids) {
@@ -169,6 +180,7 @@ const makeChatsSocket = (config) => {
         }
     };
     const fetchDisappearingDuration = async (...jids) => {
+        jids = jids.map(resolveJid);
         const usyncQuery = new WAUSync_1.USyncQuery()
             .withDisappearingModeProtocol();
         for (const jid of jids) {
@@ -181,6 +193,7 @@ const makeChatsSocket = (config) => {
     };
     /** update the profile picture for yourself or a group */
     const updateProfilePicture = async (jid, content) => {
+        jid = resolveJid(jid);
         let targetJid;
         if (!jid) {
             throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
@@ -208,6 +221,7 @@ const makeChatsSocket = (config) => {
     };
     /** remove the profile picture for yourself or a group */
     const removeProfilePicture = async (jid) => {
+        jid = resolveJid(jid);
         let targetJid;
         if (!jid) {
             throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
@@ -257,9 +271,10 @@ const makeChatsSocket = (config) => {
         });
         const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list');
         return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item')
-            .map(n => n.attrs.jid);
+            .map(n => resolveJid(n.attrs.jid));
     };
     const updateBlockStatus = async (jid, action) => {
+        jid = resolveJid(jid);
         await query({
             tag: 'iq',
             attrs: {
@@ -279,6 +294,7 @@ const makeChatsSocket = (config) => {
         });
     };
     const getBusinessProfile = async (jid) => {
+        jid = resolveJid(jid);
         var _a, _b, _c, _d, _e, _f, _g;
         const results = await query({
             tag: 'iq',
@@ -462,6 +478,7 @@ const makeChatsSocket = (config) => {
      * type = "image for the high res picture"
      */
     const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
+        jid = resolveJid(jid);
         var _a;
         jid = (0, WABinary_1.jidNormalizedUser)(jid);
         const result = await query({
@@ -480,6 +497,7 @@ const makeChatsSocket = (config) => {
         return (_a = child === null || child === void 0 ? void 0 : child.attrs) === null || _a === void 0 ? void 0 : _a.url;
     };
     const sendPresenceUpdate = async (type, toJid) => {
+        toJid = resolveJid(toJid);
         const me = authState.creds.me;
         if (type === 'available' || type === 'unavailable') {
             if (!me.name) {
@@ -520,7 +538,7 @@ const makeChatsSocket = (config) => {
     const presenceSubscribe = (toJid, tcToken) => (sendNode({
         tag: 'presence',
         attrs: {
-            to: toJid,
+            to: resolveJid(toJid),
             id: generateMessageTag(),
             type: 'subscribe'
         },
@@ -537,8 +555,8 @@ const makeChatsSocket = (config) => {
     const handlePresenceUpdate = ({ tag, attrs, content }) => {
         var _a;
         let presence;
-        const jid = attrs.from;
-        const participant = attrs.participant || attrs.from;
+        const jid = resolveJid(attrs.from);
+        const participant = resolveJid(attrs.participant || attrs.from);
         if (shouldIgnoreJid(jid) && jid != '@s.whatsapp.net') {
             return;
         }
@@ -660,6 +678,7 @@ const makeChatsSocket = (config) => {
      * requires the last messages till the last message received; required for archive & unread
     */
     const chatModify = (mod, jid) => {
+        jid = resolveJid(jid);
         const patch = (0, Utils_1.chatModificationToAppPatch)(mod, jid);
         return appPatch(patch);
     };
@@ -667,6 +686,7 @@ const makeChatsSocket = (config) => {
      * Star or Unstar a message
      */
     const star = (jid, messages, star) => {
+        jid = resolveJid(jid);
         return chatModify({
             star: {
                 messages,
@@ -678,6 +698,7 @@ const makeChatsSocket = (config) => {
      * Adds label for the chats
      */
     const addChatLabel = (jid, labelId) => {
+        jid = resolveJid(jid);
         return chatModify({
             addChatLabel: {
                 labelId
@@ -688,6 +709,7 @@ const makeChatsSocket = (config) => {
      * Removes label for the chat
      */
     const removeChatLabel = (jid, labelId) => {
+        jid = resolveJid(jid);
         return chatModify({
             removeChatLabel: {
                 labelId
@@ -698,6 +720,7 @@ const makeChatsSocket = (config) => {
      * Adds label for the message
      */
     const addMessageLabel = (jid, messageId, labelId) => {
+        jid = resolveJid(jid);
         return chatModify({
             addMessageLabel: {
                 messageId,
@@ -709,6 +732,7 @@ const makeChatsSocket = (config) => {
      * Removes label for the message
      */
     const removeMessageLabel = (jid, messageId, labelId) => {
+        jid = resolveJid(jid);
         return chatModify({
             removeMessageLabel: {
                 messageId,
@@ -830,7 +854,7 @@ const makeChatsSocket = (config) => {
                 break;
         }
     });
-    ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
+    ev.on('connection.update', ({ connection, receivedPendingNotifications, isOnline }) => {
         var _a;
         if (connection === 'open') {
             if (fireInitQueries) {
@@ -847,6 +871,9 @@ const makeChatsSocket = (config) => {
             ev.buffer();
             needToFlushWithAppStateSync = true;
         }
+        if (typeof isOnline !== 'undefined' && isOnline) {
+            sendPresenceUpdate('available').catch(error => onUnexpectedError(error, 'presence update on online'));
+        }
     });
     return {
         ...sock,
@@ -887,4 +914,4 @@ const makeChatsSocket = (config) => {
         star
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+exports.makeChatsSocket = makeChatsSocket;

package/lib/Socket/groups.js

@@ -9,6 +9,12 @@ const chats_1 = require("./chats");
 const makeGroupsSocket = (config) => {
     const sock = (0, chats_1.makeChatsSocket)(config);
     const { authState, ev, query, upsertMessage } = sock;
+    const resolveJid = (jid) => {
+        if (typeof jid === 'string' && jid.endsWith('@lid')) {
+            return (0, WABinary_1.lidToJid)(jid);
+        }
+        return jid;
+    };
     const groupQuery = async (jid, type, content) => (query({
         tag: 'iq',
         attrs: {
@@ -70,6 +76,7 @@ const makeGroupsSocket = (config) => {
         groupQuery,
         groupMetadata,
         groupCreate: async (subject, participants) => {
+            participants = participants.map(resolveJid);
             const key = (0, Utils_1.generateMessageIDV2)();
             const result = await groupQuery('@g.us', 'set', [
                 {
@@ -118,6 +125,7 @@ const makeGroupsSocket = (config) => {
             return participants.map(v => v.attrs);
         },
         groupRequestParticipantsUpdate: async (jid, participants, action) => {
+            participants = participants.map(resolveJid);
             const result = await groupQuery(jid, 'set', [{
                     tag: 'membership_requests_action',
                     attrs: {},
@@ -140,6 +148,7 @@ const makeGroupsSocket = (config) => {
             });
         },
         groupParticipantsUpdate: async (jid, participants, action) => {
+            participants = participants.map(resolveJid);
             const result = await groupQuery(jid, 'set', [
                 {
                     tag: action,
@@ -195,6 +204,7 @@ const makeGroupsSocket = (config) => {
          * @returns true if successful
          */
         groupRevokeInviteV4: async (groupJid, invitedJid) => {
+            invitedJid = resolveJid(invitedJid);
             const result = await groupQuery(groupJid, 'set', [{ tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }]);
             return !!result;
         },
@@ -206,6 +216,7 @@ const makeGroupsSocket = (config) => {
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
             var _a;
             key = typeof key === 'string' ? { remoteJid: key } : key;
+            key.remoteJid = resolveJid(key.remoteJid);
             const results = await groupQuery(inviteMessage.groupJid, 'set', [{
                     tag: 'accept',
                     attrs: {
@@ -329,4 +340,4 @@ const extractGroupMetadata = (result) => {
     };
     return metadata;
 };
-exports.extractGroupMetadata = extractGroupMetadata;
+exports.extractGroupMetadata = extractGroupMetadata;

package/lib/Socket/messages-recv.js

@@ -68,7 +68,6 @@ 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 {
@@ -253,6 +252,14 @@ const makeMessagesRecvSocket = (config) => {
             }
         }
     };
+    const toLidIfNecessary = (jid) => {
+        if (typeof jid !== 'string') return jid;
+        const [user, server] = jid.split('@');
+        if (server === 's.whatsapp.net' && /^[0-9]+$/.test(user) && user.length >= 15) {
+            return `${user}@lid`;
+        }
+        return jid;
+    };
     const handleGroupNotification = async (participant, child, groupJid, msg) => {
         var _a, _b, _c, _d;
         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);
@@ -362,16 +369,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))
         }
-        const needsResolving = (msg.messageStubParameters && msg.messageStubParameters.some(p => typeof p === 'string' && (0, WABinary_1.isLid)(p))) ||
+        // Apply LID fix before checking needsResolving
+        if (msg.messageStubParameters) {
+            msg.messageStubParameters = msg.messageStubParameters.map(toLidIfNecessary);
+        }
+        participant = toLidIfNecessary(participant);
+        if (msg.key?.participant) {
+            msg.key.participant = toLidIfNecessary(msg.key.participant);
+        }
+        const needsResolving = (msg.messageStubParameters && msg.messageStubParameters.some(p => typeof p === 'string')) ||
                                (participant && (0, WABinary_1.isLid)(participant)) ||
                                (msg.key?.participant && (0, WABinary_1.isLid)(msg.key.participant));
         if(needsResolving) {
             const metadata = await groupMetadata(groupJid);
             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);
+                    if (typeof param === 'string') {
+                        if ((0, WABinary_1.isLid)(param)) {
+                            const found = metadata.participants.find(p => p.id === param);
+                            return found?.jid || (0, WABinary_1.lidToJid)(param);
+                        } else {
+                            return param;
+                        }
                     }
                     return param;
                 }));
@@ -379,10 +398,16 @@ const makeMessagesRecvSocket = (config) => {
             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);
+            } else if (participant) {
+                //If it's a JID, treat it as a JID. Do not convert back to LID. *smh brah
+                msg.participant = 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);
+            } else if (msg.key?.participant) {
+                // If it's a JID, treat it as a JID. Do not convert back to LID. *smh brahpt2
+                msg.key.participant = msg.key.participant;
             }
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.56",
+  "version": "2.7.58",
   "description": "whatsapp api by sam",
   "keywords": [
     "baileys",
@@ -60,7 +60,7 @@
     "protobufjs": "^7.5.4",
     "sharp": "^0.33.5",
     "uuid": "^13.0.0",
-    "ws": "^8.18.3"
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",