@deinossrl/dgp-agent 1.4.22 → 1.4.24

package/index.mjs

@@ -206,9 +206,7 @@ let platformConfig = null;
  * Obtiene la ruta del archivo de SSH key del agente
  */
 function getDgpSshKeyPath() {
-  const os = require('os');
-  const path = require('path');
-  return path.join(os.homedir(), '.ssh', 'dgp_key');
+  return join(homedir(), '.ssh', 'dgp_key');
 }
 
 /**
@@ -216,19 +214,15 @@ function getDgpSshKeyPath() {
  */
 function saveSshKeyLocally(sshPrivateKey) {
   try {
-    const fs = require('fs');
-    const os = require('os');
-    const path = require('path');
-
-    const sshDir = path.join(os.homedir(), '.ssh');
-    if (!fs.existsSync(sshDir)) {
-      fs.mkdirSync(sshDir, { recursive: true, mode: 0o700 });
+    const sshDir = join(homedir(), '.ssh');
+    if (!existsSync(sshDir)) {
+      mkdirSync(sshDir, { recursive: true, mode: 0o700 });
     }
 
     const keyPath = getDgpSshKeyPath();
     // Normalizar saltos de línea
     const normalizedKey = sshPrivateKey.replace(/\\n/g, '\n').replace(/\r\n/g, '\n');
-    fs.writeFileSync(keyPath, normalizedKey, { mode: 0o600 });
+    writeFileSync(keyPath, normalizedKey, { mode: 0o600 });
 
     return keyPath;
   } catch (e) {
@@ -242,10 +236,9 @@ function saveSshKeyLocally(sshPrivateKey) {
  */
 function loadLocalSshKey() {
   try {
-    const fs = require('fs');
     const keyPath = getDgpSshKeyPath();
-    if (fs.existsSync(keyPath)) {
-      return fs.readFileSync(keyPath, 'utf8');
+    if (existsSync(keyPath)) {
+      return readFileSync(keyPath, 'utf8');
     }
     return null;
   } catch (e) {
@@ -257,12 +250,11 @@ function loadLocalSshKey() {
  * Verifica si hay una SSH key guardada localmente
  */
 function hasLocalSshKey() {
-  const fs = require('fs');
-  return fs.existsSync(getDgpSshKeyPath());
+  return existsSync(getDgpSshKeyPath());
 }
 
 // Versión del agente
-const AGENT_VERSION = '1.4.22';
+const AGENT_VERSION = '1.4.23';
 let AGENT_MODE = 'smart'; // Siempre inteligente
 
 // Configuración (prioridad: env vars > archivo config > platform config > defaults)
@@ -1322,29 +1314,31 @@ async function executeTestConnection(command) {
 
   // SSH Key: prioridad params > guardada localmente
   let sshPrivateKey = params?.ssh_private_key || null;
-  let sshKeySource = 'ninguna';
+  let sshPassword = params?.ssh_password || null;
+  let authMethod = 'ninguno';
 
   // Si viene SSH key en params, guardarla localmente para futuro uso
   if (sshPrivateKey) {
     const savedPath = saveSshKeyLocally(sshPrivateKey);
     if (savedPath) {
       logSuccess(`SSH Key guardada en ${savedPath}`);
-      sshKeySource = 'plataforma (guardada localmente)';
+      authMethod = 'key (guardada localmente)';
     } else {
-      sshKeySource = 'plataforma';
+      authMethod = 'key (plataforma)';
     }
   } else if (hasLocalSshKey()) {
     // Si no viene en params pero hay una guardada, usarla
     sshPrivateKey = loadLocalSshKey();
-    sshKeySource = `local (${getDgpSshKeyPath()})`;
+    authMethod = `key (${getDgpSshKeyPath()})`;
     logInfo(`Usando SSH Key guardada: ${getDgpSshKeyPath()}`);
+  } else if (sshPassword) {
+    authMethod = 'password';
+    logInfo('Usando autenticación por password');
   }
 
   logCommand(`=== Testing SSH Connection ===`);
   logInfo(`Target: ${ssh_user || 'root'}@${server_host}`);
-  if (sshKeySource !== 'ninguna') {
-    logInfo(`SSH Key: ${sshKeySource}`);
-  }
+  logInfo(`Auth: ${authMethod}`);
 
   // Iniciar tracking de logs
   currentCommandId = command.id;
@@ -1387,19 +1381,36 @@ async function executeTestConnection(command) {
     // Step 2: SSH test
     logInfo('Step 2: Testing SSH connection...');
 
+    const user = ssh_user || 'root';
+    let sshCmd = '';
+
     // Usar la SSH key guardada en ~/.ssh/dgp_key (ya se guardó arriba si vino de params)
     let sshKeyPath = null;
     if (sshPrivateKey && hasLocalSshKey()) {
       sshKeyPath = getDgpSshKeyPath();
       await addCommandLog('info', `Usando SSH key: ${sshKeyPath}`);
+      const sshOpts = `-i ${sshKeyPath} -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o BatchMode=yes`;
+      sshCmd = `ssh ${sshOpts} ${user}@${server_host} "echo 'SSH_OK' && hostname && whoami"`;
+    } else if (sshPassword) {
+      // Usar sshpass para autenticación por password
+      await addCommandLog('info', 'Usando autenticación por password (sshpass)');
+      const isWindows = process.platform === 'win32';
+      if (isWindows) {
+        // En Windows usar plink (PuTTY) o mostrar advertencia
+        await addCommandLog('warning', 'SSH con password en Windows requiere plink (PuTTY)');
+        // Intentar con plink si está disponible
+        sshCmd = `echo y | plink -ssh -pw "${sshPassword}" ${user}@${server_host} "echo SSH_OK && hostname && whoami"`;
+      } else {
+        // En Linux/Mac usar sshpass
+        sshCmd = `sshpass -p "${sshPassword}" ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 ${user}@${server_host} "echo 'SSH_OK' && hostname && whoami"`;
+      }
+    } else {
+      // Sin key ni password, intentar con key del sistema
+      await addCommandLog('info', 'Intentando conexión con keys del sistema (~/.ssh/)');
+      const sshOpts = `-o StrictHostKeyChecking=no -o ConnectTimeout=10 -o BatchMode=yes`;
+      sshCmd = `ssh ${sshOpts} ${user}@${server_host} "echo 'SSH_OK' && hostname && whoami"`;
     }
 
-    const user = ssh_user || 'root';
-    const sshOpts = sshKeyPath
-      ? `-i ${sshKeyPath} -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o BatchMode=yes`
-      : `-o StrictHostKeyChecking=no -o ConnectTimeout=10 -o BatchMode=yes`;
-
-    const sshCmd = `ssh ${sshOpts} ${user}@${server_host} "echo 'SSH_OK' && hostname && whoami"`;
     await addCommandLog('command', `ssh ${user}@${server_host} "hostname && whoami"`);
 
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deinossrl/dgp-agent",
-  "version": "1.4.22",
+  "version": "1.4.24",
   "description": "Agente local para Despliegue-GPT - Reporta el estado del repositorio Git a la plataforma TenMinute IA",
   "main": "index.mjs",
   "bin": {