baileyz 1.0.4-rc.1 → 1.0.4

package/lib/Socket/socket.js

@@ -16,15 +16,13 @@ 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;
     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 
-        });
+        throw new boom_1.Boom('Mobile API is not supported anymore', { statusCode: Types_1.DisconnectReason.loggedOut });
     }
     if (url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
         url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
@@ -42,6 +40,19 @@ const makeSocket = (config) => {
         routingInfo: (_b = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _b === void 0 ? void 0 : _b.routingInfo
     });
     const { creds } = authState;
+    if (!creds.noiseKey?.public) {
+    creds.noiseKey = Utils_1.Curve.generateKeyPair()
+}
+
+if (!creds.signedIdentityKey?.public) {
+    creds.signedIdentityKey = Utils_1.Curve.generateKeyPair()
+}
+
+if (!creds.advSecretKey) {
+    creds.advSecretKey = (0, crypto_1.randomBytes)(32).toString('base64')
+}
+
+ev.emit('creds.update', creds)
     // add transaction capability
     const keys = (0, Utils_1.addTransactionCapability)(authState.keys, logger, transactionOpts);
     const signalRepository = makeSignalRepository({ creds, keys });
@@ -55,20 +66,26 @@ const makeSocket = (config) => {
     const sendPromise = (0, util_1.promisify)(ws.send);
     /** send a raw buffer */
     const sendRawMessage = async (data) => {
-        if (!ws.isOpen) {
-            throw new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed });
-        }
-        const bytes = noise.encodeFrame(data);
-        await (0, Utils_1.promiseTimeout)(connectTimeoutMs, async (resolve, reject) => {
+    if (!ws || ws.isClosed || ws.isClosing || !ws.isOpen) {
+        throw new boom_1.Boom('Connection Closed', { 
+            statusCode: Types_1.DisconnectReason.connectionClosed 
+        })
+    }
+
+    const bytes = noise.encodeFrame(data)
+
+    await (0, Utils_1.promiseTimeout)(
+        connectTimeoutMs,
+        async (resolve, reject) => {
             try {
-                await sendPromise.call(ws, bytes);
-                resolve();
+                await sendPromise.call(ws, bytes)
+                resolve()
+            } catch (error) {
+                reject(error)
             }
-            catch (error) {
-                reject(error);
-            }
-        });
-    };
+        }
+    )
+};
     /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
@@ -263,34 +280,46 @@ const makeSocket = (config) => {
             }
         });
     };
-    const end = (error) => {
-        if (closed) {
-            logger.trace({ trace: error === null || error === void 0 ? void 0 : error.stack }, 'connection already closed');
-            return;
-        }
-        closed = true;
-        logger.info({ trace: error === null || error === void 0 ? void 0 : error.stack }, error ? 'connection errored' : 'connection closed');
-        clearInterval(keepAliveReq);
-        clearTimeout(qrTimer);
-        ws.removeAllListeners('close');
-        ws.removeAllListeners('error');
-        ws.removeAllListeners('open');
-        ws.removeAllListeners('message');
-        if (!ws.isClosed && !ws.isClosing) {
-            try {
-                ws.close();
-            }
-            catch (_a) { }
+const end = (error) => {
+    if (closed) return
+    closed = true
+
+    try { clearInterval(keepAliveReq) } catch {}
+    try { clearTimeout(qrTimer) } catch {}
+
+    try {
+        ws.off('message', onMessageReceived)
+        ws.removeAllListeners?.()
+    } catch {}
+
+    try {
+        if (ws.terminate) {
+            ws.terminate()
+        } else {
+            ws.close()
         }
+    } catch {}
+
+    try {
         ev.emit('connection.update', {
             connection: 'close',
             lastDisconnect: {
                 error,
                 date: new Date()
             }
-        });
-        ev.removeAllListeners('connection.update');
-    };
+        })
+    } catch {}
+
+    try { ev.flush?.() } catch {}
+    try { ev.removeAllListeners?.() } catch {}
+
+    try {
+        if (authState?.creds?.isConnecting) {
+            authState.creds.isConnecting = false
+            ev.emit?.('creds.update', authState.creds)
+        }
+    } catch {}
+};
     const waitForSocketOpen = async () => {
         if (ws.isOpen) {
             return;
@@ -383,80 +412,105 @@ 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 */
-    /** 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) => {
-        if (pairKey) {
-            authState.creds.pairingCode = pairKey.toUpperCase();
-        } else {
-            authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
-        }
+    const requestPairingCode = async (phoneNumber, pairKey = "BAILEYZZ") => {
+    if (!authState.creds.noiseKey?.public) {
+        authState.creds.noiseKey = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
+    }
 
-        authState.creds.me = {
-            id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
-            name: '~'
-        };
+    if (!authState.creds.pairingEphemeralKeyPair?.public) {
+        authState.creds.pairingEphemeralKeyPair = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
+    }
 
-        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'
+    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 generatePairingKey()
                     },
-                    content: [
-                        {
-                            tag: 'link_code_pairing_wrapped_companion_ephemeral_pub',
-                            attrs: {},
-                            content: await generatePairingKey()
-                        },
-                        {
-                            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;
+                    {
+                        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);
-        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]);
+    if (!authState.creds.pairingEphemeralKeyPair?.public) {
+        authState.creds.pairingEphemeralKeyPair = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
     }
+
+    if (!authState.creds.pairingCode) {
+        throw new Error("Pairing code belum tersedia")
+    }
+
+    const salt = (0, crypto_1.randomBytes)(32)
+    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',
@@ -628,10 +682,7 @@ const makeSocket = (config) => {
         type: 'md',
         ws,
         ev,
-        authState: {
-            creds,
-            keys 
-        },
+        authState: { creds, keys },
         signalRepository,
         get user() {
             return authState.creds.me;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "baileyz",
-    "version": "1.0.4-rc.1", 
+    "version": "1.0.4", 
     "description": "WhatsApp Web API Library Modification By DanuZz",
     "keywords": [
         "whatsapp",