@areumtecnologia/wasockets 1.0.0 → 1.0.2

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/lib/Socket/newsletter.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 
 const {
-  QueryIds, 
-  XWAPaths
+    QueryIds,
+    XWAPaths
 } = require("../Types")
 const { generateProfilePicture } = require("../Utils")
 const { getBinaryNodeChild } = require("../WABinary")
 const { makeGroupsSocket } = require("./groups")
-const { executeWMexQuery: genericExecuteWMexQuery } = require("./mex") 
+const { executeWMexQuery: genericExecuteWMexQuery } = require("./mex")
 
 const parseNewsletterCreateResponse = (response) => {
     const { id, thread_metadata: thread, viewer_metadata: viewer } = response
@@ -34,29 +34,29 @@ const parseNewsletterMetadata = (result) => {
     if (typeof result !== 'object' || result === null) {
         return null
     }
-    
+
     if ('id' in result && typeof result.id === 'string') {
         return result
     }
-    
+
     if ('result' in result && typeof result.result === 'object' && result.result !== null && 'id' in result.result) {
         return result.result
     }
-    
+
     return null
 }
 
 const makeNewsletterSocket = (config) => {
     const suki = makeGroupsSocket(config)
-    const { 
-        query, 
-        generateMessageTag 
+    const {
+        query,
+        generateMessageTag
     } = suki
-    
+
     const executeWMexQuery = (variables, queryId, dataPath) => {
         return genericExecuteWMexQuery(variables, queryId, dataPath, query, generateMessageTag)
     }
-    
+
     const newsletterUpdate = async (jid, updates) => {
         const variables = {
             newsletter_id: jid,
@@ -65,13 +65,13 @@ const makeNewsletterSocket = (config) => {
                 settings: null
             }
         }
-        
+
         return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, XWAPaths.UPDATE)
     }
-    
+
     return {
         ...suki,
-        executeWMexQuery, 
+        executeWMexQuery,
         newsletterCreate: async (name, description) => {
             const variables = {
                 input: {
@@ -79,15 +79,18 @@ const makeNewsletterSocket = (config) => {
                     description: description ?? null
                 }
             }
-            
+
             const rawResponse = await executeWMexQuery(variables, QueryIds.CREATE, XWAPaths.CREATE)
-            
+
             return parseNewsletterCreateResponse(rawResponse)
         },
         newsletterUpdate,
         newsletterSubscribers: async (jid) => {
             return executeWMexQuery({ newsletter_id: jid }, QueryIds.SUBSCRIBERS, XWAPaths.SUBSCRIBERS)
         },
+        newsletterSubscribed: async () => {
+            return executeWMexQuery({}, QueryIds.SUBSCRIBED, XWAPaths.xwa2_newsletter_subscribed);
+        },
         newsletterMetadata: async (type, key) => {
             const variables = {
                 fetch_creation_time: true,
@@ -98,9 +101,9 @@ const makeNewsletterSocket = (config) => {
                     type: type.toUpperCase()
                 }
             }
-            
+
             const result = await executeWMexQuery(variables, QueryIds.METADATA, XWAPaths.METADATA)
-            
+
             return parseNewsletterMetadata(result)
         },
         newsletterFollow: (jid) => {
@@ -150,15 +153,15 @@ const makeNewsletterSocket = (config) => {
             const messageUpdateAttrs = {
                 count: count.toString()
             }
-            
+
             if (typeof since === 'number') {
                 messageUpdateAttrs.since = since.toString()
             }
-            
+
             if (after) {
                 messageUpdateAttrs.after = after.toString()
             }
-            
+
             const result = await query({
                 tag: 'iq',
                 attrs: {
@@ -174,7 +177,7 @@ const makeNewsletterSocket = (config) => {
                     }
                 ]
             })
-            
+
             return result
         },
         subscribeNewsletterUpdates: async (jid) => {
@@ -188,10 +191,10 @@ const makeNewsletterSocket = (config) => {
                 },
                 content: [{ tag: 'live_updates', attrs: {}, content: [] }]
             })
-            
+
             const liveUpdatesNode = getBinaryNodeChild(result, 'live_updates')
             const duration = liveUpdatesNode?.attrs?.duration
-            
+
             return duration ? { duration: duration } : null
         },
         newsletterAdminCount: async (jid) => {
@@ -211,6 +214,6 @@ const makeNewsletterSocket = (config) => {
 }
 
 module.exports = {
-  makeNewsletterSocket, 
-  parseNewsletterMetadata
+    makeNewsletterSocket,
+    parseNewsletterMetadata
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@areumtecnologia/wasockets",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "WhatsApp API Modification By areumtecnologia",
   "keywords": [
     "whatsapp",
@@ -19,14 +19,12 @@
   },
   "license": "MIT",
   "author": "areumtecnologia",
-
   "main": "lib/index.js",
   "files": [
     "lib/*",
     "WAProto/*",
     "engine-requirements.js"
   ],
-
   "scripts": {
     "changelog:last": "conventional-changelog -p angular -r 2",
     "changelog:preview": "conventional-changelog -p angular -u",
@@ -37,7 +35,6 @@
     "release": "release-it",
     "test": "jest"
   },
-
   "dependencies": {
     "@hapi/boom": "^9.1.3",
     "@adiwajshing/keyed-db": "^0.2.4",
@@ -57,7 +54,6 @@
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.13.0"
   },
-
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/node": "^16.0.0",
@@ -77,28 +73,22 @@
     "typedoc-plugin-markdown": "4.4.2",
     "typescript": "^5.8.2"
   },
-
   "peerDependencies": {
-    "jimp": "^0.22.12", 
+    "jimp": "^0.22.12",
     "sharp": "*"
   },
-
   "peerDependenciesMeta": {
     "jimp": {
       "optional": true
     }
   },
-
   "packageManager": "yarn@1.22.19",
-
   "engines": {
     "node": ">=20.0.0"
   },
-
   "directories": {
     "lib": "lib"
   },
-
   "bugs": {
     "url": "https://github.com/areumtecnologia/WaSockets/issues"
   }