@tamyla/clodo-framework 2.0.14 → 2.0.16

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.0.16](https://github.com/tamylaa/clodo-framework/compare/v2.0.15...v2.0.16) (2025-10-12)
+
+
+### Bug Fixes
+
+* comprehensive readline state management and stdin restoration ([a0716fe](https://github.com/tamylaa/clodo-framework/commit/a0716fef9a5db8211b851ab7861bf2419f31e7fa))
+
+## [2.0.15](https://github.com/tamylaa/clodo-framework/compare/v2.0.14...v2.0.15) (2025-10-12)
+
+
+### Bug Fixes
+
+* improve customer selection UX with number support ([2e10d56](https://github.com/tamylaa/clodo-framework/commit/2e10d562061c478ecc238e1185e2514af453d00e))
+
 ## [2.0.14](https://github.com/tamylaa/clodo-framework/compare/v2.0.13...v2.0.14) (2025-10-12)
 
 

package/bin/clodo-service.js

@@ -516,8 +516,8 @@ program
           const customers = configPersistence.getConfiguredCustomers();
           if (customers.length > 0) {
             console.log(chalk.cyan('💡 Configured customers:'));
-            customers.forEach(customer => {
-              console.log(chalk.white(`   • ${customer}`));
+            customers.forEach((customer, index) => {
+              console.log(chalk.white(`   ${index + 1}. ${customer}`));
             });
             console.log('');
           }
@@ -527,8 +527,30 @@ program
         if (!coreInputs.cloudflareAccountId) {
           console.log(chalk.cyan('📊 Tier 1: Core Input Collection\n'));
           
-          // Collect basic info
-          const customer = options.customer || await inputCollector.question('Customer name: ');
+          // Collect basic info with smart customer selection
+          let customer = options.customer;
+          if (!customer) {
+            const customers = configPersistence.getConfiguredCustomers();
+            if (customers.length > 0) {
+              const selection = await inputCollector.question('Select customer (enter number or name): ');
+              
+              // Try to parse as number first
+              const num = parseInt(selection);
+              if (!isNaN(num) && num >= 1 && num <= customers.length) {
+                customer = customers[num - 1];
+                console.log(chalk.green(`✓ Selected: ${customer}\n`));
+              } else if (customers.includes(selection)) {
+                customer = selection;
+                console.log(chalk.green(`✓ Selected: ${customer}\n`));
+              } else {
+                // New customer name
+                customer = selection;
+                console.log(chalk.yellow(`⚠️  Creating new customer: ${customer}\n`));
+              }
+            } else {
+              customer = await inputCollector.question('Customer name: ');
+            }
+          }
           const environment = options.env || await inputCollector.collectEnvironment();
           const serviceName = await inputCollector.collectServiceName();
           const serviceType = await inputCollector.collectServiceType();
@@ -537,6 +559,7 @@ program
           const cloudflareToken = process.env.CLOUDFLARE_API_TOKEN || await inputCollector.collectCloudflareToken();
           
           // Use CloudflareAPI for automatic domain discovery
+          console.log(chalk.cyan('⏳ Fetching Cloudflare configuration...'));
           const cloudflareConfig = await inputCollector.collectCloudflareConfigWithDiscovery(
             cloudflareToken,
             options.domain
@@ -654,9 +677,31 @@ program
       
     } catch (error) {
       console.error(chalk.red(`\n❌ Deployment failed: ${error.message}`));
-      if (error.stack && process.env.DEBUG) {
+      
+      // Show helpful context based on error type
+      if (error.message.includes('timeout')) {
+        console.log(chalk.yellow('\n💡 Troubleshooting Tips:'));
+        console.log(chalk.white('  • Use non-interactive mode: npx clodo-service deploy --customer=NAME --env=ENV --non-interactive'));
+        console.log(chalk.white('  • Set DEBUG=1 for detailed logs: DEBUG=1 npx clodo-service deploy'));
+        console.log(chalk.white('  • Check your terminal supports readline'));
+      } else if (error.message.includes('domain')) {
+        console.log(chalk.yellow('\n💡 Domain Issues:'));
+        console.log(chalk.white('  • Verify domain exists in Cloudflare dashboard'));
+        console.log(chalk.white('  • Check API token has zone:read permissions'));
+        console.log(chalk.white('  • Try specifying domain: --domain=example.com'));
+      } else if (error.message.includes('readline')) {
+        console.log(chalk.yellow('\n💡 Terminal Issues:'));
+        console.log(chalk.white('  • Try a different terminal (cmd, bash, powershell)'));
+        console.log(chalk.white('  • Use --non-interactive with config file'));
+      }
+      
+      if (process.env.DEBUG) {
+        console.error(chalk.gray('\nFull Stack Trace:'));
         console.error(chalk.gray(error.stack));
+      } else {
+        console.log(chalk.gray('\nRun with DEBUG=1 for full stack trace'));
       }
+      
       process.exit(1);
     }
   });

package/dist/service-management/InputCollector.js

@@ -18,14 +18,27 @@ import { uiStructuresLoader } from '../utils/ui-structures-loader.js';
 export class InputCollector {
   constructor(options = {}) {
     this.interactive = options.interactive !== false;
+    this.isPowerShell = process.env.PSModulePath !== undefined;
 
-    // Fix for PowerShell double-echo issue
-    const isPowerShell = process.env.PSModulePath !== undefined;
-    this.rl = this.interactive ? createInterface({
-      input: process.stdin,
-      output: process.stdout,
-      terminal: !isPowerShell // Disable terminal mode in PowerShell to prevent double echo
-    }) : null;
+    // Don't create readline immediately - lazy initialize
+    this.rl = null;
+    this.options = options;
+  }
+
+  /**
+   * Ensure readline is initialized and healthy
+   * Creates new instance if needed (e.g., after password input corrupted state)
+   */
+  ensureReadline() {
+    if (!this.rl || this.rl.closed) {
+      // Fix for PowerShell double-echo issue
+      this.rl = this.interactive ? createInterface({
+        input: process.stdin,
+        output: process.stdout,
+        terminal: !this.isPowerShell // Disable terminal mode in PowerShell
+      }) : null;
+    }
+    return this.rl;
   }
 
   /**
@@ -236,11 +249,32 @@ export class InputCollector {
   }
 
   /**
-   * Promisified readline question
+   * Promisified readline question with timeout protection
+   * Automatically recreates readline if needed
    */
-  question(prompt) {
-    return new Promise(resolve => {
-      this.rl.question(prompt, answer => {
+  question(prompt, timeout = 120000) {
+    return new Promise((resolve, reject) => {
+      const rl = this.ensureReadline();
+      if (!rl) {
+        reject(new Error('Readline interface not initialized - running in non-interactive mode?'));
+        return;
+      }
+
+      // Verify stdin is readable
+      if (!process.stdin.readable) {
+        reject(new Error('stdin not readable - terminal may be in broken state'));
+        return;
+      }
+
+      // Set timeout to detect hangs (default 2 minutes)
+      const timer = setTimeout(() => {
+        console.log(chalk.red('\n\n⚠️  Input timeout - readline may be blocked'));
+        console.log(chalk.yellow('This can happen in some terminal environments.'));
+        console.log(chalk.white('Try running with explicit parameters: npx clodo-service deploy --customer=NAME --env=ENV\n'));
+        reject(new Error('Input timeout after ' + timeout / 1000 + ' seconds'));
+      }, timeout);
+      rl.question(prompt, answer => {
+        clearTimeout(timer);
         resolve(answer.trim());
       });
     });
@@ -388,21 +422,29 @@ export class InputCollector {
         throw new Error('No domains available');
       }
       console.log(chalk.green(`✓ Found ${zones.length} domain(s)\n`));
-
-      // Format zones for display
-      const formatted = formatZonesForDisplay(zones);
-      formatted.forEach((line, index) => {
-        console.log(chalk.white(`  ${index + 1}. ${line}`));
-      });
-
-      // Let user select a domain
-      const selection = await this.prompt('\nSelect domain (enter number or name): ');
-      const selectedIndex = parseZoneSelection(selection, zones);
-      if (selectedIndex === -1) {
-        throw new Error('Invalid domain selection');
+      let selectedZone;
+
+      // Auto-select if only one domain
+      if (zones.length === 1) {
+        selectedZone = zones[0];
+        console.log(chalk.white(`  1. ✅ ${zones[0].name} (${zones[0].plan?.name || 'Free'}) - Account: ${zones[0].account?.name || 'N/A'}`));
+        console.log(chalk.green(`\n✓ Auto-selected: ${selectedZone.name} (only domain available)\n`));
+      } else {
+        // Format zones for display
+        const formatted = formatZonesForDisplay(zones);
+        formatted.forEach((line, index) => {
+          console.log(chalk.white(`  ${index + 1}. ${line}`));
+        });
+
+        // Let user select a domain
+        const selection = await this.prompt('\nSelect domain (enter number or name): ');
+        const selectedIndex = parseZoneSelection(selection, zones);
+        if (selectedIndex === -1) {
+          throw new Error('Invalid domain selection');
+        }
+        selectedZone = zones[selectedIndex];
+        console.log(chalk.green(`\n✓ Selected: ${selectedZone.name}`));
       }
-      const selectedZone = zones[selectedIndex];
-      console.log(chalk.green(`\n✓ Selected: ${selectedZone.name}`));
 
       // Get full zone details
       const zoneDetails = await cfApi.getZoneDetails(selectedZone.id);
@@ -515,11 +557,12 @@ export class InputCollector {
   }
 
   /**
-   * Close readline interface
+   * Close readline interface and clean up
    */
   close() {
-    if (this.rl) {
+    if (this.rl && !this.rl.closed) {
       this.rl.close();
+      this.rl = null; // Clear reference so ensureReadline() can create new one if needed
     }
   }
 }

package/dist/utils/interactive-prompts.js

@@ -98,31 +98,58 @@ export function showProgress(message, steps = ['⏳', '⚡', '✅']) {
 
 /**
  * Ask for sensitive input (like API tokens) with hidden input
+ * CRITICAL: Properly restores stdin state for subsequent readline operations
  */
 export function askPassword(question) {
   return new Promise(resolve => {
     const prompt = `${question}: `;
     process.stdout.write(prompt);
 
+    // Save original state
+    const wasRaw = process.stdin.isRaw;
+    const wasPaused = process.stdin.isPaused();
+
     // Hide input for sensitive data
-    process.stdin.setRawMode(true);
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(true);
+    }
     process.stdin.resume();
     let password = '';
     const onData = char => {
       const charCode = char[0];
-      if (charCode === 13) {
-        // Enter key
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
+      if (charCode === 13 || charCode === 10) {
+        // Enter key (CR or LF)
+        // Restore original state BEFORE resolving
+        if (process.stdin.isTTY) {
+          process.stdin.setRawMode(wasRaw || false);
+        }
+
+        // Important: Resume stdin so readline can use it
+        if (!wasPaused) {
+          process.stdin.resume();
+        } else {
+          process.stdin.pause();
+        }
         process.stdin.removeListener('data', onData);
         process.stdout.write('\n');
-        resolve(password);
+
+        // Small delay to let stdin stabilize before next readline operation
+        setTimeout(() => resolve(password), 50);
       } else if (charCode === 127 || charCode === 8) {
         // Backspace
         if (password.length > 0) {
           password = password.slice(0, -1);
           process.stdout.write('\b \b');
         }
+      } else if (charCode === 3) {
+        // Ctrl+C
+        // Restore state and exit gracefully
+        if (process.stdin.isTTY) {
+          process.stdin.setRawMode(wasRaw || false);
+        }
+        process.stdin.removeListener('data', onData);
+        process.stdout.write('\n');
+        process.exit(0);
       } else if (charCode >= 32 && charCode <= 126) {
         // Printable characters
         password += char.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamyla/clodo-framework",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "Reusable framework for Clodo-style software architecture on Cloudflare Workers + D1",
   "type": "module",
   "sideEffects": [