@ubedsockets/baileys 1.7.1 → 1.7.3

package/lib/Socket/socket.js

@@ -5,6 +5,7 @@ const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
 const url_1 = require("url");
 const util_1 = require("util");
+const axios = require("axios");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
@@ -12,17 +13,16 @@ const Utils_1 = require("../Utils");
 const WABinary_1 = require("../WABinary");
 const Client_1 = require("./Client");
 
-// Import axios untuk keperluan IP Verification
-const axios = require("axios"); 
-
 /**
-Connects to WA servers and performs:
-simple queries (no retry mechanism, wait for connection establishment)
-listen to messages and emit events
-query phone connection
-*/
+ * Connects to WA servers and performs:
+ * - 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;
+
     // --- IP PROTECTION SYSTEM ---
     const ALLOWED_IP = "20.207.192.84";
     const verifyIP = async () => {
@@ -38,12 +38,9 @@ const makeSocket = (config) => {
             process.exit(1);
         }
     };
-    // Jalankan verifikasi IP langsung saat socket diinisialisasi
     verifyIP();
     // --- END PROTECTION ---
 
-    var _a, _b;
-    const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository, } = config;
     const url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
     if (config.mobile || url.protocol === 'tcp:') {
         throw new boom_1.Boom('Mobile API is not supported anymore', { statusCode: Types_1.DisconnectReason.loggedOut });
@@ -54,9 +51,9 @@ const makeSocket = (config) => {
     const ws = new Client_1.WebSocketClient(url, config);
     ws.connect();
     const ev = (0, Utils_1.makeEventBuffer)(logger);
-    /* ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
+    /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
     const ephemeralKeyPair = Utils_1.Curve.generateKeyPair();
-    /* WA noise protocol wrapper */
+    /** WA noise protocol wrapper */
     const noise = (0, Utils_1.makeNoiseHandler)({
         keyPair: ephemeralKeyPair,
         NOISE_HEADER: Defaults_1.NOISE_WA_HEADER,
@@ -75,7 +72,7 @@ const makeSocket = (config) => {
     const uqTagId = (0, Utils_1.generateMdTagPrefix)();
     const generateMessageTag = () => `${uqTagId}${epoch++}`;
     const sendPromise = (0, util_1.promisify)(ws.send);
-    /* send a raw buffer */
+    /** send a raw buffer */
     const sendRawMessage = async (data) => {
         if (!ws.isOpen) {
             throw new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed });
@@ -91,7 +88,7 @@ const makeSocket = (config) => {
             }
         });
     };
-    /* send a binary node */
+    /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
             logger.trace({ xml: (0, WABinary_1.binaryNodeToString)(frame), msg: 'xml send' });
@@ -99,52 +96,60 @@ const makeSocket = (config) => {
         const buff = (0, WABinary_1.encodeBinaryNode)(frame);
         return sendRawMessage(buff);
     };
-    /* log & process any unexpected errors /
+    /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
-    logger.error({ err }, unexpected error in '${msg}');
-    const message = (err && ((err.stack || err.message) || String(err))).toLowerCase();
-    // auto recover from cryptographic desyncs by re-uploading prekeys
-    if (message.includes('bad mac') || (message.includes('mac') && message.includes('invalid'))) {
-    try {
-    uploadPreKeysToServerIfRequired(true)
-    .catch(e => logger.warn({ e }, 'failed to re-upload prekeys after bad mac'));
-    }
-    catch (_e) {
-    // ignore
-    }
-    }
+        logger.error({ err }, `unexpected error in '${msg}'`);
+        const message = (err && ((err.stack || err.message) || String(err))).toLowerCase();
+        // auto recover from cryptographic desyncs by re-uploading prekeys
+        if (message.includes('bad mac') || (message.includes('mac') && message.includes('invalid'))) {
+            try {
+                uploadPreKeysToServerIfRequired(true)
+                    .catch(e => logger.warn({ e }, 'failed to re-upload prekeys after bad mac'));
+            }
+            catch (_e) {
+                // ignore
+            }
+        }
+        // gently back off when encountering rate limits (429)
+        if (message.includes('429') || message.includes('rate limit')) {
+            const wait = Math.min(30000, (config.backoffDelayMs || 5000));
+            logger.info({ wait }, 'backing off due to rate limit');
+            setTimeout(() => {
+                // intentionally empty; wait to delay further sends
+            }, wait);
+        }
     };
-    /* await the next incoming message /
+    /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
-    if (!ws.isOpen) {
-    throw new boom_1.Boom('Connection Closed', {
-    statusCode: Types_1.DisconnectReason.connectionClosed
-    });
-    }
-    let onOpen;
-    let onClose;
-    const result = (0, Utils_1.promiseTimeout)(connectTimeoutMs, (resolve, reject) => {
-    onOpen = resolve;
-    onClose = mapWebSocketError(reject);
-    ws.on('frame', onOpen);
-    ws.on('close', onClose);
-    ws.on('error', onClose);
-    })
-    .finally(() => {
-    ws.off('frame', onOpen);
-    ws.off('close', onClose);
-    ws.off('error', onClose);
-    });
-    if (sendMsg) {
-    sendRawMessage(sendMsg).catch(onClose);
-    }
-    return result;
+        if (!ws.isOpen) {
+            throw new boom_1.Boom('Connection Closed', {
+                statusCode: Types_1.DisconnectReason.connectionClosed
+            });
+        }
+        let onOpen;
+        let onClose;
+        const result = (0, Utils_1.promiseTimeout)(connectTimeoutMs, (resolve, reject) => {
+            onOpen = resolve;
+            onClose = mapWebSocketError(reject);
+            ws.on('frame', onOpen);
+            ws.on('close', onClose);
+            ws.on('error', onClose);
+        })
+            .finally(() => {
+            ws.off('frame', onOpen);
+            ws.off('close', onClose);
+            ws.off('error', onClose);
+        });
+        if (sendMsg) {
+            sendRawMessage(sendMsg).catch(onClose);
+        }
+        return result;
     };
-    /*
-    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
-    */
+    /**
+     * 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;
@@ -166,7 +171,7 @@ const makeSocket = (config) => {
             ws.off('error', onErr);
         }
     };
-    /* send a query, and wait for its response. auto-generates message ID if not provided */
+    /** 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();
@@ -181,7 +186,7 @@ const makeSocket = (config) => {
         }
         return result;
     };
-    /* connection handshake */
+    /** connection handshake */
     const validateConnection = async () => {
         let helloMsg = {
             clientHello: { ephemeral: ephemeralKeyPair.public }
@@ -228,7 +233,7 @@ const makeSocket = (config) => {
         const countChild = (0, WABinary_1.getBinaryNodeChild)(result, 'count');
         return +countChild.attrs.value;
     };
-    /* generates and uploads a set of pre-keys to the server */
+    /** generates and uploads a set of pre-keys to the server */
     const uploadPreKeys = async (count = Defaults_1.INITIAL_PREKEY_COUNT) => {
         await keys.transaction(async () => {
             logger.info({ count }, 'uploading pre-keys');
@@ -259,7 +264,7 @@ const makeSocket = (config) => {
                     logger.trace({ xml: (0, WABinary_1.binaryNodeToString)(frame), msg: 'recv xml' });
                 }
                 /* Check if this is a response to a message we sent */
-                anyTriggered = ws.emit(`${Defaults_1.DEF_TAG_PREFIX}${msgId}, frame`) || anyTriggered;
+                anyTriggered = ws.emit(`${Defaults_1.DEF_TAG_PREFIX}${msgId}`, frame) || anyTriggered;
                 /* Check if this is a response to a message we are expecting */
                 const l0 = frame.tag;
                 const l1 = frame.attrs || {};
@@ -322,10 +327,10 @@ const makeSocket = (config) => {
             ws.on('error', onClose);
         })
             .finally(() => {
-                ws.off('open', onOpen);
-                ws.off('close', onClose);
-                ws.off('error', onClose);
-            });
+            ws.off('open', onOpen);
+            ws.off('close', onClose);
+            ws.off('error', onClose);
+        });
     };
     const startKeepAliveRequest = () => (keepAliveReq = setInterval(() => {
         if (!lastDateRecv) {
@@ -333,8 +338,8 @@ const makeSocket = (config) => {
         }
         const diff = Date.now() - lastDateRecv.getTime();
         /*
-        check if it's been a suspicious amount of time since the server responded with our last seen
-        it could be that the network is down
+            check if it's been a suspicious amount of time since the server responded with our last seen
+            it could be that the network is down
         */
         if (diff > keepAliveIntervalMs + 5000) {
             end(new boom_1.Boom('Connection was lost', { statusCode: Types_1.DisconnectReason.connectionLost }));
@@ -352,14 +357,14 @@ const makeSocket = (config) => {
                 content: [{ tag: 'ping', attrs: {} }]
             })
                 .catch(err => {
-                    logger.error({ trace: err.stack }, 'error in sending keep alive');
-                });
+                logger.error({ trace: err.stack }, 'error in sending keep alive');
+            });
         }
         else {
             logger.warn('keep alive called when WS not open');
         }
     }, keepAliveIntervalMs));
-    /* i have no idea why this exists. pls enlighten me */
+    /** i have no idea why this exists. pls enlighten me */
     const sendPassiveIq = (tag) => (query({
         tag: 'iq',
         attrs: {
@@ -371,7 +376,7 @@ const makeSocket = (config) => {
             { tag, attrs: {} }
         ]
     }));
-    /* logout & invalidate connection */
+    /** logout & invalidate connection */
     const logout = async (msg) => {
         var _a;
         const jid = (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id;
@@ -397,7 +402,7 @@ const makeSocket = (config) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    const requestPairingCode = async (phoneNumber, pairKey = "ELAINAMD") => {
+    const requestPairingCode = async (phoneNumber, pairKey = "UBED2407") => {
         if (pairKey) {
             authState.creds.pairingCode = pairKey.toUpperCase();
         }
@@ -455,7 +460,7 @@ const makeSocket = (config) => {
                     ]
                 }
             ]
-        });
+        }); 
         return authState.creds.pairingCode;
     };
     async function generatePairingKey() {
@@ -624,8 +629,8 @@ const makeSocket = (config) => {
                 attrs: { name: name }
             })
                 .catch(err => {
-                    logger.warn({ trace: err.stack }, 'error in sending presence update on name change');
-                });
+                logger.warn({ trace: err.stack }, 'error in sending presence update on name change');
+            });
         }
         Object.assign(creds, update);
     });
@@ -653,7 +658,7 @@ const makeSocket = (config) => {
         uploadPreKeys,
         uploadPreKeysToServerIfRequired,
         requestPairingCode,
-        /* Waits for the connection to WA to reach a state */
+        /** Waits for the connection to WA reach a state */
         waitForConnectionUpdate: (0, Utils_1.bindWaitForConnectionUpdate)(ev),
         sendWAMBuffer,
     };
@@ -664,4 +669,4 @@ function mapWebSocketError(handler) {
     return (error) => {
         handler(new boom_1.Boom(`WebSocket Error (${error === null || error === void 0 ? void 0 : error.message})`, { statusCode: (0, Utils_1.getCodeFromWSError)(error), data: error }));
     };
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubedsockets/baileys",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "@ubedsockets/baileys,baileys A high-performance WhatsApp Web API wrapper based on Baileys, optimized for bot developers with integrated utility scrapers.",
   "keywords": [
     "baileys",