natureco-cli 2.8.0 → 2.8.1

package/package.json

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

package/src/commands/dashboard.js

@@ -211,7 +211,7 @@ body::before{
         <div class="header-bot-name" id="header-bot-name">Nature Bot</div>
         <div class="header-bot-model" id="header-bot-model">NatureCo</div>
       </div>
-      <div class="version-badge" id="version-badge">v2.8.0</div>
+      <div class="version-badge" id="version-badge">v2.8.1</div>
     </div>
     <div class="messages" id="messages"></div>
     <div class="input-area">
@@ -341,7 +341,7 @@ function dashboard(action) {
           apiKey: cfg.apiKey,
           defaultBot: cfg.defaultBot,
           defaultBotId: cfg.defaultBotId,
-          version: 'v2.8.0',
+          version: 'v2.8.1',
           bots: cfg.bots || [],
           telegramToken: cfg.telegramToken || null,
           whatsappConnected: cfg.whatsappConnected || false,

package/src/commands/gateway-server.js

@@ -128,7 +128,7 @@ async function startGateway() {
 
 async function runGatewayWorker() {
   // This runs in the background
-  log('gateway', 'Starting NatureCo Gateway v2.8.0...', 'green');
+  log('gateway', 'Starting NatureCo Gateway v2.8.1...', 'green');
   
   // Load config
   const { getConfig } = require('../utils/config');
@@ -139,6 +139,10 @@ async function runGatewayWorker() {
     process.exit(1);
   }
   
+  // Store provider instances globally for HTTP endpoint
+  global.whatsappSock = null;
+  global.telegramBot = null;
+  
   // Start WhatsApp if configured
   if (config.whatsappConnected && config.whatsappBotId) {
     const sessionDir = path.join(os.homedir(), '.natureco', 'whatsapp-sessions', config.whatsappBotId);
@@ -162,6 +166,9 @@ async function runGatewayWorker() {
     log('telegram', 'not configured, skipping', 'gray');
   }
   
+  // Start HTTP server for message sending
+  startHttpServer();
+  
   // Health check every 60 seconds
   setInterval(() => {
     log('gateway', 'health check: OK', 'gray');
@@ -236,6 +243,9 @@ async function startWhatsAppProvider(sessionDir, config) {
         log('whatsapp', `Connected successfully`, 'green');
         log('whatsapp', `Listening for inbound messages.`, 'cyan');
         log('whatsapp', `Phone: +${phone}`, 'gray');
+        
+        // Store socket globally for HTTP endpoint
+        global.whatsappSock = sock;
       }
     });
     
@@ -446,11 +456,111 @@ async function startTelegramProvider(config) {
       log('telegram', `Polling error: ${error.message}`, 'red');
     });
     
+    // Store bot globally for HTTP endpoint
+    global.telegramBot = bot;
+    
   } catch (err) {
     log('telegram', `Failed to start: ${err.message}`, 'red');
   }
 }
 
+function startHttpServer() {
+  const http = require('http');
+  
+  const server = http.createServer(async (req, res) => {
+    // CORS headers
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+    
+    if (req.method === 'OPTIONS') {
+      res.writeHead(200);
+      res.end();
+      return;
+    }
+    
+    if (req.method === 'POST' && req.url === '/send') {
+      let body = '';
+      
+      req.on('data', chunk => {
+        body += chunk.toString();
+      });
+      
+      req.on('end', async () => {
+        try {
+          const { channel, target, message } = JSON.parse(body);
+          
+          if (!channel || !target || !message) {
+            res.writeHead(400, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ error: 'Missing required fields: channel, target, message' }));
+            return;
+          }
+          
+          if (channel === 'whatsapp') {
+            if (!global.whatsappSock) {
+              res.writeHead(503, { 'Content-Type': 'application/json' });
+              res.end(JSON.stringify({ error: 'WhatsApp not connected' }));
+              return;
+            }
+            
+            const normalizedTarget = target.replace(/[^\d]/g, '');
+            const jid = `${normalizedTarget}@s.whatsapp.net`;
+            
+            await global.whatsappSock.sendMessage(jid, { text: message });
+            
+            log('http', `WhatsApp message sent to ${target}`, 'green');
+            
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ success: true, channel: 'whatsapp', target }));
+            
+          } else if (channel === 'telegram') {
+            if (!global.telegramBot) {
+              res.writeHead(503, { 'Content-Type': 'application/json' });
+              res.end(JSON.stringify({ error: 'Telegram not connected' }));
+              return;
+            }
+            
+            const chatId = target.trim();
+            if (!/^-?\d+$/.test(chatId)) {
+              res.writeHead(400, { 'Content-Type': 'application/json' });
+              res.end(JSON.stringify({ error: 'Invalid Telegram chat ID' }));
+              return;
+            }
+            
+            await global.telegramBot.sendMessage(chatId, message);
+            
+            log('http', `Telegram message sent to ${target}`, 'green');
+            
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ success: true, channel: 'telegram', target }));
+            
+          } else {
+            res.writeHead(400, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ error: 'Invalid channel. Use "whatsapp" or "telegram"' }));
+          }
+          
+        } catch (err) {
+          log('http', `Error: ${err.message}`, 'red');
+          res.writeHead(500, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ error: err.message }));
+        }
+      });
+      
+    } else {
+      res.writeHead(404, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Not found' }));
+    }
+  });
+  
+  server.listen(3847, '127.0.0.1', () => {
+    log('http', 'HTTP server listening on http://127.0.0.1:3847', 'green');
+  });
+  
+  server.on('error', (err) => {
+    log('http', `Server error: ${err.message}`, 'red');
+  });
+}
+
 function stopGateway() {
   if (!fs.existsSync(PID_FILE)) {
     console.log(chalk.gray('\n⚠️  Gateway not running\n'));

package/src/commands/message.js

@@ -5,6 +5,7 @@ const os = require('os');
 const { getConfig } = require('../utils/config');
 
 const PID_FILE = path.join(os.homedir(), '.natureco', 'gateway.pid');
+const GATEWAY_HTTP_URL = 'http://127.0.0.1:3847/send';
 
 async function message(args) {
   // Parse arguments
@@ -54,128 +55,42 @@ async function message(args) {
   
   const config = getConfig();
   
-  if (channel === 'whatsapp') {
-    await sendWhatsAppMessage(target, messageText, config);
-  } else if (channel === 'telegram') {
-    await sendTelegramMessage(target, messageText, config);
-  }
-}
-
-async function sendWhatsAppMessage(target, messageText, config) {
-  if (!config.whatsappConnected || !config.whatsappBotId) {
+  // Validate channel configuration
+  if (channel === 'whatsapp' && (!config.whatsappConnected || !config.whatsappBotId)) {
     console.log(chalk.red('\n❌ WhatsApp bağlı değil\n'));
     console.log(chalk.yellow('Önce WhatsApp\'ı bağlayın:'), chalk.cyan('natureco whatsapp connect\n'));
     process.exit(1);
   }
   
-  console.log(chalk.yellow('\n⏳ WhatsApp mesajı gönderiliyor...\n'));
-  
-  try {
-    // Lazy load Baileys
-    const baileys = require('@whiskeysockets/baileys');
-    const makeWASocket = baileys.default;
-    const useMultiFileAuthState = baileys.useMultiFileAuthState;
-    const fetchLatestBaileysVersion = baileys.fetchLatestBaileysVersion;
-    const Browsers = baileys.Browsers;
-    const pino = require('pino');
-    const logger = pino({ level: 'silent' });
-    
-    const sessionDir = path.join(os.homedir(), '.natureco', 'whatsapp-sessions', config.whatsappBotId);
-    
-    if (!fs.existsSync(sessionDir)) {
-      console.log(chalk.red('❌ WhatsApp session bulunamadı\n'));
-      console.log(chalk.yellow('Önce WhatsApp\'ı bağlayın:'), chalk.cyan('natureco whatsapp connect\n'));
-      process.exit(1);
-    }
-    
-    const { state } = await useMultiFileAuthState(sessionDir);
-    const { version } = await fetchLatestBaileysVersion();
-    
-    const sock = makeWASocket({
-      version,
-      auth: state,
-      printQRInTerminal: false,
-      logger: logger,
-      browser: Browsers.ubuntu('Chrome'),
-      connectTimeoutMs: 30000,
-    });
-    
-    // Wait for connection
-    await new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => {
-        reject(new Error('Connection timeout'));
-      }, 30000);
-      
-      sock.ev.on('connection.update', (update) => {
-        if (update.connection === 'open') {
-          clearTimeout(timeout);
-          resolve();
-        } else if (update.connection === 'close') {
-          clearTimeout(timeout);
-          reject(new Error('Connection failed'));
-        }
-      });
-    });
-    
-    // Normalize phone number
-    const normalizedTarget = target.replace(/[^\d]/g, '');
-    const jid = `${normalizedTarget}@s.whatsapp.net`;
-    
-    // Send message
-    await sock.sendMessage(jid, { text: messageText });
-    
-    console.log(chalk.green('✅ Mesaj gönderildi!\n'));
-    console.log(chalk.cyan('Hedef:'), chalk.white(target));
-    console.log(chalk.cyan('Mesaj:'), chalk.white(messageText));
-    console.log('');
-    
-    // Close connection
-    setTimeout(() => {
-      sock.end();
-      process.exit(0);
-    }, 2000);
-    
-  } catch (err) {
-    console.log(chalk.red(`\n❌ Hata: ${err.message}\n`));
-    process.exit(1);
-  }
-}
-
-async function sendTelegramMessage(target, messageText, config) {
-  if (!config.telegramToken || !config.telegramBotId) {
+  if (channel === 'telegram' && (!config.telegramToken || !config.telegramBotId)) {
     console.log(chalk.red('\n❌ Telegram bağlı değil\n'));
     console.log(chalk.yellow('Önce Telegram\'ı bağlayın:'), chalk.cyan('natureco telegram connect\n'));
     process.exit(1);
   }
   
-  console.log(chalk.yellow('\n⏳ Telegram mesajı gönderiliyor...\n'));
+  // Send message via HTTP endpoint
+  await sendMessageViaHttp(channel, target, messageText);
+}
+
+async function sendMessageViaHttp(channel, target, messageText) {
+  console.log(chalk.yellow(`\n⏳ ${channel === 'whatsapp' ? 'WhatsApp' : 'Telegram'} mesajı gönderiliyor...\n`));
   
   try {
-    // Lazy load node-telegram-bot-api
-    let TelegramBot;
-    try {
-      TelegramBot = require('node-telegram-bot-api');
-    } catch (err) {
-      console.log(chalk.red('❌ node-telegram-bot-api yüklü değil\n'));
-      console.log(chalk.yellow('Yüklemek için:'), chalk.cyan('npm install -g node-telegram-bot-api\n'));
-      process.exit(1);
-    }
+    const response = await fetch(GATEWAY_HTTP_URL, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ channel, target, message: messageText })
+    });
     
-    const bot = new TelegramBot(config.telegramToken, { polling: false });
+    const data = await response.json();
     
-    // Validate chat ID (should be numeric)
-    const chatId = target.trim();
-    if (!/^-?\d+$/.test(chatId)) {
-      console.log(chalk.red('❌ Geçersiz Telegram Chat ID\n'));
-      console.log(chalk.gray('Chat ID sadece rakamlardan oluşmalı (örnek: 123456789)\n'));
-      process.exit(1);
+    if (!response.ok) {
+      throw new Error(data.error || `HTTP ${response.status}`);
     }
     
-    // Send message
-    await bot.sendMessage(chatId, messageText);
-    
     console.log(chalk.green('✅ Mesaj gönderildi!\n'));
-    console.log(chalk.cyan('Chat ID:'), chalk.white(chatId));
+    console.log(chalk.cyan('Kanal:'), chalk.white(channel));
+    console.log(chalk.cyan('Hedef:'), chalk.white(target));
     console.log(chalk.cyan('Mesaj:'), chalk.white(messageText));
     console.log('');
     
@@ -184,8 +99,12 @@ async function sendTelegramMessage(target, messageText, config) {
   } catch (err) {
     console.log(chalk.red(`\n❌ Hata: ${err.message}\n`));
     
-    if (err.message.includes('chat not found')) {
-      console.log(chalk.yellow('⚠️  Chat ID bulunamadı. Önce bot\'a mesaj gönderin.\n'));
+    if (err.message.includes('ECONNREFUSED')) {
+      console.log(chalk.yellow('⚠️  Gateway HTTP sunucusuna bağlanılamadı'));
+      console.log(chalk.gray('Gateway\'i yeniden başlatın: natureco gateway stop && natureco gateway start\n'));
+    } else if (err.message.includes('not connected')) {
+      console.log(chalk.yellow(`⚠️  ${channel === 'whatsapp' ? 'WhatsApp' : 'Telegram'} bağlı değil`));
+      console.log(chalk.gray(`Bağlantıyı kontrol edin: natureco ${channel} status\n`));
     }
     
     process.exit(1);