natureco-cli 1.0.37 → 1.0.39

package/package.json

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

package/src/commands/gateway-server.js

@@ -236,6 +236,9 @@ async function startWhatsAppProvider(sessionDir, config) {
         const sender = msg.key.remoteJid?.split('@')[0].split(':')[0];
         const allowedNumbers = config.whatsappAllowedNumbers || [];
         
+        // Log incoming number before access control
+        log('whatsapp', `Incoming from: +${sender}, allowed: ${JSON.stringify(allowedNumbers)}`, 'gray');
+        
         // Access control
         if (allowedNumbers.length > 0 && !allowedNumbers.includes(sender)) {
           log('whatsapp', `blocked message from +${sender} (not in allowed list)`, 'yellow');

package/src/commands/whatsapp.js

@@ -42,8 +42,18 @@ async function whatsapp(action) {
     return statusWhatsApp();
   }
   
+  if (action === 'allow') {
+    const number = process.argv[4];
+    if (!number) {
+      console.log(chalk.red('\n❌ Numara belirtmelisiniz\n'));
+      console.log(chalk.gray('Kullanım: natureco whatsapp allow <numara>\n'));
+      process.exit(1);
+    }
+    return allowNumber(number);
+  }
+  
   console.log(chalk.red('\n❌ Unknown action\n'));
-  console.log(chalk.gray('Available actions: connect, disconnect, status\n'));
+  console.log(chalk.gray('Available actions: connect, disconnect, status, allow\n'));
   process.exit(1);
 }
 
@@ -85,17 +95,6 @@ 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'));
   
@@ -108,14 +107,8 @@ 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 (only for QR code)
-  await startWhatsAppConnection(sessionDir, botId, selectedBot, config, allowedNumbersList);
+  await startWhatsAppConnection(sessionDir, botId, selectedBot, config, []);
 }
 
 async function startWhatsAppConnection(sessionDir, botId, selectedBot, config, allowedNumbersList = []) {
@@ -192,21 +185,15 @@ async function startWhatsAppConnection(sessionDir, botId, selectedBot, config, a
         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?.split(':')[0].replace('@s.whatsapp.net', '');
-        const finalAllowedNumbers = ownNumber ? [ownNumber, ...allowedNumbersList] : allowedNumbersList;
-        
-        // Save to config
+        // Save to config with empty allowed numbers (allow all)
         config.whatsappConnected = true;
         config.whatsappBotId = botId;
         config.whatsappPhone = sock.user?.id;
-        config.whatsappAllowedNumbers = finalAllowedNumbers;
+        config.whatsappAllowedNumbers = [];
         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.cyan('\nİzin listesi:'), chalk.gray('Boş (herkesten mesaj kabul edilir)'));
+        console.log(chalk.gray('Numara eklemek için: natureco whatsapp allow <numara>'));
         
         console.log(chalk.green('\n✅ Kurulum tamamlandı!\n'));
         console.log(chalk.yellow('Gateway ile başlatmak için:'), chalk.cyan('natureco gateway start'));
@@ -305,6 +292,15 @@ function statusWhatsApp() {
     console.log(chalk.cyan('Phone:'), chalk.white(config.whatsappPhone));
   }
   
+  // Show allowed numbers
+  const allowedNumbers = config.whatsappAllowedNumbers || [];
+  if (allowedNumbers.length === 0) {
+    console.log(chalk.cyan('İzin listesi:'), chalk.gray('Boş (herkesten mesaj kabul edilir)'));
+  } else {
+    console.log(chalk.cyan('İzin listesi:'));
+    allowedNumbers.forEach(num => console.log(chalk.white(`  - +${num}`)));
+  }
+  
   // Check if session files exist
   const sessionDir = path.join(WHATSAPP_SESSION_DIR, config.whatsappBotId);
   if (fs.existsSync(sessionDir)) {
@@ -317,4 +313,39 @@ function statusWhatsApp() {
   console.log(chalk.gray('\nDisconnect with: natureco whatsapp disconnect\n'));
 }
 
+function allowNumber(number) {
+  const config = getConfig();
+  
+  if (!config.whatsappConnected) {
+    console.log(chalk.red('\n❌ WhatsApp not connected\n'));
+    console.log(chalk.gray('Connect first with: natureco whatsapp connect\n'));
+    process.exit(1);
+  }
+  
+  // Normalize number (remove +, spaces, etc.)
+  const normalized = number.replace(/[\s\+\-\(\)]/g, '');
+  
+  if (!/^\d+$/.test(normalized)) {
+    console.log(chalk.red('\n❌ Geçersiz numara formatı\n'));
+    console.log(chalk.gray('Örnek: natureco whatsapp allow 905551234567\n'));
+    process.exit(1);
+  }
+  
+  const allowedNumbers = config.whatsappAllowedNumbers || [];
+  
+  if (allowedNumbers.includes(normalized)) {
+    console.log(chalk.yellow('\n⚠️  Bu numara zaten izin listesinde\n'));
+    return;
+  }
+  
+  allowedNumbers.push(normalized);
+  config.whatsappAllowedNumbers = allowedNumbers;
+  saveConfig(config);
+  
+  console.log(chalk.green('\n✅ Numara izin listesine eklendi\n'));
+  console.log(chalk.cyan('Numara:'), chalk.white(`+${normalized}`));
+  console.log(chalk.cyan('Toplam:'), chalk.white(`${allowedNumbers.length} numara`));
+  console.log(chalk.gray('\nGateway\'i yeniden başlatın: natureco gateway stop && natureco gateway start\n'));
+}
+
 module.exports = whatsapp;