Add timeout for fetching server status

nisargjhaveri · Jan 8, 2025 · 7cb544c · 7cb544c
1 parent e15cd68
commit 7cb544c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/client/ServerConnection.ts b/src/client/ServerConnection.ts
@@ -97,9 +97,9 @@ export class ServerConnection {
         }
     }
 
-    getServerStatus = async (): Promise<ServerStatus> => {
+    getServerStatus = async (timeout: number = 10000): Promise<ServerStatus> => {
         await this.lastServerStatusPromise
-        this.lastServerStatusPromise = this.fetchServerStatus();
+        this.lastServerStatusPromise = this.fetchServerStatus(timeout);
 
         const status = await this.lastServerStatusPromise;
 
@@ -114,12 +114,13 @@ export class ServerConnection {
         setTimeout(this.updateStatusLoop, 5000);
     }
 
-    private fetchServerStatus = async (): Promise<ServerStatus> => {
+    private fetchServerStatus = async (timeout: number): Promise<ServerStatus> => {
         try {
             const res = await this.fetch(url.status, {
                 headers: {
                     'Content-Type': 'application/json'
                 },
+                signal: AbortSignal.timeout(timeout)
             });
 
             if (res.status !== 200) {