codecrypto-cli 1.0.20 → 1.0.22

package/src/commands/deploy-mcp.ts

@@ -1,6 +1,7 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
+import inquirer from 'inquirer';
 import { execSync, spawn } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -59,7 +60,9 @@ export const deployMcpCommand = new Command('deploy-mcp')
         projectName = path.basename(resolvedProjectPath).toLowerCase().replace(/[^a-z0-9._-]/g, '-');
       }
       
-      const imageBase = `jviejo/${projectName}`;
+      // Obtener el prefijo de imagen desde Docker config o solicitar por teclado
+      const dockerHubUsername = await getDockerHubUsernameFromToken();
+      const imageBase = `${dockerHubUsername}/${projectName}`;
       const imageName = `${imageBase}:${version}`;
       const imageLatest = `${imageBase}:latest`;
 
@@ -562,6 +565,184 @@ echo "✅ Deployment preparation completed inside container"
     }
   });
 
+// Función para obtener el username de Docker Hub desde Docker config o solicitar por teclado
+async function getDockerHubUsernameFromToken(): Promise<string> {
+  // Obtener el username desde Docker config (requerido para poder hacer push)
+  const dockerConfigPath = path.join(os.homedir(), '.docker', 'config.json');
+  
+  if (!fs.existsSync(dockerConfigPath)) {
+    throw new Error(
+      'Docker authentication not found. Please login to Docker first.\n' +
+      '  Run: docker login\n' +
+      '  This is required to push images to Docker Hub.'
+    );
+  }
+
+  try {
+    const dockerConfig = JSON.parse(fs.readFileSync(dockerConfigPath, 'utf-8'));
+    
+    // Verificar si hay credsStore (las credenciales están en el keychain del sistema)
+    const hasCredsStore = dockerConfig.credsStore && dockerConfig.credsStore !== '';
+    
+    // Buscar username en Docker Hub auth
+    let dockerHubKeys: string[] = [];
+    if (dockerConfig.auths && Object.keys(dockerConfig.auths).length > 0) {
+      dockerHubKeys = Object.keys(dockerConfig.auths).filter(reg => 
+        reg.includes('docker.io') || 
+        reg.includes('hub.docker.com') || 
+        reg === 'https://index.docker.io/v1/'
+      );
+      
+      // Si hay credsStore, los auths pueden estar vacíos pero las credenciales están en el keychain
+      if (hasCredsStore && dockerHubKeys.length > 0) {
+        // Intentar obtener username desde docker info
+        try {
+          const dockerInfo = execSync('docker info', { encoding: 'utf-8', stdio: 'pipe', timeout: 5000 });
+          const usernameMatch = dockerInfo.match(/Username:\s*(.+)/i);
+          if (usernameMatch && usernameMatch[1]) {
+            let username = usernameMatch[1].trim();
+            
+            // Si el username es un email, extraer solo la parte antes del @
+            if (username.includes('@')) {
+              username = username.split('@')[0];
+            }
+            
+            // Sanitizar el username para Docker Hub
+            username = username.toLowerCase()
+              .replace(/[^a-z0-9._-]/g, '-')
+              .replace(/^-+|-+$/g, '')
+              .replace(/-+/g, '-')
+              .replace(/\.+/g, '.')
+              .substring(0, 30);
+            
+            if (username) {
+              return username;
+            }
+          }
+        } catch (infoError) {
+          // Si docker info falla, continuar con otros métodos
+        }
+      }
+      
+      // Si no hay credsStore, buscar username directamente en auths
+      if (!hasCredsStore) {
+        for (const key of dockerHubKeys) {
+          const authData = dockerConfig.auths[key];
+          if (authData && authData.username) {
+            let username = authData.username;
+            
+            // Si el username es un email, extraer solo la parte antes del @
+            if (username.includes('@')) {
+              username = username.split('@')[0];
+            }
+            
+            // Sanitizar el username para Docker Hub
+            username = username.toLowerCase()
+              .replace(/[^a-z0-9._-]/g, '-')
+              .replace(/^-+|-+$/g, '')
+              .replace(/-+/g, '-')
+              .replace(/\.+/g, '.')
+              .substring(0, 30);
+            
+            if (username) {
+              return username;
+            }
+          }
+        }
+      }
+    }
+    
+    // Si hay credsStore pero no encontramos username, intentar con docker info
+    if (hasCredsStore) {
+      try {
+        const dockerInfo = execSync('docker info', { encoding: 'utf-8', stdio: 'pipe', timeout: 5000 });
+        const usernameMatch = dockerInfo.match(/Username:\s*(.+)/i);
+        if (usernameMatch && usernameMatch[1]) {
+          let username = usernameMatch[1].trim();
+          
+          // Si el username es un email, extraer solo la parte antes del @
+          if (username.includes('@')) {
+            username = username.split('@')[0];
+          }
+          
+          // Sanitizar el username para Docker Hub
+          username = username.toLowerCase()
+            .replace(/[^a-z0-9._-]/g, '-')
+            .replace(/^-+|-+$/g, '')
+            .replace(/-+/g, '-')
+            .replace(/\.+/g, '.')
+            .substring(0, 30);
+          
+          if (username) {
+            return username;
+          }
+        }
+      } catch (infoError) {
+        // Continuar con el error
+      }
+    }
+    
+    // Si llegamos aquí, no encontramos el username - solicitar por teclado
+    console.log(chalk.yellow('\n⚠️  Could not automatically detect Docker Hub username.'));
+    console.log(chalk.gray('   Please enter your Docker Hub username manually.\n'));
+    
+    const answer = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'username',
+        message: 'Docker Hub username:',
+        validate: (input: string) => {
+          if (!input || input.trim().length === 0) {
+            return 'Username is required';
+          }
+          // Validar formato básico de username Docker Hub
+          const sanitized = input.toLowerCase().replace(/[^a-z0-9._-]/g, '');
+          if (sanitized !== input.toLowerCase()) {
+            return 'Username can only contain lowercase letters, numbers, dots, hyphens, and underscores';
+          }
+          if (input.length > 30) {
+            return 'Username must be 30 characters or less';
+          }
+          return true;
+        },
+        filter: (input: string) => {
+          // Si el input es un email, extraer solo la parte antes del @
+          if (input.includes('@')) {
+            return input.split('@')[0].trim();
+          }
+          return input.trim();
+        }
+      }
+    ]);
+    
+    let username = answer.username.toLowerCase();
+    
+    // Sanitizar el username para Docker Hub
+    username = username
+      .replace(/[^a-z0-9._-]/g, '-')
+      .replace(/^-+|-+$/g, '')
+      .replace(/-+/g, '-')
+      .replace(/\.+/g, '.')
+      .substring(0, 30);
+    
+    if (!username) {
+      throw new Error('Invalid username provided');
+    }
+    
+    return username;
+  } catch (error: any) {
+    // Si el error ya tiene mensaje, relanzarlo
+    if (error.message && (error.message.includes('Docker') || error.message.includes('username'))) {
+      throw error;
+    }
+    // Si hay error leyendo Docker config, lanzar error
+    throw new Error(
+      `Failed to read Docker config: ${error.message || String(error)}\n` +
+      '  Please ensure you are logged in to Docker: docker login'
+    );
+  }
+}
+
 // Función para leer certificados Docker desde token.json
 function loadDockerCertificatesFromToken(): { caPem: string; certPem: string; keyPem: string; certPath: string } {
   const tokenFilePath = path.join(os.homedir(), '.codecrypto', 'token.json');

package/src/commands/deploy.ts

@@ -1,6 +1,7 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
+import inquirer from 'inquirer';
 import { execSync, spawn } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -134,7 +135,9 @@ export const deployCommand = new Command('deploy')
         projectName = path.basename(resolvedProjectPath).toLowerCase().replace(/[^a-z0-9._-]/g, '-');
       }
       
-      const imageBase = `jviejo/${projectName}`;
+      // Obtener el prefijo de imagen desde Docker config o solicitar por teclado
+      const dockerHubUsername = await getDockerHubUsernameFromToken();
+      const imageBase = `${dockerHubUsername}/${projectName}`;
       const imageName = `${imageBase}:${version}`;
       const imageLatest = `${imageBase}:latest`;
 
@@ -700,6 +703,184 @@ CMD ${JSON.stringify(startCmd)}
     }
   });
 
+// Función para obtener el username de Docker Hub desde Docker config o solicitar por teclado
+async function getDockerHubUsernameFromToken(): Promise<string> {
+  // Obtener el username desde Docker config (requerido para poder hacer push)
+  const dockerConfigPath = path.join(os.homedir(), '.docker', 'config.json');
+  
+  if (!fs.existsSync(dockerConfigPath)) {
+    throw new Error(
+      'Docker authentication not found. Please login to Docker first.\n' +
+      '  Run: docker login\n' +
+      '  This is required to push images to Docker Hub.'
+    );
+  }
+
+  try {
+    const dockerConfig = JSON.parse(fs.readFileSync(dockerConfigPath, 'utf-8'));
+    
+    // Verificar si hay credsStore (las credenciales están en el keychain del sistema)
+    const hasCredsStore = dockerConfig.credsStore && dockerConfig.credsStore !== '';
+    
+    // Buscar username en Docker Hub auth
+    let dockerHubKeys: string[] = [];
+    if (dockerConfig.auths && Object.keys(dockerConfig.auths).length > 0) {
+      dockerHubKeys = Object.keys(dockerConfig.auths).filter(reg => 
+        reg.includes('docker.io') || 
+        reg.includes('hub.docker.com') || 
+        reg === 'https://index.docker.io/v1/'
+      );
+      
+      // Si hay credsStore, los auths pueden estar vacíos pero las credenciales están en el keychain
+      if (hasCredsStore && dockerHubKeys.length > 0) {
+        // Intentar obtener username desde docker info
+        try {
+          const dockerInfo = execSync('docker info', { encoding: 'utf-8', stdio: 'pipe', timeout: 5000 });
+          const usernameMatch = dockerInfo.match(/Username:\s*(.+)/i);
+          if (usernameMatch && usernameMatch[1]) {
+            let username = usernameMatch[1].trim();
+            
+            // Si el username es un email, extraer solo la parte antes del @
+            if (username.includes('@')) {
+              username = username.split('@')[0];
+            }
+            
+            // Sanitizar el username para Docker Hub
+            username = username.toLowerCase()
+              .replace(/[^a-z0-9._-]/g, '-')
+              .replace(/^-+|-+$/g, '')
+              .replace(/-+/g, '-')
+              .replace(/\.+/g, '.')
+              .substring(0, 30);
+            
+            if (username) {
+              return username;
+            }
+          }
+        } catch (infoError) {
+          // Si docker info falla, continuar con otros métodos
+        }
+      }
+      
+      // Si no hay credsStore, buscar username directamente en auths
+      if (!hasCredsStore) {
+        for (const key of dockerHubKeys) {
+          const authData = dockerConfig.auths[key];
+          if (authData && authData.username) {
+            let username = authData.username;
+            
+            // Si el username es un email, extraer solo la parte antes del @
+            if (username.includes('@')) {
+              username = username.split('@')[0];
+            }
+            
+            // Sanitizar el username para Docker Hub
+            username = username.toLowerCase()
+              .replace(/[^a-z0-9._-]/g, '-')
+              .replace(/^-+|-+$/g, '')
+              .replace(/-+/g, '-')
+              .replace(/\.+/g, '.')
+              .substring(0, 30);
+            
+            if (username) {
+              return username;
+            }
+          }
+        }
+      }
+    }
+    
+    // Si hay credsStore pero no encontramos username, intentar con docker info
+    if (hasCredsStore) {
+      try {
+        const dockerInfo = execSync('docker info', { encoding: 'utf-8', stdio: 'pipe', timeout: 5000 });
+        const usernameMatch = dockerInfo.match(/Username:\s*(.+)/i);
+        if (usernameMatch && usernameMatch[1]) {
+          let username = usernameMatch[1].trim();
+          
+          // Si el username es un email, extraer solo la parte antes del @
+          if (username.includes('@')) {
+            username = username.split('@')[0];
+          }
+          
+          // Sanitizar el username para Docker Hub
+          username = username.toLowerCase()
+            .replace(/[^a-z0-9._-]/g, '-')
+            .replace(/^-+|-+$/g, '')
+            .replace(/-+/g, '-')
+            .replace(/\.+/g, '.')
+            .substring(0, 30);
+          
+          if (username) {
+            return username;
+          }
+        }
+      } catch (infoError) {
+        // Continuar con el error
+      }
+    }
+    
+    // Si llegamos aquí, no encontramos el username - solicitar por teclado
+    console.log(chalk.yellow('\n⚠️  Could not automatically detect Docker Hub username.'));
+    console.log(chalk.gray('   Please enter your Docker Hub username manually.\n'));
+    
+    const answer = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'username',
+        message: 'Docker Hub username:',
+        validate: (input: string) => {
+          if (!input || input.trim().length === 0) {
+            return 'Username is required';
+          }
+          // Validar formato básico de username Docker Hub
+          const sanitized = input.toLowerCase().replace(/[^a-z0-9._-]/g, '');
+          if (sanitized !== input.toLowerCase()) {
+            return 'Username can only contain lowercase letters, numbers, dots, hyphens, and underscores';
+          }
+          if (input.length > 30) {
+            return 'Username must be 30 characters or less';
+          }
+          return true;
+        },
+        filter: (input: string) => {
+          // Si el input es un email, extraer solo la parte antes del @
+          if (input.includes('@')) {
+            return input.split('@')[0].trim();
+          }
+          return input.trim();
+        }
+      }
+    ]);
+    
+    let username = answer.username.toLowerCase();
+    
+    // Sanitizar el username para Docker Hub
+    username = username
+      .replace(/[^a-z0-9._-]/g, '-')
+      .replace(/^-+|-+$/g, '')
+      .replace(/-+/g, '-')
+      .replace(/\.+/g, '.')
+      .substring(0, 30);
+    
+    if (!username) {
+      throw new Error('Invalid username provided');
+    }
+    
+    return username;
+  } catch (error: any) {
+    // Si el error ya tiene mensaje, relanzarlo
+    if (error.message && (error.message.includes('Docker') || error.message.includes('username'))) {
+      throw error;
+    }
+    // Si hay error leyendo Docker config, lanzar error
+    throw new Error(
+      `Failed to read Docker config: ${error.message || String(error)}\n` +
+      '  Please ensure you are logged in to Docker: docker login'
+    );
+  }
+}
+
 // Función para leer certificados Docker desde token.json
 function loadDockerCertificatesFromToken(): { caPem: string; certPem: string; keyPem: string; certPath: string } {
   const tokenFilePath = path.join(os.homedir(), '.codecrypto', 'token.json');

package/src/commands/doctor.ts

@@ -127,23 +127,210 @@ export const doctorCommand = new Command('doctor')
       });
     }
 
-    // 6. Check Docker Hub authentication (optional)
-    const dockerAuthCheck = ora('Checking Docker Hub authentication...').start();
+    // 6. Check Docker authentication
+    const dockerAuthCheck = ora('Checking Docker authentication...').start();
     try {
-      execSync('docker pull hello-world:latest', { encoding: 'utf-8', stdio: 'pipe' });
-      dockerAuthCheck.succeed('Docker Hub authentication OK');
-      checks.push({
-        name: 'Docker Hub Auth',
-        status: 'success',
-        message: 'Docker Hub authentication verified'
-      });
-    } catch (error) {
-      dockerAuthCheck.warn('Docker Hub authentication may be required');
+      // Obtener email del token.json para comparar
+      const tokenFilePath = path.join(os.homedir(), '.codecrypto', 'token.json');
+      let tokenEmail: string | null = null;
+      if (fs.existsSync(tokenFilePath)) {
+        try {
+          const tokenData = JSON.parse(fs.readFileSync(tokenFilePath, 'utf-8'));
+          tokenEmail = tokenData.email || null;
+        } catch {
+          // Ignorar errores al leer token
+        }
+      }
+
+      // Verificar si hay credenciales guardadas en Docker config
+      const dockerConfigPath = path.join(os.homedir(), '.docker', 'config.json');
+      let dockerUsername: string | null = null;
+      let dockerEmail: string | null = null;
+      let hasDockerAuth = false;
+      let dockerAuthInfo = '';
+      
+      if (fs.existsSync(dockerConfigPath)) {
+        try {
+          const dockerConfig = JSON.parse(fs.readFileSync(dockerConfigPath, 'utf-8'));
+          
+          // Verificar si hay auths configurados
+          if (dockerConfig.auths && Object.keys(dockerConfig.auths).length > 0) {
+            hasDockerAuth = true;
+            const registries = Object.keys(dockerConfig.auths);
+            dockerAuthInfo = `Authenticated to: ${registries.join(', ')}`;
+            
+            // Intentar obtener el username de Docker Hub
+            const dockerHubKey = registries.find(reg => 
+              reg.includes('docker.io') || 
+              reg.includes('hub.docker.com') || 
+              reg === 'https://index.docker.io/v1/'
+            );
+            
+            if (dockerHubKey && dockerConfig.auths[dockerHubKey]) {
+              // El username puede estar en auths[registry].auth (base64) o directamente
+              const authData = dockerConfig.auths[dockerHubKey];
+              if (authData && authData.username) {
+                dockerUsername = authData.username;
+                // Si el username parece un email, usarlo como email
+                if (dockerUsername && dockerUsername.includes('@')) {
+                  dockerEmail = dockerUsername;
+                }
+              }
+            }
+            
+            // Intentar obtener username de docker info como fallback
+            if (!dockerUsername) {
+              try {
+                const dockerInfo = execSync('docker info', { encoding: 'utf-8', stdio: 'pipe', timeout: 5000 });
+                const usernameMatch = dockerInfo.match(/Username:\s*(.+)/i);
+                if (usernameMatch) {
+                  dockerUsername = usernameMatch[1].trim();
+                  if (dockerUsername.includes('@')) {
+                    dockerEmail = dockerUsername;
+                  }
+                }
+              } catch {
+                // Ignorar errores
+              }
+            }
+            
+            // Verificar específicamente Docker Hub
+            const hasDockerHub = registries.some(reg => 
+              reg.includes('docker.io') || 
+              reg.includes('hub.docker.com') || 
+              reg === 'https://index.docker.io/v1/'
+            );
+            
+            // Construir mensaje con información de email/usuario
+            let authMessage = `Docker authentication verified: ${dockerAuthInfo}`;
+            if (dockerUsername || dockerEmail) {
+              const dockerIdentity = dockerEmail || dockerUsername;
+              authMessage += ` (User: ${dockerIdentity})`;
+              
+              // Comparar con token.json
+              if (tokenEmail && dockerEmail) {
+                if (dockerEmail.toLowerCase() === tokenEmail.toLowerCase()) {
+                  authMessage += ` ✓ Matches token.json email`;
+                } else {
+                  authMessage += ` ⚠ Different from token.json email (${tokenEmail})`;
+                }
+              } else if (tokenEmail && dockerUsername && !dockerEmail) {
+                // Comparar username con email del token (parte antes del @)
+                const tokenUsername = tokenEmail.split('@')[0].toLowerCase();
+                if (dockerUsername.toLowerCase() === tokenUsername) {
+                  authMessage += ` ✓ Username matches token.json email`;
+                } else {
+                  authMessage += ` ⚠ Username differs from token.json email (${tokenEmail})`;
+                }
+              }
+            }
+            
+            if (hasDockerHub) {
+              dockerAuthCheck.succeed(`Docker authentication OK (Docker Hub configured)`);
+              checks.push({
+                name: 'Docker Auth',
+                status: 'success',
+                message: authMessage
+              });
+            } else {
+              dockerAuthCheck.succeed(`Docker authentication OK (${registries.length} registry/registries configured)`);
+              checks.push({
+                name: 'Docker Auth',
+                status: 'success',
+                message: authMessage
+              });
+            }
+          } else {
+            // No hay auths configurados, intentar verificar con pull
+            try {
+              execSync('docker pull hello-world:latest', { encoding: 'utf-8', stdio: 'pipe', timeout: 10000 });
+              dockerAuthCheck.succeed('Docker authentication OK (public access)');
+              let message = 'Docker can access public images (authentication may not be required)';
+              if (tokenEmail) {
+                message += ` (Token email: ${tokenEmail})`;
+              }
+              checks.push({
+                name: 'Docker Auth',
+                status: 'success',
+                message: message
+              });
+            } catch (pullError) {
+              dockerAuthCheck.warn('Docker authentication not configured');
+              let details = 'Run "docker login" if you need to push images to Docker Hub or private registries';
+              if (tokenEmail) {
+                details += ` (Token email: ${tokenEmail})`;
+              }
+              checks.push({
+                name: 'Docker Auth',
+                status: 'warning',
+                message: 'Docker authentication not configured',
+                details: details
+              });
+            }
+          }
+        } catch (configError) {
+          // Error leyendo config, intentar verificar con pull
+          try {
+            execSync('docker pull hello-world:latest', { encoding: 'utf-8', stdio: 'pipe', timeout: 10000 });
+            dockerAuthCheck.succeed('Docker authentication OK');
+            let message = 'Docker can access public images';
+            if (tokenEmail) {
+              message += ` (Token email: ${tokenEmail})`;
+            }
+            checks.push({
+              name: 'Docker Auth',
+              status: 'success',
+              message: message
+            });
+          } catch (pullError) {
+            dockerAuthCheck.warn('Docker authentication may be required');
+            let details = 'Run "docker login" if you need to push images';
+            if (tokenEmail) {
+              details += ` (Token email: ${tokenEmail})`;
+            }
+            checks.push({
+              name: 'Docker Auth',
+              status: 'warning',
+              message: 'Docker authentication not verified',
+              details: details
+            });
+          }
+        }
+      } else {
+        // No existe config.json, intentar verificar con pull
+        try {
+          execSync('docker pull hello-world:latest', { encoding: 'utf-8', stdio: 'pipe', timeout: 10000 });
+          dockerAuthCheck.succeed('Docker authentication OK (public access)');
+          let message = 'Docker can access public images (authentication may not be required)';
+          if (tokenEmail) {
+            message += ` (Token email: ${tokenEmail})`;
+          }
+          checks.push({
+            name: 'Docker Auth',
+            status: 'success',
+            message: message
+          });
+        } catch (error) {
+          dockerAuthCheck.warn('Docker authentication not configured');
+          let details = 'Run "docker login" if you need to push images to Docker Hub or private registries';
+          if (tokenEmail) {
+            details += ` (Token email: ${tokenEmail})`;
+          }
+          checks.push({
+            name: 'Docker Auth',
+            status: 'warning',
+            message: 'Docker authentication not configured',
+            details: details
+          });
+        }
+      }
+    } catch (error: any) {
+      dockerAuthCheck.fail('Docker authentication check failed');
       checks.push({
-        name: 'Docker Hub Auth',
-        status: 'warning',
-        message: 'Docker Hub authentication not verified',
-        details: 'Run "docker login" if you need to push images'
+        name: 'Docker Auth',
+        status: 'error',
+        message: 'Docker authentication check failed',
+        details: `Error: ${error.message || String(error)}`
       });
     }
 
@@ -499,11 +686,11 @@ export const doctorCommand = new Command('doctor')
         }
         
         besu1Check.succeed(`Besu1 network accessible (chain-id: ${chainId}, block: ${blockNumber})`);
-        checks.push({
-          name: 'Besu1 Network',
-          status: 'success',
+      checks.push({
+        name: 'Besu1 Network',
+        status: 'success',
           message: `Besu1 network accessible: ${rpcUrl} (chain-id: ${chainId}, block: ${blockNumber})`
-        });
+      });
       }
     } catch (error: any) {
       const errorMsg = error.message || String(error);