ezpm2gui 1.8.0 → 1.9.0

package/dist/server/config/project-configs.json

@@ -1,235 +1,235 @@
-{
-  "projectTypes": {
-    "node": {
-      "name": "Node.js",
-      "detection": {
-        "files": ["package.json"],
-        "extensions": [".js", ".ts", ".jsx", ".tsx"]
-      },
-      "setup": {
-        "steps": [
-          {
-            "name": "Check Node.js version",
-            "command": "node --version",
-            "description": "Verifying Node.js installation",
-            "required": true
-          },
-          {
-            "name": "Install dependencies",
-            "command": "npm install",
-            "description": "Installing project dependencies",
-            "required": true,
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Build project (if build script exists)",
-            "command": "npm run build",
-            "description": "Building the project",
-            "required": false,
-            "conditional": "build_script_exists",
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Run tests (if test script exists)",
-            "command": "npm test",
-            "description": "Running tests",
-            "required": false,
-            "conditional": "test_script_exists",
-            "workingDirectory": "project"
-          }
-        ],
-        "environment": {}
-      },
-      "validation": {
-        "checks": [
-          {
-            "name": "package.json exists",
-            "file": "package.json"
-          },
-          {
-            "name": "node_modules exists after install",
-            "directory": "node_modules",
-            "optional": true
-          }
-        ]
-      },
-      "defaultConfig": {
-        "interpreter": "node",
-        "execMode": "fork",
-        "supportsCluster": true,
-        "startScript": "npm start"
-      }
-    },
-    "python": {
-      "name": "Python",
-      "detection": {
-        "files": ["requirements.txt", "pyproject.toml", "setup.py", "Pipfile"],
-        "extensions": [".py"]
-      },
-      "setup": {
-        "steps": [
-          {
-            "name": "Check Python version",
-            "command": "python --version",
-            "description": "Verifying Python installation",
-            "required": true
-          },
-          {
-            "name": "Create virtual environment",
-            "command": "python -m venv venv",
-            "description": "Creating Python virtual environment",
-            "required": true,
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Activate virtual environment (Windows)",
-            "command": ".\\venv\\Scripts\\Activate.ps1",
-            "description": "Activating virtual environment",
-            "required": true,
-            "platform": "win32",
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Activate virtual environment (Unix)",
-            "command": "source venv/bin/activate",
-            "description": "Activating virtual environment",
-            "required": true,
-            "platform": "unix",
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Upgrade pip",
-            "command": "python -m pip install --upgrade pip",
-            "description": "Upgrading pip",
-            "required": true,
-            "workingDirectory": "project",
-            "useVenv": true
-          },
-          {
-            "name": "Install requirements",
-            "command": "pip install -r requirements.txt",
-            "description": "Installing Python dependencies",
-            "required": true,
-            "conditional": "requirements_exists",
-            "workingDirectory": "project",
-            "useVenv": true
-          },
-          {
-            "name": "Install from pyproject.toml",
-            "command": "pip install -e .",
-            "description": "Installing from pyproject.toml",
-            "required": true,
-            "conditional": "pyproject_exists",
-            "workingDirectory": "project",
-            "useVenv": true
-          }
-        ],
-        "environment": {
-          "PYTHONPATH": ".",
-          "PYTHON_UNBUFFERED": "1"
-        }
-      },
-      "validation": {
-        "checks": [
-          {
-            "name": "Virtual environment created",
-            "directory": "venv"
-          },
-          {
-            "name": "Requirements file exists",
-            "file": "requirements.txt",
-            "optional": true
-          }
-        ]
-      },
-      "defaultConfig": {
-        "interpreter": "python",
-        "execMode": "fork",
-        "supportsCluster": false,
-        "interpreterPath": "venv/Scripts/python.exe"
-      }
-    },
-    "dotnet": {
-      "name": ".NET",
-      "detection": {
-        "files": ["*.csproj", "*.fsproj", "*.vbproj", "*.sln"],
-        "extensions": [".cs", ".fs", ".vb"]
-      },
-      "setup": {
-        "steps": [
-          {
-            "name": "Check .NET version",
-            "command": "dotnet --version",
-            "description": "Verifying .NET installation",
-            "required": true
-          },
-          {
-            "name": "Restore packages",
-            "command": "dotnet restore",
-            "description": "Restoring NuGet packages",
-            "required": true,
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Build project",
-            "command": "dotnet build --configuration Release",
-            "description": "Building .NET project",
-            "required": true,
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Publish project",
-            "command": "dotnet publish --configuration Release --output ./publish",
-            "description": "Publishing .NET project",
-            "required": true,
-            "workingDirectory": "project"
-          },
-          {
-            "name": "Run tests",
-            "command": "dotnet test",
-            "description": "Running .NET tests",
-            "required": false,
-            "conditional": "test_project_exists",
-            "workingDirectory": "project"
-          }
-        ],
-        "environment": {
-          "DOTNET_ENVIRONMENT": "Production",
-          "ASPNETCORE_ENVIRONMENT": "Production"
-        }
-      },
-      "validation": {
-        "checks": [
-          {
-            "name": "Project file exists",
-            "pattern": "*.csproj"
-          },
-          {
-            "name": "Publish directory exists",
-            "directory": "publish"
-          }
-        ]
-      },
-      "defaultConfig": {
-        "interpreter": "dotnet",
-        "execMode": "fork",
-        "supportsCluster": false,
-        "startCommand": "dotnet run"
-      }
-    }
-  },
-  "global": {
-    "timeouts": {
-      "setup": 300000,
-      "validation": 30000
-    },
-    "retries": {
-      "setup": 2,
-      "validation": 1
-    },
-    "logging": {
-      "level": "info",
-      "file": "deployment.log"
-    }
-  }
-}
+{
+  "projectTypes": {
+    "node": {
+      "name": "Node.js",
+      "detection": {
+        "files": ["package.json"],
+        "extensions": [".js", ".ts", ".jsx", ".tsx"]
+      },
+      "setup": {
+        "steps": [
+          {
+            "name": "Check Node.js version",
+            "command": "node --version",
+            "description": "Verifying Node.js installation",
+            "required": true
+          },
+          {
+            "name": "Install dependencies",
+            "command": "npm install",
+            "description": "Installing project dependencies",
+            "required": true,
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Build project (if build script exists)",
+            "command": "npm run build",
+            "description": "Building the project",
+            "required": false,
+            "conditional": "build_script_exists",
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Run tests (if test script exists)",
+            "command": "npm test",
+            "description": "Running tests",
+            "required": false,
+            "conditional": "test_script_exists",
+            "workingDirectory": "project"
+          }
+        ],
+        "environment": {}
+      },
+      "validation": {
+        "checks": [
+          {
+            "name": "package.json exists",
+            "file": "package.json"
+          },
+          {
+            "name": "node_modules exists after install",
+            "directory": "node_modules",
+            "optional": true
+          }
+        ]
+      },
+      "defaultConfig": {
+        "interpreter": "node",
+        "execMode": "fork",
+        "supportsCluster": true,
+        "startScript": "npm start"
+      }
+    },
+    "python": {
+      "name": "Python",
+      "detection": {
+        "files": ["requirements.txt", "pyproject.toml", "setup.py", "Pipfile"],
+        "extensions": [".py"]
+      },
+      "setup": {
+        "steps": [
+          {
+            "name": "Check Python version",
+            "command": "python --version",
+            "description": "Verifying Python installation",
+            "required": true
+          },
+          {
+            "name": "Create virtual environment",
+            "command": "python -m venv venv",
+            "description": "Creating Python virtual environment",
+            "required": true,
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Activate virtual environment (Windows)",
+            "command": ".\\venv\\Scripts\\Activate.ps1",
+            "description": "Activating virtual environment",
+            "required": true,
+            "platform": "win32",
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Activate virtual environment (Unix)",
+            "command": "source venv/bin/activate",
+            "description": "Activating virtual environment",
+            "required": true,
+            "platform": "unix",
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Upgrade pip",
+            "command": "python -m pip install --upgrade pip",
+            "description": "Upgrading pip",
+            "required": true,
+            "workingDirectory": "project",
+            "useVenv": true
+          },
+          {
+            "name": "Install requirements",
+            "command": "pip install -r requirements.txt",
+            "description": "Installing Python dependencies",
+            "required": true,
+            "conditional": "requirements_exists",
+            "workingDirectory": "project",
+            "useVenv": true
+          },
+          {
+            "name": "Install from pyproject.toml",
+            "command": "pip install -e .",
+            "description": "Installing from pyproject.toml",
+            "required": true,
+            "conditional": "pyproject_exists",
+            "workingDirectory": "project",
+            "useVenv": true
+          }
+        ],
+        "environment": {
+          "PYTHONPATH": ".",
+          "PYTHON_UNBUFFERED": "1"
+        }
+      },
+      "validation": {
+        "checks": [
+          {
+            "name": "Virtual environment created",
+            "directory": "venv"
+          },
+          {
+            "name": "Requirements file exists",
+            "file": "requirements.txt",
+            "optional": true
+          }
+        ]
+      },
+      "defaultConfig": {
+        "interpreter": "python",
+        "execMode": "fork",
+        "supportsCluster": false,
+        "interpreterPath": "venv/Scripts/python.exe"
+      }
+    },
+    "dotnet": {
+      "name": ".NET",
+      "detection": {
+        "files": ["*.csproj", "*.fsproj", "*.vbproj", "*.sln"],
+        "extensions": [".cs", ".fs", ".vb"]
+      },
+      "setup": {
+        "steps": [
+          {
+            "name": "Check .NET version",
+            "command": "dotnet --version",
+            "description": "Verifying .NET installation",
+            "required": true
+          },
+          {
+            "name": "Restore packages",
+            "command": "dotnet restore",
+            "description": "Restoring NuGet packages",
+            "required": true,
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Build project",
+            "command": "dotnet build --configuration Release",
+            "description": "Building .NET project",
+            "required": true,
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Publish project",
+            "command": "dotnet publish --configuration Release --output ./publish",
+            "description": "Publishing .NET project",
+            "required": true,
+            "workingDirectory": "project"
+          },
+          {
+            "name": "Run tests",
+            "command": "dotnet test",
+            "description": "Running .NET tests",
+            "required": false,
+            "conditional": "test_project_exists",
+            "workingDirectory": "project"
+          }
+        ],
+        "environment": {
+          "DOTNET_ENVIRONMENT": "Production",
+          "ASPNETCORE_ENVIRONMENT": "Production"
+        }
+      },
+      "validation": {
+        "checks": [
+          {
+            "name": "Project file exists",
+            "pattern": "*.csproj"
+          },
+          {
+            "name": "Publish directory exists",
+            "directory": "publish"
+          }
+        ]
+      },
+      "defaultConfig": {
+        "interpreter": "dotnet",
+        "execMode": "fork",
+        "supportsCluster": false,
+        "startCommand": "dotnet run"
+      }
+    }
+  },
+  "global": {
+    "timeouts": {
+      "setup": 300000,
+      "validation": 30000
+    },
+    "retries": {
+      "setup": 2,
+      "validation": 1
+    },
+    "logging": {
+      "level": "info",
+      "file": "deployment.log"
+    }
+  }
+}

package/dist/server/index.js

@@ -41,15 +41,15 @@ function createServer() {
             origin: '*',
             methods: ['GET', 'POST']
         },
-        // Increase ping timeout to prevent false positive disconnections
-        pingTimeout: 10000, // How long to wait for a pong response (default: 5000ms)
+        // Increase ping timeout to prevent false positive disconnections in VPN/remote scenarios
+        pingTimeout: 20000, // How long to wait for a pong response (increased from 10s to 20s)
         pingInterval: 25000, // How often to send ping packets (default: 25000ms)
         // Allow reconnection attempts
         allowEIO3: true,
         // Transport configuration
         transports: ['websocket', 'polling'],
         // Upgrade timeout
-        upgradeTimeout: 10000
+        upgradeTimeout: 20000 // Increased from 10s to 20s for slow VPN connections
     });
     // Configure middleware
     app.use(express_1.default.json());
@@ -448,7 +448,7 @@ function createServer() {
 // Only start the server if this file is run directly
 if (require.main === module) {
     const PORT = parseInt(process.env.PORT || '3101', 10);
-    const HOST = process.env.HOST || '::';
+    const HOST = process.env.HOST || 'localhost';
     const server = createServer();
     server.listen(PORT, HOST, () => {
         console.log(`Server running on http://${HOST}:${PORT}`);

package/dist/server/routes/deployApplication.js

@@ -161,8 +161,8 @@ router.post('/generate-ecosystem', (req, res) => {
                     env: pm2Env.env || {}
                 };
             });
-            const ecosystemConfig = `module.exports = {
-  apps: ${JSON.stringify(apps, null, 2)}
+            const ecosystemConfig = `module.exports = {
+  apps: ${JSON.stringify(apps, null, 2)}
 };`;
             // Create the file (either at specified path or default location)
             const filePath = req.body.path || path_1.default.join(process.cwd(), 'ecosystem.config.js');
@@ -215,8 +215,8 @@ router.get('/generate-ecosystem-preview', (req, res) => {
                     env: pm2Env.env || {}
                 };
             });
-            const ecosystemConfig = `module.exports = {
-  apps: ${JSON.stringify(apps, null, 2)}
+            const ecosystemConfig = `module.exports = {
+  apps: ${JSON.stringify(apps, null, 2)}
 };`;
             pm2_1.default.disconnect();
             res.json({

package/dist/server/routes/logStreaming.js

@@ -74,8 +74,19 @@ const getRemoteLogStream = async (io, connectionId, processId) => {
         return activeRemoteStreams[streamKey];
     }
     const connection = remote_connection_1.remoteConnectionManager.getConnection(connectionId);
-    if (!connection || !connection.isConnected()) {
-        throw new Error('Connection not found or not connected');
+    if (!connection) {
+        throw new Error('Connection not found');
+    }
+    // Ensure connection is active before starting log stream
+    if (!connection.isConnected()) {
+        console.log(`Connection ${connectionId} not active, attempting to connect...`);
+        try {
+            await connection.connect();
+            console.log(`Successfully connected to ${connectionId} for log streaming`);
+        }
+        catch (error) {
+            throw new Error(`Failed to connect: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        }
     }
     // Get process info using the multi-path fallback so pm2 is found regardless of PATH
     console.log(`Getting process info for: ${processId}`);
@@ -185,9 +196,24 @@ const getRemoteLogStream = async (io, connectionId, processId) => {
                 processName,
                 error: error.message
             });
+            // Clean up on error
+            if (activeRemoteStreams[streamKey]) {
+                delete activeRemoteStreams[streamKey];
+            }
         });
         logStream.on('close', (code) => {
             console.log(`PM2 logs stream closed for ${processName} with code:`, code);
+            // Notify clients that the stream has closed
+            io.to(streamKey).emit('remote-log-closed', {
+                connectionId,
+                processId,
+                processName,
+                code
+            });
+            // Clean up the stream reference
+            if (activeRemoteStreams[streamKey]) {
+                delete activeRemoteStreams[streamKey];
+            }
         });
         streams.combined = logStream;
     }
@@ -274,10 +300,15 @@ const setupLogStreaming = (io) => {
                 const streams = activeRemoteStreams[streamKey];
                 if (streams) {
                     console.log(`Stopping remote log streams: ${streamKey}`);
-                    if (streams.stdout && streams.stdout.kill) {
+                    // Kill the log stream properly
+                    if (streams.combined && typeof streams.combined.kill === 'function') {
+                        streams.combined.kill();
+                    }
+                    // Also handle legacy stdout/stderr streams if they exist
+                    if (streams.stdout && typeof streams.stdout.kill === 'function') {
                         streams.stdout.kill();
                     }
-                    if (streams.stderr && streams.stderr.kill) {
+                    if (streams.stderr && typeof streams.stderr.kill === 'function') {
                         streams.stderr.kill();
                     }
                     delete activeRemoteStreams[streamKey];