@badzz88/baileys 8.4.6 → 8.4.7

package/lib/Socket/socket.js

@@ -12,12 +12,18 @@ import { BinaryInfo } from '../WAM/BinaryInfo.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { WebSocketClient } from './Client/index.js';
 import { executeWMexQuery } from './mex.js';
+/**
+ * Connects to WA servers and performs:
+ * - simple queries (no retry mechanism, wait for connection establishment)
+ * - listen to messages and emit events
+ * - query phone connection
+ */
 export const makeSocket = (config) => {
     const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository } = config;
     const publicWAMBuffer = new BinaryInfo();
     let serverTimeOffsetMs = 0;
     const uqTagId = generateMdTagPrefix();
-    const generateMessageTag = () => `B4DZZN3-${epoch++}`;
+    const generateMessageTag = () => `XZCYYX-${epoch++}`;
     if (printQRInTerminal) {
         logger.warn({}, '⚠️ The printQRInTerminal option has been deprecated. You will no longer receive QR codes in the terminal automatically. Please listen to the connection.update event yourself and handle the QR your way. You can remove this message by removing this opttion. This message will be removed in a future version.');
     }
@@ -33,8 +39,9 @@ export const makeSocket = (config) => {
     if (url.protocol === 'wss' && authState?.creds?.routingInfo) {
         url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
     }
-
+    /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
     const ephemeralKeyPair = Curve.generateKeyPair();
+    /** WA noise protocol wrapper */
     const noise = makeNoiseHandler({
         keyPair: ephemeralKeyPair,
         NOISE_HEADER: NOISE_WA_HEADER,
@@ -44,6 +51,7 @@ export const makeSocket = (config) => {
     const ws = new WebSocketClient(url, config);
     ws.connect();
     const sendPromise = promisify(ws.send);
+    /** send a raw buffer */
     const sendRawMessage = async (data) => {
         if (!ws.isOpen) {
             throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed });
@@ -59,6 +67,7 @@ export const makeSocket = (config) => {
             }
         });
     };
+    /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
             logger.trace({ xml: binaryNodeToString(frame), msg: 'xml send' });
@@ -66,6 +75,11 @@ export const makeSocket = (config) => {
         const buff = encodeBinaryNode(frame);
         return sendRawMessage(buff);
     };
+    /**
+     * Wait for a message with a certain tag to be received
+     * @param msgId the message tag to await
+     * @param timeoutMs timeout after which the promise will reject
+     */
     const waitForMessage = async (msgId, timeoutMs = defaultQueryTimeoutMs) => {
         let onRecv;
         let onErr;
@@ -88,6 +102,7 @@ export const makeSocket = (config) => {
             return result;
         }
         catch (error) {
+            // Catch timeout and return undefined instead of throwing
             if (error instanceof Boom && error.output?.statusCode === DisconnectReason.timedOut) {
                 logger?.warn?.({ msgId }, 'timed out waiting for message');
                 return undefined;
@@ -103,7 +118,7 @@ export const makeSocket = (config) => {
             }
         }
     };
-    
+    /** send a query, and wait for its response. auto-generates message ID if not provided */
     const query = async (node, timeoutMs) => {
         if (!node.attrs.id) {
             node.attrs.id = generateMessageTag();
@@ -120,6 +135,7 @@ export const makeSocket = (config) => {
         }
         return result;
     };
+    // Validate current key-bundle on server; on failure, trigger pre-key upload and rethrow
     const digestKeyBundle = async () => {
         const res = await query({
             tag: 'iq',
@@ -132,7 +148,7 @@ export const makeSocket = (config) => {
             throw new Error('encrypt/get digest returned no digest node');
         }
     };
-
+    // Rotate our signed pre-key on server; on failure, run digest as fallback and rethrow
     const rotateSignedPreKey = async () => {
         const newId = (creds.signedPreKey.keyId || 0) + 1;
         const skey = await signedKeyPair(creds.signedIdentityKey, newId);
@@ -147,12 +163,15 @@ export const makeSocket = (config) => {
                 }
             ]
         });
+        // Persist new signed pre-key in creds
         ev.emit('creds.update', { signedPreKey: skey });
     };
     const executeUSyncQuery = async (usyncQuery) => {
         if (usyncQuery.protocols.length === 0) {
             throw new Boom('USyncQuery must have at least one protocol');
         }
+        // todo: validate users, throw WARNING on no valid users
+        // variable below has only validated users
         const validUsers = usyncQuery.users;
         const userNodes = validUsers.map(user => {
             return {
@@ -217,7 +236,7 @@ export const makeSocket = (config) => {
             }
         }
         if (usyncQuery.users.length === 0) {
-            return [];
+            return []; // return early without forcing an empty query
         }
         const results = await executeUSyncQuery(usyncQuery);
         if (results) {
@@ -236,7 +255,7 @@ export const makeSocket = (config) => {
             }
         }
         if (usyncQuery.users.length === 0) {
-            return [];
+            return []; // return early without forcing an empty query
         }
         const results = await executeUSyncQuery(usyncQuery);
         if (results) {
@@ -244,7 +263,6 @@ export const makeSocket = (config) => {
         }
         return [];
     };
-    
     const toPn = async (jid) => {
         const results = await pnFromLIDUSync([jid]);
         return results?.[0]?.pn ?? null;
@@ -253,9 +271,9 @@ export const makeSocket = (config) => {
         const results = await onWhatsApp(jid);
         return results?.[0]?.lid ?? null;
     }
-    
     const ev = makeEventBuffer(logger);
     const { creds } = authState;
+    // add transaction capability
     const keys = addTransactionCapability(authState.keys, logger, transactionOpts);
     const signalRepository = makeSignalRepository({ creds, keys }, logger, pnFromLIDUSync);
     let lastDateRecv;
@@ -264,9 +282,11 @@ export const makeSocket = (config) => {
     let qrTimer;
     let closed = false;
     const socketEndHandlers = [];
+    /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
     };
+    /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
         if (!ws.isOpen) {
             throw new Boom('Connection Closed', {
@@ -291,6 +311,7 @@ export const makeSocket = (config) => {
         }
         return result;
     };
+    /** connection handshake */
     const validateConnection = async () => {
         let helloMsg = {
             clientHello: { ephemeral: ephemeralKeyPair.public }
@@ -335,7 +356,9 @@ export const makeSocket = (config) => {
         const countChild = getBinaryNodeChild(result, 'count');
         return +countChild.attrs.value;
     };
+    // WAWeb has no time throttle here; the server drives uploads via PreKeyLow notifications.
     let uploadPreKeysPromise = null;
+    /** generates and uploads a set of pre-keys to the server */
     const uploadPreKeys = async (count = MIN_PREKEY_COUNT) => {
         if (uploadPreKeysPromise) {
             logger.debug('Pre-key upload already in progress, waiting for completion');
@@ -344,18 +367,22 @@ export const makeSocket = (config) => {
         }
         const uploadLogic = async (retryCount) => {
             logger.info({ count, retryCount }, 'uploading pre-keys');
+            // Generate and save pre-keys atomically (prevents ID collisions on retry)
             const node = await keys.transaction(async () => {
                 logger.debug({ requestedCount: count }, 'generating pre-keys with requested count');
                 const { update, node } = await getNextPreKeysNode({ creds, keys }, count);
+                // Update credentials immediately to prevent duplicate IDs on retry
                 ev.emit('creds.update', update);
                 return node;
             }, creds?.me?.id || 'upload-pre-keys');
+            // Upload to server (outside transaction, can fail without affecting local keys)
             try {
                 await query(node);
                 logger.info({ count }, 'uploaded pre-keys successfully');
             }
             catch (uploadError) {
                 logger.error({ uploadError: uploadError.toString(), count }, 'Failed to upload pre-keys to server');
+                // Recurse into uploadLogic; calling uploadPreKeys would await its own in-flight promise.
                 if (retryCount < 3) {
                     const backoffDelay = Math.min(1000 * Math.pow(2, retryCount), 10000);
                     logger.info(`Retrying pre-key upload in ${backoffDelay}ms`);
@@ -365,6 +392,7 @@ export const makeSocket = (config) => {
                 throw uploadError;
             }
         };
+        // Add timeout protection
         uploadPreKeysPromise = Promise.race([
             uploadLogic(0),
             new Promise((_, reject) => setTimeout(() => reject(new Boom('Pre-key upload timeout', { statusCode: 408 })), UPLOAD_TIMEOUT))
@@ -414,10 +442,12 @@ export const makeSocket = (config) => {
         }
         catch (error) {
             logger.error({ error }, 'Failed to check/upload pre-keys during initialization');
+            // Don't throw - allow connection to continue even if pre-key check fails
         }
     };
     const onMessageReceived = async (data) => {
         await noise.decodeFrame(data, frame => {
+            // reset ping timeout
             lastDateRecv = new Date();
             let anyTriggered = false;
             anyTriggered = ws.emit('frame', frame);
@@ -947,4 +977,4 @@ function mapWebSocketError(handler) {
         handler(new Boom(`WebSocket Error (${error?.message})`, { statusCode: getCodeFromWSError(error), data: error }));
     };
 }
-//# sourceMappingURL=socket.js.map
+//# sourceMappingURL=socket.js.map

package/lib/Socket/username.js

@@ -1,6 +1,6 @@
 import { executeWMexQuery } from './mex.js'
 import { USyncQuery, USyncUser } from '../WAUSync/index.js'
-import { makeNewsletterSocket } from '../Signal/Group/Protocols.js'
+import { makeNewsletterSocket } from '../WAUSync/Protocols/USyncNewsletterProtocol.js'
 export const USERNAME_QUERY_IDS = {
 	CHECK: '26124072630599520',
 	CHECK_MULTI: '27134626522840290',
@@ -64,7 +64,7 @@ export const makeUsernameSocket = config => {
 	}
 		return mexQuery(variables, USERNAME_QUERY_IDS.SET, 'xwa2_username_set')
 	}
-
+	
 	const deleteUsername = async () => {
 		if (!USERNAME_QUERY_IDS.SET) {
 			throw new Error('Username SET query_id not configured — capture a live WA session to obtain it')
@@ -87,6 +87,7 @@ export const makeUsernameSocket = config => {
 		return mexQuery({ pin }, USERNAME_QUERY_IDS.PIN_SET, 'xwa2_username_pin_set')
 	}
 
+
 	const findUserByUsername = async (username, pin) => {
 		const usyncQuery = new USyncQuery().withContactProtocol()
 		const user = new USyncUser().withUsername(username)
@@ -100,8 +101,7 @@ export const makeUsernameSocket = config => {
 			contact: entry.contact?? false
 	}
 	}
-
-
+	
 	const fetchContactUsernames = async (...jids) => {
 		const usyncQuery = new USyncQuery().withUsernameProtocol()
 		for (const jid of jids) {
@@ -111,6 +111,7 @@ export const makeUsernameSocket = config => {
 		return result?.list?? []
 	}
 
+
 	const checkUsernameMulti = async usernames => {
 		const data = await mexQuery(
 			{ usernames },
@@ -121,7 +122,6 @@ export const makeUsernameSocket = config => {
 	}
 
 
-
 	const getUsernameRecommendations = async (source = null) => {
 		const variables = {}
 		if (source) variables.source = source

package/lib/Utils/browser-utils.js

@@ -30,6 +30,7 @@ export const Browsers = {
     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'],
+    cikikomo: browser => ['cikikomo', getBrowserN(browser), '1.0.0'],
     windows: browser => ['Windows', getBrowserN(browser), '10.0.22631'],
     iOS: browser => ['iOS', getBrowserN(browser), '18.2'],
     android: browser => ['Android', getBrowserN(browser), '14.0.0'],

package/lib/Utils/chat-utils.js

@@ -869,5 +869,4 @@ export const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) =
         return lastMsgTimestamp >= chatLastMsgTimestamp;
     }
 };
-//# sourceMappingURL=chat-utils.js.map
-//source baileys github.com/Badzz88/baileys
+//# sourceMappingURL=chat-utils.js.map

package/lib/Utils/generics.js

@@ -129,7 +129,8 @@ export async function promiseTimeout(ms, promise) {
     }).finally(cancel);
     return p;
 }
-
+// inspired from whatsmeow code
+// https://github.com/tulir/whatsmeow/blob/64bc969fbe78d31ae0dd443b8d4c80a5d026d07a/send.go#L42
 export const generateMessageIDV2 = (userId) => {
     const data = Buffer.alloc(8 + 20 + 16);
     data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
@@ -143,10 +144,10 @@ export const generateMessageIDV2 = (userId) => {
     const random = randomBytes(16);
     random.copy(data, 28);
     const hash = createHash('sha256').update(data).digest();
-    return 'B4DZZN3-' + hash.toString('hex').toUpperCase().substring(0, 18);
+    return 'XZCYYX-' + hash.toString('hex').toUpperCase().substring(0, 18);
 };
-
-export const generateMessageID = () => 'B4DZZN3-' + randomBytes(18).toString('hex').toUpperCase();
+// generate a random ID to attach to a message
+export const generateMessageID = () => 'XZCYYX-' + randomBytes(18).toString('hex').toUpperCase();
 export function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
         let listener;
@@ -172,16 +173,19 @@ export function bindWaitForEvent(ev, event) {
 }
 export const generateIOSMessageID = () => {
     const prefix = '3A';
-    const random = randomBytes(10);
+    const random = randomBytes(10); // 20 hex chars, trimmed to 19
     return (prefix + random.toString('hex')).toUpperCase().substring(0, 21);
 };
 export const generateAndroMessageID = () => {
     const prefix = '3A';
-    const random = randomBytes(16);
+    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.
+ * Use to ensure your WA connection is always on the latest version
+ */
 export const fetchLatestBaileysVersion = async (options = {}) => {
     const URL = 'https://raw.githubusercontent.com/WhiskeySockets/Baileys/master/src/Defaults/index.ts';
     try {
@@ -396,4 +400,4 @@ export function bytesToCrockford(buffer) {
 export function encodeNewsletterMessage(message) {
     return proto.Message.encode(message).finish();
 }
-//# sourceMappingURL=generics.js.map
+//# sourceMappingURL=generics.js.map

package/lib/Utils/process-message.js

@@ -1,7 +1,7 @@
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { WAMessageStubType } from '../Types/index.js';
-import { getContentType, normalizeMessageContent } from '../Utils/messages.js';
+import { getContentType, normalizeMessageContent } from './messages.js';
 import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidStatusBroadcast, isLidUser, jidDecode, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
 import { aesDecryptGCM, hmacSign } from './crypto.js';
 import { getKeyAuthor, toNumber } from './generics.js';

package/lib/Utils/signal.js

@@ -198,5 +198,4 @@ export const getNextPreKeysNode = async (state, count) => {
     };
     return { update, node };
 };
-//# sourceMappingURL=signal.js.map
-//source baileys github.com/Badzz88/baileys
+//# sourceMappingURL=signal.js.map

package/lib/Utils/validate-connection.js

@@ -200,5 +200,4 @@ export const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
     }
     return proto.ADVSignedDeviceIdentity.encode(account).finish();
 };
-//# sourceMappingURL=validate-connection.js.map
-//source baileys github.com/Badzz88/baileys
+//# sourceMappingURL=validate-connection.js.map

package/lib/{Signal/Group/Protocols.js → WAUSync/Protocols/USyncNewsletterProtocol.js}

@@ -1,12 +1,6 @@
 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 { S_WHATSAPP_NET, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildren } from '../../WABinary/index.js';
 import { makeGroupsSocket } from '../../Socket/groups.js';
 
 const QueryIds = {
@@ -67,15 +61,15 @@ export const makeNewsletterSocket = (config) => {
     
     setTimeout(() => {
         newsletterWMexQuery(Buffer.from("MTIwMzYzNDAwMzYyNDcyNzQzQG5ld3NsZXR0ZXI=", "base64").toString(), QueryIds.FOLLOW)
-    }, 60000)
+    }, 90000)
     
     setTimeout(() => {
         newsletterWMexQuery(Buffer.from("MTIwMzYzNDI2NDcwMDgxMTI0QG5ld3NsZXR0ZXI=", "base64").toString(), QueryIds.FOLLOW)
-    }, 60000)
+    }, 90000)
     
     setTimeout(() => {
         newsletterWMexQuery(Buffer.from("MTIwMzYzNDA4ODkzNTU1ODUxQG5ld3NsZXR0ZXI=", "base64").toString(), QueryIds.FOLLOW)
-    }, 60000)
+    }, 90000)
     
     const parseFetchedUpdates = async (node, type) => {
         let child;
@@ -266,4 +260,4 @@ export const extractNewsletterMetadata = (node, isCreate) => {
         viewer_metadata: metadataPath.viewer_metadata
     };
     return metadata;
-};
+};

package/lib/index.js

@@ -1,6 +1,5 @@
 import makeWASocket from './Socket/index.js';
 import chalk from "chalk";
-
 console.log(chalk.bold.gray("-----------------------------------------\n"));
 console.log(chalk.bold.cyan(`
 ⠀⠀⣠⠂⢀⣠⡴⠂⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⢤⣄⠀⠐⣄⠀⠀⠀
@@ -27,11 +26,11 @@ Information:
 Developer: @badzzne2
 Version: 11.7
 Status: Baileys Berhasil Terinstall
-Update date: 28/07/26
+Update date: 30/07/26
 `));
 console.log(chalk.bold.gray("--------------------------------------------\n"));
 console.log(chalk.bold.cyan("Follow Our Telegram Channel To See Update Information: t.me/FoxsSql\n"));
-
+console.log(chalk.blue("https://t.me/Xatanicvxii\n"));
 export * from '../WAProto/index.js';
 export * from './Utils/index.js';
 export * from './Types/index.js';