@periskope/baileys 6.7.18-17-21 → 6.7.18-17-23

package/lib/Signal/libsignal.js

@@ -64,13 +64,34 @@ function makeLibSignalRepository(auth) {
             key.includes('.whatsapp.net.history'));
     }
     const repository = {
-        decryptGroupMessage({ group, authorJid, msg }) {
-            const senderName = jidToSignalSenderKeyName(group, authorJid);
-            const cipher = new Group_1.GroupCipher(storage, senderName);
-            // Use transaction to ensure atomicity
-            return parsedKeys.transaction(async () => {
-                return cipher.decrypt(msg);
-            }, group);
+        async decryptGroupMessage({ group, authorJid, authorLid, msg }) {
+            // First attempt with authorJid
+            try {
+                const senderName = jidToSignalSenderKeyName(group, authorJid);
+                const cipher = new Group_1.GroupCipher(storage, senderName);
+                // Use transaction to ensure atomicity
+                return await parsedKeys.transaction(async () => {
+                    return cipher.decrypt(msg);
+                }, group);
+            }
+            catch (error) {
+                // If authorLid is available and authorJid failed, try with authorLid as fallback
+                if (authorLid && authorLid !== authorJid) {
+                    try {
+                        const senderNameLid = jidToSignalSenderKeyName(group, authorLid);
+                        const cipherLid = new Group_1.GroupCipher(storage, senderNameLid);
+                        return await parsedKeys.transaction(async () => {
+                            return cipherLid.decrypt(msg);
+                        }, group);
+                    }
+                    catch (lidError) {
+                        // If both fail, throw the original error
+                        throw error;
+                    }
+                }
+                // No authorLid available or it's the same as authorJid, throw original error
+                throw error;
+            }
         },
         async processSenderKeyDistributionMessage({ item, authorJid }) {
             const builder = new Group_1.GroupSessionBuilder(storage);

package/lib/Socket/messages-recv.js

@@ -134,6 +134,13 @@ const makeMessagesRecvSocket = (config) => {
         if (retryCount >= maxMsgRetryCount) {
             logger.warn({ retryCount, msgId }, 'reached maximum retry limit (5), not sending more retry receipts');
             msgRetryCache.del(key);
+            // Create a CIPHERTEXT stub message when retry limit is reached and upsert it
+            const msg = fullMessage;
+            msg.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+            msg.messageStubParameters = ['Decryption failed after retries'];
+            (0, Utils_1.cleanMessage)(msg, authState.creds.me.id);
+            await sendMessageAck(node);
+            await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
             return;
         }
         retryCount += 1;

package/lib/Types/Signal.d.ts

@@ -3,6 +3,7 @@ import type { LIDMappingStore } from '../Signal/lid-mapping';
 type DecryptGroupSignalOpts = {
     group: string;
     authorJid: string;
+    authorLid?: string;
     msg: Uint8Array;
 };
 type ProcessSenderKeyDistributionMessageOpts = {

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

@@ -362,6 +362,8 @@ function decodeMessageNode(stanza, meId, meLid) {
 }
 const decryptMessageNode = (stanza, meId, meLid, repository, logger, sendRetryRequestFn, sessionContext) => {
     const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
+    // Extract authorLid for group messages - use participantLid if available
+    const authorLid = fullMessage.key.participantLid;
     return {
         fullMessage,
         category: stanza.attrs.category,
@@ -404,6 +406,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger, sendRetryRe
                                         return await repository.decryptGroupMessage({
                                             group: sender,
                                             authorJid: author,
+                                            authorLid,
                                             msg: content
                                         });
                                     case 'pkmsg':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@periskope/baileys",
-  "version": "6.7.18-17-21",
+  "version": "6.7.18-17-23",
   "description": "WhatsApp API",
   "keywords": [
     "periskope",