natureco-cli 1.0.26 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "NatureCo AI Bot Terminal Interface",
   "main": "bin/natureco.js",
   "bin": {

package/src/commands/whatsapp.js

@@ -6,7 +6,7 @@ const path = require('path');
 const os = require('os');
 const pino = require('pino');
 const { getApiKey, getConfig, saveConfig } = require('../utils/config');
-const { getBots } = require('../utils/api');
+const { getBots, sendMessage } = require('../utils/api');
 
 // Baileys imports
 let makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, Browsers;
@@ -85,6 +85,17 @@ async function connectWhatsApp() {
   
   const selectedBot = botList.bots.find(b => b.id === botId);
   
+  // Ask for allowed numbers
+  process.stdin.resume();
+  const { allowedNumbers } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'allowedNumbers',
+      message: 'Hangi numaralar mesaj gönderebilir? (virgülle ayırın, boş bırakırsan sadece kendi numaran)',
+      default: '',
+    },
+  ]);
+  
   console.log(chalk.cyan('\n📱 WhatsApp bağlantısı başlatılıyor...'));
   console.log(chalk.gray('Telefonunuzda WhatsApp\'ı açın ve QR kodu taratın.\n'));
   
@@ -97,11 +108,17 @@ async function connectWhatsApp() {
     fs.mkdirSync(sessionDir, { recursive: true });
   }
   
+  // Parse allowed numbers
+  const allowedNumbersList = allowedNumbers
+    .split(',')
+    .map(n => n.trim())
+    .filter(n => n.length > 0);
+  
   // Start connection
-  await startWhatsAppConnection(sessionDir, botId, selectedBot, config);
+  await startWhatsAppConnection(sessionDir, botId, selectedBot, config, allowedNumbersList);
 }
 
-async function startWhatsAppConnection(sessionDir, botId, selectedBot, config) {
+async function startWhatsAppConnection(sessionDir, botId, selectedBot, config, allowedNumbersList = []) {
   try {
     // Create auth state
     const { state, saveCreds } = await useMultiFileAuthState(sessionDir);
@@ -116,8 +133,12 @@ async function startWhatsAppConnection(sessionDir, botId, selectedBot, config) {
       version,
       auth: state,
       printQRInTerminal: false,
-      browser: Browsers.ubuntu('Chrome'),
       logger: logger,
+      browser: Browsers.ubuntu('Chrome'),
+      connectTimeoutMs: 60000,
+      defaultQueryTimeoutMs: 60000,
+      keepAliveIntervalMs: 10000,
+      retryRequestDelayMs: 2000,
     });
     
     let qrDisplayed = false;
@@ -145,10 +166,10 @@ async function startWhatsAppConnection(sessionDir, botId, selectedBot, config) {
       if (connection === 'close') {
         const statusCode = lastDisconnect?.error?.output?.statusCode;
         
-        if (statusCode === 515) {
+        if (statusCode === 515 || statusCode === 408) {
           // Normal — yeniden bağlan, logout değil
           console.log(chalk.yellow('🔄 Yeniden bağlanıyor...'));
-          setTimeout(() => startWhatsAppConnection(sessionDir, botId, selectedBot, config), 1000);
+          setTimeout(() => startWhatsAppConnection(sessionDir, botId, selectedBot, config, allowedNumbersList), 2000);
           return;
         } else if (statusCode === 401) {
           console.log(chalk.red('❌ Oturum sonlandı, tekrar bağlanın.'));
@@ -171,12 +192,22 @@ async function startWhatsAppConnection(sessionDir, botId, selectedBot, config) {
         console.log(chalk.cyan('Telefon:'), chalk.white(sock.user?.id || 'Unknown'));
         console.log(chalk.gray('\nSession kaydedildi: ~/.natureco/whatsapp-sessions/'));
         
+        // Prepare allowed numbers list (add own number)
+        const ownNumber = sock.user?.id?.replace('@s.whatsapp.net', '');
+        const finalAllowedNumbers = ownNumber ? [ownNumber, ...allowedNumbersList] : allowedNumbersList;
+        
         // Save to config
         config.whatsappConnected = true;
         config.whatsappBotId = botId;
         config.whatsappPhone = sock.user?.id;
+        config.whatsappAllowedNumbers = finalAllowedNumbers;
         saveConfig(config);
         
+        if (finalAllowedNumbers.length > 0) {
+          console.log(chalk.cyan('\nİzin verilen numaralar:'));
+          finalAllowedNumbers.forEach(num => console.log(chalk.gray(`  - ${num}`)));
+        }
+        
         console.log(chalk.green('\n✅ Kurulum tamamlandı!\n'));
         console.log(chalk.gray('Botunuz WhatsApp\'ta aktif.\n'));
         
@@ -187,6 +218,43 @@ async function startWhatsAppConnection(sessionDir, botId, selectedBot, config) {
       }
     });
     
+    // Message handler with access control
+    sock.ev.on('messages.upsert', async ({ messages }) => {
+      for (const msg of messages) {
+        if (msg.key.fromMe) continue; // kendi mesajları yoksay
+        
+        const sender = msg.key.remoteJid?.replace('@s.whatsapp.net', '');
+        const allowedNumbers = config.whatsappAllowedNumbers || [];
+        
+        // İzin listesi doluysa kontrol et
+        if (allowedNumbers.length > 0 && !allowedNumbers.includes(sender)) {
+          console.log(chalk.yellow(`⚠️  İzinsiz numara: ${sender}`));
+          continue; // izinsiz numara, yoksay
+        }
+        
+        // Mesaj içeriğini al
+        const messageText = msg.message?.conversation || 
+                           msg.message?.extendedTextMessage?.text || 
+                           '';
+        
+        if (messageText) {
+          console.log(chalk.cyan(`\n📱 ${sender}:`), chalk.white(messageText));
+          
+          try {
+            const response = await sendMessage(config.apiKey, config.defaultBotId, messageText, null, '');
+            const reply = response?.reply || response?.message || '';
+            
+            if (reply) {
+              await sock.sendMessage(msg.key.remoteJid, { text: reply });
+              console.log(chalk.green(`✅ Cevap gönderildi: ${reply.substring(0, 50)}...`));
+            }
+          } catch (err) {
+            console.log(chalk.red('❌ API hatası:', err.message));
+          }
+        }
+      }
+    });
+    
     // Save credentials on update
     sock.ev.on('creds.update', saveCreds);