Update index.js

index.js

@@ -51,7 +51,8 @@ app.get('/checkState', async (req, res) => {
             const sessionData = { ip, apiKey };
             fs.writeFileSync(sessionFile, JSON.stringify(sessionData, null, 2));
 
-            connectToWhatsApp(apiKey, ip); // Start WhatsApp connection
+            // Initialize WhatsApp connection
+            await connectToWhatsApp(apiKey, ip);
         }
 
         res.cookie('apiKey', apiKey, { 
@@ -71,12 +72,18 @@ app.get('/checkState', async (req, res) => {
     }
 });
 
-app.get('/qrCode', (req, res) => {
+// Serve QR code for login
+app.get('/qrCode', async (req, res) => {
     const { apiKey } = req.query;
 
     if (apiKey) {
         const qrFile = path.join(sessionDir, `${apiKey}_qr.svg`);
 
+        if (!fs.existsSync(qrFile)) {
+            // Generate QR code if it does not exist
+            await connectToWhatsApp(apiKey);
+        }
+
         if (fs.existsSync(qrFile)) {
             res.sendFile(qrFile);
         } else {
@@ -115,35 +122,37 @@ async function connectToWhatsApp(apiKey, ip) {
         printQRInTerminal: true
     });
 
-    sock.ev.on('connection.update', (update) => {
-        const { connection, lastDisconnect, qr } = update;
-        if (connection === 'close') {
-            const shouldReconnect = (lastDisconnect.error instanceof Boom) ? lastDisconnect.error.output.statusCode !== DisconnectReason.loggedOut : true;
-            console.log('Connection closed due to ', lastDisconnect.error, ', reconnecting ', shouldReconnect);
-            if (shouldReconnect) {
-                connectToWhatsApp(apiKey, ip);
+    return new Promise((resolve, reject) => {
+        sock.ev.on('connection.update', (update) => {
+            const { connection, lastDisconnect, qr } = update;
+            if (connection === 'close') {
+                const shouldReconnect = (lastDisconnect.error instanceof Boom) ? lastDisconnect.error.output.statusCode !== DisconnectReason.loggedOut : true;
+                console.log('Connection closed due to ', lastDisconnect.error, ', reconnecting ', shouldReconnect);
+                if (shouldReconnect) {
+                    connectToWhatsApp(apiKey, ip);
+                }
+            } else if (connection === 'open') {
+                console.log('Opened connection');
+                resolve();
+            } else if (qr) {
+                // Generate QR code
+                const qrImage = qri.imageSync(qr, { type: 'svg' });
+                fs.writeFileSync(path.join(sessionDir, `${apiKey}_qr.svg`), qrImage);
             }
-        } else if (connection === 'open') {
-            console.log('Opened connection');
-        } else if (qr) {
-            // Send QR code to client
-            const qrImage = qri.imageSync(qr, { type: 'svg' });
-            fs.writeFileSync(path.join(sessionDir, `${apiKey}_qr.svg`), qrImage);
-        }
-    });
+        });
 
-    sock.ev.on('messages.upsert', async m => {
-        console.log(JSON.stringify(m, undefined, 2));
-        console.log('Replying to', m.messages[0].key.remoteJid);
-        await sock.sendMessage(m.messages[0].key.remoteJid, { text: 'Hello there!' });
-    });
+        sock.ev.on('messages.upsert', async m => {
+            console.log(JSON.stringify(m, undefined, 2));
+            console.log('Replying to', m.messages[0].key.remoteJid);
+            await sock.sendMessage(m.messages[0].key.remoteJid, { text: 'Hello there!' });
+        });
 
-    // Save session to file
-    const sessionFile = path.join(sessionDir, `${ip}.json`);
-    fs.writeFileSync(sessionFile, JSON.stringify({ apiKey, ip, session: sock.state }, null, 2));
+        // Save session to file
+        const sessionFile = path.join(sessionDir, `${ip}.json`);
+        fs.writeFileSync(sessionFile, JSON.stringify({ apiKey, ip, session: sock.state }, null, 2));
+    });
 }
 
-
 const PORT = 7860;
 app.listen(PORT, () => {
     console.log(`Server is running on port ${PORT}`);