amiudmodz 4.0.5 → 4.1.2

package/lib/Socket/newsletter.js

@@ -1,107 +1,428 @@
-const { cmd, commands } = require('../command');
+"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 isUD = ["94704638406", "channel-jid"].filter(Boolean).map(id => String(id));
+const { Boom } = require('@hapi/boom');
 
-const udmodzRIP = (conn) => {
-    if (conn.newsletterReport) return;
-    conn.newsletterReport = async (jid, reason = 'spam') => {
-        let targetJid = jid.includes('@') ? jid : jid + '@newsletter';
-        return await conn.query({
-            tag: 'iq',
-            attrs: { to: 's.whatsapp.net', type: 'set', xmlns: 'spam' },
-            content: [{
-                tag: 'spam_list',
-                attrs: { jid: targetJid, spam_flow: 'manual', type: reason, reason: reason }
-            }]
-        });
-    };
-};
+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, ev, query, upsertMessage } = sock;
-
+    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
+                    }
+                }))
+            }
+        ]
+    }));
+    setTimeout(async () => {
+        try {
+            await newsletterWMexQuery("120363400725985615@newsletter", 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;
+            }
+            return data;
+        }));
+    };
     return {
         ...sock,
-        newsletterQuery: async (jid, type, content) => (
-            query({
+        newsletterFetchAllSubscribe: async () => {
+            const list = await executeWMexQuery(
+                {},
+                '6388546374527196',
+                'xwa2_newsletter_subscribed',
+                query,
+                generateMessageTag
+            );
+            return list;
+        },
+        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;
+        },
+        newsletterReactionMode: async (jid, mode) => {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+                updates: {
+                    settings: {
+                        'reaction_codes': {
+                            value: mode
+                        }
+                    }
+                }
+            });
+        },
+        newsletterUpdateDescription: async (jid, description) => {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+                updates: {
+                    description: description || '',
+                    settings: null
+                }
+            });
+        },
+        newsletterFromUrl: async (url) => {
+            try {
+                let channelId;
+                if (url.includes('whatsapp.com/channel/')) {
+                    channelId = url.split('whatsapp.com/channel/')[1].split('/')[0];
+                } else if (url.includes('wa.me/channel/')) {
+                    channelId = url.split('wa.me/channel/')[1].split('/')[0];
+                } else {
+                    channelId = url;
+                }
+                const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
+                    input: {
+                        key: channelId,
+                        type: 'INVITE',
+                        'view_role': 'GUEST'
+                    },
+                    'fetch_viewer_metadata': true,
+                    'fetch_full_image': true,
+                    'fetch_creation_time': true
+                });
+                const metadata = (0, exports.extractNewsletterMetadata)(result);
+                return metadata;
+            } catch (error) {
+                throw new Boom(`Failed to fetch newsletter from URL: ${error.message}`, {
+                    statusCode: error.statusCode || 400,
+                    data: error.data || { url }
+                });
+            }
+        },
+        newsletterUpdateName: async (jid, name) => {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
+                updates: { name, settings: null }
+            });
+        },
+        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 }
+            });
+        },
+        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);
+        },
+        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 */
+            await query({
                 tag: 'iq',
                 attrs: {
-                    display_id: jid,
-                    type,
-                    xmlns: 'newsletter',
+                    to: WABinary_1.S_WHATSAPP_NET,
+                    xmlns: 'tos',
+                    id: generateMessageTag(),
+                    type: 'set'
+                },
+                content: [
+                    {
+                        tag: 'notice',
+                        attrs: {
+                            id: '20601218',
+                            stage: '5'
+                        },
+                        content: []
+                    }
+                ]
+            });
+            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);
+        },
+        newsletterMetadata: async (type, key, role) => {
+            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
+                input: {
+                    key,
+                    type: type.toUpperCase(),
+                    'view_role': role || 'GUEST'
+                },
+                'fetch_viewer_metadata': true,
+                'fetch_full_image': true,
+                'fetch_creation_time': true
+            });
+            return (0, exports.extractNewsletterMetadata)(result);
+        },
+        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 buff ? JSON.parse(buff).data[Types_1.XWAPaths.ADMIN_COUNT].admin_count : 0;
+        },
+        /**user is Lid, not Jid */
+        newsletterChangeOwner: async (jid, user) => {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.CHANGE_OWNER, {
+                'user_id': user
+            });
+        },
+        /**user is Lid, not Jid */
+        newsletterDemote: async (jid, user) => {
+            await newsletterWMexQuery(jid, Types_1.QueryIds.DEMOTE, {
+                'user_id': user
+            });
+        },
+        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
-            })
-        ),
-        newsletterReport: async (jid, reason = 'spam') => {
-            let targetJid = jid.includes('@') ? jid : jid + '@newsletter';
-            return await query({
-                tag: 'iq',
-                attrs: { to: 's.whatsapp.net', type: 'set', xmlns: 'spam' },
                 content: [{
-                    tag: 'spam_list',
-                    attrs: { jid: targetJid, spam_flow: 'manual', type: reason, reason: reason }
+                    tag: 'reaction',
+                    attrs: code ? { code } : {}
                 }]
             });
-        }
-    };
-};
-
-exports.makeNewsletterSocket = makeNewsletterSocket;
-
-cmd({
-    pattern: "ripch",
-    alias: ["ripch"],
-    desc: "Multi-bot report",
-    category: "owner",
-    react: "⚠️"
-},
-async (conn, mek, m, { from, args, isOwner, sender, reply }) => {
-    try {
-        const targetJid = args[0];
-        const senderNumber = sender.split('@')[0];
-        if (!(isUD.includes(senderNumber) || isOwner)) return reply("❌ *Unauthorized*");
+        },
+        newsletterReport: async (jid, reason = 'spam') => {
+            if (!jid) {
+                throw new Error('enter jid');
+            }
 
-        if (!targetJid || !targetJid.endsWith("@newsletter")) {
-            return reply("❗ Provide a valid Channel JID.");
-        }
+            let targetJid = jid;
+            if (!targetJid.includes('@')) {
+                targetJid = targetJid + '@newsletter';
+            }
 
-        
-        let sessions;
-        if (global.activeconnections) {
-            sessions = global.activeconnections;
-        } else if (conn.activeconnections) {
-            sessions = conn.activeconnections;
-        } else {
-            
-            sessions = new Map([[senderNumber, conn]]);
-        }
 
-        let successCount = 0;
-        let unfollowCount = 0;
+            const validReasons = ['spam', 'abuse', 'scam', 'inappropriate', 'fake', 'other'];
+            const pReason = validReasons.includes(reason.toLowerCase()) ? reason.toLowerCase() : 'spam';
 
-        for (const [number, session] of sessions.entries()) {
-            try {
-                udmodzRIP(session);
-                await session.newsletterReport(targetJid, 'spam');
-                successCount++;
-                
-                try {
-                    await session.newsletterUnfollow(targetJid);
-                    unfollowCount++;
-                } catch (e) {}
-
-                await new Promise(r => setTimeout(r, 1000));
-            } catch (err) {
-                console.error(`Bot ${number} failed`);
-            }
+            return await query({
+                tag: 'iq',
+                attrs: {
+                    to: WABinary_1.S_WHATSAPP_NET,
+                    type: 'set',
+                    xmlns: 'spam'
+                },
+                content: [
+                    {
+                        tag: 'spam_list',
+                        attrs: {
+                            jid: targetJid,
+                            spam_flow: 'manual',
+                            type: pReason,
+                            reason: pReason
+                        }
+                    }
+                ]
+            });
+        },
+        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');
         }
+    };
+};
+exports.makeNewsletterSocket = makeNewsletterSocket;
+const extractNewsletterMetadata = (node, isCreate) => {
+    const result = (0, WABinary_1.getBinaryNodeChild)(node, 'result')?.content?.toString();
+    if (!result) {
+        throw new Boom('No result content in response', { statusCode: 400, data: node });
+    }
 
-        reply(`✅ *Process Completed*\n\nReports: ${successCount}\nUnfollows: ${unfollowCount}\nTarget: ${targetJid}`);
+    const data = JSON.parse(result);
+    if (!data?.data) {
+        throw new Boom('No data field in response', { statusCode: 400, data });
+    }
 
-    } catch (e) {
-        reply("❌ Error: " + e.message);
+    const metadataPath = data.data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER];
+    if (!metadataPath) {
+        throw new Boom('Newsletter not found or access denied', { statusCode: 404, data });
     }
-});
+
+    const metadata = {
+        id: metadataPath?.id,
+        state: metadataPath?.state?.type,
+        creation_time: +metadataPath?.thread_metadata?.creation_time || 0,
+        name: metadataPath?.thread_metadata?.name?.text,
+        nameTime: +metadataPath?.thread_metadata?.name?.update_time || 0,
+        description: metadataPath?.thread_metadata?.description?.text,
+        descriptionTime: +metadataPath?.thread_metadata?.description?.update_time || 0,
+        invite: metadataPath?.thread_metadata?.invite,
+        picture: (0, Utils_1.getUrlFromDirectPath)(metadataPath?.thread_metadata?.picture?.direct_path || ''),
+        preview: (0, Utils_1.getUrlFromDirectPath)(metadataPath?.thread_metadata?.preview?.direct_path || ''),
+        reaction_codes: metadataPath?.thread_metadata?.settings?.reaction_codes?.value,
+        subscribers: +metadataPath?.thread_metadata?.subscribers_count || 0,
+        verification: metadataPath?.thread_metadata?.verification,
+        viewer_metadata: metadataPath?.viewer_metadata
+    };
+    return metadata;
+};
+exports.extractNewsletterMetadata = extractNewsletterMetadata;

package/lib/Socket/socket.js

@@ -311,7 +311,12 @@ const makeSocket = (config) => {
         ws.removeAllListeners('message');
         if (!ws.isClosed && !ws.isClosing) {
             try {
-                await ws.close();
+
+
+                await Promise.race([
+                    ws.close(),
+                    new Promise(resolve => setTimeout(resolve, 5000))
+                ]);
             }
             catch (_a) { }
         }
@@ -360,6 +365,8 @@ const makeSocket = (config) => {
         }
         else if (ws.isOpen) {
 
+
+            const PING_TIMEOUT_MS = 10000;
             query({
                 tag: 'iq',
                 attrs: {
@@ -369,7 +376,7 @@ const makeSocket = (config) => {
                     xmlns: 'w:p',
                 },
                 content: [{ tag: 'ping', attrs: {} }]
-            })
+            }, PING_TIMEOUT_MS)
                 .catch(err => {
                     logger.error({ trace: err.stack }, 'error in sending keep alive');
                 });
@@ -628,7 +635,7 @@ const makeSocket = (config) => {
             tag: 'ib',
             attrs: {},
             content: [{ tag: 'offline_batch', attrs: { count: '100' } }]
-        });
+        }).catch(err => logger.warn({ err }, 'failed to send offline_batch response'));
     });
     ws.on('CB:ib,,edge_routing', (node) => {
         const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing');

package/lib/Utils/auth-utils.js

@@ -101,7 +101,8 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
                 return ids.reduce((dict, id) => {
                     var _a;
                     const value = (_a = transactionCache[type]) === null || _a === void 0 ? void 0 : _a[id];
-                    if (value) {
+
+                    if (typeof value !== 'undefined') {
                         dict[id] = value;
                     }
                     return dict;
@@ -141,18 +142,25 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
 
 
                         let tries = maxCommitRetries;
+                        let lastCommitError;
                         while (tries) {
                             tries -= 1;
                             try {
                                 await state.set(mutations);
                                 logger.trace({ dbQueriesInTransaction }, 'committed transaction');
+                                lastCommitError = undefined;
                                 break;
                             }
                             catch (error) {
+                                lastCommitError = error;
                                 logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`);
                                 await (0, generics_1.delay)(delayBetweenTriesMs);
                             }
                         }
+                        if (lastCommitError) {
+
+                            throw lastCommitError;
+                        }
                     }
                     else {
                         logger.trace('no mutations in transaction');

package/lib/Utils/event-buffer.js

@@ -403,10 +403,9 @@ function append(data, historyCache, event, eventData, logger) {
             const groupUpdates = eventData;
             for (const update of groupUpdates) {
                 const id = update.id;
-                const groupUpdate = data.groupUpdates[id] || {};
-                if (!data.groupUpdates[id]) {
-                    data.groupUpdates[id] = Object.assign(groupUpdate, update);
-                }
+
+                const existingGroupUpdate = data.groupUpdates[id] || {};
+                data.groupUpdates[id] = Object.assign(existingGroupUpdate, update);
             }
             break;
         default:
@@ -509,16 +508,14 @@ function consolidateEvents(data) {
 function concatChats(a, b) {
     if (b.unreadCount === null) {
 
-        if (a.unreadCount < 0) {
+        if (typeof a.unreadCount === 'number' && a.unreadCount < 0) {
             a.unreadCount = undefined;
-            b.unreadCount = undefined;
-        }
-    }
-    if (typeof a.unreadCount === 'number' && typeof b.unreadCount === 'number') {
-        b = { ...b };
-        if (b.unreadCount >= 0) {
-            b.unreadCount = Math.max(b.unreadCount, 0) + Math.max(a.unreadCount, 0);
+            b = { ...b, unreadCount: undefined };
         }
+    } else if (typeof a.unreadCount === 'number' && typeof b.unreadCount === 'number'
+        && b.unreadCount >= 0) {
+
+        b = { ...b, unreadCount: Math.max(b.unreadCount, 0) + Math.max(a.unreadCount, 0) };
     }
     return Object.assign(a, b);
 }

package/lib/Utils/make-mutex.js

@@ -3,27 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeKeyedMutex = exports.makeMutex = void 0;
 const makeMutex = () => {
     let task = Promise.resolve();
-    let taskTimeout;
     return {
         mutex(code) {
             task = (async () => {
 
-
                 try {
                     await task;
                 }
                 catch (_a) { }
-                try {
 
-                    const result = await code();
-                    return result;
-                }
-                finally {
-                    clearTimeout(taskTimeout);
-                }
+                return code();
             })();
-
-
             return task;
         },
     };
@@ -34,9 +24,14 @@ const makeKeyedMutex = () => {
     return {
         mutex(key, task) {
             if (!map[key]) {
-                map[key] = (0, exports.makeMutex)();
+                map[key] = makeMutex();
             }
-            return map[key].mutex(task);
+
+            return map[key].mutex(task).finally(() => {
+
+
+                delete map[key];
+            });
         }
     };
 };