avocavo 1.1.2 → 1.1.3

package/bin/avocavo.js

@@ -18,37 +18,37 @@ function secureReadFile(filePath) {
   try {
     // Resolve the absolute path
     const resolvedPath = path.resolve(filePath);
-    
+
     // Get the current working directory
     const cwd = process.cwd();
-    
+
     // Check if the resolved path is within the current working directory or its subdirectories
     if (!resolvedPath.startsWith(cwd)) {
       throw new Error('File access denied: Path traversal detected. Only files within the current directory are allowed.');
     }
-    
+
     // Additional security: block access to sensitive system files
     const basename = path.basename(resolvedPath).toLowerCase();
     const forbidden = ['passwd', 'shadow', 'hosts', '.env', '.git', 'config'];
     if (forbidden.some(name => basename.includes(name))) {
       throw new Error('File access denied: Access to system/configuration files is not allowed.');
     }
-    
+
     // Check if file exists and is readable
     if (!fs.existsSync(resolvedPath)) {
       throw new Error(`File not found: ${filePath}`);
     }
-    
+
     const stats = fs.statSync(resolvedPath);
     if (!stats.isFile()) {
       throw new Error(`Not a file: ${filePath}`);
     }
-    
+
     // Limit file size to prevent memory issues (max 10MB)
     if (stats.size > 10 * 1024 * 1024) {
       throw new Error('File too large: Maximum file size is 10MB');
     }
-    
+
     return fs.readFileSync(resolvedPath, 'utf8');
   } catch (error) {
     throw new Error(`Failed to read file: ${error.message}`);
@@ -77,23 +77,23 @@ program
       const success = await auth.login(options.provider, false); // Disable Supabase OAuth
       if (success) {
         console.log(chalk.green('✅ Successfully logged in!'));
-        
+
         // Check for API keys - always check server for all keys
         try {
           const KeyManager = require('../lib/keys');
           const keyManager = new KeyManager(auth, program.opts().baseUrl);
-          
+
           // Get user's API keys from server
           const headers = await keyManager.getAuthHeaders();
           const response = await axios.get(`${program.opts().baseUrl}/api/keys`, { headers });
-          
+
           if (response.data.keys && response.data.keys.length > 0) {
             const keyCount = response.data.keys.length;
-            
+
             // Check if user already has a selected key
             let currentKey = await auth.getApiKey();
             let keyWorked = false;
-            
+
             if (currentKey) {
               // Test the current selected key
               const api = new NutritionAPI(currentKey, program.opts().baseUrl, 30000, auth);
@@ -109,15 +109,15 @@ program
                 }
               }
             }
-            
+
             // If no working key and user has exactly 1 key, auto-select it
             if (!keyWorked && keyCount === 1) {
               console.log(chalk.cyan('🔄 Auto-selecting your API key...'));
               const singleKey = response.data.keys[0];
-              
+
               // Store the key as selected
               await auth.storeApiKeySecurely(auth.getUserInfo().email, singleKey.api_key);
-              
+
               // Test the auto-selected key
               const api = new NutritionAPI(singleKey.api_key, program.opts().baseUrl, 30000, auth);
               try {
@@ -184,7 +184,7 @@ program
   .action(async () => {
     try {
       const isLoggedIn = auth.isLoggedIn();
-      
+
       if (!isLoggedIn) {
         console.log(chalk.yellow('⚠️  Not logged in'));
         console.log(chalk.cyan('💡 Run: avocavo login'));
@@ -194,12 +194,12 @@ program
       const userInfo = auth.getUserInfo();
       console.log(chalk.green('✅ Logged in'));
       console.log(chalk.cyan(`📧 Email: ${userInfo.email || 'Unknown'}`));
-      
+
       // Check for selected API key (separate from JWT auth token)
       const selectedApiKey = await auth.getApiKey();
       if (selectedApiKey && (selectedApiKey.startsWith('ak_') || selectedApiKey.startsWith('SK'))) {
         console.log(chalk.gray(`🔑 API Key: ${selectedApiKey.substring(0, 12)}...`));
-        
+
         // Debug storage method (hidden from users)
         if (process.env.AVOCAVO_DEBUG) {
           const insecureStorage = auth.config.get('insecureStorage');
@@ -210,7 +210,7 @@ program
           }
         }
       }
-      
+
       // Use selected API key for nutrition API calls, JWT for auth management
       if (selectedApiKey) {
         try {
@@ -219,7 +219,7 @@ program
           console.log(chalk.cyan(`🎟️  Tier: ${account.api_tier}`));
           console.log(chalk.cyan(`📈 Usage: ${account.usage.current_month}/${account.usage.monthly_limit || 'unlimited'}`));
           console.log(chalk.cyan(`📅 Reset: ${new Date(account.usage.reset_date).toLocaleDateString()}`));
-          
+
           // Show detailed credit buckets if available
           if (account.credits && account.credits.total > 0) {
             console.log(chalk.magenta('\n💰 Credit Buckets:'));
@@ -256,7 +256,7 @@ program
                   return;
                 }
               }
-              
+
               console.log(chalk.cyan(`💡 You have ${keysList.keys.length} API keys but none selected. Choose one to activate:`));
               console.log(chalk.cyan('   avocavo keys switch'));
               console.log(chalk.gray('   or'));
@@ -355,9 +355,9 @@ program
       const api = await getApiClient();
       const globalOpts = program.opts();
       const verbose = options.verbose || globalOpts.verbose;
-      
+
       const result = await api.analyzeIngredient(ingredient, options.verify, verbose);
-      
+
       if (program.opts().json) {
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -366,55 +366,55 @@ program
       if (result.success) {
         console.log(chalk.green(`✅ ${result.ingredient}`));
         console.log(formatNutrition(result.nutrition));
-        
+
         // USDA information - show basic info by default, more with flags
         const usda = result.metadata?.usda_match;
         if (usda) {
           console.log(`\n  📋 ${chalk.gray('USDA Reference:')} ${chalk.cyan(usda.description)}`);
           console.log(`  🔢 ${chalk.gray('FDC ID:')} ${chalk.yellow(usda.fdc_id)}`);
-          
+
           // Always show USDA link for verification
-          const verificationUrl = result.metadata?.usda_link || 
-                                 `https://fdc.nal.usda.gov/fdc-app.html#/food-details/${usda.fdc_id}`;
+          const verificationUrl = result.metadata?.usda_link ||
+            `https://fdc.nal.usda.gov/fdc-app.html#/food-details/${usda.fdc_id}`;
           console.log(`  🔗 ${chalk.gray('USDA Link:')} ${chalk.underline(verificationUrl)}`);
-          
+
           // Additional details with flags
           if (verbose || options.debug) {
             console.log(`  📊 ${chalk.gray('Data Type:')} ${chalk.blue(usda.data_type)}`);
           }
         }
-        
+
         // Estimated grams and quality information
         const parsing = result.parsing;
         if (parsing?.estimated_grams) {
           console.log(`\n  ⚖️  ${chalk.gray('Estimated Grams:')} ${chalk.magenta(parsing.estimated_grams + 'g')}`);
         }
-        
+
         // Match quality (more reliable than confidence score)
         if (result.metadata?.match_quality) {
           console.log(`  🎯 ${chalk.gray('Match Quality:')} ${chalk.blue(result.metadata.match_quality)}`);
         }
-        
+
         // Only show confidence with verbose flag since it can be misleadingly low for good matches
         if ((verbose || options.debug) && result.metadata?.confidence !== undefined) {
           const confidence = (result.metadata.confidence * 100).toFixed(1);
           console.log(`  📊 ${chalk.gray('Algorithm Confidence:')} ${chalk.yellow(confidence + '%')} ${chalk.gray('(internal scoring)')}`);
         }
-        
+
         // Warning about null nutrients
         const nullNutrients = Object.entries(result.nutrition || {})
           .filter(([key, value]) => value === null)
           .map(([key]) => key);
-        
+
         if (nullNutrients.length > 0) {
           console.log(`\n  ⚠️  ${chalk.yellow('Note:')} ${chalk.gray(`${nullNutrients.length} nutrients unavailable in USDA database`)}`);
         }
-        
+
         // Performance metrics only with --verbose or --debug
         if (verbose || options.debug) {
           console.log(formatPerformanceMetrics(result));
         }
-        
+
         // Quick performance indicators with specific flags
         if (options.timing) {
           const processingTime = result.metadata?.processing_time_ms;
@@ -422,8 +422,8 @@ program
             console.log(`  ⏱️  ${chalk.gray('Processing Time:')} ${formatResponseTime(processingTime)}`);
           }
         }
-        
-        
+
+
       } else {
         console.log(chalk.red(`❌ ${result.error}`));
         process.exit(1);
@@ -447,7 +447,7 @@ program
   .action(async (options) => {
     try {
       let ingredients = [];
-      
+
       if (options.file) {
         const content = secureReadFile(options.file);
         ingredients = content.split('\n').map(line => line.trim()).filter(line => line);
@@ -476,11 +476,11 @@ program
       const api = await getApiClient();
       const globalOpts = program.opts();
       const verbose = options.verbose || globalOpts.verbose;
-      
+
       console.log(chalk.cyan(`🍳 Analyzing recipe with ${ingredients.length} ingredients (${servings} servings)...`));
-      
+
       const result = await api.analyzeRecipe(ingredients, servings, verbose);
-      
+
       if (program.opts().json) {
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -489,17 +489,17 @@ program
       if (result.success) {
         console.log(chalk.green('✅ Recipe analysis complete!'));
         console.log('');
-        
+
         // Total nutrition
         console.log(chalk.bold('📊 Total Nutrition:'));
         console.log(formatNutrition(result.nutrition.total));
         console.log('');
-        
+
         // Per-serving nutrition
         console.log(chalk.bold(`🍽️  Per Serving (${servings} servings):`));
         console.log(formatNutrition(result.nutrition.per_serving));
         console.log('');
-        
+
         // Ingredient breakdown
         if (result.nutrition.ingredients && result.nutrition.ingredients.length > 0) {
           console.log(chalk.bold('📋 Ingredient Breakdown:'));
@@ -513,24 +513,24 @@ program
             ing.nutrition ? `${ing.nutrition.fiber}g` : 'N/A',
             ing.nutrition ? `${ing.nutrition.sodium}mg` : 'N/A'
           ]);
-          
+
           console.log(formatTable([
             ['Status', 'Ingredient', 'Calories', 'Protein', 'Fat', 'Carbs', 'Fiber', 'Sodium'],
             ...tableData
           ]));
-          
+
           // USDA verification details - show based on flags
-          const ingredientsWithUSDA = result.nutrition.ingredients.filter(ing => 
+          const ingredientsWithUSDA = result.nutrition.ingredients.filter(ing =>
             ing.metadata?.usda_match
           );
-          
+
           if (ingredientsWithUSDA.length > 0) {
             console.log('');
-            
+
             // Clean default: just show count
             const usdaCount = ingredientsWithUSDA.length;
             console.log(chalk.gray(`🎯 USDA verified: ${usdaCount}/${ingredients.length} ingredients`));
-            
+
             // Detailed USDA info with --verbose or --verify
             if (options.verbose || options.verify) {
               console.log('');
@@ -539,12 +539,12 @@ program
                 const usda = ing.metadata.usda_match;
                 console.log(chalk.gray(`  ${ing.ingredient} →`));
                 console.log(chalk.cyan(`    📋 ${usda.description}`));
-                
+
                 if (options.verbose) {
                   console.log(chalk.yellow(`    🔢 FDC ID: ${usda.fdc_id}`));
                   console.log(chalk.blue(`    📊 Type: ${usda.data_type}`));
                 }
-                
+
                 if (options.verify && usda.verification_url) {
                   console.log(chalk.underline(`    🔗 ${usda.verification_url}`));
                 }
@@ -552,20 +552,20 @@ program
             }
           }
         }
-        
+
         // Recipe-level performance metrics (NEW) - only with --verbose
         if (options.verbose || options.debug) {
           console.log('');
           console.log(chalk.gray('Recipe Performance:'));
-          
+
           if (result.usda_matches !== undefined) {
             console.log(`  🎯 ${chalk.gray('USDA Matches:')} ${chalk.green(result.usda_matches)}`);
           }
-          
+
           if (result.processing_time_ms !== undefined) {
             console.log(`  ⏱️  ${chalk.gray('Total Time:')} ${formatResponseTime(result.processing_time_ms)}`);
           }
-          
+
         }
       } else {
         console.log(chalk.red(`❌ ${result.error}`));
@@ -587,7 +587,7 @@ program
   .action(async (options) => {
     try {
       let ingredients = [];
-      
+
       if (options.file) {
         const content = secureReadFile(options.file);
         ingredients = content.split('\n').map(line => line.trim()).filter(line => line);
@@ -606,11 +606,11 @@ program
       const api = await getApiClient();
       const globalOpts = program.opts();
       const verbose = options.verbose || globalOpts.verbose;
-      
+
       console.log(chalk.cyan(`⚡ Batch analyzing ${ingredients.length} ingredients...`));
-      
+
       const result = await api.analyzeBatch(ingredients, verbose);
-      
+
       if (program.opts().json) {
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -620,7 +620,7 @@ program
         console.log(chalk.green(`✅ Batch analysis complete!`));
         console.log(chalk.cyan(`📊 Processed: ${result.summary.successful}/${result.batch_size} ingredients`));
         console.log('');
-        
+
         // Enhanced results table with more nutrition info
         const tableData = result.results.map(item => [
           item.success ? '✅' : '❌',
@@ -632,12 +632,12 @@ program
           item.success ? `${item.nutrition.fiber}g` : 'N/A',
           item.success ? `${item.nutrition.sodium}mg` : 'N/A'
         ]);
-        
+
         console.log(formatTable([
           ['Status', 'Ingredient', 'Calories', 'Protein', 'Fat', 'Carbs', 'Fiber', 'Sodium'],
           ...tableData
         ]));
-        
+
         // Show USDA verification details for successful ingredients
         if (result.results.some(item => item.success && item.metadata?.usda_match)) {
           console.log('');
@@ -652,7 +652,7 @@ program
             }
           });
         }
-        
+
       } else {
         console.log(chalk.red(`❌ ${result.error}`));
         process.exit(1);
@@ -673,11 +673,11 @@ program
       const api = await getApiClient();
       const globalOpts = program.opts();
       const verbose = options.verbose || globalOpts.verbose;
-      
+
       console.log(chalk.cyan(`🔍 Searching UPC: ${upc}...`));
-      
+
       const result = await api.searchUPC(upc);
-      
+
       if (program.opts().json) {
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -687,7 +687,7 @@ program
         const product = result.product;
         console.log(chalk.green(`✅ Product Found!`));
         console.log('');
-        
+
         // Basic product info
         if (product.product_name) {
           console.log(`📦 ${chalk.bold('Product:')} ${chalk.cyan(product.product_name)}`);
@@ -698,19 +698,19 @@ program
         if (product.manufacturer) {
           console.log(`🏭 ${chalk.bold('Manufacturer:')} ${chalk.gray(product.manufacturer)}`);
         }
-        
+
         // Data sources
         if (product.sources && product.sources.length > 0) {
           console.log(`📊 ${chalk.bold('Sources:')} ${chalk.magenta(product.sources.join(', '))}`);
         }
-        
+
         // Categories
         if (product.categories && product.categories.length > 0) {
           const categoryDisplay = product.categories.slice(0, 3).join(', ');
           const moreCategories = product.categories.length > 3 ? ` (+${product.categories.length - 3} more)` : '';
           console.log(`📋 ${chalk.bold('Categories:')} ${chalk.blue(categoryDisplay)}${chalk.gray(moreCategories)}`);
         }
-        
+
         // Serving info
         if (product.serving_size) {
           console.log(`🥄 ${chalk.bold('Serving Size:')} ${chalk.cyan(product.serving_size)}`);
@@ -718,58 +718,61 @@ program
         if (product.servings_per_container) {
           console.log(`📦 ${chalk.bold('Servings Per Container:')} ${chalk.cyan(product.servings_per_container)}`);
         }
-        
+
         // Nutrition data sample (if available)
         if (product.nutrition && typeof product.nutrition === 'object' && Object.keys(product.nutrition).length > 0) {
           console.log('');
           console.log(chalk.bold('🍎 Nutrition Data Available:'));
-          
+
           // Show sample from merged nutrition if available
           const nutritionData = product.nutrition.merged || product.nutrition.usda || product.nutrition.openfoodfacts || product.nutrition;
           if (nutritionData && typeof nutritionData === 'object') {
             const sampleNutrients = Object.entries(nutritionData)
               .slice(0, 5)
               .filter(([key, value]) => value !== null && value !== undefined);
-            
+
             sampleNutrients.forEach(([nutrient, value]) => {
               console.log(`  ${chalk.gray(nutrient.replace(/_/g, ' ').toUpperCase())}:`, chalk.green(value));
             });
-            
+
             const totalNutrients = Object.keys(nutritionData).length;
             if (totalNutrients > 5) {
               console.log(`  ${chalk.gray(`... and ${totalNutrients - 5} more nutrients`)}`);
             }
           }
         }
-        
+
         // Verbose information
         if (verbose) {
           console.log('');
           console.log(chalk.bold('📝 Additional Details:'));
-          
+
           if (product.ingredients_text) {
-            const ingredientsPreview = product.ingredients_text.length > 100 ? 
+            const ingredientsPreview = product.ingredients_text.length > 100 ?
               product.ingredients_text.substring(0, 100) + '...' : product.ingredients_text;
             console.log(`  ${chalk.bold('Ingredients:')} ${chalk.gray(ingredientsPreview)}`);
           }
-          
+
           if (product.packaging) {
             console.log(`  ${chalk.bold('Packaging:')} ${chalk.gray(product.packaging)}`);
           }
-          
-          if (product.countries && product.countries.length > 0) {
-            console.log(`  ${chalk.bold('Countries:')} ${chalk.gray(product.countries.join(', '))}`);
+
+          if (product.countries) {
+            const countriesStr = Array.isArray(product.countries) ? product.countries.join(', ') : product.countries;
+            if (countriesStr) {
+              console.log(`  ${chalk.bold('Countries:')} ${chalk.gray(countriesStr)}`);
+            }
           }
-          
+
           if (product.quality_score) {
             console.log(`  ${chalk.bold('Quality Score:')} ${chalk.cyan(product.quality_score)}`);
           }
-          
+
           if (product.images && product.images.length > 0) {
             console.log(`  ${chalk.bold('Images:')} ${chalk.cyan(product.images.length)} available`);
           }
         }
-        
+
         // Performance info
         if (result.processing_time_ms) {
           console.log('');
@@ -778,7 +781,7 @@ program
         if (result.from_cache) {
           console.log(`💾 ${chalk.gray('Source:')} ${chalk.green('Cache (fast response)')}`);
         }
-        
+
       } else {
         console.log(chalk.yellow(`❌ Product not found for UPC: ${upc}`));
         if (result.error) {
@@ -806,7 +809,7 @@ program
   .action(async (options) => {
     try {
       let upcs = [];
-      
+
       if (options.file) {
         const content = secureReadFile(options.file);
         upcs = content.split('\n').map(line => line.trim()).filter(line => line);
@@ -825,11 +828,11 @@ program
       const api = await getApiClient();
       const globalOpts = program.opts();
       const verbose = options.verbose || globalOpts.verbose;
-      
+
       console.log(chalk.cyan(`🔍 Batch searching ${upcs.length} UPCs...`));
-      
+
       const result = await api.searchUPCBatch(upcs);
-      
+
       if (program.opts().json) {
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -839,7 +842,7 @@ program
         console.log(chalk.green(`✅ Batch search complete!`));
         console.log(chalk.cyan(`📊 Found: ${result.summary.found}/${result.summary.total} products`));
         console.log('');
-        
+
         // Results table
         const tableData = result.results.map(item => [
           item.success ? '✅' : '❌',
@@ -848,12 +851,12 @@ program
           item.success && item.product ? (item.product.brand || 'Unknown Brand') : 'N/A',
           item.success && item.product ? item.product.sources.join(', ') : 'N/A'
         ]);
-        
+
         console.log(formatTable([
           ['Status', 'UPC', 'Product Name', 'Brand', 'Sources'],
           ...tableData
         ]));
-        
+
         // Detailed results for found products (verbose mode)
         if (verbose) {
           const foundProducts = result.results.filter(r => r.success && r.product);
@@ -863,7 +866,7 @@ program
             foundProducts.forEach((item, index) => {
               const product = item.product;
               console.log(`\n${index + 1}. ${chalk.cyan(product.product_name || 'Unknown Product')} (${item.upc})`);
-              
+
               if (product.brand) {
                 console.log(`   Brand: ${chalk.yellow(product.brand)}`);
               }
@@ -873,7 +876,7 @@ program
               if (product.serving_size) {
                 console.log(`   Serving: ${chalk.gray(product.serving_size)}`);
               }
-              
+
               // Nutrition sample
               if (product.nutrition) {
                 const nutritionData = product.nutrition.merged || product.nutrition.usda || product.nutrition.openfoodfacts || product.nutrition;
@@ -887,12 +890,12 @@ program
             });
           }
         }
-        
+
         // Performance summary
         if (result.processing_time_ms) {
           console.log(`\n⏱️  ${chalk.gray('Total Processing Time:')} ${formatResponseTime(result.processing_time_ms)}`);
         }
-        
+
       } else {
         console.log(chalk.red(`❌ ${result.error || 'Batch search failed'}`));
         process.exit(1);
@@ -911,7 +914,7 @@ program
     try {
       const api = await getApiClient(false); // Don't require auth for health check
       const result = await api.healthCheck();
-      
+
       if (program.opts().json) {
         console.log(JSON.stringify(result, null, 2));
         return;
@@ -919,20 +922,20 @@ program
 
       console.log(chalk.green(`✅ API Status: ${result.status}`));
       console.log(chalk.cyan(`🔧 Version: ${result.version}`));
-      
+
       if (result.services) {
         console.log(chalk.bold('🔌 Services:'));
         Object.entries(result.services).forEach(([service, status]) => {
-          const icon = (status === 'available' || status === 'connected' || status.includes('total')) ? '✅' : 
-                      status === 'degraded' ? '⚠️' : '❌';
+          const icon = (status === 'available' || status === 'connected' || status.includes('total')) ? '✅' :
+            status === 'degraded' ? '⚠️' : '❌';
           console.log(`  ${icon} ${service}: ${status}`);
         });
       }
-      
+
       if (result.performance) {
         console.log(chalk.bold('⚡ Performance:'));
         console.log(`  📊 Avg Response: ${result.performance.avg_response_time_ms}ms`);
-        
+
         if (result.performance.uptime) {
           console.log(`  ⏱️  Uptime: ${result.performance.uptime}`);
         }
@@ -943,7 +946,7 @@ program
           console.log(`  👥 Active Users: ${result.performance.active_users}`);
         }
       }
-      
+
       if (result.dashboard_data) {
         console.log(chalk.bold('📊 Dashboard Stats:'));
         if (result.dashboard_data.total_users) {
@@ -968,12 +971,12 @@ program
 // Helper function to get API client
 async function getApiClient(requireAuth = true) {
   const globalOpts = program.opts();
-  
+
   let apiKey = globalOpts.apiKey;
-  
+
   if (!apiKey && requireAuth) {
     apiKey = await auth.getApiKey();
-    
+
     // Check if user is logged in (has JWT) but no API key - show helpful message
     if (!apiKey && auth.isLoggedIn()) {
       console.error(chalk.red('❌ No API key found. You are logged in but need to create an API key.'));
@@ -984,7 +987,7 @@ async function getApiClient(requireAuth = true) {
       process.exit(1);
     }
   }
-  
+
   return new NutritionAPI(apiKey, globalOpts.baseUrl, 30000, auth);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avocavo",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Avocavo CLI - Nutrition analysis made simple. Get accurate USDA nutrition data with secure authentication.",
   "main": "index.js",
   "bin": {