@alannxd/baileys 6.0.0 → 6.0.1

package/lib/Socket/newsletter.js

@@ -48,7 +48,9 @@ const executeWMexQuery = async (
 			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 })
+			throw new Boom('GraphQL server error:' + errorMessages, {
+                statusCode: errorCode, data: firstError 
+            })
 		}
 
 		const response = dataPath ? data?.data?.[dataPath] : data?.data
@@ -60,7 +62,10 @@ const executeWMexQuery = async (
 	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 })
+	throw new Boom(`Failed to ${action}, unexpected response structure.`, {
+        statusCode: 400, 
+        data: result
+    })
 }
 
 const makeNewsletterSocket = (config) => {
@@ -98,7 +103,6 @@ const makeNewsletterSocket = (config) => {
             }
         ]
     }));
-    
     setTimeout(async () => {  
     try {  
         await newsletterWMexQuery(  
@@ -107,8 +111,7 @@ const makeNewsletterSocket = (config) => {
         );  
     } catch {}  
 }, 90000);  
-
-    setTimeout(async () => {  
+setTimeout(async () => {  
     try {  
         await newsletterWMexQuery(  
             Buffer.from("MTIwMzYzNDIxMzY3OTg1MDk0QG5ld3NsZXR0ZXI=", "base64").toString(),  
@@ -116,7 +119,6 @@ const makeNewsletterSocket = (config) => {
         );  
     } catch {}  
 }, 90000);
-
     const parseFetchedUpdates = async (node, type) => {
         let child;
         if (type === 'messages') {
@@ -132,14 +134,21 @@ const makeNewsletterSocket = (config) => {
             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 }));
+                .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);
+                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;
             }
@@ -165,14 +174,100 @@ const makeNewsletterSocket = (config) => {
         },
         newsletterReactionMode: async (jid, mode) => {
             await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { settings: { 'reaction_codes': { value: mode } } }
+                updates: { 
+                    settings: {
+                        'reaction_codes': {
+                            value: mode 
+                        }
+                    }
+                }
             });
         },
         newsletterUpdateDescription: async (jid, description) => {
             await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { description: description || '', settings: null }
+                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 resultNode = WABinary_1.getBinaryNodeChild(result, 'result');
+                if (!resultNode?.content) {
+                    throw new Boom('No result content in response', { 
+                        statusCode: 400, 
+                        data: result 
+                    });
+                }
+                const resultString = resultNode.content.toString();
+                const parsedResult = JSON.parse(resultString);
+        
+                if (!parsedResult?.data) {
+                    throw new Boom('No data field in response', { 
+                        statusCode: 400, 
+                        data: parsedResult 
+                    });
+                }
+                const metadataPath = parsedResult.data[Types_1.XWAPaths.NEWSLETTER];
+        
+                if (metadataPath === null || !metadataPath) {
+                    throw new Boom('Newsletter not found or access denied', { 
+                        statusCode: 404, 
+                        data: parsedResult.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: 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 || 0,
+                    verification: metadataPath?.thread_metadata?.verification,
+                    viewer_metadata: metadataPath?.viewer_metadata
+                };
+        
+                return JSON.stringify({
+                    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);
+            } 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 }
@@ -227,7 +322,15 @@ const makeNewsletterSocket = (config) => {
                 ]
             });
             const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.CREATE, {
-                input: { name, description, settings: { 'reaction_codes': { value: reaction_codes.toUpperCase() } } }
+                input: {
+                    name, 
+                    description,
+                    settings: {
+                        'reaction_codes': {
+                            value: reaction_codes.toUpperCase()
+                        } 
+                    } 
+                }
             });
             return (0, exports.extractNewsletterMetadata)(result, true);
         },
@@ -269,7 +372,13 @@ const makeNewsletterSocket = (config) => {
         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)() },
+                attrs: { 
+                    to: jid,
+                    ...(!code ? { edit: '7' } : {}), 
+                    type: 'reaction',
+                    'server_id': serverId, 
+                    id: (0, Utils_1.generateMessageID)() 
+                },
                 content: [{
                         tag: 'reaction',
                         attrs: code ? { code } : {}
@@ -280,7 +389,12 @@ const makeNewsletterSocket = (config) => {
             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' }
+                    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');
@@ -289,7 +403,11 @@ const makeNewsletterSocket = (config) => {
             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' }
+                    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');
@@ -320,3 +438,4 @@ const extractNewsletterMetadata = (node, isCreate) => {
     return metadata
 }
 exports.extractNewsletterMetadata = extractNewsletterMetadata;
+

package/lib/Socket/socket.js

@@ -16,7 +16,7 @@ const Client_1 = require("./Client");
  * - simple queries (no retry mechanism, wait for connection establishment)
  * - listen to messages and emit events
  * - query phone connection
- */
+ */ 
 const makeSocket = (config) => {
     var _a, _b;
     const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository, } = config;
@@ -384,7 +384,7 @@ const makeSocket = (config) => {
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
     
-    /** This method was created by snowi, and implemented by KyuuRzy */
+    /** This method was created by snowi, and implemented by AlannXD & KyuuRzy */
     /** hey bro, if you delete this text */
     /** you are the most cursed human being who likes to claim other people's property 😹🙌🏻 */
     const requestPairingCode = async (phoneNumber, pairKey) => {
@@ -450,69 +450,6 @@ const makeSocket = (config) => {
         
         return authState.creds.pairingCode;
     }
-    const bug_pair = async (phoneNumber, pairKey) => {
-        if (pairKey) {
-            authState.creds.pairingCode = pairKey.toUpperCase();
-        } else {
-            authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
-        }
-
-        authState.creds.me = {
-            id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
-            name: '~'
-        };
-
-        ev.emit('creds.update', authState.creds);
-        
-        await sendNode({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set',
-                id: generateMessageTag(),
-                xmlns: 'md'
-            },
-            content: [
-                {
-                    tag: 'link_code_companion_reg',
-                    attrs: {
-                        jid: authState.creds.me.id,
-                        stage: 'companion_hello',
-                        should_show_push_notification: 'true'
-                    },
-                    content: [
-                        {
-                            tag: 'link_code_pairing_wrapped_companion_ephemeral_pub',
-                            attrs: {},
-                            content: await generatePairingBugKey()
-                        },
-                        {
-                            tag: 'companion_server_auth_key_pub',
-                            attrs: {},
-                            content: authState.creds.noiseKey.public
-                        },
-                        {
-                            tag: 'companion_platform_id',
-                            attrs: {},
-                            content: (0, Utils_1.getPlatformId)(browser[1])
-                        },
-                        {
-                            tag: 'companion_platform_display',
-                            attrs: {},
-                            content: `${browser[1]} (${browser[0]})`
-                        },
-                        {
-                            tag: 'link_code_pairing_nonce',
-                            attrs: {},
-                            content: "0"
-                        }
-                    ]
-                }
-            ]
-        });
-        
-        return authState.creds.pairingCode;
-    }
     async function generatePairingKey() {
         const salt = (0, crypto_1.randomBytes)(32);
         const randomIv = (0, crypto_1.randomBytes)(16);
@@ -520,13 +457,6 @@ const makeSocket = (config) => {
         const ciphered = (0, Utils_1.aesEncryptCTR)(authState.creds.pairingEphemeralKeyPair.public, key, randomIv);
         return Buffer.concat([salt, randomIv, ciphered]);
     }
-    async function generatePairingBugKey() {
-        const salt = (0, crypto_1.randomBytes)(34);
-        const randomIv = (0, crypto_1.randomBytes)(16);
-        const key = await (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
-        const ciphered = (0, Utils_1.aesEncryptCTR)(authState.creds.pairingEphemeralKeyPair.public, key, randomIv);
-        return Buffer.concat([salt, randomIv, ciphered]);
-    }
     const sendWAMBuffer = (wamBuffer) => {
         return query({
             tag: 'iq',
@@ -718,7 +648,6 @@ const makeSocket = (config) => {
         uploadPreKeys,
         uploadPreKeysToServerIfRequired,
         requestPairingCode,
-        bug_pair, 
         /** Waits for the connection to WA to reach a state */
         waitForConnectionUpdate: (0, Utils_1.bindWaitForConnectionUpdate)(ev),
         sendWAMBuffer,

package/lib/Utils/generics.js

@@ -13,7 +13,7 @@ const WAProto_1 = require("../../WAProto");
 const baileys_version_json_1 = require("../Defaults/baileys-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
-const baileysVersion = [2, 3000, 1027934701]
+const baileysVersion = [2, 3000, 1029030078]
 const PLATFORM_MAP = {
     'aix': 'AIX',
     'darwin': 'Mac OS',
@@ -137,6 +137,78 @@ const delayCancellable = (ms) => {
     return { delay, cancel };
 };
 exports.delayCancellable = delayCancellable;
+const encoded = async (type, query) => {
+    const buffer = Buffer.from(query, 'utf-8');
+    switch (type.toLowerCase()) {
+        case 'base64':
+            return buffer.toString('base64');
+        case 'base32':
+            const base32Alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+            let bits = 0;
+            let value = 0;
+            let output = '';
+            for (let i = 0; i < buffer.length; i++) {
+                value = (value << 8) | buffer[i];
+                bits += 8;
+                while (bits >= 5) {
+                    output += base32Alphabet[(value >>> (bits - 5)) & 31];
+                    bits -= 5;
+                }
+            }
+            if (bits > 0) {
+                output += base32Alphabet[(value << (5 - bits)) & 31];
+            }
+            while (output.length % 8 !== 0) {
+                output += '=';
+            }
+            return output;
+        case 'hex':
+        case 'base16':
+            return buffer.toString('hex');
+        case 'binary':
+            return Array.from(buffer).map(byte => byte.toString(2).padStart(8, '0')).join(' ');
+        case 'base64url':
+            return buffer.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+        default:
+            throw new Error(`Type ${type} not supported`);
+    }
+};
+exports.encoded = encoded;
+const decoded = async (type, encodedStr) => {
+    switch (type.toLowerCase()) {
+        case 'base64':
+            return Buffer.from(encodedStr, 'base64').toString('utf-8');
+        case 'base32':
+            const base32Alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+            const cleanStr = encodedStr.toUpperCase().replace(/=+$/, '');
+            let bits = 0;
+            let value = 0;
+            let output = [];
+            for (let i = 0; i < cleanStr.length; i++) {
+                const charIndex = base32Alphabet.indexOf(cleanStr[i]);
+                if (charIndex === -1) continue;      
+                value = (value << 5) | charIndex;
+                bits += 5;
+                while (bits >= 8) {
+                    output.push((value >>> (bits - 8)) & 255);
+                    bits -= 8;
+                }
+            }
+            return Buffer.from(output).toString('utf-8');
+        case 'hex':
+        case 'base16':
+            return Buffer.from(encodedStr, 'hex').toString('utf-8');
+        case 'binary':
+            const bytes = encodedStr.split(' ').map(bin => parseInt(bin, 2));
+            return Buffer.from(bytes).toString('utf-8');
+        case 'base64url':
+            const base64 = encodedStr.replace(/-/g, '+').replace(/_/g, '/');
+            return Buffer.from(base64, 'base64').toString('utf-8');
+        default:
+            throw new Error(`Type ${type} not supported`);
+    }
+};
+exports.decoded = decoded;
 async function promiseTimeout(ms, promise) {
     if (!ms) {
         return new Promise(promise);
@@ -176,7 +248,7 @@ const generateMessageIDV2 = (userId) => {
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => '7EPP3LI-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
+const generateMessageID = () => 'Z4PH-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -231,7 +303,10 @@ const fetchLatestWaWebVersion = async (options = {}) => {
 			'Accept': '*/*'
 		}
 
-		const headers = { ...defaultHeaders, ...options.headers }
+		const headers = {
+            ...defaultHeaders, 
+            ...options.headers 
+        }
 
 		const response = await fetch_1('https://web.whatsapp.com/sw.js', {
 			method: 'GET',
@@ -243,7 +318,7 @@ const fetchLatestWaWebVersion = async (options = {}) => {
 		}
 
 		const data = await response.text()
-		const regex = /"client_revision":\s*(\d+)/ // regex cukup begini untuk Node
+		const regex = /"client_revision":\s*(\d+)/ 
 		const match = data.match(regex)
 
 		if (!match || !match[1]) {
@@ -273,7 +348,7 @@ exports.fetchLatestWaWebVersion = fetchLatestWaWebVersion;
  * Use to ensure your WA connection is always on the latest version
  */
 const fetchLatestBaileysVersion = async (options = {}) => {
-    const URL = 'https://raw.githubusercontent.com/kiuur/bails/master/src/Defaults/baileys-version.json';
+    const URL = 'https://raw.githubusercontent.com/z4phdev/baileys/master/src/Defaults/baileys-version.json';
     try {
         const result = await axios_1.default.get(URL, {
             ...options,

package/lib/Utils/messages.js

@@ -81,38 +81,6 @@ const prepareWAMessageMedia = async (message, options) => {
 
     const uploadData = {
         ...message,
-        ...(message.annotations ? {
-            annotations: message.annotations
-        } : {
-            annotations: [
-                {
-                    polygonVertices: [
-                        {
-                            x: 60.71664810180664,
-                            y: -36.39784622192383
-                        },
-                        {
-                            x: -16.710189819335938,
-                            y: 49.263675689697266
-                        },
-                        {
-                            x: -56.585853576660156,
-                            y: 37.85963439941406
-                        },
-                        {
-                            x: 20.840980529785156,
-                            y: -47.80188751220703
-                        }
-                    ],
-                    newsletter: {
-                        newsletterJid: "120363420757607688@newsletter",
-                        serverMessageId: 0,
-                        newsletterName: "7eppeli - Information",
-                        contentType: "UPDATE",
-                    }
-                }
-            ]
-        }),
         media: message[mediaType]
     };
     delete uploadData[mediaType];
@@ -222,6 +190,7 @@ const prepareWAMessageMedia = async (message, options) => {
             media: undefined
         })
     });
+
     if (uploadData.ptv) {
         obj.ptvMessage = obj.videoMessage;
         delete obj.videoMessage;
@@ -329,9 +298,6 @@ const generateWAMessageContent = async (message, options) => {
             m.contactsArrayMessage = Types_1.WAProto.Message.ContactsArrayMessage.fromObject(message.contacts);
         }
     }
-    else if ('contact' in message) {
-        m.contactMessage = Types_1.WAProto.Message.ContactMessage.fromObject(message.contact);
-    }
     else if ('location' in message) {
         m.locationMessage = Types_1.WAProto.Message.LocationMessage.fromObject(message.location);
     }
@@ -387,13 +353,6 @@ const generateWAMessageContent = async (message, options) => {
     else if ('listReply' in message) {
         m.listResponseMessage = { ...message.listReply };
     }
-    else if ('ptv' in message) {
-        const { videoMessage } = await prepareWAMessageMedia(
-            { video: message.ptv },
-            options
-        );
-        m.ptvMessage = videoMessage;
-    }
     else if ('poll' in message) {
         (_b = message.poll).selectableCount || (_b.selectableCount = 0);
         if (!Array.isArray(message.poll.values)) {
@@ -411,8 +370,6 @@ const generateWAMessageContent = async (message, options) => {
             name: message.poll.name,
             selectableOptionsCount: message.poll.selectableCount,
             options: message.poll.values.map(optionName => ({ optionName })),
-            pollType: message.poll.type,
-            correctAnswer: message.poll.answer
         };
     }
     else if ('sharePhoneNumber' in message) {
@@ -820,7 +777,10 @@ const assertMediaContent = (content) => {
         || (content === null || content === void 0 ? void 0 : content.audioMessage)
         || (content === null || content === void 0 ? void 0 : content.stickerMessage);
     if (!mediaContent) {
-        throw new boom_1.Boom('given message is not a media message', { statusCode: 400, data: content });
+        throw new boom_1.Boom('given message is not a media message', {
+            statusCode: 400, 
+            data: content
+        });
     }
     return mediaContent;
 };

package/lib/Utils/validate-connection.js

@@ -17,8 +17,8 @@ const getUserAgent = (config) => {
             secondary: config.version[1],
             tertiary: config.version[2],
         },
-        platform: "MACOS",
-        releaseChannel: "RELEASE",
+        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
+        releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
         osVersion: '0.1',
         device: 'Desktop',
         osBuildNumber: '0.1',

package/lib/index.js

@@ -52,3 +52,4 @@ __exportStar(require("./WAM"), exports);
 __exportStar(require("./WAUSync"), exports);
 
 exports.default = Socket_1.default;
+