diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 52a02b6..f1c1b46 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -20,7 +20,9 @@ export default function RootLayout({ - + {children} diff --git a/src/lib/websocket/client.ts b/src/lib/websocket/client.ts index 1f1645a..b904e2c 100644 --- a/src/lib/websocket/client.ts +++ b/src/lib/websocket/client.ts @@ -57,9 +57,9 @@ export class WebSocketClient { private associatedServerId: string | null = null; private baseUrl: string; - constructor(token: string) { + constructor(token: string, url: string) { this.token = token; - this.baseUrl = process.env.NEXT_PUBLIC_WEBSOCKET_URL || 'ws://localhost:3000/ws'; + this.baseUrl = url; } connect(): Promise { diff --git a/src/lib/websocket/context.tsx b/src/lib/websocket/context.tsx index 7737857..4518c78 100644 --- a/src/lib/websocket/context.tsx +++ b/src/lib/websocket/context.tsx @@ -30,9 +30,10 @@ export function useWebSocket() { interface WebSocketProviderProps { children: ReactNode; + websocketURL: string; } -export function WebSocketProvider({ children }: WebSocketProviderProps) { +export function WebSocketProvider({ children, websocketURL }: WebSocketProviderProps) { const [client, setClient] = useState(null); const [isConnected, setIsConnected] = useState(false); const [connectionStatus, setConnectionStatus] = useState< @@ -50,7 +51,7 @@ export function WebSocketProvider({ children }: WebSocketProviderProps) { client.disconnect(); } - const newClient = new WebSocketClient(token); + const newClient = new WebSocketClient(token, websocketURL); const statusHandler: ConnectionStatusHandler = (status, error) => { setConnectionStatus(status);