@periskope/baileys 6.7.10-alpha.1 → 6.7.12-alpha.1

package/lib/Socket/messages-recv.js

@@ -22,7 +22,6 @@ const makeMessagesRecvSocket = (config) => {
     const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = (0, make_mutex_1.makeMutex)();
-    const keyRetryMap = new Map();
     const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
         useClones: false
@@ -484,7 +483,7 @@ const makeMessagesRecvSocket = (config) => {
             }
         }
     };
-    const handleReceipt = async (node, offline) => {
+    const handleReceipt = async (node) => {
         var _a, _b;
         const { attrs, content } = node;
         const isLid = attrs.from.includes('lid');
@@ -570,7 +569,7 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
         }
     };
-    const handleNotification = async (node, offline) => {
+    const handleNotification = async (node) => {
         const remoteJid = node.attrs.from;
         if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification');
@@ -603,12 +602,8 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
         }
     };
-    const handleMessage = async (node, offline) => {
+    const handleMessage = async (node) => {
         var _a, _b, _c;
-        if (offline) {
-            await sendMessageAck(node);
-            return;
-        }
         if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
             logger.debug({ key: node.attrs.key }, 'ignored message');
             await sendMessageAck(node);
@@ -780,26 +775,19 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleBadAck = async ({ attrs }) => {
         const key = { remoteJid: attrs.from, fromMe: true, id: attrs.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
-        if (attrs.phash) {
-            const retryCount = keyRetryMap.get(key.id) || 0;
-            keyRetryMap.set(key.id, retryCount + 1);
-            if (retryCount > 3) {
-                logger.warn({ attrs }, 'ignoring phash in ack, as it has been retried too many times');
-            }
-            else {
-                logger.info({ attrs }, 'received phash in ack, resending message...');
-                const msg = await getMessage(key);
-                if (msg) {
-                    await relayMessage(key.remoteJid, msg, { messageId: key.id, useUserDevicesCache: false });
-                }
-                else {
-                    logger.warn({ attrs }, 'could not send message again, as it was not found');
-                }
-            }
-        }
+        // WARNING: REFRAIN FROM ENABLING THIS FOR NOW. IT WILL CAUSE A LOOP
+        // // 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
+        // if(attrs.phash) {
+        // 	logger.info({ attrs }, 'received phash in ack, resending message...')
+        // 	const msg = await getMessage(key)
+        // 	if(msg) {
+        // 		await relayMessage(key.remoteJid!, msg, { messageId: key.id!, useUserDevicesCache: false })
+        // 	} else {
+        // 		logger.warn({ attrs }, 'could not send message again, as it was not found')
+        // 	}
+        // }
         // error in acknowledgement,
         // device could not display the message
         if (attrs.error) {
@@ -851,7 +839,7 @@ const makeMessagesRecvSocket = (config) => {
                         onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node');
                         continue;
                     }
-                    await nodeProcessor(node, true);
+                    await nodeProcessor(node);
                 }
                 isProcessing = false;
             };

package/lib/Utils/messages.js

@@ -449,10 +449,10 @@ const generateWAMessageFromContent = (jid, message, options) => {
     if (quoted) {
         const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid);
         let quotedMsg = (0, exports.normalizeMessageContent)(quoted.message);
-        const msgType = (0, exports.getContentType)(quotedMsg);
-        // strip any redundant properties
-        quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
         if (quotedMsg) {
+            const msgType = (0, exports.getContentType)(quotedMsg);
+            // strip any redundant properties
+            quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
             const quotedContent = quotedMsg[msgType];
             if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
                 delete quotedContent.contextInfo;

package/lib/Utils/process-message.js

@@ -217,6 +217,22 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                         }
                     }
                 }
+            case WAProto_1.proto.Message.ProtocolMessage.Type.MESSAGE_EDIT:
+                ev.emit('messages.update', [
+                    {
+                        key: protocolMsg.key,
+                        update: {
+                            message: {
+                                editedMessage: {
+                                    message: protocolMsg.editedMessage
+                                }
+                            },
+                            messageTimestamp: protocolMsg.timestampMs
+                                ? Math.floor((0, generics_1.toNumber)(protocolMsg.timestampMs) / 1000)
+                                : message.messageTimestamp
+                        }
+                    }
+                ]);
                 break;
         }
     }

package/lib/WABinary/encode.js

@@ -160,7 +160,7 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         }
         for (const char of str) {
             const isInNibbleRange = char >= '0' && char <= '9';
-            if (!isInNibbleRange && !(char >= 'A' && char <= 'F') && !(char >= 'a' && char <= 'f')) {
+            if (!isInNibbleRange && !(char >= 'A' && char <= 'F')) {
                 return false;
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@periskope/baileys",
-  "version": "6.7.10-alpha.1",
-  "description": "Periskope Fork of Baileys",
+  "version": "6.7.12-alpha.1",
+  "description": "WhatsApp API",
   "keywords": [
     "whatsapp",
     "js-whatsapp",