@rexxhayanasi/elaina-baileys 1.1.0-DEV.1 → 1.1.0-DEV.2

package/lib/Socket/socket.js

@@ -412,46 +412,30 @@ const end = (error) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-
-    const getPairingJid = () => {
-    if (authState.creds?.me?.id) {
-        return authState.creds.me.id
-    }
-
-    if (!authState.creds?.pairingPhone) {
-        throw new Error('pairingPhone belum tersedia')
-    }
-
-    const phone = authState.creds.pairingPhone.replace(/\D/g, '')
-    return `${phone}@s.whatsapp.net`
-}
     const requestPairingCode = async (phoneNumber, pairKey = "ELAINAMD") => {
-    // FIX: normalisasi nomor (WA v6 wajib)
-    authState.creds.pairingPhone = phoneNumber.replace(/\D/g, '')
-    ev.emit('creds.update', authState.creds)
-
     if (!authState.creds.noiseKey?.public) {
         authState.creds.noiseKey = Utils_1.Curve.generateKeyPair()
         ev.emit('creds.update', authState.creds)
     }
 
-    // FIX: pairingEphemeralKeyPair HARUS STABIL
-    if (!authState.creds.pairingEphemeralKeyPair) {
+    if (!authState.creds.pairingEphemeralKeyPair?.public) {
         authState.creds.pairingEphemeralKeyPair = Utils_1.Curve.generateKeyPair()
         ev.emit('creds.update', authState.creds)
     }
 
-    // FIX: pairing code konsisten
-    authState.creds.pairingCode = pairKey
-        ? pairKey.toUpperCase()
-        : (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5))
+    if (pairKey) {
+        authState.creds.pairingCode = pairKey.toUpperCase()
+    } else {
+        authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5))
+    }
 
-    // FIX: salt pairing harus stabil
-    if (!authState.creds.pairingSalt) {
-        authState.creds.pairingSalt = (0, crypto_1.randomBytes)(32)
-        ev.emit('creds.update', authState.creds)
+    authState.creds.me = {
+        id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
+        name: '~'
     }
 
+    ev.emit('creds.update', authState.creds)
+
     await sendNode({
         tag: 'iq',
         attrs: {
@@ -464,8 +448,7 @@ const end = (error) => {
             {
                 tag: 'link_code_companion_reg',
                 attrs: {
-                    // FIX PALING PENTING (Baileys v6)
-                    jid: getPairingJid(),
+                    jid: authState.creds.me.id,
                     stage: 'companion_hello',
                     should_show_push_notification: 'true'
                 },
@@ -493,7 +476,7 @@ const end = (error) => {
                     {
                         tag: 'link_code_pairing_nonce',
                         attrs: {},
-                        content: Buffer.from([0])
+                        content: '0'
                     }
                 ]
             }
@@ -501,20 +484,19 @@ const end = (error) => {
     })
 
     return authState.creds.pairingCode
-}
-    
+    }
     async function generatePairingKey() {
     if (!authState.creds.pairingEphemeralKeyPair?.public) {
-        throw new Error('pairingEphemeralKeyPair tidak tersedia')
+        authState.creds.pairingEphemeralKeyPair = Utils_1.Curve.generateKeyPair()
+        ev.emit('creds.update', authState.creds)
     }
 
     if (!authState.creds.pairingCode) {
-        throw new Error('pairingCode belum tersedia')
+        throw new Error("Pairing code belum tersedia")
     }
 
-    // FIX: pakai salt yang sama
-    const salt = authState.creds.pairingSalt
-    const iv = (0, crypto_1.randomBytes)(16)
+    const salt = (0, crypto_1.randomBytes)(32)
+    const randomIv = (0, crypto_1.randomBytes)(16)
 
     const key = await (0, Utils_1.derivePairingCodeKey)(
         authState.creds.pairingCode,
@@ -524,10 +506,10 @@ const end = (error) => {
     const ciphered = (0, Utils_1.aesEncryptCTR)(
         authState.creds.pairingEphemeralKeyPair.public,
         key,
-        iv
+        randomIv
     )
 
-    return Buffer.concat([salt, iv, ciphered])
+    return Buffer.concat([salt, randomIv, ciphered])
 }
     const sendWAMBuffer = (wamBuffer) => {
         return query({
@@ -548,19 +530,14 @@ const end = (error) => {
     };
     ws.on('message', onMessageReceived);
     ws.on('open', async () => {
-    try {
-        if (!authState.creds.isConnecting) {
-            authState.creds.isConnecting = true;
-            ev.emit('creds.update', authState.creds);
+        try {
+            await validateConnection();
         }
-
-        await validateConnection();
-    }
-    catch (err) {
-        logger.error({ err }, 'error in validating connection');
-        end(err);
-    }
-});
+        catch (err) {
+            logger.error({ err }, 'error in validating connection');
+            end(err);
+        }
+    });
     ws.on('error', mapWebSocketError(end));
     ws.on('close', () => end(new boom_1.Boom('Connection Terminated', { statusCode: Types_1.DisconnectReason.connectionClosed })));
     // the server terminated the connection
@@ -602,39 +579,34 @@ const end = (error) => {
     // 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) => {
-    try {
-        const { reply, creds: updatedCreds } =
-            (0, Utils_1.configureSuccessfulPairing)(stanza, creds)
-
-        // FIX: reset state pairing
-        delete updatedCreds.pairingCode
-        delete updatedCreds.pairingPhone
-        delete updatedCreds.pairingSalt
-        delete updatedCreds.pairingEphemeralKeyPair
-        updatedCreds.isConnecting = false
-
-        ev.emit('creds.update', updatedCreds)
-        ev.emit('connection.update', { isNewLogin: true, qr: undefined })
-
-        await sendNode(reply)
-    } catch (err) {
-        end(err)
-    }
-});
+        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 the connection...');
+            ev.emit('creds.update', updatedCreds);
+            ev.emit('connection.update', { isNewLogin: true, qr: undefined });
+            await sendNode(reply);
+        }
+        catch (error) {
+            logger.info({ trace: error.stack }, 'error in pairing');
+            end(error);
+        }
+    });
     // login complete
     ws.on('CB:success', async (node) => {
-    try {
-        await uploadPreKeysToServerIfRequired()
-        await sendPassiveIq('active')
-
-        authState.creds.isConnecting = false
-        ev.emit('creds.update', authState.creds)
-
-        ev.emit('connection.update', { connection: 'open' })
-    } catch (err) {
-        end(err)
-    }
-});
+        try {
+            await uploadPreKeysToServerIfRequired();
+            await sendPassiveIq('active');
+            logger.info('opened connection to WA');
+            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' });
+        }
+        catch (err) {
+            logger.error({ err }, 'error opening connection');
+            end(err);
+        }
+    });
     ws.on('CB:stream:error', (node) => {
         logger.error({ node }, 'stream errored out');
         const { reason, statusCode } = (0, Utils_1.getErrorCodeFromStreamError)(node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.1.0-DEV.1",
+  "version": "1.1.0-DEV.2",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys",