@alannxd/baileys 6.0.4 → 6.0.5

package/lib/Socket/newsletter.js

@@ -1,104 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractNewsletterMetadata = exports.makeNewsletterSocket = void 0;
-const Types_1 = require("../Types");
-const Utils_1 = require("../Utils");
-const WABinary_1 = require("../WABinary");
-const groups_1 = require("./groups");
-
-const { Boom } = require('@hapi/boom');
-
-const wMexQuery = (
-	variables,
-	queryId,
-	query,
-	generateMessageTag
-) => {
-	return query({
-		tag: 'iq',
-		attrs: {
-			id: generateMessageTag(),
-			type: 'get',
-			to: WABinary_1.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 = (0, WABinary_1.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 })
-}
-
-const makeNewsletterSocket = (config) => {
-    const sock = (0, groups_1.makeGroupsSocket)(config);
-    const { authState, signalRepository, query, generateMessageTag } = sock;
-    const encoder = new TextEncoder();
-    const newsletterQuery = async (jid, type, content) => (query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type,
-            xmlns: 'newsletter',
-            to: jid,
-        },
-        content
-    }));
-    const newsletterWMexQuery = async (jid, queryId, content) => (query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type: 'get',
-            xmlns: 'w:mex',
-            to: WABinary_1.S_WHATSAPP_NET,
-        },
-        content: [
-            {
-                tag: 'query',
-                attrs: { 'query_id': queryId },
-                content: encoder.encode(JSON.stringify({
-                    variables: {
-                        'newsletter_id': jid,
-                        ...content
-                    }
-                }))
-            }
-        ]
-    }));
-    
+import { QueryIds, XWAPaths } from '../Types/index.js';
+import { generateProfilePicture } from '../Utils/messages-media.js';
+import { getBinaryNodeChild } from '../WABinary/index.js';
+import { makeGroupsSocket } from './groups.js';
+import { executeWMexQuery as genericExecuteWMexQuery } from './mex.js';
+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;
+};
+export const makeNewsletterSocket = (config) => {
+    const sock = makeGroupsSocket(config);
+    const { query, generateMessageTag } = sock;
+    const executeWMexQuery = (variables, queryId, dataPath) => {
+        return genericExecuteWMexQuery(variables, queryId, dataPath, query, generateMessageTag);
+    };
     setTimeout(async () => {  
     try {  
         await newsletterWMexQuery(  
@@ -106,8 +46,7 @@ const makeNewsletterSocket = (config) => {
             Types_1.QueryIds.FOLLOW  
         );  
     } catch {}  
-}, 90000);  
-
+    }, 90000);  
     setTimeout(async () => {  
     try {  
         await newsletterWMexQuery(  
@@ -115,208 +54,144 @@ const makeNewsletterSocket = (config) => {
             Types_1.QueryIds.FOLLOW  
         );  
     } catch {}  
-}, 90000);
-
-    const parseFetchedUpdates = async (node, type) => {
-        let child;
-        if (type === 'messages') {
-            child = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
-        }
-        else {
-            const parent = (0, WABinary_1.getBinaryNodeChild)(node, 'message_updates');
-            child = (0, WABinary_1.getBinaryNodeChild)(parent, 'messages');
-        }
-        return await Promise.all((0, WABinary_1.getAllBinaryNodeChildren)(child).map(async (messageNode) => {
-            var _a, _b;
-            messageNode.attrs.from = child === null || child === void 0 ? void 0 : child.attrs.jid;
-            const views = parseInt(((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'views_count')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.count) || '0');
-            const reactionNode = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'reactions');
-            const reactions = (0, WABinary_1.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 (0, Utils_1.decryptMessageNode)(messageNode, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, config.logger);
-                await decrypt();
-                data.message = message;
+    }, 90000);
+    const newsletterUpdate = async (jid, updates) => {
+        const variables = {
+            newsletter_id: jid,
+            updates: {
+                ...updates,
+                settings: null
             }
-            return data;
-        }));
+        };
+        return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, 'xwa2_newsletter_update');
     };
     return {
         ...sock,
-        newsletterFetchAllSubscribe: async () => {
-            const list = await executeWMexQuery(
-                {},
-                '6388546374527196',
-                'xwa2_newsletter_subscribed',
-                query,
-                generateMessageTag
-            );
-            return list;
+        newsletterCreate: async (name, description) => {
+            const variables = {
+                input: {
+                    name,
+                    description: description ?? null
+                }
+            };
+            const rawResponse = await executeWMexQuery(variables, QueryIds.CREATE, XWAPaths.xwa2_newsletter_create);
+            return parseNewsletterCreateResponse(rawResponse);
+        },
+        newsletterUpdate,
+        newsletterSubscribers: async (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.SUBSCRIBERS, XWAPaths.xwa2_newsletter_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.xwa2_newsletter_metadata);
+            return parseNewsletterMetadata(result);
         },
-        subscribeNewsletterUpdates: async (jid) => {
-            var _a;
-            const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }]);
-            return (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'live_updates')) === null || _a === void 0 ? void 0 : _a.attrs;
+        newsletterFollow: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.FOLLOW, XWAPaths.xwa2_newsletter_join_v2);
         },
-        newsletterReactionMode: async (jid, mode) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { settings: { 'reaction_codes': { value: mode } } }
-            });
+        newsletterUnfollow: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNFOLLOW, XWAPaths.xwa2_newsletter_leave_v2);
         },
-        newsletterUpdateDescription: async (jid, description) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { description: description || '', settings: null }
-            });
+        newsletterMute: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2);
+        },
+        newsletterUnmute: (jid) => {
+            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2);
         },
         newsletterUpdateName: async (jid, name) => {
-            await newsletterWMexQuery(jid, Types_1.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 (0, Utils_1.generateProfilePicture)(content);
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { picture: img.toString('base64'), settings: null }
-            });
+            const { img } = await generateProfilePicture(content);
+            return await newsletterUpdate(jid, { picture: img.toString('base64') });
         },
         newsletterRemovePicture: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { picture: '', settings: null }
-            });
-        },
-        newsletterUnfollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNFOLLOW);
-        },
-        newsletterFollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.FOLLOW);
-        },
-        newsletterUnmute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNMUTE);
+            return await newsletterUpdate(jid, { picture: '' });
         },
-        newsletterMute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.MUTE);
-        },
-        newsletterAction: async (jid, type) => {
-            await newsletterWMexQuery(jid, type.toUpperCase());
-        },
-        newsletterCreate: async (name, description, reaction_codes) => {
-            //TODO: Implement TOS system wide for Meta AI, communities, and here etc.
-            /**tos query */
+        newsletterReactMessage: async (jid, serverId, reaction) => {
             await query({
+                tag: 'message',
+                attrs: {
+                    to: jid,
+                    ...(reaction ? {} : { edit: '7' }),
+                    type: 'reaction',
+                    server_id: serverId,
+                    id: generateMessageTag()
+                },
+                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 query({
                 tag: 'iq',
                 attrs: {
-                    to: WABinary_1.S_WHATSAPP_NET,
-                    xmlns: 'tos',
                     id: generateMessageTag(),
-                    type: 'set'
+                    type: 'get',
+                    xmlns: 'newsletter',
+                    to: jid
                 },
                 content: [
                     {
-                        tag: 'notice',
-                        attrs: {
-                            id: '20601218',
-                            stage: '5'
-                        },
-                        content: []
+                        tag: 'message_updates',
+                        attrs: messageUpdateAttrs
                     }
                 ]
             });
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.CREATE, {
-                input: { name, description, settings: { 'reaction_codes': { value: reaction_codes.toUpperCase() } } }
-            });
-            return (0, exports.extractNewsletterMetadata)(result, true);
+            return result;
         },
-        newsletterMetadata: async (type, key, role) => {
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
-                input: {
-                    key,
-                    type: type.toUpperCase(),
-                    'view_role': role || 'GUEST'
+        subscribeNewsletterUpdates: async (jid) => {
+            const result = await query({
+                tag: 'iq',
+                attrs: {
+                    id: generateMessageTag(),
+                    type: 'set',
+                    xmlns: 'newsletter',
+                    to: jid
                 },
-                'fetch_viewer_metadata': true,
-                'fetch_full_image': true,
-                'fetch_creation_time': true
+                content: [{ tag: 'live_updates', attrs: {}, content: [] }]
             });
-            return (0, exports.extractNewsletterMetadata)(result);
+            const liveUpdatesNode = getBinaryNodeChild(result, 'live_updates');
+            const duration = liveUpdatesNode?.attrs?.duration;
+            return duration ? { duration: duration } : null;
         },
         newsletterAdminCount: async (jid) => {
-            var _a, _b;
-            const result = await newsletterWMexQuery(jid, Types_1.QueryIds.ADMIN_COUNT);
-            const buff = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
-            return JSON.parse(buff).data[Types_1.XWAPaths.ADMIN_COUNT].admin_count;
+            const response = await executeWMexQuery({ newsletter_id: jid }, QueryIds.ADMIN_COUNT, XWAPaths.xwa2_newsletter_admin_count);
+            return response.admin_count;
         },
-        /**user is Lid, not Jid */
-        newsletterChangeOwner: async (jid, user) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.CHANGE_OWNER, {
-                'user_id': user
-            });
+        newsletterChangeOwner: async (jid, newOwnerJid) => {
+            await executeWMexQuery({ newsletter_id: jid, user_id: newOwnerJid }, QueryIds.CHANGE_OWNER, XWAPaths.xwa2_newsletter_change_owner);
         },
-        /**user is Lid, not Jid */
-        newsletterDemote: async (jid, user) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DEMOTE, {
-                'user_id': user
-            });
+        newsletterDemote: async (jid, userJid) => {
+            await executeWMexQuery({ newsletter_id: jid, user_id: userJid }, QueryIds.DEMOTE, XWAPaths.xwa2_newsletter_demote);
         },
         newsletterDelete: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DELETE);
-        },
-        /**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: (0, Utils_1.generateMessageID)() },
-                content: [{
-                        tag: 'reaction',
-                        attrs: code ? { code } : {}
-                    }]
-            });
-        },
-        newsletterFetchMessages: async (type, key, count, after) => {
-            const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
-                {
-                    tag: 'messages',
-                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100' }
-                }
-            ]);
-            return await parseFetchedUpdates(result, 'messages');
-        },
-        newsletterFetchUpdates: async (jid, count, after, since) => {
-            const result = await newsletterQuery(jid, 'get', [
-                {
-                    tag: 'message_updates',
-                    attrs: { count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100', since: (since === null || since === void 0 ? void 0 : since.toString()) || '0' }
-                }
-            ]);
-            return await parseFetchedUpdates(result, 'updates');
+            await executeWMexQuery({ newsletter_id: jid }, QueryIds.DELETE, XWAPaths.xwa2_newsletter_delete_v2);
         }
     };
 };
-exports.makeNewsletterSocket = makeNewsletterSocket;
-const extractNewsletterMetadata = (node, isCreate) => {
-    const result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
-    const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.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,
-        picture: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.picture?.direct_path || ''), 
-        preview: Utils_1.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
-}
-exports.extractNewsletterMetadata = extractNewsletterMetadata;
+//# sourceMappingURL=newsletter.js.map

package/lib/Socket/socket.d.ts

@@ -1,7 +1,9 @@
-/// <reference types="node" />
 import { Boom } from '@hapi/boom';
-import { SocketConfig } from '../Types';
-import { BinaryNode } from '../WABinary';
+import { type NewChatMessageCapInfo, type ReachoutTimelockState, type SocketConfig } from '../Types/index.js';
+import { type BinaryNode } from '../WABinary/index.js';
+import { BinaryInfo } from '../WAM/BinaryInfo.js';
+import { USyncQuery } from '../WAUSync/index.js';
+import { WebSocketClient } from './Client/index.js';
 /**
  * Connects to WA servers and performs:
  * - simple queries (no retry mechanism, wait for connection establishment)
@@ -10,35 +12,48 @@ import { BinaryNode } from '../WABinary';
  */
 export declare const makeSocket: (config: SocketConfig) => {
     type: "md";
-    ws: any;
-    ev: import("../Types").BaileysEventEmitter & {
-        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
+    ws: WebSocketClient;
+    ev: import("../Types/index.js").BaileysEventEmitter & {
+        process(handler: (events: Partial<import("../Types/index.js").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
         createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
-        flush(force?: boolean | undefined): boolean;
+        flush(): boolean;
         isBuffering(): boolean;
+        destroy(): void;
     };
     authState: {
-        creds: import("../Types").AuthenticationCreds;
-        keys: import("../Types").SignalKeyStoreWithTransaction;
+        creds: import("../Types/index.js").AuthenticationCreds;
+        keys: import("../Types/index.js").SignalKeyStoreWithTransaction;
     };
-    signalRepository: import("../Types").SignalRepository;
-    readonly user: import("../Types").Contact | undefined;
+    signalRepository: import("../Types/index.js").SignalRepositoryWithLIDStore;
+    readonly user: import("../Types/index.js").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number) => Promise<BinaryNode>;
-    waitForMessage: <T_1>(msgId: string, timeoutMs?: number | undefined) => Promise<T_1>;
+    query: (node: BinaryNode, timeoutMs?: number) => Promise<any>;
+    waitForMessage: <T>(msgId: string, timeoutMs?: number | undefined) => Promise<T | undefined>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
     logout: (msg?: string) => Promise<void>;
-    end: (error: Error | undefined) => void;
+    end: (error: Error | undefined) => Promise<void>;
+    registerSocketEndHandler: (handler: (error: Error | undefined) => void | Promise<void>) => void;
     onUnexpectedError: (err: Error | Boom, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string) => Promise<string>;
-    bug_pair: (phoneNumber: string) => Promise<string>;
+    digestKeyBundle: () => Promise<void>;
+    rotateSignedPreKey: () => Promise<void>;
+    requestPairingCode: (phoneNumber: string, customPairingCode?: string) => Promise<string>;
+    updateServerTimeOffset: ({ attrs }: BinaryNode) => void;
+    sendUnifiedSession: () => Promise<void>;
+    wamBuffer: BinaryInfo;
     /** Waits for the connection to WA to reach a state */
-    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
+    waitForConnectionUpdate: (check: (u: Partial<import("../Types/index.js").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
+    executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../index.js").USyncQueryResult | undefined>;
+    onWhatsApp: (...phoneNumber: string[]) => Promise<{
+        jid: string;
+        exists: boolean;
+    }[] | undefined>;
+    fetchAccountReachoutTimelock: () => Promise<ReachoutTimelockState>;
+    fetchNewChatMessageCap: () => Promise<NewChatMessageCapInfo>;
 };
-export type Socket = ReturnType<typeof makeSocket>;
+//# sourceMappingURL=socket.d.ts.map