natureco-cli 1.0.38 → 1.0.40

package/package.json

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

package/src/commands/gateway-server.js

@@ -45,6 +45,12 @@ function log(module, message, color = 'white') {
   }
 }
 
+// Number matching helper - compare last 10 digits only
+function numberMatches(incoming, allowed) {
+  const clean = (n) => n.replace(/\D/g, '').slice(-10);
+  return clean(incoming) === clean(allowed);
+}
+
 async function gatewayServer(action) {
   // Check if running as background worker
   if (process.argv.includes('--gateway-worker')) {
@@ -239,8 +245,8 @@ async function startWhatsAppProvider(sessionDir, config) {
         // 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)) {
+        // Access control - compare last 10 digits
+        if (allowedNumbers.length > 0 && !allowedNumbers.some(n => numberMatches(n, sender))) {
           log('whatsapp', `blocked message from +${sender} (not in allowed list)`, 'yellow');
           continue;
         }

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);
 }
 
@@ -91,8 +101,13 @@ async function connectWhatsApp() {
     {
       type: 'input',
       name: 'allowedNumbers',
-      message: 'Hangi numaralar mesaj gönderebilir? (virgülle ayırın, boş bırakırsan sadece kendi numaran)',
-      default: '',
+      message: 'Hangi numaralar mesaj gönderebilir? (virgülle ayırın, zorunlu)',
+      validate: (input) => {
+        if (!input || input.trim().length === 0) {
+          return 'En az bir numara girmelisiniz';
+        }
+        return true;
+      },
     },
   ]);
   
@@ -111,7 +126,7 @@ async function connectWhatsApp() {
   // Parse allowed numbers
   const allowedNumbersList = allowedNumbers
     .split(',')
-    .map(n => n.trim())
+    .map(n => n.trim().replace(/[\s\+\-\(\)]/g, ''))
     .filter(n => n.length > 0);
   
   // Start connection (only for QR code)
@@ -192,20 +207,16 @@ 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 allowed numbers
         config.whatsappConnected = true;
         config.whatsappBotId = botId;
         config.whatsappPhone = sock.user?.id;
-        config.whatsappAllowedNumbers = finalAllowedNumbers;
+        config.whatsappAllowedNumbers = allowedNumbersList;
         saveConfig(config);
         
-        if (finalAllowedNumbers.length > 0) {
+        if (allowedNumbersList.length > 0) {
           console.log(chalk.cyan('\nİzin verilen numaralar:'));
-          finalAllowedNumbers.forEach(num => console.log(chalk.gray(`  - ${num}`)));
+          allowedNumbersList.forEach(num => console.log(chalk.gray(`  - +${num}`)));
         }
         
         console.log(chalk.green('\n✅ Kurulum tamamlandı!\n'));
@@ -305,6 +316,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 +337,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;