natureco-cli 2.23.30 → 2.23.32

package/src/commands/cron.js

@@ -1,9 +1,11 @@
 const chalk = require('chalk');
+const F = require('../utils/format');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
 const CRONS_FILE = path.join(os.homedir(), '.natureco', 'crons.json');
+const CRONS_RUNS_FILE = path.join(os.homedir(), '.natureco', 'cron-runs.json');
 
 /**
  * Normalize WhatsApp number from JID format to clean phone number
@@ -36,12 +38,18 @@ function saveCrons(crons) {
 }
 
 async function cron(action, options) {
-  if (!action || !['add', 'list', 'remove'].includes(action)) {
+  if (!action || !['add', 'list', 'remove', 'get', 'edit', 'enable', 'disable', 'runs', 'run'].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 get <name>'));
+    console.log(chalk.cyan('  natureco cron edit <name> [--name <name>] [--schedule <cron>] [--action <channel>] [--target <target>] [--prompt <prompt>]'));
     console.log(chalk.cyan('  natureco cron remove --name <name>'));
+    console.log(chalk.cyan('  natureco cron enable <name>'));
+    console.log(chalk.cyan('  natureco cron disable <name>'));
+    console.log(chalk.cyan('  natureco cron runs <name>'));
+    console.log(chalk.cyan('  natureco cron run <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);
@@ -53,6 +61,18 @@ async function cron(action, options) {
     listCrons();
   } else if (action === 'remove') {
     removeCron(options);
+  } else if (action === 'get') {
+    getCron(options);
+  } else if (action === 'edit') {
+    editCron(options);
+  } else if (action === 'enable') {
+    enableCron(options);
+  } else if (action === 'disable') {
+    disableCron(options);
+  } else if (action === 'runs') {
+    showRuns(options);
+  } else if (action === 'run') {
+    runCron(options);
   }
 }
 
@@ -120,42 +140,42 @@ function listCrons() {
   const crons = loadCrons();
   
   if (crons.length === 0) {
-    console.log(chalk.gray('\n⚪ Kayıtlı cron yok\n'));
+    F.header('Cron Jobs');
+    F.meta('Kayıtlı cron yok');
     return;
   }
   
-  // Load config for fallback targets
   const { getConfig } = require('../utils/config');
   const config = getConfig();
   const defaultWhatsappTarget = normalizeWhatsAppNumber(config.whatsappPhone) || 'N/A';
   const defaultTelegramTarget = (config.telegramAllowedChats && config.telegramAllowedChats[0]) || 'N/A';
   
-  console.log(chalk.green(`\n📅 Kayıtlı Cron'lar (${crons.length})\n`));
-  
-  crons.forEach((c, i) => {
-    // Use target from cron or fallback to config
+  const runs = loadRuns();
+  const rows = crons.map(c => {
     let target = c.target;
     if (!target || target === 'undefined') {
       target = c.action === 'telegram' ? defaultTelegramTarget : defaultWhatsappTarget;
     } else if (c.action === 'whatsapp') {
-      // Normalize WhatsApp JID format
       target = normalizeWhatsAppNumber(target);
     }
-    
-    console.log(chalk.cyan(`${i + 1}. ${c.name}`));
-    console.log(chalk.gray(`   Zamanlama: ${c.schedule}`));
-    console.log(chalk.gray(`   Kanal: ${c.action} → ${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('');
+    const cronRuns = runs.filter(r => r.name === c.name);
+    const lastRun = cronRuns.sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp))[0];
+    return [
+      c.name,
+      c.schedule,
+      c.enabled ? 'Aktif' : 'Pasif',
+      lastRun ? lastRun.timestamp.slice(0, 10) : '—'
+    ];
   });
+  F.header('Cron Jobs');
+  F.table(['Name', 'Schedule', 'Status', 'LastRun'], rows);
 }
 
 function removeCron(options) {
   const { name } = options;
   
   if (!name) {
-    console.log(chalk.red('\n❌ --name parametresi gerekli\n'));
+    F.error('--name parametresi gerekli');
     process.exit(1);
   }
   
@@ -163,15 +183,215 @@ function removeCron(options) {
   const index = crons.findIndex(c => c.name === name);
   
   if (index === -1) {
-    console.log(chalk.red('\n❌ Bu isimde bir cron bulunamadı\n'));
+    F.error('Bu isimde bir cron bulunamadı');
     process.exit(1);
   }
   
   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'));
+  F.success('Cron silindi!');
+  F.meta('Gateway çalışıyorsa yeniden başlatın: natureco gateway stop && natureco gateway start');
+}
+
+function getCron(options) {
+  const { name } = options;
+  if (!name) {
+    F.error('Cron adı gerekli. Kullanım: natureco cron get <name>');
+    process.exit(1);
+  }
+
+  const crons = loadCrons();
+  const cron = crons.find(c => c.name === name);
+  if (!cron) {
+    F.error('"' + name + '" isminde bir cron bulunamadı');
+    process.exit(1);
+  }
+
+  F.header('Cron: ' + cron.name);
+  F.kv('İsim', cron.name);
+  F.kv('Zamanlama', cron.schedule);
+  F.kv('Kanal', cron.action);
+  F.kv('Hedef', cron.target);
+  F.kv('Prompt', cron.prompt);
+  F.kv('Oluşturulma', cron.createdAt);
+  F.kv('Durum', cron.enabled ? 'Aktif' : 'Pasif');
+}
+
+function editCron(options) {
+  const { name, schedule, action, target, prompt } = options;
+  const newName = options['newName'];
+
+  if (!name) {
+    F.error('Cron adı gerekli. Kullanım: natureco cron edit <name> [--name <newName>] [--schedule <cron>] [--action <channel>] [--target <target>] [--prompt <prompt>]');
+    process.exit(1);
+  }
+
+  const crons = loadCrons();
+  const cron = crons.find(c => c.name === name);
+  if (!cron) {
+    F.error('"' + name + '" isminde bir cron bulunamadı');
+    process.exit(1);
+  }
+
+  if (newName) cron.name = newName;
+  if (schedule) {
+    try {
+      const nodeCron = require('node-cron');
+      if (!nodeCron.validate(schedule)) {
+        F.error('Geçersiz cron ifadesi');
+        process.exit(1);
+      }
+    } catch (err) {
+      F.error('node-cron yüklü değil');
+      process.exit(1);
+    }
+    cron.schedule = schedule;
+  }
+  if (action) {
+    if (!['whatsapp', 'telegram'].includes(action)) {
+      F.error('Geçersiz action. Sadece "whatsapp" veya "telegram" kullanılabilir');
+      process.exit(1);
+    }
+    cron.action = action;
+  }
+  if (target) cron.target = target;
+  if (prompt) cron.prompt = prompt;
+
+  saveCrons(crons);
+
+  F.success('Cron güncellendi!');
+  F.kv('İsim', cron.name);
+  F.kv('Zamanlama', cron.schedule);
+  F.kv('Kanal', cron.action);
+  F.kv('Hedef', cron.target);
+  F.kv('Prompt', cron.prompt);
+  F.meta('Gateway çalışıyorsa yeniden başlatın: natureco gateway stop && natureco gateway start');
+}
+
+function enableCron(options) {
+  const { name } = options;
+  if (!name) {
+    F.error('Cron adı gerekli. Kullanım: natureco cron enable <name>');
+    process.exit(1);
+  }
+
+  const crons = loadCrons();
+  const cron = crons.find(c => c.name === name);
+  if (!cron) {
+    F.error('"' + name + '" isminde bir cron bulunamadı');
+    process.exit(1);
+  }
+
+  if (cron.enabled) {
+    F.warning('"' + name + '" cron zaten aktif');
+    return;
+  }
+
+  cron.enabled = true;
+  saveCrons(crons);
+  F.dot(true, name);
+  F.success('"' + name + '" cron aktifleştirildi');
+  F.meta('Gateway çalışıyorsa yeniden başlatın: natureco gateway stop && natureco gateway start');
+}
+
+function disableCron(options) {
+  const { name } = options;
+  if (!name) {
+    F.error('Cron adı gerekli. Kullanım: natureco cron disable <name>');
+    process.exit(1);
+  }
+
+  const crons = loadCrons();
+  const cron = crons.find(c => c.name === name);
+  if (!cron) {
+    F.error('"' + name + '" isminde bir cron bulunamadı');
+    process.exit(1);
+  }
+
+  if (!cron.enabled) {
+    F.warning('"' + name + '" cron zaten pasif');
+    return;
+  }
+
+  cron.enabled = false;
+  saveCrons(crons);
+  F.dot(false, name);
+  F.success('"' + name + '" cron pasifleştirildi');
+  F.meta('Gateway çalışıyorsa yeniden başlatın: natureco gateway stop && natureco gateway start');
+}
+
+function loadRuns() {
+  try {
+    if (!fs.existsSync(CRONS_RUNS_FILE)) {
+      return [];
+    }
+    return JSON.parse(fs.readFileSync(CRONS_RUNS_FILE, 'utf-8'));
+  } catch {
+    return [];
+  }
+}
+
+function showRuns(options) {
+  const { name } = options;
+  if (!name) {
+    F.error('Cron adı gerekli. Kullanım: natureco cron runs <name>');
+    process.exit(1);
+  }
+
+  const runs = loadRuns().filter(r => r.name === name);
+
+  F.header('Cron Runs: ' + name);
+
+  if (runs.length === 0) {
+    F.meta('"' + name + '" için kayıtlı çalışma geçmişi yok');
+    return;
+  }
+
+  const rows = runs.map(r => [
+    r.timestamp,
+    r.status,
+    r.output ? r.output.substring(0, 60) : '—'
+  ]);
+  F.table(['Time', 'Status', 'Output'], rows);
+}
+
+function runCron(options) {
+  const { name } = options;
+  if (!name) {
+    F.error('Cron adı gerekli. Kullanım: natureco cron run <name>');
+    process.exit(1);
+  }
+
+  const crons = loadCrons();
+  const cron = crons.find(c => c.name === name);
+  if (!cron) {
+    F.error('"' + name + '" isminde bir cron bulunamadı');
+    process.exit(1);
+  }
+
+  const timestamp = new Date().toISOString();
+
+  F.info('"' + name + '" cron manuel olarak çalıştırılıyor...');
+  F.kv('Zamanlama', cron.schedule);
+  F.kv('Kanal', cron.action);
+  F.kv('Hedef', cron.target);
+  F.kv('Prompt', cron.prompt);
+  F.success('Cron tetiklendi (mock)');
+
+  // Log the run
+  const runs = loadRuns();
+  runs.push({
+    name,
+    timestamp,
+    status: 'success',
+    output: `Mock run of ${name} (${cron.action} → ${cron.target})`
+  });
+  const dir = path.dirname(CRONS_RUNS_FILE);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  fs.writeFileSync(CRONS_RUNS_FILE, JSON.stringify(runs, null, 2), 'utf-8');
 }
 
 module.exports = cron;

package/src/commands/daemon.js

@@ -1,6 +1,8 @@
 const chalk = require('chalk');
 const { execSync, spawn } = require('child_process');
 const path = require('path');
+const fs = require('fs');
+const os = require('os');
 
 const GATEWAY_SCRIPT = path.join(__dirname, 'gateway-server.js');
 
@@ -11,18 +13,38 @@ function daemon(args) {
   if (action === 'start') return startDaemon();
   if (action === 'stop') return stopDaemon();
   if (action === 'restart') return restartDaemon();
+  if (action === 'install') return installDaemon();
+  if (action === 'uninstall') return uninstallDaemon();
 
   console.log(chalk.red(`\n  ❌ Bilinmeyen komut: ${action}\n`));
-  console.log(chalk.gray('  Kullanım: natureco daemon [status|start|stop|restart]\n'));
+  console.log(chalk.gray('  Kullanım: natureco daemon [status|start|stop|restart|install|uninstall]\n'));
   process.exit(1);
 }
 
 function statusDaemon() {
+  const pidFile = path.join(os.homedir(), '.natureco', 'daemon.pid');
+  let running = false;
+  let pid = null;
+
+  if (fs.existsSync(pidFile)) {
+    try {
+      pid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10);
+      process.kill(pid, 0);
+      running = true;
+    } catch {
+      running = false;
+    }
+  }
+
   console.log(chalk.cyan('\n  ⚙️  Gateway Daemon\n'));
   console.log(chalk.gray('  ' + '─'.repeat(48)));
-  console.log(`  ${chalk.white('Status:')} ${chalk.green('running')}`);
-  console.log(`  ${chalk.white('PID:')}    ${process.pid}`);
-  console.log(`  ${chalk.white('Uptime:')} ${Math.floor(process.uptime())}s`);
+  if (running) {
+    console.log(`  ${chalk.white('Status:')} ${chalk.green('running')}`);
+    console.log(`  ${chalk.white('PID:')}    ${pid}`);
+  } else {
+    console.log(`  ${chalk.white('Status:')} ${chalk.yellow('not running')}`);
+    console.log(`  ${chalk.white('PID:')}    ${chalk.gray('N/A')}`);
+  }
   console.log(chalk.gray('\n  Manage with:') + chalk.cyan(' natureco gateway start|stop|status'));
   console.log();
 }
@@ -57,4 +79,12 @@ function restartDaemon() {
   setTimeout(() => startDaemon(), 1000);
 }
 
+function installDaemon() {
+  console.log(chalk.yellow('\n  daemon install would register as a system service\n'));
+}
+
+function uninstallDaemon() {
+  console.log(chalk.yellow('\n  daemon uninstall would remove system service registration\n'));
+}
+
 module.exports = daemon;