This commit is contained in:
Baobhan Sith
2025-04-28 20:03:37 +08:00
parent bc08141982
commit c43b2c63f1
4 changed files with 11 additions and 9 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ services:
- .env # Load environment variables from .env file in the root - .env # Load environment variables from .env file in the root
container_name: nexus-terminal-backend container_name: nexus-terminal-backend
ports: ports:
- "18112:3001" - "3001:3001"
environment: environment:
NODE_ENV: production NODE_ENV: production
PORT: 3001 PORT: 3001
+2 -2
View File
@@ -3,7 +3,7 @@ services:
image: heavrnl/nexus-terminal-frontend image: heavrnl/nexus-terminal-frontend
container_name: nexus-terminal-frontend container_name: nexus-terminal-frontend
ports: ports:
- "18111:80" - "3001:80"
depends_on: depends_on:
- backend - backend
- rdp # Added rdp dependency - rdp # Added rdp dependency
@@ -14,7 +14,7 @@ services:
image: heavrnl/nexus-terminal-backend image: heavrnl/nexus-terminal-backend
container_name: nexus-terminal-backend container_name: nexus-terminal-backend
ports: ports:
- "18112:3001" - "3001:3001"
environment: environment:
NODE_ENV: production NODE_ENV: production
PORT: 3001 PORT: 3001
+7 -4
View File
@@ -476,14 +476,17 @@ export const initializeWebSocket = async (server: http.Server, sessionParser: Re
} }
// Determine RDP target URL based on deployment mode // Determine RDP target URL based on deployment mode
const deploymentMode = process.env.DEPLOYMENT_MODE || 'docker'; // Default to docker mode const deploymentMode = process.env.DEPLOYMENT_MODE; // Default to docker mode
let rdpBaseUrl: string; let rdpBaseUrl: string;
if (deploymentMode === 'local') { if (deploymentMode === 'local') {
rdpBaseUrl = process.env.RDP_SERVICE_URL_LOCAL || 'ws://localhost:18114'; // Default for local rdpBaseUrl = process.env.RDP_SERVICE_URL_LOCAL || 'ws://localhost:8081'; // Default for local, fallback to localhost:3001
console.log(`[WebSocket RDP Proxy] Using LOCAL deployment mode. RDP Target Base: ${rdpBaseUrl}`); console.log(`[WebSocket RDP Proxy] Using LOCAL deployment mode. RDP Target Base: ${rdpBaseUrl}`);
} else { } else if (deploymentMode === 'docker') { // Explicitly check for docker mode
rdpBaseUrl = process.env.RDP_SERVICE_URL_DOCKER || 'ws://rdp:8081'; // Default for docker rdpBaseUrl = process.env.RDP_SERVICE_URL_DOCKER || 'ws://rdp:8081'; // Default for docker, fallback to localhost:3001
console.log(`[WebSocket RDP Proxy] Using DOCKER deployment mode. RDP Target Base: ${rdpBaseUrl}`); console.log(`[WebSocket RDP Proxy] Using DOCKER deployment mode. RDP Target Base: ${rdpBaseUrl}`);
} else { // Handle unknown modes
rdpBaseUrl = 'ws://localhost:8081'; // Fallback to a safe default for unknown modes
console.warn(`[WebSocket RDP Proxy] Unknown deployment mode '${deploymentMode}'. Defaulting to safe fallback RDP Target Base: ${rdpBaseUrl}`);
} }
// Ensure base URL doesn't end with a slash before appending query params // Ensure base URL doesn't end with a slash before appending query params
@@ -40,8 +40,7 @@ const MIN_MODAL_HEIGHT = 768;
// Dynamically construct WebSocket URL based on environment // Dynamically construct WebSocket URL based on environment
let backendBaseUrl: string; let backendBaseUrl: string;
// const LOCAL_BACKEND_URL = 'ws://localhost:18112' const LOCAL_BACKEND_URL = 'ws://localhost:3001'
const LOCAL_BACKEND_URL = 'ws://localhost:8081'
// Determine WebSocket URL based on hostname // Determine WebSocket URL based on hostname
if (window.location.hostname === 'localhost') { if (window.location.hostname === 'localhost') {