natureco-cli 2.8.3 → 2.9.1

package/bin/natureco.js

@@ -106,11 +106,16 @@ program
   });
 
 program
-  .command('cron [action] [params...]')
-  .description('Manage cron jobs (list|add|remove|run|enable|disable|start|logs)')
-  .action((action, params) => {
+  .command('cron <action>')
+  .option('--name <name>', 'Cron job adı')
+  .option('--schedule <schedule>', 'Cron schedule (örnek: "0 9 * * *")')
+  .option('--action <action>', 'Aksiyon: whatsapp veya telegram')
+  .option('--target <target>', 'Hedef numara veya chat ID')
+  .option('--prompt <prompt>', 'AI\'a gönderilecek prompt')
+  .description('Cron job yönetimi (add|list|remove)')
+  .action((action, options) => {
     const cronCmd = require('../src/commands/cron');
-    cronCmd(action, ...(params || []));
+    cronCmd(action, options);
   });
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natureco-cli",
-  "version": "2.8.3",
+  "version": "2.9.1",
   "description": "NatureCo AI Bot Terminal Interface",
   "main": "bin/natureco.js",
   "bin": {
@@ -31,7 +31,7 @@
     "conf": "^10.2.0",
     "eventsource": "^2.0.2",
     "inquirer": "^8.2.7",
-    "node-cron": "^2.0.3",
+    "node-cron": "^3.0.3",
     "node-telegram-bot-api": "^0.65.1",
     "ora": "^5.4.1",
     "pino": "^8.21.0",

package/src/commands/cron.js

@@ -1,383 +1,151 @@
-const inquirer = require('inquirer');
 const chalk = require('chalk');
-const cron = require('node-cron');
-const { getApiKey } = require('../utils/config');
-const { getBots, sendMessage } = require('../utils/api');
-const {
-  loadCronJobs,
-  addCronJob,
-  removeCronJob,
-  updateCronJob,
-  getCronJob,
-  parseCronSchedule,
-  validateCronExpression,
-  logCronOutput,
-  getCronLog,
-} = require('../utils/cron');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 
-async function cronCommand(action, ...args) {
-  if (!action || action === 'list') {
-    return listCronJobs();
-  }
-  
-  if (action === 'add') {
-    return addCronJobInteractive();
-  }
-  
-  if (action === 'remove') {
-    const id = args[0];
-    if (!id) {
-      console.log(chalk.red('\n❌ Job ID required\n'));
-      console.log(chalk.gray('Usage: natureco cron remove <id>\n'));
-      process.exit(1);
-    }
-    return removeCronJobCommand(id);
-  }
-  
-  if (action === 'run') {
-    const id = args[0];
-    if (!id) {
-      console.log(chalk.red('\n❌ Job ID required\n'));
-      console.log(chalk.gray('Usage: natureco cron run <id>\n'));
-      process.exit(1);
-    }
-    return runCronJobNow(id);
-  }
-  
-  if (action === 'enable') {
-    const id = args[0];
-    if (!id) {
-      console.log(chalk.red('\n❌ Job ID required\n'));
-      console.log(chalk.gray('Usage: natureco cron enable <id>\n'));
-      process.exit(1);
-    }
-    return toggleCronJob(id, true);
-  }
-  
-  if (action === 'disable') {
-    const id = args[0];
-    if (!id) {
-      console.log(chalk.red('\n❌ Job ID required\n'));
-      console.log(chalk.gray('Usage: natureco cron disable <id>\n'));
-      process.exit(1);
-    }
-    return toggleCronJob(id, false);
-  }
-  
-  if (action === 'start') {
-    return startCronDaemon();
-  }
-  
-  if (action === 'logs') {
-    const id = args[0];
-    if (!id) {
-      console.log(chalk.red('\n❌ Job ID required\n'));
-      console.log(chalk.gray('Usage: natureco cron logs <id>\n'));
-      process.exit(1);
+const CRONS_FILE = path.join(os.homedir(), '.natureco', 'crons.json');
+
+function loadCrons() {
+  try {
+    if (!fs.existsSync(CRONS_FILE)) {
+      return [];
     }
-    return showCronLogs(id);
+    return JSON.parse(fs.readFileSync(CRONS_FILE, 'utf-8'));
+  } catch {
+    return [];
   }
-  
-  console.log(chalk.red(`\n❌ Unknown action: ${action}\n`));
-  console.log(chalk.gray('Available actions: list, add, remove, run, enable, disable, start, logs\n'));
-  process.exit(1);
 }
 
-function listCronJobs() {
-  const jobs = loadCronJobs();
-  
-  if (jobs.length === 0) {
-    console.log(chalk.gray('\nNo cron jobs found.\n'));
-    console.log(chalk.gray('Create one with: natureco cron add\n'));
-    return;
+function saveCrons(crons) {
+  const dir = path.dirname(CRONS_FILE);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
   }
-  
-  console.log(chalk.yellow('\nCron Jobs:\n'));
-  
-  jobs.forEach(job => {
-    const status = job.enabled ? chalk.green('✓ enabled') : chalk.gray('✗ disabled');
-    console.log(`  ${chalk.cyan(job.id)} ${status}`);
-    console.log(chalk.white(`    ${job.name}`));
-    console.log(chalk.gray(`    Bot: ${job.botName} | Schedule: ${job.schedule}`));
-    console.log(chalk.gray(`    Output: ${job.outputType === 'file' ? 'log file' : 'terminal'}`));
-    console.log('');
-  });
+  fs.writeFileSync(CRONS_FILE, JSON.stringify(crons, null, 2), 'utf-8');
 }
 
-async function addCronJobInteractive() {
-  const apiKey = getApiKey();
-  
-  if (!apiKey) {
-    console.log(chalk.red('\n❌ Not logged in. Run "natureco login" first.\n'));
-    process.exit(1);
-  }
-  
-  let botList;
-  try {
-    botList = await getBots(apiKey);
-  } catch (err) {
-    console.log(chalk.red(`\n❌ Error: ${err.message}\n`));
+async function cron(action, options) {
+  if (!action || !['add', 'list', 'remove'].includes(action)) {
+    console.log(chalk.red('\n❌ Geçersiz aksiyon\n'));
+    console.log(chalk.gray('Kullanım:'));
+    console.log(chalk.cyan('  natureco cron add --name <name> --schedule <cron> --action <channel> --target <target> --prompt <prompt>'));
+    console.log(chalk.cyan('  natureco cron list'));
+    console.log(chalk.cyan('  natureco cron remove --name <name>'));
+    console.log(chalk.gray('\nÖrnek:'));
+    console.log(chalk.cyan('  natureco cron add --name "bitcoin-fiyat" --schedule "0 9 * * *" --action "whatsapp" --target "+905422842631" --prompt "Bugünkü Bitcoin fiyatını öğren ve kısaca bildir"\n'));
     process.exit(1);
   }
   
-  if (!botList || !botList.bots || botList.bots.length === 0) {
-    console.log(chalk.gray('No bots found. Create one at https://developers.natureco.me\n'));
-    process.exit(1);
-  }
-  
-  process.stdin.resume();
-  
-  const answers = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'name',
-      message: 'Job name:',
-      validate: (val) => val.trim() !== '' || 'Name cannot be empty',
-    },
-    {
-      type: 'input',
-      name: 'message',
-      message: 'Message to send to bot:',
-      validate: (val) => val.trim() !== '' || 'Message cannot be empty',
-    },
-    {
-      type: 'list',
-      name: 'botId',
-      message: 'Select bot:',
-      choices: botList.bots.map(b => ({ name: b.name, value: b.id })),
-    },
-    {
-      type: 'list',
-      name: 'scheduleType',
-      message: 'Schedule type:',
-      choices: [
-        { name: 'Daily at specific time', value: 'daily' },
-        { name: 'Every X hours', value: 'hours' },
-        { name: 'Custom cron expression', value: 'custom' },
-      ],
-    },
-  ]);
-  
-  let schedule;
-  
-  if (answers.scheduleType === 'daily') {
-    const timeAnswer = await inquirer.prompt([
-      {
-        type: 'input',
-        name: 'time',
-        message: 'Time (HH:MM):',
-        default: '09:00',
-        validate: (val) => {
-          const match = val.match(/^(\d{1,2}):(\d{2})$/);
-          if (!match) return 'Invalid time format. Use HH:MM';
-          const hour = parseInt(match[1]);
-          const minute = parseInt(match[2]);
-          if (hour < 0 || hour > 23 || minute < 0 || minute > 59) {
-            return 'Invalid time';
-          }
-          return true;
-        },
-      },
-    ]);
-    schedule = `daily at ${timeAnswer.time}`;
-  } else if (answers.scheduleType === 'hours') {
-    const hoursAnswer = await inquirer.prompt([
-      {
-        type: 'input',
-        name: 'hours',
-        message: 'Every X hours:',
-        default: '1',
-        validate: (val) => {
-          const num = parseInt(val);
-          if (isNaN(num) || num < 1 || num > 24) {
-            return 'Enter a number between 1 and 24';
-          }
-          return true;
-        },
-      },
-    ]);
-    schedule = `every ${hoursAnswer.hours} hours`;
-  } else {
-    const cronAnswer = await inquirer.prompt([
-      {
-        type: 'input',
-        name: 'cron',
-        message: 'Cron expression:',
-        default: '0 9 * * *',
-        validate: (val) => {
-          const parsed = parseCronSchedule(val);
-          if (!validateCronExpression(parsed)) {
-            return 'Invalid cron expression';
-          }
-          return true;
-        },
-      },
-    ]);
-    schedule = cronAnswer.cron;
-  }
-  
-  const outputAnswer = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'outputType',
-      message: 'Output destination:',
-      choices: [
-        { name: 'Save to log file', value: 'file' },
-        { name: 'Print to terminal', value: 'terminal' },
-      ],
-      default: 'file',
-    },
-  ]);
-  
-  const bot = botList.bots.find(b => b.id === answers.botId);
-  
-  const job = addCronJob({
-    name: answers.name,
-    message: answers.message,
-    botId: answers.botId,
-    botName: bot.name,
-    schedule,
-    outputType: outputAnswer.outputType,
-  });
-  
-  console.log(chalk.green(`\n✅ Cron job created: ${job.id}\n`));
-  console.log(chalk.gray('Start the cron daemon with: natureco cron start\n'));
-}
-
-function removeCronJobCommand(id) {
-  const removed = removeCronJob(id);
-  if (removed) {
-    console.log(chalk.green(`\n✅ Cron job removed: ${id}\n`));
-  } else {
-    console.log(chalk.red(`\n❌ Cron job not found: ${id}\n`));
-    process.exit(1);
+  if (action === 'add') {
+    await addCron(options);
+  } else if (action === 'list') {
+    listCrons();
+  } else if (action === 'remove') {
+    removeCron(options);
   }
 }
 
-async function runCronJobNow(id) {
-  const job = getCronJob(id);
-  if (!job) {
-    console.log(chalk.red(`\n❌ Cron job not found: ${id}\n`));
+async function addCron(options) {
+  const { name, schedule, action, target, prompt } = options;
+  
+  if (!name || !schedule || !action || !target || !prompt) {
+    console.log(chalk.red('\n❌ Eksik parametre\n'));
+    console.log(chalk.gray('Gerekli parametreler: --name, --schedule, --action, --target, --prompt\n'));
     process.exit(1);
   }
   
-  const apiKey = getApiKey();
-  if (!apiKey) {
-    console.log(chalk.red('\n❌ Not logged in. Run "natureco login" first.\n'));
+  if (!['whatsapp', 'telegram'].includes(action)) {
+    console.log(chalk.red('\n❌ Geçersiz action. Sadece "whatsapp" veya "telegram" kullanılabilir\n'));
     process.exit(1);
   }
   
-  console.log(chalk.yellow(`\n⏳ Running job: ${job.name}...\n`));
-  
+  // Validate cron expression
   try {
-    const response = await sendMessage(apiKey, job.botId, job.message, null, '');
-    const reply = response.reply || response.message || 'No response';
-    
-    const output = `Job: ${job.name}\nBot: ${job.botName}\nMessage: ${job.message}\nReply: ${reply}`;
-    
-    if (job.outputType === 'file') {
-      logCronOutput(job.id, output);
-      console.log(chalk.green('✅ Job completed. Output saved to log file.\n'));
-    } else {
-      console.log(chalk.green('✅ Job completed:\n'));
-      console.log(chalk.white(reply));
-      console.log('');
+    const nodeCron = require('node-cron');
+    if (!nodeCron.validate(schedule)) {
+      console.log(chalk.red('\n❌ Geçersiz cron ifadesi\n'));
+      console.log(chalk.gray('Örnek: "0 9 * * *" (her gün saat 09:00)\n'));
+      process.exit(1);
     }
   } catch (err) {
-    console.log(chalk.red(`\n❌ Error: ${err.message}\n`));
+    console.log(chalk.red('\n❌ node-cron yüklü değil\n'));
+    console.log(chalk.yellow('Yüklemek için:'), chalk.cyan('npm install -g node-cron\n'));
     process.exit(1);
   }
-}
-
-function toggleCronJob(id, enabled) {
-  const updated = updateCronJob(id, { enabled });
-  if (updated) {
-    const status = enabled ? 'enabled' : 'disabled';
-    console.log(chalk.green(`\n✅ Cron job ${status}: ${id}\n`));
-  } else {
-    console.log(chalk.red(`\n❌ Cron job not found: ${id}\n`));
+  
+  const crons = loadCrons();
+  
+  // Check if name already exists
+  if (crons.find(c => c.name === name)) {
+    console.log(chalk.red('\n❌ Bu isimde bir cron zaten var\n'));
+    console.log(chalk.yellow('Önce silin:'), chalk.cyan(`natureco cron remove --name "${name}"\n`));
     process.exit(1);
   }
+  
+  const newCron = {
+    name,
+    schedule,
+    action,
+    target,
+    prompt,
+    createdAt: new Date().toISOString(),
+    enabled: true
+  };
+  
+  crons.push(newCron);
+  saveCrons(crons);
+  
+  console.log(chalk.green('\n✅ Cron eklendi!\n'));
+  console.log(chalk.cyan('İsim:'), chalk.white(name));
+  console.log(chalk.cyan('Zamanlama:'), chalk.white(schedule));
+  console.log(chalk.cyan('Kanal:'), chalk.white(action));
+  console.log(chalk.cyan('Hedef:'), chalk.white(target));
+  console.log(chalk.cyan('Prompt:'), chalk.white(prompt));
+  console.log(chalk.gray('\nCron\'lar gateway başlatıldığında aktif olur.'));
+  console.log(chalk.gray('Gateway çalışıyorsa yeniden başlatın: natureco gateway stop && natureco gateway start\n'));
 }
 
-async function startCronDaemon() {
-  const apiKey = getApiKey();
-  if (!apiKey) {
-    console.log(chalk.red('\n❌ Not logged in. Run "natureco login" first.\n'));
-    process.exit(1);
-  }
-  
-  console.log(chalk.green('🚀 Cron daemon started\n'));
-  console.log(chalk.gray('Press Ctrl+C to stop\n'));
+function listCrons() {
+  const crons = loadCrons();
   
-  const jobs = loadCronJobs();
-  const tasks = [];
-  
-  jobs.forEach(job => {
-    if (!job.enabled) return;
-    
-    const cronExpression = parseCronSchedule(job.schedule);
-    
-    if (!validateCronExpression(cronExpression)) {
-      console.log(chalk.red(`❌ Invalid cron expression for job ${job.id}: ${job.schedule}`));
-      return;
-    }
-    
-    const task = cron.schedule(cronExpression, async () => {
-      console.log(chalk.yellow(`⏳ Running job: ${job.name}`));
-      
-      try {
-        const response = await sendMessage(apiKey, job.botId, job.message, null, '');
-        const reply = response.reply || response.message || 'No response';
-        
-        const output = `Job: ${job.name}\nBot: ${job.botName}\nMessage: ${job.message}\nReply: ${reply}`;
-        
-        if (job.outputType === 'file') {
-          logCronOutput(job.id, output);
-          console.log(chalk.green(`✅ Job completed: ${job.name} (saved to log)`));
-        } else {
-          console.log(chalk.green(`✅ Job completed: ${job.name}`));
-          console.log(chalk.white(reply));
-        }
-      } catch (err) {
-        console.log(chalk.red(`❌ Job failed: ${job.name} - ${err.message}`));
-      }
-    });
-    
-    tasks.push(task);
-    console.log(chalk.cyan(`✓ Scheduled: ${job.name} (${job.schedule})`));
-  });
-  
-  if (tasks.length === 0) {
-    console.log(chalk.gray('No enabled jobs found.\n'));
-    process.exit(0);
+  if (crons.length === 0) {
+    console.log(chalk.gray('\n⚪ Kayıtlı cron yok\n'));
+    return;
   }
   
-  console.log('');
+  console.log(chalk.green(`\n📅 Kayıtlı Cron'lar (${crons.length})\n`));
   
-  // Keep process alive
-  process.on('SIGINT', () => {
-    console.log(chalk.gray('\n\n👋 Stopping cron daemon...\n'));
-    tasks.forEach(task => task.stop());
-    process.exit(0);
+  crons.forEach((c, i) => {
+    console.log(chalk.cyan(`${i + 1}. ${c.name}`));
+    console.log(chalk.gray(`   Zamanlama: ${c.schedule}`));
+    console.log(chalk.gray(`   Kanal: ${c.action} → ${c.target}`));
+    console.log(chalk.gray(`   Prompt: ${c.prompt.substring(0, 60)}${c.prompt.length > 60 ? '...' : ''}`));
+    console.log(chalk.gray(`   Durum: ${c.enabled ? '✅ Aktif' : '❌ Pasif'}`));
+    console.log('');
   });
 }
 
-function showCronLogs(id) {
-  const job = getCronJob(id);
-  if (!job) {
-    console.log(chalk.red(`\n❌ Cron job not found: ${id}\n`));
+function removeCron(options) {
+  const { name } = options;
+  
+  if (!name) {
+    console.log(chalk.red('\n❌ --name parametresi gerekli\n'));
     process.exit(1);
   }
   
-  const logs = getCronLog(id);
-  if (!logs) {
-    console.log(chalk.gray(`\nNo logs found for job: ${job.name}\n`));
-    return;
+  const crons = loadCrons();
+  const index = crons.findIndex(c => c.name === name);
+  
+  if (index === -1) {
+    console.log(chalk.red('\n❌ Bu isimde bir cron bulunamadı\n'));
+    process.exit(1);
   }
   
-  console.log(chalk.yellow(`\nLogs for job: ${job.name}\n`));
-  console.log(logs);
+  crons.splice(index, 1);
+  saveCrons(crons);
+  
+  console.log(chalk.green('\n✅ Cron silindi!\n'));
+  console.log(chalk.gray('Gateway çalışıyorsa yeniden başlatın: natureco gateway stop && natureco gateway start\n'));
 }
 
-module.exports = cronCommand;
+module.exports = cron;

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.3</div>
+      <div class="version-badge" id="version-badge">v2.9.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.3',
+          version: 'v2.9.1',
           bots: cfg.bots || [],
           telegramToken: cfg.telegramToken || null,
           whatsappConnected: cfg.whatsappConnected || false,

package/src/commands/gateway-server.js

@@ -138,7 +138,7 @@ async function startGateway() {
 
 async function runGatewayWorker() {
   // This runs in the background
-  log('gateway', 'Starting NatureCo Gateway v2.8.3...', 'green');
+  log('gateway', 'Starting NatureCo Gateway v2.9.1...', 'green');
   
   // Load config
   const { getConfig } = require('../utils/config');
@@ -179,6 +179,9 @@ async function runGatewayWorker() {
   // Start HTTP server for message sending
   startHttpServer();
   
+  // Load and start cron jobs
+  startCronJobs(config);
+  
   // Health check every 60 seconds
   setInterval(() => {
     log('gateway', 'health check: OK', 'gray');
@@ -571,6 +574,87 @@ function startHttpServer() {
   });
 }
 
+function startCronJobs(config) {
+  try {
+    const nodeCron = require('node-cron');
+    const CRONS_FILE = path.join(os.homedir(), '.natureco', 'crons.json');
+    
+    if (!fs.existsSync(CRONS_FILE)) {
+      log('cron', 'No cron jobs configured', 'gray');
+      return;
+    }
+    
+    const crons = JSON.parse(fs.readFileSync(CRONS_FILE, 'utf-8'));
+    const enabledCrons = crons.filter(c => c.enabled);
+    
+    if (enabledCrons.length === 0) {
+      log('cron', 'No enabled cron jobs', 'gray');
+      return;
+    }
+    
+    log('cron', `Loading ${enabledCrons.length} cron job(s)...`, 'cyan');
+    
+    enabledCrons.forEach(cronJob => {
+      try {
+        nodeCron.schedule(cronJob.schedule, async () => {
+          log('cron', `Triggered: ${cronJob.name}`, 'yellow');
+          
+          try {
+            // Send prompt to AI
+            const { sendMessage } = require('../utils/api');
+            const conversationId = `cron_${cronJob.name.replace(/\s+/g, '_')}`;
+            
+            log('cron', `Sending prompt to AI...`, 'cyan');
+            const response = await sendMessage(null, null, cronJob.prompt, conversationId);
+            const reply = response?.reply || response?.message || '';
+            
+            if (!reply) {
+              log('cron', `No response from AI`, 'red');
+              return;
+            }
+            
+            log('cron', `AI response received (${reply.length} chars)`, 'green');
+            
+            // Send to target channel
+            if (cronJob.action === 'whatsapp') {
+              if (!global.whatsappSock) {
+                log('cron', `WhatsApp not connected, skipping`, 'red');
+                return;
+              }
+              
+              const normalizedTarget = cronJob.target.replace(/[^\d]/g, '');
+              const jid = `${normalizedTarget}@s.whatsapp.net`;
+              
+              await global.whatsappSock.sendMessage(jid, { text: reply });
+              log('cron', `Sent to WhatsApp: ${cronJob.target}`, 'green');
+              
+            } else if (cronJob.action === 'telegram') {
+              if (!global.telegramBot) {
+                log('cron', `Telegram not connected, skipping`, 'red');
+                return;
+              }
+              
+              await global.telegramBot.sendMessage(cronJob.target, reply);
+              log('cron', `Sent to Telegram: ${cronJob.target}`, 'green');
+            }
+            
+          } catch (err) {
+            log('cron', `Error executing ${cronJob.name}: ${err.message}`, 'red');
+          }
+        });
+        
+        log('cron', `Scheduled: ${cronJob.name} (${cronJob.schedule})`, 'green');
+        
+      } catch (err) {
+        log('cron', `Failed to schedule ${cronJob.name}: ${err.message}`, 'red');
+      }
+    });
+    
+  } catch (err) {
+    log('cron', `Failed to load cron jobs: ${err.message}`, 'red');
+  }
+}
+
 function stopGateway() {
   if (!fs.existsSync(PID_FILE)) {
     console.log(chalk.gray('\n⚠️  Gateway not running\n'));