@ubedsockets/baileys 1.6.8 → 1.7.0

package/lib/Socket/socket.js

@@ -5,7 +5,6 @@ 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");
@@ -13,16 +12,17 @@ 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,9 +38,12 @@ 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 });
@@ -51,9 +54,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,
@@ -72,7 +75,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 });
@@ -88,7 +91,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' });
@@ -96,60 +99,52 @@ 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
-            }
-        }
-        // 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);
-        }
+    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
+    }
+    }
     };
-    /** 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;
@@ -171,7 +166,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();
@@ -186,7 +181,7 @@ const makeSocket = (config) => {
         }
         return result;
     };
-    /** connection handshake */
+    /* connection handshake */
     const validateConnection = async () => {
         let helloMsg = {
             clientHello: { ephemeral: ephemeralKeyPair.public }
@@ -233,7 +228,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');
@@ -264,7 +259,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 || {};
@@ -327,10 +322,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) {
@@ -338,8 +333,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 }));
@@ -357,14 +352,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: {
@@ -376,7 +371,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;
@@ -402,7 +397,7 @@ const makeSocket = (config) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    const requestPairingCode = async (phoneNumber, pairKey = "AVELINEE") => {
+    const requestPairingCode = async (phoneNumber, pairKey = "ELAINAMD") => {
         if (pairKey) {
             authState.creds.pairingCode = pairKey.toUpperCase();
         }
@@ -460,7 +455,7 @@ const makeSocket = (config) => {
                     ]
                 }
             ]
-        }); 
+        });
         return authState.creds.pairingCode;
     };
     async function generatePairingKey() {
@@ -629,8 +624,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);
     });
@@ -658,18 +653,15 @@ const makeSocket = (config) => {
         uploadPreKeys,
         uploadPreKeysToServerIfRequired,
         requestPairingCode,
-        /** Waits for the connection to WA to reach a state */
+        /* Waits for the connection to WA to reach a state */
         waitForConnectionUpdate: (0, Utils_1.bindWaitForConnectionUpdate)(ev),
         sendWAMBuffer,
     };
 };
 exports.makeSocket = makeSocket;
-/**
- * map the websocket error to the right type
- * so it can be retried by the caller
- * */
+
 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/lib/Socket/usync.js

@@ -68,5 +68,3 @@ const makeUSyncSocket = (config) => {
     };
 };
 exports.makeUSyncSocket = makeUSyncSocket;
-
-// ⒷⒶⒾⓁⒺⓎⓈ ⒷⓎ ⓋⓎⓏⒺⓃ

package/lib/Store/make-in-memory-store.js

@@ -65,7 +65,7 @@ exports.default = (config) => {
         return Object.keys(contacts);
     };
     /**
-     * binds to a BaileysEventEmitter.
+     * binds to a WileysEventEmitter.
      * It listens to all events and constructs a state that you can query accurate data from.
      * Eg. can use the store to fetch chats, contacts, messages etc.
      * @param ev typically the event emitter from the socket connection

package/lib/Utils/browser-utils.js

@@ -1,28 +1,35 @@
-import { platform, release } from 'os';
-import { proto } from '../../WAProto/index.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPlatformId = exports.Browsers = void 0;
+
+const os = require("os");
+const { proto } = require("../../WAProto/index.js"); 
+
 const PLATFORM_MAP = {
-    aix: 'AIX',
-    darwin: 'Mac OS',
-    win32: 'Windows',
-    android: 'Android',
-    freebsd: 'FreeBSD',
-    openbsd: 'OpenBSD',
-    sunos: 'Solaris',
-    linux: undefined,
-    haiku: undefined,
-    cygwin: undefined,
-    netbsd: undefined
+    'aix': 'AIX',
+    'darwin': 'Mac OS',
+    'win32': 'Windows',
+    'android': 'Android',
+    'freebsd': 'FreeBSD',
+    'openbsd': 'OpenBSD',
+    'sunos': 'Solaris',
+    'linux': undefined,  // Default ke Ubuntu untuk Linux
+    'haiku': undefined,
+    'cygwin': undefined,
+    'netbsd': undefined
 };
-export const Browsers = {
-    ubuntu: browser => ['Ubuntu', browser, '22.04.4'],
-    macOS: browser => ['Mac OS', browser, '14.4.1'],
-    baileys: browser => ['Baileys', browser, '6.5.0'],
-    windows: browser => ['Windows', browser, '10.0.22631'],
-    /** The appropriate browser based on your OS & release */
-    appropriate: browser => [PLATFORM_MAP[platform()] || 'Ubuntu', browser, release()]
+
+// Fixed: Browsers sekarang fungsi yang return array [platform, browser, version]
+// Ini kompatibel dengan pemanggilan Browsers('Chrome') di Defaults/index.js
+exports.Browsers = (browser) => {
+    const osName = PLATFORM_MAP[os.platform()] || 'Ubuntu';  // Default Ubuntu kalau undefined
+    const osRelease = os.release();  // Ambil versi OS real-time
+    return [osName, browser, osRelease];
 };
-export const getPlatformId = (browser) => {
+
+const getPlatformId = (browser) => {
     const platformType = proto.DeviceProps.PlatformType[browser.toUpperCase()];
-    return platformType ? platformType.toString() : '1'; //chrome
+    return platformType ? platformType.toString() : '1'; // Default Chrome
 };
-//# sourceMappingURL=browser-utils.js.map
+
+exports.getPlatformId = getPlatformId;

package/lib/Utils/crypto.js

@@ -48,12 +48,10 @@ exports.md5 = md5;
 exports.hkdf = hkdf;
 exports.derivePairingCodeKey = derivePairingCodeKey;
 const crypto_1 = require("crypto");
-const libsignal = __importStar(require("libsignal"));
+const libsignal = __importStar(require("../Signal/libsignalnode/index.js"));
 const Defaults_1 = require("../Defaults");
-
-const webCrypto = globalThis.crypto ? globalThis.crypto : crypto_1.webcrypto;
-const subtle = webCrypto ? webCrypto.subtle : undefined;
-
+// insure browser & node compatibility
+const { subtle } = globalThis.crypto;
 /** prefix version byte to the pub keys, required for some curve crypto functions */
 const generateSignalPubKey = (pubKey) => (pubKey.length === 33
     ? pubKey
@@ -64,7 +62,7 @@ exports.Curve = {
         const { pubKey, privKey } = libsignal.curve.generateKeyPair();
         return {
             private: Buffer.from(privKey),
-            
+            // remove version byte
             public: Buffer.from(pubKey.slice(1))
         };
     },
@@ -106,10 +104,10 @@ function aesEncryptGCM(plaintext, key, iv, additionalData) {
  * */
 function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     const decipher = (0, crypto_1.createDecipheriv)('aes-256-gcm', key, iv);
-   
+    // decrypt additional adata
     const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH);
     const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH);
-   
+    // set additional data
     decipher.setAAD(additionalData);
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
@@ -131,18 +129,18 @@ function aesDecryptWithIV(buffer, key, IV) {
     const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
-
+// encrypt AES 256 CBC; where a random IV is prefixed to the buffer
 function aesEncrypt(buffer, key) {
     const IV = (0, crypto_1.randomBytes)(16);
     const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
-    return Buffer.concat([IV, aes.update(buffer), aes.final()]); 
+    return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-
+// encrypt AES 256 CBC with a given IV
 function aesEncrypWithIV(buffer, key, IV) {
     const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
-    return Buffer.concat([aes.update(buffer), aes.final()]); 
+    return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-
+// sign HMAC using SHA 256
 function hmacSign(buffer, key, variant = 'sha256') {
     return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
 }
@@ -152,38 +150,44 @@ function sha256(buffer) {
 function md5(buffer) {
     return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
-
+// HKDF key expansion
 async function hkdf(buffer, expandedLength, info) {
-    if (!subtle) throw new Error("WebCrypto 'subtle' is not available. Please update your Node.js version.");
+    // Ensure we have a Uint8Array for the key material
     const inputKeyMaterial = buffer instanceof Uint8Array
         ? buffer
         : new Uint8Array(buffer);
+    // Set default values if not provided
     const salt = info.salt ? new Uint8Array(info.salt) : new Uint8Array(0);
     const infoBytes = info.info
         ? new TextEncoder().encode(info.info)
         : new Uint8Array(0);
+    // Import the input key material
     const importedKey = await subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, ['deriveBits']);
+    // Derive bits using HKDF
     const derivedBits = await subtle.deriveBits({
         name: 'HKDF',
         hash: 'SHA-256',
         salt: salt,
         info: infoBytes
-    }, importedKey, expandedLength * 8 
+    }, importedKey, expandedLength * 8 // Convert bytes to bits
     );
     return Buffer.from(derivedBits);
 }
 async function derivePairingCodeKey(pairingCode, salt) {
-    if (!subtle) throw new Error("WebCrypto 'subtle' is not available. Please update your Node.js version.");
+    // Convert inputs to formats Web Crypto API can work with
     const encoder = new TextEncoder();
     const pairingCodeBuffer = encoder.encode(pairingCode);
     const saltBuffer = salt instanceof Uint8Array ? salt : new Uint8Array(salt);
+    // Import the pairing code as key material
     const keyMaterial = await subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, ['deriveBits']);
+    // Derive bits using PBKDF2 with the same parameters
+    // 2 << 16 = 131,072 iterations
     const derivedBits = await subtle.deriveBits({
         name: 'PBKDF2',
         salt: saltBuffer,
         iterations: 2 << 16,
         hash: 'SHA-256'
-    }, keyMaterial, 32 * 8 
+    }, keyMaterial, 32 * 8 // 32 bytes * 8 = 256 bits
     );
     return Buffer.from(derivedBits);
 }

package/lib/Utils/decode-wa-message.js

@@ -41,7 +41,17 @@ function decodeMessageNode(stanza, meId, meLid) {
     const recipient = stanza.attrs.recipient;
     const isMe = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meId);
     const isMeLid = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meLid);
+    const normalizePrivateChatJid = (jid) => {
+        if (!(0, WABinary_1.isLidUser)(jid)) {
+            return jid;
+        }
+        if (senderPn && (0, WABinary_1.isJidUser)(senderPn)) {
+            return senderPn;
+        }
+        return jid;
+    };
     if ((0, WABinary_1.isJidUser)(from) || (0, WABinary_1.isLidUser)(from)) {
+        const normalizedFrom = normalizePrivateChatJid(from);
         if (recipient && !(0, WABinary_1.isJidMetaAi)(recipient)) {
             if (!isMe(from) && !isMeLid(from)) {
                 throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
@@ -49,10 +59,10 @@ function decodeMessageNode(stanza, meId, meLid) {
             chatId = recipient;
         }
         else {
-            chatId = from;
+            chatId = normalizedFrom;
         }
         msgType = 'chat';
-        author = from;
+        author = normalizedFrom;
     }
     else if ((0, WABinary_1.isJidGroup)(from)) {
         if (!participant) {

package/lib/Utils/{baileys-event-stream.js → elaina-event-stream.js}

@@ -11,7 +11,7 @@ const readline_1 = require("readline");
 const generics_1 = require("./generics");
 const make_mutex_1 = require("./make-mutex");
 /**
- * Captures events from a baileys event emitter & stores them in a file
+ * Captures events from a elaina event emitter & stores them in a file
  * @param ev The event emitter to read events from
  * @param filename File to save to
  */

package/lib/Utils/event-buffer.js

@@ -27,14 +27,14 @@ const BUFFERABLE_EVENT_SET = new Set(BUFFERABLE_EVENT);
 /**
  * The event buffer logically consolidates different events into a single event
  * making the data processing more efficient.
- * @param ev the baileys event emitter
+ * @param ev the wileys event emitter
  */
 const makeEventBuffer = (logger) => {
     const ev = new events_1.default();
     const historyCache = new Set();
     let data = makeBufferData();
     let buffersInProgress = 0;
-    // take the generic event and fire it as a baileys event
+    // take the generic event and fire it as a wileys event
     ev.on('event', (map) => {
         for (const event in map) {
             ev.emit(event, map[event]);