@hansaka02/baileys 7.3.4 → 7.3.6

package/lib/Socket/mex.js

@@ -0,0 +1,61 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { Boom } = require("@hapi/boom") 
+const {
+  getBinaryNodeChild, 
+  S_WHATSAPP_NET
+} = require("../WABinary")
+
+const wMexQuery = (variables, queryId, query, generateMessageTag) => {
+    return query({
+        tag: 'iq',
+        attrs: {
+            id: generateMessageTag(),
+            type: 'get',
+            to: S_WHATSAPP_NET,
+            xmlns: 'w:mex'
+        },
+        content: [
+            {
+                tag: 'query',
+                attrs: { query_id: queryId },
+                content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
+            }
+        ]
+    })
+}
+
+const executeWMexQuery = async (variables, queryId, dataPath, query, generateMessageTag) => {
+    const result = await wMexQuery(variables, queryId, query, generateMessageTag)
+    const child = getBinaryNodeChild(result, 'result')
+    
+    if (child?.content) {
+        const data = JSON.parse(child.content.toString())
+        
+        if (data.errors && data.errors.length > 0) {
+            const errorMessages = data.errors.map((err) => err.message || 'Unknown error').join(', ')
+            const firstError = data.errors[0]
+            const errorCode = firstError.extensions?.error_code || 400
+            
+            throw new Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError })
+        }
+        
+        const response = dataPath ? data?.data?.[dataPath] : data?.data
+        
+        if (typeof response !== 'undefined') {
+            return response
+        }
+    }
+    
+    const action = (dataPath || '').startsWith('xwa2_')
+        ? dataPath.substring(5).replace(/_/g, ' ')
+        : dataPath?.replace(/_/g, ' ')
+        
+    throw new Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result })
+}
+
+module.exports = {
+  executeWMexQuery
+}

package/lib/Socket/newsletter.js

@@ -6,304 +6,211 @@ const {
   QueryIds, 
   XWAPaths
 } = require("../Types")
-const {
-  decryptMessageNode, 
-  generateProfilePicture, 
-  getUrlFromDirectPath, 
-  generateMessageID
-} = require("../Utils")
-const {
-  getAllBinaryNodeChildren, 
-  getBinaryNodeChildren, 
-  getBinaryNodeChild, 
-  isJidNewsletter, 
-  S_WHATSAPP_NET
-} = require("../WABinary")
+const { generateProfilePicture } = require("../Utils")
+const { getBinaryNodeChild } = require("../WABinary")
 const { makeGroupsSocket } = require("./groups")
+const { executeWMexQuery: genericExecuteWMexQuery } = require("./mex") 
+
+const parseNewsletterCreateResponse = (response) => {
+    const { id, thread_metadata: thread, viewer_metadata: viewer } = response
+    return {
+        id: id,
+        owner: undefined,
+        name: thread.name.text,
+        creation_time: parseInt(thread.creation_time, 10),
+        description: thread.description.text,
+        invite: thread.invite,
+        subscribers: parseInt(thread.subscribers_count, 10),
+        verification: thread.verification,
+        picture: {
+            id: thread.picture.id,
+            directPath: thread.picture.direct_path
+        },
+        mute_state: viewer.mute
+    }
+}
+
+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 { authState, signalRepository, query, generateMessageTag } = suki
-    const encoder = new TextEncoder()
+    const { 
+        query, 
+        generateMessageTag 
+    } = suki
     
-    const newsletterQuery = async (jid, type, content) => (query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type,
-            xmlns: 'newsletter',
-            to: jid,
-        },
-        content
-    }))
+    const executeWMexQuery = (variables, queryId, dataPath) => {
+        return genericExecuteWMexQuery(variables, queryId, dataPath, query, generateMessageTag)
+    }
     
-    const newsletterWMexQuery = async (jid, queryId, content) => (query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type: 'get',
-            xmlns: 'w:mex',
-            to: S_WHATSAPP_NET,
-        },
-        content: [
-            {
-                tag: 'query',
-                attrs: { 'query_id': queryId },
-                content: encoder.encode(JSON.stringify({
-                    variables: {
-                        'newsletter_id': jid,
-                        ...content
-                    }
-                }))
+    const newsletterUpdate = async (jid, updates) => {
+        const variables = {
+            newsletter_id: jid,
+            updates: {
+                ...updates,
+                settings: null
             }
-        ]
-    }))
-    
-    const parseFetchedUpdates = async (node, type) => {
-        let child
-        if (type === 'messages') {
-            child = getBinaryNodeChild(node, 'messages')
         }
         
-        else {
-            const parent = getBinaryNodeChild(node, 'message_updates')
-            child = getBinaryNodeChild(parent, 'messages')
-        }
-        
-        return await Promise.all(getAllBinaryNodeChildren(child).map(async (messageNode) => {
-            messageNode.attrs.from = child?.attrs.jid
-            
-            const views = parseInt(getBinaryNodeChild(messageNode, 'views_count')?.attrs?.count || '0')
-            const reactionNode = getBinaryNodeChild(messageNode, 'reactions')
-            const reactions = getBinaryNodeChildren(reactionNode, 'reaction')
-                .map(({ attrs }) => ({ count: +attrs.count, code: attrs.code }))
-                
-            const data = {
-                'server_id': messageNode.attrs.server_id,
-                views,
-                reactions
-            }
-            
-            if (type === 'messages') {
-                const { fullMessage: message, decrypt } = await decryptMessageNode(messageNode, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, config.logger)
-                await decrypt()
-                data.message = message
-            }
-            
-            return data
-        }))
-    }
-    
-    const newsletterMetadata = async (type, key, role) => {
-        const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
-            input: {
-                key,
-                type: type.toUpperCase(),
-                view_role: role || 'GUEST'
-            },
-            fetch_viewer_metadata: true,
-            fetch_full_image: true,
-            fetch_creation_time: true
-        })
-            
-        return extractNewsletterMetadata(result)
+        return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, XWAPaths.UPDATE)
     }
     
     return {
         ...suki,
-        newsletterQuery, 
-        newsletterWMexQuery, 
-        subscribeNewsletterUpdates: async (jid) => {
-            const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }])
+        executeWMexQuery, 
+        newsletterCreate: async (name, description) => {
+            const variables = {
+                input: {
+                    name,
+                    description: description ?? null
+                }
+            }
             
-            return getBinaryNodeChild(result, 'live_updates')?.attrs
+            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)
+        },
+        newsletterMetadata: async (type, key) => {
+            const variables = {
+                fetch_creation_time: true,
+                fetch_full_image: true,
+                fetch_viewer_metadata: true,
+                input: {
+                    key,
+                    type: type.toUpperCase()
+                }
+            }
+            
+            const result = await executeWMexQuery(variables, QueryIds.METADATA, XWAPaths.METADATA)
+            
+            return parseNewsletterMetadata(result)
         },
-        newsletterReactionMode: async (jid, mode) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
-                updates: { settings: { 'reaction_codes': { value: mode } } }
-            })
+        newsletterFollow: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.FOLLOW, XWAPaths.FOLLOW)
         },
-        newsletterUpdateDescription: async (jid, description) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
-                updates: { description: description || '', settings: null }
-            })
+        newsletterUnfollow: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNFOLLOW, XWAPaths.UNFOLLOW)
+        },
+        newsletterMute: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.MUTE_V2)
+        },
+        newsletterUnmute: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.UNMUTE_V2)
         },
         newsletterUpdateName: async (jid, name) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
-                updates: { name, settings: null }
-            })
+            return await newsletterUpdate(jid, { name })
+        },
+        newsletterUpdateDescription: async (jid, description) => {
+            return await newsletterUpdate(jid, { description })
         },
         newsletterUpdatePicture: async (jid, content) => {
             const { img } = await generateProfilePicture(content)
-            
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
-                updates: { picture: img.toString('base64'), settings: null }
-            })
+            return await newsletterUpdate(jid, { picture: img.toString('base64') })
         },
         newsletterRemovePicture: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
-                updates: { picture: '', settings: null }
-            })
-        },
-        newsletterUnfollow: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.UNFOLLOW)
-        },
-        newsletterFollow: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.FOLLOW)
+            return await newsletterUpdate(jid, { picture: '' })
         },
-        newsletterUnmute: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.UNMUTE)
-        },
-        newsletterMute: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.MUTE)
-        },
-        newsletterAction: async (jid, type) => {
-            await newsletterWMexQuery(jid, QueryIds[type.toUpperCase()])
-        },
-        newsletterCreate: async (name, description, picture) => {
-            //TODO: Implement TOS system wide for Meta AI, communities, and here etc.
-            /**tos query */
+        newsletterReactMessage: async (jid, serverId, reaction) => {
             await query({
-                tag: 'iq',
+                tag: 'message',
                 attrs: {
-                    to: S_WHATSAPP_NET,
-                    xmlns: 'tos',
-                    id: generateMessageTag(),
-                    type: 'set'
+                    to: jid,
+                    ...(reaction ? {} : { edit: '7' }),
+                    type: 'reaction',
+                    server_id: serverId,
+                    id: generateMessageTag()
                 },
                 content: [
                     {
-                        tag: 'notice',
-                        attrs: {
-                            id: '20601218',
-                            stage: '5'
-                        },
-                        content: []
+                        tag: 'reaction',
+                        attrs: reaction ? { code: reaction } : {}
                     }
                 ]
             })
+        },
+        newsletterFetchMessages: async (jid, count, since, after) => {
+            const messageUpdateAttrs = {
+                count: count.toString()
+            }
+            
+            if (typeof since === 'number') {
+                messageUpdateAttrs.since = since.toString()
+            }
+            
+            if (after) {
+                messageUpdateAttrs.after = after.toString()
+            }
             
-            const result = await newsletterWMexQuery(undefined, QueryIds.CREATE, {
-                input: { 
-                	name, 
-                    description: description || null, 
-                    picture: picture ? (await generateProfilePicture(picture)).img.toString('base64') : null, 
-                    settings: {
-                    	reaction_codes: {
-                    	    value: 'ALL'
-                        }
+            const result = await query({
+                tag: 'iq',
+                attrs: {
+                    id: generateMessageTag(),
+                    type: 'get',
+                    xmlns: 'newsletter',
+                    to: jid
+                },
+                content: [
+                    {
+                        tag: 'message_updates',
+                        attrs: messageUpdateAttrs
                     }
-                }
+                ]
             })
             
-            return extractNewsletterMetadata(result, true)
+            return result
         },
-        newsletterMetadata, 
-        newsletterFetchAllParticipating: async () => {
-        	const data = {}
-        
-        	const result = await newsletterWMexQuery(undefined, QueryIds.SUBSCRIBED) 
-        	const child = JSON.parse(getBinaryNodeChild(result, 'result')?.content?.toString())
-        	const newsletters = child.data[XWAPaths.SUBSCRIBED]
-        
-        	for (const i of newsletters) {
-        		if (!isJidNewsletter(i.id)) {
-        			continue
-        		}
-        	
-        		const metadata = await newsletterMetadata('JID', i.id) 
-        		data[metadata.id] = metadata
-        	}
-        	
-        	return data
-        }, 
-        newsletterFetchAllParticipating: async () => {
-  		const result = await newsletterWMexQuery(undefined, QueryIds.SUBSCRIBED)
- 		 const child = JSON.parse(getBinaryNodeChild(result, 'result')?.content?.toString())
-  		const newsletters = child.data[XWAPaths.SUBSCRIBED] || []
-
-  		const data = {}
-
-  		for (const { id } of newsletters) {
-    		if (!isJidNewsletter(id)) continue
-   		 const metadata = await newsletterMetadata('JID', id)
-    		data[metadata.id] = metadata
-  		}
-
-  		return data
-		},
-        newsletterChangeOwner: async (jid, userLid) => {
-            await newsletterWMexQuery(jid, QueryIds.CHANGE_OWNER, {
-                user_id: userLid
-            })
-        },
-        newsletterDemote: async (jid, userLid) => {
-            await newsletterWMexQuery(jid, QueryIds.DEMOTE, {
-                user_id: userLid
+        subscribeNewsletterUpdates: async (jid) => {
+            const result = await query({
+                tag: 'iq',
+                attrs: {
+                    id: generateMessageTag(),
+                    type: 'set',
+                    xmlns: 'newsletter',
+                    to: jid
+                },
+                content: [{ tag: 'live_updates', attrs: {}, content: [] }]
             })
+            
+            const liveUpdatesNode = getBinaryNodeChild(result, 'live_updates')
+            const duration = liveUpdatesNode?.attrs?.duration
+            
+            return duration ? { duration: duration } : null
         },
-        newsletterDelete: async (jid) => {
-            await newsletterWMexQuery(jid, QueryIds.DELETE)
+        newsletterAdminCount: async (jid) => {
+            const response = await executeWMexQuery({ newsletter_id: jid }, QueryIds.ADMIN_COUNT, XWAPaths.ADMIN_COUNT)
+            return response.admin_count
         },
-        /**if code wasn't passed, the reaction will be removed (if is reacted) */
-        newsletterReactMessage: async (jid, serverId, code) => {
-            await query({
-                tag: 'message',
-                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', server_id: serverId, id: generateMessageID() },
-                content: [{
-                        tag: 'reaction',
-                        attrs: code ? { code } : {}
-                    }]
-            })
+        newsletterChangeOwner: async (jid, newOwnerJid) => {
+            await executeWMexQuery({ newsletter_id: jid, user_id: newOwnerJid }, QueryIds.CHANGE_OWNER, XWAPaths.CHANGE_OWNER)
         },
-        newsletterFetchMessages: async (type, key, count, after) => {
-            const result = await newsletterQuery(S_WHATSAPP_NET, 'get', [
-                {
-                    tag: 'messages',
-                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: after?.toString() || '100' }
-                }
-            ])
-            
-            return await parseFetchedUpdates(result, 'messages')
+        newsletterDemote: async (jid, userJid) => {
+            await executeWMexQuery({ newsletter_id: jid, user_id: userJid }, QueryIds.DEMOTE, XWAPaths.DEMOTE)
         },
-        newsletterFetchUpdates: async (jid, count, after, since) => {
-            const result = await newsletterQuery(jid, 'get', [
-                {
-                    tag: 'message_updates',
-                    attrs: { count: count.toString(), after: after?.toString() || '100', since: since?.toString() || '0' }
-                }
-            ])
-            
-            return await parseFetchedUpdates(result, 'updates')
+        newsletterDelete: async (jid) => {
+            await executeWMexQuery({ newsletter_id: jid }, QueryIds.DELETE, XWAPaths.DELETE_V2)
         }
     }
 }
 
-const extractNewsletterMetadata = (node, isCreate) => {
-    const result = getBinaryNodeChild(node, 'result')?.content?.toString()
-    const metadataPath = JSON.parse(result).data[isCreate ? XWAPaths.CREATE : XWAPaths.NEWSLETTER]
-    
-    const metadata = {
-        id: metadataPath?.id,
-        state: metadataPath?.state?.type,
-        creation_time: +metadataPath?.thread_metadata?.creation_time,
-        name: metadataPath?.thread_metadata?.name?.text,
-        nameTime: +metadataPath?.thread_metadata?.name?.update_time,
-        description: metadataPath?.thread_metadata?.description?.text,
-        descriptionTime: +metadataPath?.thread_metadata?.description?.update_time,
-        invite: metadataPath?.thread_metadata?.invite,
-        handle: metadataPath?.thread_metadata?.handle,
-        picture: getUrlFromDirectPath(metadataPath?.thread_metadata?.picture?.direct_path || ''), 
-        preview: getUrlFromDirectPath(metadataPath?.thread_metadata?.preview?.direct_path || ''), 
-        reaction_codes: metadataPath?.thread_metadata?.settings?.reaction_codes?.value,
-        subscribers: +metadataPath?.thread_metadata?.subscribers_count,
-        verification: metadataPath?.thread_metadata?.verification,
-        viewer_metadata: metadataPath?.viewer_metadata
-    }
-    return metadata
-}
-
 module.exports = {
   makeNewsletterSocket, 
-  extractNewsletterMetadata
+  parseNewsletterMetadata
 }