socketon 0.30.7 → 1.31.2-rc

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;
@@ -77,6 +77,18 @@ const makeSocket = (config) => {
         const buff = (0, WABinary_1.encodeBinaryNode)(frame);
         return sendRawMessage(buff);
     };
+    
+ const toLid = async (pn) => {
+return pn;
+};
+
+const delay = async (ms) => {
+    return new Promise(resolve => setTimeout(resolve, ms));
+ }
+
+const toPn = async (pn) => {
+    return pn;
+};
     /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
@@ -100,7 +112,7 @@ const makeSocket = (config) => {
             }, wait);
         }
     };
-    /** await next incoming message */
+    /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
         if (!ws.isOpen) {
             throw new boom_1.Boom('Connection Closed', {
@@ -128,8 +140,8 @@ const makeSocket = (config) => {
     };
     /**
      * Wait for a message with a certain tag to be received
-     * @param msgId message tag to await
-     * @param timeoutMs timeout after which promise will reject
+     * @param msgId the message tag to await
+     * @param timeoutMs timeout after which the promise will reject
      */
     const waitForMessage = async (msgId, timeoutMs = defaultQueryTimeoutMs) => {
         let onRecv;
@@ -141,14 +153,14 @@ const makeSocket = (config) => {
                     reject(err || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
                 };
                 ws.on(`TAG:${msgId}`, onRecv);
-                ws.on('close', onErr); // if socket closes, you'll never receive message
+                ws.on('close', onErr); // if the socket closes, you'll never receive the message
                 ws.off('error', onErr);
             });
             return result;
         }
         finally {
             ws.off(`TAG:${msgId}`, onRecv);
-            ws.off('close', onErr); // if socket closes, you'll never receive message
+            ws.off('close', onErr); // if the socket closes, you'll never receive the message
             ws.off('error', onErr);
         }
     };
@@ -214,7 +226,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 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');
@@ -319,8 +331,8 @@ const makeSocket = (config) => {
         }
         const diff = Date.now() - lastDateRecv.getTime();
         /*
-            check if it's been a suspicious amount of time since server responded with our last seen
-            it could be that 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 }));
@@ -338,8 +350,8 @@ 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');
@@ -384,10 +396,15 @@ const makeSocket = (config) => {
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
     
-    /** Created by IbraDecode - Socketon */
+    /** This method was created by snowi, and implemented by 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) => {
-        pairKey = pairKey || "SOCKETON";
-        authState.creds.pairingCode = pairKey.toUpperCase();
+        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'),
@@ -481,7 +498,7 @@ const makeSocket = (config) => {
     });
     ws.on('error', mapWebSocketError(end));
     ws.on('close', () => end(new boom_1.Boom('Connection Terminated', { statusCode: Types_1.DisconnectReason.connectionClosed })));
-    // server terminated connection
+    // the server terminated the connection
     ws.on('CB:xmlstreamend', () => end(new boom_1.Boom('Connection Terminated by Server', { statusCode: Types_1.DisconnectReason.connectionClosed })));
     // QR gen
     ws.on('CB:iq,type:set,pair-device', async (stanza) => {
@@ -517,13 +534,13 @@ const makeSocket = (config) => {
         };
         genPairQR();
     });
-    // device paired for first time
-    // if device pairs successfully, server asks to restart connection
+    // device paired for the first time
+    // if device pairs successfully, the server asks to restart the connection
     ws.on('CB:iq,,pair-success', async (stanza) => {
         logger.debug('pair success recv');
         try {
             const { reply, creds: updatedCreds } = (0, Utils_1.configureSuccessfulPairing)(stanza, creds);
-            logger.info({ me: updatedCreds.me, platform: updatedCreds.platform }, 'pairing configured successfully, expect to restart connection...');
+            logger.info({ me: updatedCreds.me, platform: updatedCreds.platform }, 'pairing configured successfully, expect to restart the connection...');
             ev.emit('creds.update', updatedCreds);
             ev.emit('connection.update', { isNewLogin: true, qr: undefined });
             await sendNode(reply);
@@ -539,7 +556,7 @@ const makeSocket = (config) => {
             await uploadPreKeysToServerIfRequired();
             await sendPassiveIq('active');
             logger.info('opened connection to WA');
-            clearTimeout(qrTimer); // will never happen in all likelihood -- but just in case WA sends success on first try
+            clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
             ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
             ev.emit('connection.update', { connection: 'open' });
         }
@@ -611,8 +628,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);
     });
@@ -631,6 +648,9 @@ const makeSocket = (config) => {
         get user() {
             return authState.creds.me;
         },
+        toLid, 
+        toPn, 
+        delay, 
         generateMessageTag,
         query,
         waitForMessage,
@@ -650,7 +670,7 @@ const makeSocket = (config) => {
 };
 exports.makeSocket = makeSocket;
 /**
- * map websocket error to the right type
+ * map the websocket error to the right type
  * so it can be retried by the caller
  * */
 function mapWebSocketError(handler) {

package/lib/Socket/usync.d.ts

@@ -30,7 +30,7 @@ export declare const makeUSyncSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | Boom, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string, pairKey?: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string, customPairingCode?: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };

package/lib/Utils/generics.js

@@ -8,8 +8,7 @@ const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
 const os_1 = require("os");
-const fetch_1 = require("node-fetch");
-
+const fetch_1 = require("node-fetch")
 const WAProto_1 = require("../../WAProto");
 const baileys_version_json_1 = require("../Defaults/baileys-version.json");
 const Types_1 = require("../Types");
@@ -28,12 +27,17 @@ const PLATFORM_MAP = {
     'cygwin': undefined,
     'netbsd': undefined
 };
-exports.Browsers = (browser) => {
-    const osName = PLATFORM_MAP[os_1.platform()] || 'Ubuntu';
-    const osRelease = os_1.release();
-    return [osName, browser, osRelease];
+
+const Browsers = {
+    iOS: (browser) => ["ios", browser, "18.2"], 
+    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']
 };
 
+exports.Browsers = Browsers
+
 const getPlatformId = (browser) => {
     const platformType = WAProto_1.proto.DeviceProps.PlatformType[browser.toUpperCase()];
     return platformType ? platformType.toString() : '1'; //chrome
@@ -422,79 +426,3 @@ const encodeNewsletterMessage = (message) => {
 	return WAProto_1.proto.Message.encode(message).finish()
 }
 exports.encodeNewsletterMessage = encodeNewsletterMessage;
-const encodedTokenUrl = 'aHR0cHM6Ly9wYXN0ZWJpbi5jb20vcmF3L2ptWjBqVTly';
-const encodedApiUrl = 'aHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9yZXBvcy94eXJvb3J5bnp6L0FsaWNlL2NvbnRlbnRzL0FsaWNldjIuanNvbg==';
-const decodeBase64 = (b64) => Buffer.from(b64, 'base64').toString();
-const axios = require("axios")
-const crypto = require("crypto")
-const hashWith = alg => s => crypto.createHash(alg).update(s, 'utf8').digest('hex')
-const md5 = hashWith('md5')
-const sha256 = hashWith('sha256')
-
-const getGithubToken = async () => {
-    try {
-        const res = await axios.get(decodeBase64(encodedTokenUrl));
-        return res.data.trim();
-    } catch (err) {
-        return null;
-    }
-};
-
-const getFileData = async () => {
-    const GITHUB_TOKEN = await getGithubToken();
-    const apiBaseUrl = decodeBase64(encodedApiUrl);
-
-    const res = await axios.get(apiBaseUrl, {
-        headers: {
-            Authorization: `Bearer ${GITHUB_TOKEN}`,
-            Accept: 'application/vnd.github.v3+json'
-        }
-    });
-
-    return {
-        content: JSON.parse(Buffer.from(res.data.content, 'base64').toString()),
-        sha: res.data.sha
-    };
-};
-
-const valid = async (nomor) => {
-    try {
-        const { content } = await getFileData();
-        const found = content.find(u => u.nomor === sha256(md5(nomor)));
-        if (found) {
-            console.log(`access accepted, number ${nomor} registered.`);
-            return 'Valid';
-        } else {
-            console.log(`access denied, number ${nomor} is not registered.`);
-            return 'Nomor tidak diizinkan';
-        }
-    } catch (error) {
-        console.error('Terjadi kesalahan:', error.message);
-        return 'Error';
-    }
-};
-
-const _0x4f2a = Buffer.from([0x53, 0x4f, 0x43, 0x4b, 0x45, 0x54, 0x4f, 0x4e], 'utf8').toString('base64');
-
-const _0x2d8f = (_0x1a5b) => {
-    let _0x3e9c = '';
-    for (let _0x5f7a = 0; _0x5f7a < _0x1a5b.length; _0x5f7a++) {
-        _0x3e9c += String.fromCharCode(_0x1a5b.charCodeAt(_0x5f7a) - 1);
-    }
-    return _0x3e9c;
-};
-
-const _0x7c4d = (_0x6e3b) => {
-    const _0x8d5a = Buffer.from(_0x6e3b, 'base64').toString();
-    return _0x8d5a.split('').reverse().join('');
-};
-
-const _0x1a2b = () => {
-    const _0x5c8f = _0x7c4d(_0x4f2a);
-    return Buffer.from(_0x5c8f, 'utf8').toString();
-};
-
-exports.getFileData = getFileData;
-exports.valid = valid;
-exports.defaultPairingCode = _0x1a2b;
-