FJurmanovic/acc-server-manager-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: FJurmanovic:v0.21.0
Branches Tags
FJurmanovic:main
FJurmanovic:v0.21.8 FJurmanovic:v0.21.7 FJurmanovic:v0.21.6 FJurmanovic:v0.21.5 FJurmanovic:v0.21.4 FJurmanovic:v0.21.3 FJurmanovic:v0.21.2 FJurmanovic:v0.21.1 FJurmanovic:v0.21.0 FJurmanovic:v0.20.7 FJurmanovic:v0.20.6 FJurmanovic:v0.20.5 FJurmanovic:v0.20.4 FJurmanovic:v0.20.3 FJurmanovic:v0.20.2 FJurmanovic:v0.20.1 FJurmanovic:v0.20.0 FJurmanovic:v0.10.0
..
compare: FJurmanovic:v0.21.2
Branches Tags
FJurmanovic:main
FJurmanovic:v0.21.8 FJurmanovic:v0.21.7 FJurmanovic:v0.21.6 FJurmanovic:v0.21.5 FJurmanovic:v0.21.4 FJurmanovic:v0.21.3 FJurmanovic:v0.21.2 FJurmanovic:v0.21.1 FJurmanovic:v0.21.0 FJurmanovic:v0.20.7 FJurmanovic:v0.20.6 FJurmanovic:v0.20.5 FJurmanovic:v0.20.4 FJurmanovic:v0.20.3 FJurmanovic:v0.20.2 FJurmanovic:v0.20.1 FJurmanovic:v0.20.0 FJurmanovic:v0.10.0

2 Commits
v0.21.0 ... v0.21.2

Author SHA1 Message Date
Fran Jurmanović
3ba83ad538 update websocket url passing through server 2025-09-18 23:14:45 +02:00
Fran Jurmanović
fe6a36f3dc move websocket base url inside of constructor 2025-09-18 22:56:47 +02:00
3 changed files with 10 additions and 7 deletions
Expand all files Collapse all files

4
src/app/layout.tsx
View File

@@ -20,7 +20,9 @@ export default function RootLayout({
<html lang="en"> <html lang="en">
<body className="bg-gray-900 text-white antialiased"> <body className="bg-gray-900 text-white antialiased">
<QueryProvider> <QueryProvider>
<WebSocketProvider> <WebSocketProvider
websocketURL={process.env.NEXT_PUBLIC_WEBSOCKET_URL || 'ws://localhost:3000/ws'}
>
<SteamCMDProvider> <SteamCMDProvider>
<ServerCreationPopupProvider> <ServerCreationPopupProvider>
{children} {children}

8
src/lib/websocket/client.ts
View File

@@ -1,5 +1,3 @@
const BASE_URL = process.env.NEXT_PUBLIC_WEBSOCKET_URL || 'ws://localhost:3000/ws';
export interface WebSocketMessage { export interface WebSocketMessage {
type: 'step' | 'steam_output' | 'error' | 'complete'; type: 'step' | 'steam_output' | 'error' | 'complete';
server_id: string; server_id: string;
@@ -57,9 +55,11 @@ export class WebSocketClient {
private reconnectTimer: NodeJS.Timeout | null = null; private reconnectTimer: NodeJS.Timeout | null = null;
private shouldReconnect = true; private shouldReconnect = true;
private associatedServerId: string | null = null; private associatedServerId: string | null = null;
private baseUrl: string;
constructor(token: string) { constructor(token: string, url: string) {
this.token = token; this.token = token;
this.baseUrl = url;
} }
connect(): Promise<void> { connect(): Promise<void> {
@@ -72,7 +72,7 @@ export class WebSocketClient {
this.connectionPromise = new Promise((resolve, reject) => { this.connectionPromise = new Promise((resolve, reject) => {
try { try {
this.ws = new WebSocket(`${BASE_URL}?token=${this.token}`); this.ws = new WebSocket(`${this.baseUrl}?token=${this.token}`);
this.ws.onopen = () => { this.ws.onopen = () => {
console.log('WebSocket connected'); console.log('WebSocket connected');

5
src/lib/websocket/context.tsx
View File

@@ -30,9 +30,10 @@ export function useWebSocket() {
interface WebSocketProviderProps { interface WebSocketProviderProps {
children: ReactNode; children: ReactNode;
websocketURL: string;
} }
export function WebSocketProvider({ children }: WebSocketProviderProps) { export function WebSocketProvider({ children, websocketURL }: WebSocketProviderProps) {
const [client, setClient] = useState<WebSocketClient | null>(null); const [client, setClient] = useState<WebSocketClient | null>(null);
const [isConnected, setIsConnected] = useState(false); const [isConnected, setIsConnected] = useState(false);
const [connectionStatus, setConnectionStatus] = useState< const [connectionStatus, setConnectionStatus] = useState<
@@ -50,7 +51,7 @@ export function WebSocketProvider({ children }: WebSocketProviderProps) {
client.disconnect(); client.disconnect();
} }
const newClient = new WebSocketClient(token); const newClient = new WebSocketClient(token, websocketURL);
const statusHandler: ConnectionStatusHandler = (status, error) => { const statusHandler: ConnectionStatusHandler = (status, error) => {
setConnectionStatus(status); setConnectionStatus(status);