natureco-cli 1.0.30 → 1.0.32

package/package.json

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

package/src/commands/gateway-server.js

@@ -2,12 +2,58 @@ const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 
 const PID_FILE = path.join(os.homedir(), '.natureco', 'gateway.pid');
 const LOG_FILE = path.join(os.homedir(), '.natureco', 'gateway.log');
 
+// WhatsApp imports
+let makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, Browsers;
+const pino = require('pino');
+const logger = pino({ level: 'silent' });
+
+// Lazy load Baileys
+function loadBaileys() {
+  if (!makeWASocket) {
+    const baileys = require('@whiskeysockets/baileys');
+    makeWASocket = baileys.default;
+    useMultiFileAuthState = baileys.useMultiFileAuthState;
+    DisconnectReason = baileys.DisconnectReason;
+    fetchLatestBaileysVersion = baileys.fetchLatestBaileysVersion;
+    Browsers = baileys.Browsers;
+  }
+}
+
+// Log helper
+function log(module, message, color = 'white') {
+  const timestamp = new Date().toISOString().replace('T', ' ').substring(0, 19);
+  const logLine = `[${timestamp}] [${module}] ${message}`;
+  
+  // Console output with color
+  const colorFn = chalk[color] || chalk.white;
+  console.log(colorFn(logLine));
+  
+  // File output (no color)
+  try {
+    const dir = path.dirname(LOG_FILE);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.appendFileSync(LOG_FILE, logLine + '\n', 'utf-8');
+  } catch (err) {
+    // Ignore file write errors
+  }
+}
+
 async function gatewayServer(action) {
+  // Check if running as background worker
+  if (process.argv.includes('--gateway-worker')) {
+    process.stdin.resume();
+    process.title = 'natureco-gateway';
+    log('gateway', 'Worker process started, PID: ' + process.pid);
+    return runGatewayWorker();
+  }
+  
   if (!action || action === 'start') {
     return startGateway();
   }
@@ -20,12 +66,16 @@ async function gatewayServer(action) {
     return statusGateway();
   }
   
+  if (action === 'logs') {
+    return showLogs();
+  }
+  
   console.log(chalk.red('\n❌ Unknown action\n'));
-  console.log(chalk.gray('Available actions: start, stop, status\n'));
+  console.log(chalk.gray('Available actions: start, stop, status, logs\n'));
   process.exit(1);
 }
 
-function startGateway() {
+async function startGateway() {
   // Check if already running
   if (fs.existsSync(PID_FILE)) {
     const pid = fs.readFileSync(PID_FILE, 'utf-8').trim();
@@ -41,31 +91,188 @@ function startGateway() {
     }
   }
   
-  console.log(chalk.green('\n🚀 Starting WebSocket Gateway...\n'));
+  console.log(chalk.green('\n🚀 Starting NatureCo Gateway...\n'));
   
-  // Start gateway server as detached process
-  const serverPath = path.join(__dirname, '..', 'utils', 'gateway-ws.js');
-  const child = spawn('node', [serverPath], {
+  // Ensure log directory exists
+  const dir = path.dirname(LOG_FILE);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  
+  // Open log file for stdio redirection
+  const logFile = fs.openSync(LOG_FILE, 'a');
+  
+  // Start as detached background process
+  const child = spawn(process.execPath, [__filename, '--gateway-worker'], {
     detached: true,
-    stdio: 'ignore',
+    stdio: ['ignore', logFile, logFile],
+    windowsHide: true,
   });
   
   child.unref();
   
   // Save PID
-  const dir = path.dirname(PID_FILE);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
   fs.writeFileSync(PID_FILE, String(child.pid), 'utf-8');
   
-  console.log(chalk.green('✅ Gateway started'));
-  console.log(chalk.cyan('Port:'), chalk.white('3847'));
+  console.log(chalk.green('✅ Gateway started in background'));
   console.log(chalk.cyan('PID:'), chalk.white(child.pid));
-  console.log(chalk.gray('\nConnect with WebSocket client:'));
-  console.log(chalk.white('ws://localhost:3847'));
-  console.log(chalk.gray('\nSend JSON: { "botId": "...", "message": "...", "apiKey": "..." }'));
-  console.log(chalk.gray('\nStop with: natureco gateway stop\n'));
+  console.log(chalk.cyan('Logs:'), chalk.white(LOG_FILE));
+  console.log(chalk.gray('\nView logs: natureco gateway logs'));
+  console.log(chalk.gray('Check status: natureco gateway status'));
+  console.log(chalk.gray('Stop gateway: natureco gateway stop\n'));
+  
+  process.exit(0);
+}
+
+async function runGatewayWorker() {
+  // This runs in the background
+  log('gateway', 'Starting NatureCo Gateway...', 'green');
+  
+  // Load config
+  const { getConfig } = require('../utils/config');
+  const config = getConfig();
+  
+  if (!config || !config.apiKey) {
+    log('gateway', 'No API key found. Run "natureco login" first.', 'red');
+    process.exit(1);
+  }
+  
+  // Start WhatsApp if configured
+  if (config.whatsappConnected && config.whatsappBotId) {
+    const sessionDir = path.join(os.homedir(), '.natureco', 'whatsapp-sessions', config.whatsappBotId);
+    
+    if (fs.existsSync(sessionDir)) {
+      const phone = config.whatsappPhone?.split(':')[0].replace('@s.whatsapp.net', '') || 'unknown';
+      log('whatsapp', `starting provider (+${phone})`, 'cyan');
+      startWhatsAppProvider(sessionDir, config);
+    } else {
+      log('whatsapp', 'session not found, skipping', 'yellow');
+    }
+  } else {
+    log('whatsapp', 'not configured, skipping', 'gray');
+  }
+  
+  // Health check every 60 seconds
+  setInterval(() => {
+    log('gateway', 'health check: OK', 'gray');
+  }, 60000);
+  
+  log('gateway', 'Gateway running in background', 'green');
+  
+  // Handle shutdown
+  process.on('SIGINT', () => {
+    log('gateway', 'Shutting down...', 'yellow');
+    if (fs.existsSync(PID_FILE)) {
+      fs.unlinkSync(PID_FILE);
+    }
+    process.exit(0);
+  });
+  
+  process.on('SIGTERM', () => {
+    log('gateway', 'Shutting down...', 'yellow');
+    if (fs.existsSync(PID_FILE)) {
+      fs.unlinkSync(PID_FILE);
+    }
+    process.exit(0);
+  });
+}
+
+async function startWhatsAppProvider(sessionDir, config) {
+  try {
+    loadBaileys();
+    
+    const { state, saveCreds } = await useMultiFileAuthState(sessionDir);
+    const { version } = await fetchLatestBaileysVersion();
+    
+    const sock = makeWASocket({
+      version,
+      auth: state,
+      printQRInTerminal: false,
+      logger: logger,
+      browser: Browsers.ubuntu('Chrome'),
+      connectTimeoutMs: 60000,
+      defaultQueryTimeoutMs: 60000,
+      keepAliveIntervalMs: 10000,
+      retryRequestDelayMs: 2000,
+    });
+    
+    sock.ev.on('connection.update', async (update) => {
+      const { connection, lastDisconnect } = update;
+      
+      if (connection === 'close') {
+        const statusCode = lastDisconnect?.error?.output?.statusCode;
+        
+        if (statusCode === 515 || statusCode === 408) {
+          log('whatsapp', 'connection lost, reconnecting in 10s...', 'yellow');
+          setTimeout(() => startWhatsAppProvider(sessionDir, config), 10000);
+          return;
+        } else if (statusCode === 401) {
+          log('whatsapp', 'session expired, please reconnect', 'red');
+        } else {
+          log('whatsapp', `disconnected (code: ${statusCode}), reconnecting in 10s...`, 'yellow');
+          setTimeout(() => startWhatsAppProvider(sessionDir, config), 10000);
+        }
+      } else if (connection === 'open') {
+        const phone = sock.user?.id?.split(':')[0].replace('@s.whatsapp.net', '') || 'unknown';
+        log('whatsapp', `Listening for inbound messages.`, 'cyan');
+      }
+    });
+    
+    sock.ev.on('messages.upsert', async ({ messages }) => {
+      for (const msg of messages) {
+        if (msg.key.fromMe) continue;
+        
+        const sender = msg.key.remoteJid?.split('@')[0].split(':')[0];
+        const allowedNumbers = config.whatsappAllowedNumbers || [];
+        
+        // Access control
+        if (allowedNumbers.length > 0 && !allowedNumbers.includes(sender)) {
+          log('whatsapp', `blocked message from +${sender} (not in allowed list)`, 'yellow');
+          continue;
+        }
+        
+        const messageText = msg.message?.conversation || 
+                           msg.message?.extendedTextMessage?.text || 
+                           '';
+        
+        if (messageText) {
+          const ownNumber = sock.user?.id?.split(':')[0].replace('@s.whatsapp.net', '') || 'unknown';
+          log('whatsapp', `Inbound message +${sender} -> +${ownNumber}`, 'cyan');
+          log('whatsapp', `Message: "${messageText.substring(0, 100)}${messageText.length > 100 ? '...' : ''}"`, 'gray');
+          
+          try {
+            const { sendMessage } = require('../utils/api');
+            log('whatsapp', 'Sending to NatureCo API...', 'cyan');
+            
+            const response = await sendMessage(config.apiKey, config.whatsappBotId, messageText, null, '');
+            const reply = response?.reply || response?.message || '';
+            
+            if (reply) {
+              log('whatsapp', `API response: "${reply.substring(0, 100)}${reply.length > 100 ? '...' : ''}"`, 'gray');
+              log('whatsapp', 'Sending reply...', 'cyan');
+              
+              await sock.sendMessage(msg.key.remoteJid, { text: reply });
+              log('whatsapp', `Reply sent (${reply.length} chars)`, 'green');
+            } else {
+              log('whatsapp', 'No reply from API', 'yellow');
+            }
+          } catch (err) {
+            log('whatsapp', `API error: ${err.message}`, 'red');
+          }
+        }
+      }
+    });
+    
+    sock.ev.on('creds.update', saveCreds);
+    
+  } catch (err) {
+    log('whatsapp', `Failed to start: ${err.message}`, 'red');
+    log('whatsapp', 'Retrying in 10s...', 'yellow');
+    setTimeout(() => startWhatsAppProvider(sessionDir, config), 10000);
+  }
 }
 
 function stopGateway() {
@@ -74,14 +281,52 @@ function stopGateway() {
     return;
   }
   
-  const pid = fs.readFileSync(PID_FILE, 'utf-8').trim();
+  const pid = parseInt(fs.readFileSync(PID_FILE, 'utf-8').trim());
   
   try {
+    // Try graceful shutdown first
     process.kill(pid, 'SIGTERM');
-    fs.unlinkSync(PID_FILE);
-    console.log(chalk.green('\n✅ Gateway stopped\n'));
+    
+    // Wait a bit and check if process is still running
+    setTimeout(() => {
+      try {
+        process.kill(pid, 0);
+        // Process still running, force kill
+        if (process.platform === 'win32') {
+          try {
+            execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+            console.log(chalk.green('\n✅ Gateway stopped (force killed)\n'));
+          } catch (err) {
+            console.log(chalk.red(`\n❌ Failed to stop gateway: ${err.message}\n`));
+          }
+        } else {
+          process.kill(pid, 'SIGKILL');
+          console.log(chalk.green('\n✅ Gateway stopped (force killed)\n'));
+        }
+      } catch {
+        // Process already stopped
+        console.log(chalk.green('\n✅ Gateway stopped\n'));
+      }
+      
+      // Remove PID file
+      if (fs.existsSync(PID_FILE)) {
+        fs.unlinkSync(PID_FILE);
+      }
+    }, 1000);
+    
   } catch (err) {
-    console.log(chalk.red(`\n❌ Failed to stop gateway: ${err.message}\n`));
+    // Process not found, try force kill on Windows
+    if (process.platform === 'win32') {
+      try {
+        execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+        console.log(chalk.green('\n✅ Gateway stopped\n'));
+      } catch {
+        console.log(chalk.yellow('\n⚠️  Gateway process not found\n'));
+      }
+    } else {
+      console.log(chalk.yellow('\n⚠️  Gateway process not found\n'));
+    }
+    
     // Remove stale PID file
     if (fs.existsSync(PID_FILE)) {
       fs.unlinkSync(PID_FILE);
@@ -101,13 +346,12 @@ function statusGateway() {
     process.kill(pid, 0);
     console.log(chalk.green('\n✅ Gateway running\n'));
     console.log(chalk.cyan('PID:'), chalk.white(pid));
-    console.log(chalk.cyan('Port:'), chalk.white('3847'));
-    console.log(chalk.cyan('WebSocket:'), chalk.white('ws://localhost:3847'));
+    console.log(chalk.cyan('Logs:'), chalk.white(LOG_FILE));
     
     // Show log tail if exists
     if (fs.existsSync(LOG_FILE)) {
-      const logs = fs.readFileSync(LOG_FILE, 'utf-8').split('\n').slice(-5).join('\n');
-      console.log(chalk.gray('\nRecent logs:'));
+      const logs = fs.readFileSync(LOG_FILE, 'utf-8').split('\n').filter(l => l.trim()).slice(-10).join('\n');
+      console.log(chalk.gray('\nRecent logs (last 10):'));
       console.log(chalk.white(logs));
     }
     console.log('');
@@ -117,4 +361,14 @@ function statusGateway() {
   }
 }
 
+function showLogs() {
+  if (!fs.existsSync(LOG_FILE)) {
+    console.log(chalk.gray('\n⚠️  No logs found\n'));
+    return;
+  }
+  
+  const logs = fs.readFileSync(LOG_FILE, 'utf-8');
+  console.log(logs);
+}
+
 module.exports = gatewayServer;

package/src/commands/gateway.js

@@ -1,12 +1,35 @@
 const chalk = require('chalk');
 const boxen = require('boxen');
 const fs = require('fs');
+const path = require('path');
+const os = require('os');
 const packageJson = require('../../package.json');
 const { getConfig, CONFIG_FILE } = require('../utils/config');
 const { getSkills } = require('../utils/skills');
 const { getMcpServers } = require('../utils/mcp');
 
-async function gateway() {
+// WhatsApp imports
+let makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, Browsers;
+const pino = require('pino');
+const logger = pino({ level: 'silent' });
+
+// Lazy load Baileys
+function loadBaileys() {
+  if (!makeWASocket) {
+    const baileys = require('@whiskeysockets/baileys');
+    makeWASocket = baileys.default;
+    useMultiFileAuthState = baileys.useMultiFileAuthState;
+    DisconnectReason = baileys.DisconnectReason;
+    fetchLatestBaileysVersion = baileys.fetchLatestBaileysVersion;
+    Browsers = baileys.Browsers;
+  }
+}
+
+async function gateway(action) {
+  if (action === 'start') {
+    return startGateway();
+  }
+  
   // Config kontrolü - yoksa veya apiKey yoksa setup çalıştır
   if (!fs.existsSync(CONFIG_FILE)) {
     const setup = require('./setup');
@@ -98,6 +121,9 @@ async function gateway() {
   console.log(chalk.yellow('  natureco config'));
   console.log(chalk.gray('    Ayarları görüntüle ve düzenle\n'));
   
+  console.log(chalk.yellow('  natureco gateway start'));
+  console.log(chalk.gray('    Gateway\'i başlat (WhatsApp dahil)\n'));
+  
   console.log(chalk.yellow('  natureco help'));
   console.log(chalk.gray('    Tüm komutları ve örnekleri göster\n'));
 
@@ -110,4 +136,123 @@ async function gateway() {
   console.log('');
 }
 
+async function startGateway() {
+  const config = getConfig();
+  
+  if (!config || !config.apiKey) {
+    console.log(chalk.red('\n❌ Not logged in. Run "natureco login" first.\n'));
+    process.exit(1);
+  }
+  
+  console.log(chalk.green.bold('\n🚀 NatureCo Gateway Starting...\n'));
+  console.log(chalk.gray('─'.repeat(60)));
+  console.log('');
+  
+  // WhatsApp provider başlat
+  if (config.whatsappConnected && config.whatsappBotId) {
+    const sessionDir = path.join(os.homedir(), '.natureco', 'whatsapp-sessions', config.whatsappBotId);
+    
+    if (fs.existsSync(sessionDir)) {
+      console.log(chalk.cyan('[whatsapp]'), chalk.white(`starting provider (${config.whatsappPhone || 'unknown'})`));
+      await startWhatsAppProvider(sessionDir, config);
+    } else {
+      console.log(chalk.yellow('[whatsapp]'), chalk.gray('session not found, skipping'));
+    }
+  }
+  
+  console.log('');
+  console.log(chalk.gray('─'.repeat(60)));
+  console.log(chalk.green('\n✅ Gateway running. Press Ctrl+C to stop.\n'));
+  
+  // Keep process alive
+  process.on('SIGINT', () => {
+    console.log(chalk.yellow('\n\n⚠️  Gateway stopped\n'));
+    process.exit(0);
+  });
+}
+
+async function startWhatsAppProvider(sessionDir, config) {
+  try {
+    loadBaileys();
+    
+    const { state, saveCreds } = await useMultiFileAuthState(sessionDir);
+    const { version } = await fetchLatestBaileysVersion();
+    
+    const sock = makeWASocket({
+      version,
+      auth: state,
+      printQRInTerminal: false,
+      logger: logger,
+      browser: Browsers.ubuntu('Chrome'),
+      connectTimeoutMs: 60000,
+      defaultQueryTimeoutMs: 60000,
+      keepAliveIntervalMs: 10000,
+      retryRequestDelayMs: 2000,
+    });
+    
+    sock.ev.on('connection.update', async (update) => {
+      const { connection, lastDisconnect } = update;
+      
+      if (connection === 'close') {
+        const statusCode = lastDisconnect?.error?.output?.statusCode;
+        
+        if (statusCode === 515 || statusCode === 408) {
+          console.log(chalk.yellow('[whatsapp]'), chalk.gray('reconnecting...'));
+          setTimeout(() => startWhatsAppProvider(sessionDir, config), 2000);
+          return;
+        } else if (statusCode === 401) {
+          console.log(chalk.red('[whatsapp]'), chalk.gray('session expired'));
+        } else {
+          console.log(chalk.red('[whatsapp]'), chalk.gray(`disconnected (${statusCode})`));
+        }
+      } else if (connection === 'open') {
+        const phone = sock.user?.id?.split(':')[0].replace('@s.whatsapp.net', '') || 'unknown';
+        console.log(chalk.cyan('[whatsapp]'), chalk.white(`Listening for inbound messages.`));
+      }
+    });
+    
+    sock.ev.on('messages.upsert', async ({ messages }) => {
+      for (const msg of messages) {
+        if (msg.key.fromMe) continue;
+        
+        const sender = msg.key.remoteJid?.split('@')[0].split(':')[0];
+        const allowedNumbers = config.whatsappAllowedNumbers || [];
+        
+        if (allowedNumbers.length > 0 && !allowedNumbers.includes(sender)) {
+          continue;
+        }
+        
+        const messageText = msg.message?.conversation || 
+                           msg.message?.extendedTextMessage?.text || 
+                           '';
+        
+        if (messageText) {
+          const ownNumber = sock.user?.id?.split(':')[0].replace('@s.whatsapp.net', '') || 'unknown';
+          console.log(chalk.cyan('[whatsapp]'), chalk.white(`Inbound message +${sender} -> +${ownNumber}`));
+          
+          try {
+            const { sendMessage } = require('../utils/api');
+            console.log(chalk.cyan('[whatsapp]'), chalk.gray('Sending reply...'));
+            
+            const response = await sendMessage(config.apiKey, config.whatsappBotId, messageText, null, '');
+            const reply = response?.reply || response?.message || '';
+            
+            if (reply) {
+              await sock.sendMessage(msg.key.remoteJid, { text: reply });
+              console.log(chalk.cyan('[whatsapp]'), chalk.green(`Reply sent (${reply.length} chars)`));
+            }
+          } catch (err) {
+            console.log(chalk.red('[whatsapp]'), chalk.gray(`error: ${err.message}`));
+          }
+        }
+      }
+    });
+    
+    sock.ev.on('creds.update', saveCreds);
+    
+  } catch (err) {
+    console.log(chalk.red('[whatsapp]'), chalk.gray(`failed to start: ${err.message}`));
+  }
+}
+
 module.exports = gateway;

package/src/commands/whatsapp.js

@@ -114,7 +114,7 @@ async function connectWhatsApp() {
     .map(n => n.trim())
     .filter(n => n.length > 0);
   
-  // Start connection
+  // Start connection (only for QR code)
   await startWhatsAppConnection(sessionDir, botId, selectedBot, config, allowedNumbersList);
 }
 
@@ -209,56 +209,17 @@ async function startWhatsAppConnection(sessionDir, botId, selectedBot, config, a
         }
         
         console.log(chalk.green('\n✅ Kurulum tamamlandı!\n'));
-        console.log(chalk.gray('Botunuz WhatsApp\'ta aktif.\n'));
+        console.log(chalk.yellow('Gateway ile başlatmak için:'), chalk.cyan('natureco gateway start'));
+        console.log(chalk.gray('Gateway, WhatsApp\'ı otomatik olarak başlatacak.\n'));
         
-        // Keep process alive for a moment then exit
+        // Exit after setup
         setTimeout(() => {
           process.exit(0);
         }, 2000);
       }
     });
     
-    // 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?.split('@')[0].split(':')[0];
-        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('📨 Mesaj alındı:', sender, messageText);
-          console.log(chalk.cyan(`\n📱 ${sender}:`), chalk.white(messageText));
-          
-          try {
-            console.log('📡 API isteği gönderiliyor...');
-            const response = await sendMessage(config.apiKey, config.defaultBotId, messageText, null, '');
-            console.log('📩 API yanıtı:', JSON.stringify(response));
-            
-            const reply = response?.reply || response?.message || '';
-            
-            if (reply) {
-              console.log('📤 WhatsApp yanıtı gönderiliyor:', 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));
-          }
-        }
-      }
-    });
+    // Message handler removed - gateway handles this now
     
     // Save credentials on update
     sock.ev.on('creds.update', saveCreds);