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

package/lib/Socket/socket.js

@@ -40,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 });
@@ -53,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();
-            }
-            catch (error) {
-                reject(error);
+                await sendPromise.call(ws, bytes)
+                resolve()
+            } catch (error) {
+                reject(error)
             }
-        });
-    };
+        }
+    )
+};
     /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
@@ -261,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;
@@ -381,74 +412,123 @@ const makeSocket = (config) => {
         }
         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") => {
-        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',
-                        // eslint-disable-next-line camelcase
-                        should_show_push_notification: 'true'
+    // 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) {
+        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))
+
+    // FIX: salt pairing harus stabil
+    if (!authState.creds.pairingSalt) {
+        authState.creds.pairingSalt = (0, crypto_1.randomBytes)(32)
+        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: {
+                    // FIX PALING PENTING (Baileys v6)
+                    jid: getPairingJid(),
+                    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: Buffer.from([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) {
+        throw new Error('pairingEphemeralKeyPair tidak tersedia')
     }
+
+    if (!authState.creds.pairingCode) {
+        throw new Error('pairingCode belum tersedia')
+    }
+
+    // FIX: pakai salt yang sama
+    const salt = authState.creds.pairingSalt
+    const iv = (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,
+        iv
+    )
+
+    return Buffer.concat([salt, iv, ciphered])
+}
     const sendWAMBuffer = (wamBuffer) => {
         return query({
             tag: 'iq',
@@ -468,14 +548,19 @@ const makeSocket = (config) => {
     };
     ws.on('message', onMessageReceived);
     ws.on('open', async () => {
-        try {
-            await validateConnection();
-        }
-        catch (err) {
-            logger.error({ err }, 'error in validating connection');
-            end(err);
+    try {
+        if (!authState.creds.isConnecting) {
+            authState.creds.isConnecting = true;
+            ev.emit('creds.update', authState.creds);
         }
-    });
+
+        await validateConnection();
+    }
+    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
@@ -517,34 +602,39 @@ const makeSocket = (config) => {
     // 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 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);
-        }
-    });
+    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)
+    }
+});
     // login complete
     ws.on('CB:success', async (node) => {
-        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);
-        }
-    });
+    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)
+    }
+});
     ws.on('CB:stream:error', (node) => {
         logger.error({ node }, 'stream errored out');
         const { reason, statusCode } = (0, Utils_1.getErrorCodeFromStreamError)(node);

package/lib/index.js

@@ -53,5 +53,6 @@ __exportStar(require("./WABinary"), exports);
 __exportStar(require("./WAM"), exports);
 __exportStar(require("./WAUSync"), exports);
 __exportStar(require("./Api"), exports);
+__exportStar(require("./Auth"), exports);
 
 exports.default = Socket_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.0.9",
+  "version": "1.1.0-DEV.1",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -47,6 +47,7 @@
     "@hapi/boom": "^9.1.3",
     "async-mutex": "^0.5.0",
     "axios": "^1.6.0",
+    "better-sqlite3": "^12.5.0",
     "chalk": "^4.1.2",
     "gradient-string": "^2.0.2",
     "cache-manager": "^5.7.6",
@@ -70,7 +71,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^8.0.0",
     "jest": "^27.0.6",
-    "jimp": "^0.16.1",
+    "jimp": "^1.6.0",
     "json": "^11.0.0",
     "link-preview-js": "^3.0.0",
     "open": "^8.4.2",
@@ -84,7 +85,7 @@
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",
-    "jimp": "^0.16.1",
+    "jimp": "^0.22.10",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
     "sharp": "^0.34.1"