Update WebSocketService.tsx

Author: Fr4nc3

src/frontend/src/services/WebSocketService.tsx

@@ -1,4 +1,4 @@
-import { headerBuilder } from '../api/config';
+import { getApiUrl, headerBuilder } from '../api/config';
 import { PlanDataService } from './PlanDataService';
 import { MPlanData, ParsedPlanApprovalRequest, StreamingPlanUpdate, StreamMessage, WebsocketMessageType } from '../models';
 
@@ -12,8 +12,24 @@ class WebSocketService {
     private planSubscriptions: Set<string> = new Set();
     private reconnectTimer: NodeJS.Timeout | null = null;
     private isConnecting = false;
-    private baseWsUrl = process.env.REACT_APP_BACKEND_URL?.replace('http', 'ws') || 'ws://localhost:8000';
+    private baseWsUrl = getApiUrl() || 'ws://localhost:8000';
 
+    private buildSocketUrl(processId?: string, sessionId?: string): string {
+        // Trim and remove trailing slashes
+        let base = (this.baseWsUrl || '').trim().replace(/\/+$/, '');
+        // Normalize protocol: http -> ws, https -> wss
+        base = base.replace(/^http:\/\//i, 'ws://')
+            .replace(/^https:\/\//i, 'wss://');
+
+        // Leave ws/wss as-is; anything else is assumed already correct
+
+        // Decide path addition
+        const hasApiSegment = /\/api(\/|$)/i.test(base);
+        const socketPath = hasApiSegment ? '/v3/socket' : '/api/v3/socket';
+        const url = `${base}${socketPath}${processId ? `/${processId}` : `/${sessionId}`}`;
+        console.log("Constructed WebSocket URL:", url);
+        return url;
+    }
     connect(sessionId: string, processId?: string): Promise<void> {
         return new Promise((resolve, reject) => {
             if (this.isConnecting) {
@@ -26,9 +42,7 @@ class WebSocketService {
             }
             try {
                 this.isConnecting = true;
-                const wsUrl = processId
-                    ? `${this.baseWsUrl}/api/v3/socket/${processId}`
-                    : `${this.baseWsUrl}/api/v3/socket/${sessionId}`;
+                const wsUrl = this.buildSocketUrl(processId, sessionId);
                 this.ws = new WebSocket(wsUrl);
 
                 this.ws.onopen = () => {