@realvare/based 2.7.54 → 2.7.55

package/lib/Socket/messages-recv.js

@@ -46,7 +46,7 @@ const makeMessagesRecvSocket = (config) => {
             tag: 'ack',
             attrs: {
                 id: attrs.id,
-                to: resolveJid(attrs.from),
+                to: attrs.from,
                 class: tag
             }
         };
@@ -54,10 +54,10 @@ const makeMessagesRecvSocket = (config) => {
             stanza.attrs.error = errorCode.toString();
         }
         if (!!attrs.participant) {
-            stanza.attrs.participant = resolveJid(attrs.participant);
+            stanza.attrs.participant = attrs.participant;
         }
         if (!!attrs.recipient) {
-            stanza.attrs.recipient = resolveJid(attrs.recipient);
+            stanza.attrs.recipient = attrs.recipient;
         }
         if (!!attrs.type && (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
             stanza.attrs.type = attrs.type;
@@ -68,6 +68,7 @@ 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 {
@@ -117,7 +118,7 @@ const makeMessagesRecvSocket = (config) => {
         const stanza = ({
             tag: 'call',
             attrs: {
-                to: resolveJid(toJid),
+                to: toJid,
             },
             content: [{
                     tag: 'offer',
@@ -140,13 +141,13 @@ const makeMessagesRecvSocket = (config) => {
             tag: 'call',
             attrs: {
                 from: authState.creds.me.id,
-                to: resolveJid(callFrom),
+                to: callFrom,
             },
             content: [{
                     tag: 'reject',
                     attrs: {
                         'call-id': callId,
-                        'call-creator': resolveJid(callFrom),
+                        'call-creator': callFrom,
                         count: '0',
                     },
                     content: undefined,
@@ -180,7 +181,7 @@ const makeMessagesRecvSocket = (config) => {
                 attrs: {
                     id: msgId,
                     type: 'retry',
-                    to: resolveJid(node.attrs.from)
+                    to: node.attrs.from
                 },
                 content: [
                     {
@@ -200,10 +201,10 @@ const makeMessagesRecvSocket = (config) => {
                 ]
             };
             if (node.attrs.recipient) {
-                receipt.attrs.recipient = resolveJid(node.attrs.recipient);
+                receipt.attrs.recipient = node.attrs.recipient;
             }
             if (node.attrs.participant) {
-                receipt.attrs.participant = resolveJid(node.attrs.participant);
+                receipt.attrs.participant = node.attrs.participant;
             }
             if (retryCount > 1 || forceIncludeKeys) {
                 const { update, preKeys } = await (0, Utils_1.getNextPreKeys)(authState, 1);
@@ -228,7 +229,7 @@ const makeMessagesRecvSocket = (config) => {
         });
     };
     const handleEncryptNotification = async (node) => {
-        const from = resolveJid(node.attrs.from);
+        const from = node.attrs.from;
         if (from === WABinary_1.S_WHATSAPP_NET) {
             const countChild = (0, WABinary_1.getBinaryNodeChild)(node, 'count');
             const count = +countChild.attrs.value;
@@ -293,24 +294,22 @@ const makeMessagesRecvSocket = (config) => {
                 msg.messageStubParameters = oldNumber || [];
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
                 break;
-            case 'add':
-            case 'remove':
             case 'promote':
             case 'demote':
+            case 'remove':
+            case 'add':
             case 'leave':
-                const stubTypes = {
-                    add: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                    remove: Types_1.WAMessageStubType.GROUP_PARTICIPANT_REMOVE,
-                    promote: Types_1.WAMessageStubType.GROUP_PARTICIPANT_PROMOTE,
-                    demote: Types_1.WAMessageStubType.GROUP_PARTICIPANT_DEMOTE,
-                    leave: Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE,
-                };
-                msg.messageStubType = stubTypes[child.tag];
-                let affected = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
-                if (affected.length === 0) {
-                    affected = [participant];
+                const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`;
+                msg.messageStubType = Types_1.WAMessageStubType[stubType];
+                const participants = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
+                if (participants.length === 1 &&
+                    // if recv. "remove" message and sender removed themselves
+                    // mark as left
+                    (0, WABinary_1.areJidsSameUser)(participants[0], participant) &&
+                    child.tag === 'remove') {
+                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
                 }
-                msg.messageStubParameters = affected;
+                msg.messageStubParameters = participants;
                 break;
             case 'subject':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT;
@@ -623,7 +622,7 @@ const makeMessagesRecvSocket = (config) => {
         // todo: implement a cache to store the last 256 sent messages (copy whatsmeow)
         const msgs = await Promise.all(ids.map(id => getMessage({ ...key, id })));
         const remoteJid = key.remoteJid;
-        const participant = resolveJid(key.participant || remoteJid);
+        const participant = key.participant || remoteJid;
         // if it's the primary jid sending the request
         // just re-send the message to everyone
         // prevents the first message decryption failure
@@ -658,7 +657,7 @@ const makeMessagesRecvSocket = (config) => {
         const { attrs, content } = node;
         const isLid = attrs.from.includes('lid');
         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) : resolveJid(attrs.recipient);
+        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,
@@ -719,14 +718,13 @@ const makeMessagesRecvSocket = (config) => {
                     }
                     if (attrs.type === 'retry') {
                         // correctly set who is asking for the retry
-                        key.participant = key.participant || resolveJid(attrs.from);
+                        key.participant = key.participant || attrs.from;
                         const retryNode = (0, WABinary_1.getBinaryNodeChild)(node, 'retry');
                         if (willSendMessageAgain(ids[0], key.participant)) {
                             if (key.fromMe) {
                                 try {
                                     logger.debug({ attrs, key }, 'recv retry request');
-                                    sendMessagesAgain(key, ids, retryNode)
-                                        .catch(error => logger.error({ key, ids, trace: error.stack }, 'error in sending message again'));
+                                    await sendMessagesAgain(key, ids, retryNode);
                                 }
                                 catch (error) {
                                     logger.error({ key, ids, trace: error.stack }, 'error in sending message again');
@@ -782,7 +780,7 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleMessage = withAck(async (node) => {
         var _a, _b, _c;
-        if (shouldIgnoreJid(resolveJid(node.attrs.from)) && node.attrs.from !== '@s.whatsapp.net') {
+        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
             logger.debug({ key: node.attrs.key }, 'ignored message');
             return;
         }
@@ -850,7 +848,8 @@ const makeMessagesRecvSocket = (config) => {
                                 const metadata = await groupMetadata(msg.key.remoteJid);
                                 const sender = msg.message.extendedTextMessage.contextInfo.participant;
                                 const found = metadata.participants.find(p => p.id === sender);
-                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || (0, WABinary_1.lidToJid)(sender); }
+                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || sender;
+                            }
                         }
                         if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
                             msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
@@ -926,15 +925,13 @@ const makeMessagesRecvSocket = (config) => {
                 }],
             peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.PLACEHOLDER_MESSAGE_RESEND
         };
-        const result = await Promise.race([
-            sendPeerDataOperationMessage(pdoMessage),
-            (0, Utils_1.delay)(15000).then(() => 'timeout')
-        ]);
-        if (result === 'timeout') {
-            logger.debug({ messageKey }, 'PDO message without response after 15 seconds. Phone possibly offline');
-            placeholderResendCache.del(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id);
-        }
-        return result;
+        setTimeout(() => {
+            if (placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
+                logger.debug({ messageKey }, 'PDO message without response after 15 seconds. Phone possibly offline');
+                placeholderResendCache.del(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id);
+            }
+        }, 15000);
+        return sendPeerDataOperationMessage(pdoMessage);
     };
     const handleCall = async (node) => {
         const { attrs } = node;
@@ -970,7 +967,7 @@ const makeMessagesRecvSocket = (config) => {
         await sendMessageAck(node);
     };
     const handleBadAck = async ({ attrs }) => {
-        const key = { remoteJid: resolveJid(attrs.from), fromMe: true, id: attrs.id, 'server_id': attrs === null || attrs === void 0 ? void 0 : attrs.server_id };
+        const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id, 'server_id': attrs === null || attrs === void 0 ? void 0 : attrs.server_id };
         // current hypothesis is that if pash is sent in the ack
         // it means -- the message hasn't reached all devices yet
         // we'll retry sending the message here

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.54",
+  "version": "2.7.55",
   "description": "whatsapp api by sam",
   "keywords": [
     "baileys",