codecrypto-cli 1.0.21 → 1.0.23

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,8 +60,8 @@ export const deployMcpCommand = new Command('deploy-mcp')
         projectName = path.basename(resolvedProjectPath).toLowerCase().replace(/[^a-z0-9._-]/g, '-');
       }
       
-      // Obtener el prefijo de imagen desde token.json (email sin @dominio)
-      const dockerHubUsername = getDockerHubUsernameFromToken();
+      // 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`;
@@ -458,14 +459,22 @@ echo "✅ Deployment preparation completed inside container"
       }
 
       // Paso 5: Construir y hacer push
-      const buildDockerSpinner = ora('Building Docker image for multiple platforms...').start();
+      // Detectar si estamos en Windows (buildx tiene problemas con ARM en Windows)
+      const isWindows = os.platform() === 'win32';
+      const platform = isWindows ? 'linux/amd64' : 'linux/amd64,linux/arm64';
+      const platformDisplay = isWindows ? 'linux/amd64' : 'linux/amd64, linux/arm64';
+      const buildSpinnerText = isWindows 
+        ? 'Building Docker image for linux/amd64...' 
+        : 'Building Docker image for multiple platforms...';
+      
+      const buildDockerSpinner = ora(buildSpinnerText).start();
       try {
         const tags = shouldPush 
           ? [`--tag ${imageName}`, `--tag ${imageLatest}`, '--push']
           : [`--tag ${imageName}`, `--tag ${imageLatest}`, '--load'];
         
         const buildCommand = `docker buildx build \
-          --platform linux/amd64,linux/arm64 \
+          --platform ${platform} \
           ${tags.join(' \\\n          ')} \
           --progress=plain \
           .`;
@@ -475,7 +484,10 @@ echo "✅ Deployment preparation completed inside container"
         console.log(chalk.cyan(buildCommand));
         console.log(chalk.gray('─'.repeat(60)));
         console.log(chalk.gray(`\n  Working directory: ${chalk.cyan(resolvedDestFolder)}`));
-        console.log(chalk.gray(`  Platforms: ${chalk.cyan('linux/amd64, linux/arm64')}`));
+        console.log(chalk.gray(`  Platforms: ${chalk.cyan(platformDisplay)}`));
+        if (isWindows) {
+          console.log(chalk.yellow(`  Note: Building only for linux/amd64 on Windows (ARM builds are disabled)`));
+        }
         console.log(chalk.gray(`  Push to registry: ${shouldPush ? chalk.green('Yes') : chalk.yellow('No')}\n`));
 
         execSync(buildCommand, { 
@@ -564,49 +576,182 @@ echo "✅ Deployment preparation completed inside container"
     }
   });
 
-// Función para obtener el username de Docker Hub desde token.json
-function getDockerHubUsernameFromToken(): string {
-  const tokenFilePath = path.join(os.homedir(), '.codecrypto', 'token.json');
+// 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(tokenFilePath)) {
-    throw new Error(`Token file not found at ${tokenFilePath}. Please run 'codecrypto auth' first.`);
+  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.'
+    );
   }
 
-  let tokenData: any;
   try {
-    tokenData = JSON.parse(fs.readFileSync(tokenFilePath, 'utf-8'));
+    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) {
-    throw new Error(`Failed to read token file: ${error.message}`);
-  }
-
-  // Obtener el email del token
-  const email = tokenData.email;
-  if (!email) {
-    throw new Error('Email not found in token.json. Please run "codecrypto auth --force" to refresh your token.');
-  }
-
-  // Extraer el username del email (parte antes del @) y sanitizarlo para Docker Hub
-  const emailParts = email.split('@');
-  if (emailParts.length < 2) {
-    throw new Error(`Invalid email format in token.json: ${email}`);
-  }
-
-  let username = emailParts[0].toLowerCase();
-  
-  // Sanitizar el username para Docker Hub
-  // Docker Hub permite: letras minúsculas, números, guiones, guiones bajos
-  username = username
-    .replace(/[^a-z0-9._-]/g, '-') // Reemplazar caracteres inválidos con guiones
-    .replace(/^-+|-+$/g, '') // Eliminar guiones al inicio y final
-    .replace(/-+/g, '-') // Reemplazar múltiples guiones con uno solo
-    .replace(/\.+/g, '.') // Reemplazar múltiples puntos con uno solo
-    .substring(0, 30); // Limitar longitud (Docker Hub tiene límites)
-
-  if (!username) {
-    throw new Error(`Could not extract valid username from email: ${email}`);
+    // 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'
+    );
   }
-
-  return username;
 }
 
 // Función para leer certificados Docker desde 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,8 +135,8 @@ export const deployCommand = new Command('deploy')
         projectName = path.basename(resolvedProjectPath).toLowerCase().replace(/[^a-z0-9._-]/g, '-');
       }
       
-      // Obtener el prefijo de imagen desde token.json (email sin @dominio)
-      const dockerHubUsername = getDockerHubUsernameFromToken();
+      // 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`;
@@ -615,14 +616,22 @@ CMD ${JSON.stringify(startCmd)}
       }
 
       // Paso 5: Construir y hacer push
-      const buildDockerSpinner = ora('Building Docker image for multiple platforms...').start();
+      // Detectar si estamos en Windows (buildx tiene problemas con ARM en Windows)
+      const isWindows = os.platform() === 'win32';
+      const platform = isWindows ? 'linux/amd64' : 'linux/amd64,linux/arm64';
+      const platformDisplay = isWindows ? 'linux/amd64' : 'linux/amd64, linux/arm64';
+      const buildSpinnerText = isWindows 
+        ? 'Building Docker image for linux/amd64...' 
+        : 'Building Docker image for multiple platforms...';
+      
+      const buildDockerSpinner = ora(buildSpinnerText).start();
       try {
         const tags = shouldPush 
           ? [`--tag ${imageName}`, `--tag ${imageLatest}`, '--push']
           : [`--tag ${imageName}`, `--tag ${imageLatest}`, '--load'];
         
         const buildCommand = `docker buildx build \
-          --platform linux/amd64,linux/arm64 \
+          --platform ${platform} \
           ${tags.join(' \\\n          ')} \
           --progress=plain \
           .`;
@@ -632,7 +641,10 @@ CMD ${JSON.stringify(startCmd)}
         console.log(chalk.cyan(buildCommand));
         console.log(chalk.gray('─'.repeat(60)));
         console.log(chalk.gray(`\n  Working directory: ${chalk.cyan(resolvedDestFolder)}`));
-        console.log(chalk.gray(`  Platforms: ${chalk.cyan('linux/amd64, linux/arm64')}`));
+        console.log(chalk.gray(`  Platforms: ${chalk.cyan(platformDisplay)}`));
+        if (isWindows) {
+          console.log(chalk.yellow(`  Note: Building only for linux/amd64 on Windows (ARM builds are disabled)`));
+        }
         console.log(chalk.gray(`  Push to registry: ${shouldPush ? chalk.green('Yes') : chalk.yellow('No')}\n`));
 
         execSync(buildCommand, { 
@@ -702,49 +714,182 @@ CMD ${JSON.stringify(startCmd)}
     }
   });
 
-// Función para obtener el username de Docker Hub desde token.json
-function getDockerHubUsernameFromToken(): string {
-  const tokenFilePath = path.join(os.homedir(), '.codecrypto', 'token.json');
+// 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(tokenFilePath)) {
-    throw new Error(`Token file not found at ${tokenFilePath}. Please run 'codecrypto auth' first.`);
+  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.'
+    );
   }
 
-  let tokenData: any;
   try {
-    tokenData = JSON.parse(fs.readFileSync(tokenFilePath, 'utf-8'));
+    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) {
-    throw new Error(`Failed to read token file: ${error.message}`);
-  }
-
-  // Obtener el email del token
-  const email = tokenData.email;
-  if (!email) {
-    throw new Error('Email not found in token.json. Please run "codecrypto auth --force" to refresh your token.');
-  }
-
-  // Extraer el username del email (parte antes del @) y sanitizarlo para Docker Hub
-  const emailParts = email.split('@');
-  if (emailParts.length < 2) {
-    throw new Error(`Invalid email format in token.json: ${email}`);
-  }
-
-  let username = emailParts[0].toLowerCase();
-  
-  // Sanitizar el username para Docker Hub
-  // Docker Hub permite: letras minúsculas, números, guiones, guiones bajos
-  username = username
-    .replace(/[^a-z0-9._-]/g, '-') // Reemplazar caracteres inválidos con guiones
-    .replace(/^-+|-+$/g, '') // Eliminar guiones al inicio y final
-    .replace(/-+/g, '-') // Reemplazar múltiples guiones con uno solo
-    .replace(/\.+/g, '.') // Reemplazar múltiples puntos con uno solo
-    .substring(0, 30); // Limitar longitud (Docker Hub tiene límites)
-
-  if (!username) {
-    throw new Error(`Could not extract valid username from email: ${email}`);
+    // 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'
+    );
   }
-
-  return username;
 }
 
 // Función para leer certificados Docker desde token.json