@deinossrl/dgp-agent 1.4.35 → 1.4.37

package/index.mjs

@@ -221,8 +221,14 @@ function saveSshKeyLocally(sshPrivateKey) {
     }
 
     const keyPath = getDgpSshKeyPath();
-    // Normalizar saltos de línea
-    let normalizedKey = sshPrivateKey.replace(/\\n/g, '\n').replace(/\r\n/g, '\n');
+
+    // Normalizar la key: los saltos de línea pueden venir ya interpretados o como \n literal
+    let normalizedKey = sshPrivateKey;
+
+    // Si no tiene saltos de línea reales pero tiene \n literal, convertirlos
+    if (!normalizedKey.includes('\n') && normalizedKey.includes('\\n')) {
+      normalizedKey = normalizedKey.replace(/\\n/g, '\n');
+    }
 
     // Verificar si la key tiene los delimitadores BEGIN/END
     if (!normalizedKey.includes('-----BEGIN')) {
@@ -346,7 +352,7 @@ function getPlinkPath() {
 }
 
 // Versión del agente
-const AGENT_VERSION = '1.4.35';
+const AGENT_VERSION = '1.4.37';
 let AGENT_MODE = 'smart'; // Siempre inteligente
 
 // Configuración (prioridad: env vars > archivo config > platform config > defaults)
@@ -1179,9 +1185,31 @@ async function executeDeploy(command) {
     const fs = await import('fs');
     const path = await import('path');
     sshKeyPath = path.join(os.tmpdir(), `dgp_deploy_key_${Date.now()}`);
-    // Normalizar saltos de línea (pueden venir como \n literal del JSON)
-    const normalizedKey = sshPrivateKey.replace(/\\n/g, '\n').replace(/\r\n/g, '\n');
+
+    // Normalizar la key: los saltos de línea pueden venir ya interpretados o como \n literal
+    let normalizedKey = sshPrivateKey;
+
+    // Si no tiene saltos de línea reales pero tiene \n literal, convertirlos
+    if (!normalizedKey.includes('\n') && normalizedKey.includes('\\n')) {
+      normalizedKey = normalizedKey.replace(/\\n/g, '\n');
+    }
+
+    // Asegurar que termina con salto de línea
+    if (!normalizedKey.endsWith('\n')) {
+      normalizedKey += '\n';
+    }
+
     fs.writeFileSync(sshKeyPath, normalizedKey, { mode: 0o600 });
+
+    // En Windows, ajustar permisos con icacls
+    if (process.platform === 'win32') {
+      try {
+        shellSync(`icacls "${sshKeyPath}" /inheritance:r /grant:r "%USERNAME%:(R,W)"`);
+      } catch (e) {
+        // Ignorar si falla
+      }
+    }
+
     sshOptions = `-e "ssh -i ${sshKeyPath} -o StrictHostKeyChecking=no"`;
   }
 
@@ -1192,66 +1220,56 @@ async function executeDeploy(command) {
     // Mark as running
     await updateCommandStatus(id, 'running');
 
-    // Step 1: Git fetch and checkout
-    currentStep = 'git_checkout';
-    logCommand(`[1/5] Checkout branch ${branch}...`);
-    steps.push({ step: currentStep, status: 'running' });
-
-    await shellAsync(`git fetch origin`);
-    await shellAsync(`git checkout ${branch}`);
-    await shellAsync(`git pull origin ${branch}`);
+    // Determinar carpeta de proyecto en el servidor
+    const projectFolder = params?.project_path || (environment === 'production'
+      ? '/var/www/tenminuteia-prod/'
+      : '/var/www/tenminuteia-staging/');
 
-    steps[steps.length - 1].status = 'success';
-    logSuccess(`Branch ${branch} updated`);
+    // Construir base del comando SSH
+    const sshBase = sshKeyPath
+      ? `ssh -i ${sshKeyPath} -o StrictHostKeyChecking=no ${ssh_user}@${server_host}`
+      : `ssh ${ssh_user}@${server_host}`;
 
-    // Step 2: Install dependencies
-    currentStep = 'npm_install';
-    logCommand(`[2/5] Installing dependencies...`);
+    // Step 1: Git pull on server
+    currentStep = 'git_pull_server';
+    logCommand(`[1/4] Pulling latest code on server (${branch})...`);
     steps.push({ step: currentStep, status: 'running' });
 
-    await shellAsync(`npm ci`);
+    const gitPullCmd = `${sshBase} "cd ${projectFolder} && git fetch origin && git checkout ${branch} && git pull origin ${branch}"`;
+    await shellAsync(gitPullCmd);
 
     steps[steps.length - 1].status = 'success';
-    logSuccess(`Dependencies installed`);
+    logSuccess(`Code updated on server`);
 
-    // Step 3: Build
-    currentStep = 'npm_build';
-    logCommand(`[3/5] Building application...`);
+    // Step 2: Install dependencies on server
+    currentStep = 'npm_install_server';
+    logCommand(`[2/4] Installing dependencies on server...`);
     steps.push({ step: currentStep, status: 'running' });
 
-    await shellAsync(`npm run build`);
+    const npmInstallCmd = `${sshBase} "cd ${projectFolder} && npm ci"`;
+    await shellAsync(npmInstallCmd);
 
     steps[steps.length - 1].status = 'success';
-    logSuccess(`Build completed`);
+    logSuccess(`Dependencies installed on server`);
 
-    // Step 4: Deploy via rsync
-    currentStep = 'rsync_deploy';
-    logCommand(`[4/5] Deploying to server...`);
+    // Step 3: Build on server
+    currentStep = 'npm_build_server';
+    logCommand(`[3/4] Building application on server...`);
     steps.push({ step: currentStep, status: 'running' });
 
-    const deployFolder = environment === 'production'
-      ? '/var/www/tenminuteia-prod/'
-      : '/var/www/tenminuteia-staging/';
-
-    // Rsync the dist folder (con SSH key si disponible)
-    const rsyncCmd = sshOptions
-      ? `rsync -avz --delete ${sshOptions} dist/ ${ssh_user}@${server_host}:${deployFolder}`
-      : `rsync -avz --delete dist/ ${ssh_user}@${server_host}:${deployFolder}`;
-    await shellAsync(rsyncCmd);
+    const npmBuildCmd = `${sshBase} "cd ${projectFolder} && npm run build"`;
+    await shellAsync(npmBuildCmd);
 
     steps[steps.length - 1].status = 'success';
-    logSuccess(`Files deployed to ${server_host}:${deployFolder}`);
+    logSuccess(`Build completed on server`);
 
-    // Step 5: Reload nginx
+    // Step 4: Reload nginx
     currentStep = 'reload_nginx';
-    logCommand(`[5/5] Reloading Nginx...`);
+    logCommand(`[4/4] Reloading Nginx...`);
     steps.push({ step: currentStep, status: 'running' });
 
-    // SSH con key si disponible
-    const sshCmd = sshKeyPath
-      ? `ssh -i ${sshKeyPath} -o StrictHostKeyChecking=no ${ssh_user}@${server_host} "sudo nginx -t && sudo systemctl reload nginx"`
-      : `ssh ${ssh_user}@${server_host} "sudo nginx -t && sudo systemctl reload nginx"`;
-    await shellAsync(sshCmd);
+    const reloadNginxCmd = `${sshBase} "sudo nginx -t && sudo systemctl reload nginx"`;
+    await shellAsync(reloadNginxCmd);
 
     steps[steps.length - 1].status = 'success';
     logSuccess(`Nginx reloaded`);

package/package.json

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