mlgym-deploy 3.3.15 → 3.3.19

package/index.js

@@ -18,7 +18,7 @@ import crypto from 'crypto';
 const execAsync = promisify(exec);
 
 // Current version of this MCP server - INCREMENT FOR WORKFLOW FIXES
-const CURRENT_VERSION = '3.3.15';  // Fix: Use expose instead of ports:80 for Traefik compatibility
+const CURRENT_VERSION = '3.3.17';  // Fix: Extract EXPOSE port from Dockerfile and send to backend
 const PACKAGE_NAME = 'mlgym-deploy';
 
 // Debug logging configuration - ENABLED BY DEFAULT
@@ -95,6 +95,12 @@ const CONFIG = {
 
 // Helper to load/save authentication
 async function loadAuth() {
+  // First check environment variable
+  if (process.env.MLGYM_TOKEN) {
+    return { token: process.env.MLGYM_TOKEN, email: process.env.MLGYM_EMAIL || 'env-token-user' };
+  }
+
+  // Fall back to config file
   try {
     const data = await fs.readFile(CONFIG.config_file, 'utf8');
     return JSON.parse(data);
@@ -985,6 +991,30 @@ async function smartDeploy(args) {
 }
 
 // Deployment Strategy Detection (matches CLI logic)
+// Extract EXPOSE port from Dockerfile
+async function extractDockerfilePort(dockerfilePath) {
+  try {
+    const content = await fs.readFile(dockerfilePath, 'utf8');
+    const lines = content.split('\n');
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (trimmed.startsWith('EXPOSE ')) {
+        const portMatch = trimmed.match(/EXPOSE\s+(\d+)/);
+        if (portMatch) {
+          const port = portMatch[1];
+          log.info(`MCP >>> [extractDockerfilePort] Found EXPOSE ${port}`);
+          return port;
+        }
+      }
+    }
+    log.info('MCP >>> [extractDockerfilePort] No EXPOSE directive found, defaulting to 3000');
+    return '3000'; // Default if no EXPOSE found
+  } catch (err) {
+    log.error('MCP >>> [extractDockerfilePort] Error reading Dockerfile:', err.message);
+    return '3000';
+  }
+}
+
 async function detectDeploymentStrategy(projectPath) {
   const dockerfilePath = path.join(projectPath, 'Dockerfile');
   const composePathYML = path.join(projectPath, 'docker-compose.yml');
@@ -1000,8 +1030,9 @@ async function detectDeploymentStrategy(projectPath) {
 
   // Case 1: Only Dockerfile
   if (hasDockerfile && !hasCompose) {
-    log.info('MCP >>> [detectDeploymentStrategy] Strategy: dockerfile (Dockerfile only)');
-    return { type: 'dockerfile', reason: 'Dockerfile only' };
+    const port = await extractDockerfilePort(dockerfilePath);
+    log.info(`MCP >>> [detectDeploymentStrategy] Strategy: dockerfile (Dockerfile only), port: ${port}`);
+    return { type: 'dockerfile', reason: 'Dockerfile only', port };
   }
 
   // Case 2: Only docker-compose
@@ -1022,8 +1053,9 @@ async function detectDeploymentStrategy(projectPath) {
       // SIMPLE: Only 1 web service, no other services, uses local Dockerfile
       // → docker-compose is just convenience wrapper
       if (totalServiceCount === 1 && webServiceCount === 1 && usesLocalDockerfile) {
-        log.info('MCP >>> [detectDeploymentStrategy] Strategy: dockerfile (single web service)');
-        return { type: 'dockerfile', reason: 'docker-compose.yml only has web service (convenience wrapper for Dockerfile)' };
+        const port = await extractDockerfilePort(dockerfilePath);
+        log.info(`MCP >>> [detectDeploymentStrategy] Strategy: dockerfile (single web service), port: ${port}`);
+        return { type: 'dockerfile', reason: 'docker-compose.yml only has web service (convenience wrapper for Dockerfile)', port };
       }
 
       // COMPLEX: Multiple services (web + database, etc.)
@@ -1165,29 +1197,34 @@ function randomizeVolumeNames(content, suffix) {
 function validateDockerfile(content) {
   const lines = content.split('\n');
   const issues = [];
-  let hasExpose80 = false;
+  let hasExpose = false;
+  let exposedPort = null;
 
   for (let i = 0; i < lines.length; i++) {
-    const trimmed = lines[i].trim().toUpperCase();
-
-    if (trimmed.startsWith('EXPOSE')) {
-      // Check if it exposes port 80
-      if (trimmed.includes('80') && !trimmed.includes('8080') && !trimmed.includes('8443')) {
-        hasExpose80 = true;
+    const trimmed = lines[i].trim();
+    const upper = trimmed.toUpperCase();
+
+    if (upper.startsWith('EXPOSE')) {
+      hasExpose = true;
+      // Extract the port number
+      const portMatch = trimmed.match(/EXPOSE\s+(\d+)/i);
+      if (portMatch) {
+        exposedPort = portMatch[1];
       }
     }
   }
 
-  if (!hasExpose80) {
+  if (!hasExpose) {
     issues.push({
-      issue: 'Dockerfile does not EXPOSE port 80',
-      fix: 'Add "EXPOSE 80" to your Dockerfile'
+      issue: 'Dockerfile does not have an EXPOSE directive',
+      fix: 'Add "EXPOSE <port>" to your Dockerfile (e.g., EXPOSE 80 for web servers, EXPOSE 3000 for Node.js)'
     });
   }
 
   return {
     isValid: issues.length === 0,
-    issues
+    issues,
+    exposedPort
   };
 }
 
@@ -1357,6 +1394,12 @@ async function initProject(args) {
     projectData.hostname = hostname;
     projectData.local_path = local_path;
 
+    // Send ports_exposes for Dockerfile deployments (v3.3.17+)
+    if (strategy.port) {
+      projectData.ports_exposes = strategy.port;
+      log.info(`MCP >>> [initProject] Sending ports_exposes: ${strategy.port} to backend`);
+    }
+
     // Read docker-compose content if using dockercompose strategy (v3.2.1+)
     if (strategy.type === 'dockercompose') {
       const composeFiles = ['docker-compose.yml', 'docker-compose.yaml'];
@@ -1886,7 +1929,7 @@ class DeploymentWorkflow {
     // Parse the result
     const resultData = JSON.parse(authResult.content[0].text);
 
-    if (resultData.status === 'success' || resultData.authenticated) {
+    if (resultData.status === 'success' || resultData.status === 'authenticated' || resultData.authenticated) {
       this.authToken = (await loadAuth()).token;
       this.updateLastStep('completed', 'Authentication successful');
       return { authenticated: true, cached: false };
@@ -2208,9 +2251,11 @@ async function deployProject(args) {
             log.info(`    Fix: ${issue.fix}`);
           });
 
-          // For Dockerfile, we'll add EXPOSE 80 if missing
-          if (!content.includes('EXPOSE 80')) {
-            log.info('MCP >>> Auto-fixing Dockerfile: adding EXPOSE 80...');
+          // Only add EXPOSE if there's truly no EXPOSE directive at all
+          // Don't override an existing EXPOSE with a different port
+          const hasAnyExpose = /^\s*EXPOSE\s+\d+/mi.test(content);
+          if (!hasAnyExpose) {
+            log.info('MCP >>> Auto-fixing Dockerfile: adding EXPOSE 80 (no existing EXPOSE found)...');
             const lines = content.split('\n');
 
             // Find the last FROM or WORKDIR line to add EXPOSE after it
@@ -2230,6 +2275,8 @@ async function deployProject(args) {
             fsSync.writeFileSync(dockerfilePath, fixedContent);
 
             log.success('MCP >>> Fixed Dockerfile: added EXPOSE 80');
+          } else {
+            log.info('MCP >>> Dockerfile already has EXPOSE directive, skipping auto-fix');
           }
         } else {
           log.success('MCP >>> Dockerfile is Coolify compliant');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlgym-deploy",
-  "version": "3.3.15",
+  "version": "3.3.19",
   "description": "MCP server for MLGym - Complete deployment management: deploy, configure, monitor, and rollback applications",
   "main": "index.js",
   "type": "module",