@areumtecnologia/wasockets 1.0.0 → 1.0.1

package/lib/Signal/libsignal.js

@@ -39,15 +39,35 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
     })
     
     const repository = {
-        decryptGroupMessage({ group, authorJid, msg }) {
-            const senderName = jidToSignalSenderKeyName(group, authorJid)
-            const cipher = new GroupCipher(storage, senderName)
-            
-            // Use transaction to ensure atomicity
-            return parsedKeys.transaction(async () => {
-                return cipher.decrypt(msg)
-            }, group)
-        },
+        decryptGroupMessage({ group, authorJid, msg }) {
+            const decryptWithAuthor = (author) => {
+                const senderName = jidToSignalSenderKeyName(group, author)
+                const cipher = new GroupCipher(storage, senderName)
+                return cipher.decrypt(msg)
+            }
+            
+            // Use transaction to ensure atomicity
+            return parsedKeys.transaction(async () => {
+                try {
+                    return await decryptWithAuthor(authorJid)
+                }
+                
+                catch (error) {
+                    if (!isMissingSenderKeySessionError(error)) {
+                        throw error
+                    }
+                    
+                    const alternateAuthorJid = await getAlternateSenderKeyAuthor(authorJid, lidMapping)
+                    
+                    if (!alternateAuthorJid || alternateAuthorJid === authorJid) {
+                        throw error
+                    }
+                    
+                    logger.debug({ group, authorJid, alternateAuthorJid }, 'retrying group decrypt with alternate sender key identity')
+                    return await decryptWithAuthor(alternateAuthorJid)
+                }
+            }, group)
+        },
         
         async processSenderKeyDistributionMessage({ item, authorJid }) {
             const builder = new GroupSessionBuilder(storage)
@@ -68,13 +88,25 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
             return parsedKeys.transaction(async () => {
                 const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr])
                 
-                if (!senderKey) {
-                    await storage.storeSenderKey(senderName, new SenderKeyRecord())
-                }
-                
-                await builder.process(senderName, senderMsg)
-            }, item.groupId)
-        },
+                if (!senderKey) {
+                    await storage.storeSenderKey(senderName, new SenderKeyRecord())
+                }
+                
+                await builder.process(senderName, senderMsg)
+
+                const alternateAuthorJid = await getAlternateSenderKeyAuthor(authorJid, lidMapping)
+
+                if (alternateAuthorJid && alternateAuthorJid !== authorJid) {
+                    const primarySenderName = senderName.toString()
+                    const alternateSenderName = jidToSignalSenderKeyName(item.groupId, alternateAuthorJid).toString()
+                    const { [primarySenderName]: primarySenderKey } = await auth.keys.get('sender-key', [primarySenderName])
+
+                    if (primarySenderKey) {
+                        await auth.keys.set({ 'sender-key': { [alternateSenderName]: primarySenderKey } })
+                    }
+                }
+            }, item.groupId)
+        },
         
         async decryptMessage({ jid, type, ciphertext }) {
             const addr = jidToSignalProtocolAddress(jid)
@@ -351,11 +383,28 @@ const jidToSignalProtocolAddress = (jid) => {
     return new ProtocolAddress(signalUser, finalDevice)
 }
 
-const jidToSignalSenderKeyName = (group, user) => {
-    return new SenderKeyName(group, jidToSignalProtocolAddress(user))
-}
-
-function signalStorage({ creds, keys }, lidMapping) {
+const jidToSignalSenderKeyName = (group, user) => {
+    return new SenderKeyName(group, jidToSignalProtocolAddress(user))
+}
+
+const getAlternateSenderKeyAuthor = async (authorJid, lidMapping) => {
+    if (isPnUser(authorJid) || isHostedPnUser(authorJid)) {
+        return await lidMapping.getLIDForPN(authorJid)
+    }
+
+    if (isLidUser(authorJid) || isHostedLidUser(authorJid)) {
+        return await lidMapping.getPNForLID(authorJid)
+    }
+
+    return null
+}
+
+const isMissingSenderKeySessionError = (error) => {
+    const message = error?.message || error?.toString?.() || ''
+    return message.includes('No session found to decrypt message')
+}
+
+function signalStorage({ creds, keys }, lidMapping) {
     // Shared function to resolve PN signal address to LID if mapping exists
     const resolveLIDSignalAddress = async (id) => {
         if (id.includes('.')) {
@@ -448,4 +497,4 @@ function signalStorage({ creds, keys }, lidMapping) {
 
 module.exports = {
   makeLibSignalRepository
-}
+}

package/lib/Socket/Client/websocket.js

@@ -27,11 +27,11 @@ class WebSocketClient extends AbstractSocketClient {
     }
     
     get isClosing() {
-        this.socket?.readyState === CLOSING
+        return this.socket?.readyState === CLOSING
     }
     
     get isConnecting() {
-        this.socket?.readyState === CONNECTING
+        return this.socket?.readyState === CONNECTING
     }
     
     connect() {
@@ -68,4 +68,4 @@ class WebSocketClient extends AbstractSocketClient {
 
 module.exports = {
   WebSocketClient
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@areumtecnologia/wasockets",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "WhatsApp API Modification By areumtecnologia",
   "keywords": [
     "whatsapp",