Don't throw if there are no online players or maps

Tripperful · May 6, 2024 · ab9a6d6 · ab9a6d6
1 parent 385c581
commit ab9a6d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/server/src/srcdsApi/WsSrcdsApi.ts b/packages/server/src/srcdsApi/WsSrcdsApi.ts
@@ -36,11 +36,13 @@ export class WsSrcdsApi implements SrcdsApi {
     ...cvars: TCvars[]
   ): Promise<{ [cvar in TCvars]: string }> {
     return (
-      await this.request<TCvars[], { [cvar in TCvars]: string }>(
-        'get_cvars_request',
-        cvars,
-      )
-    ).data;
+      (
+        await this.request<TCvars[], { [cvar in TCvars]: string }>(
+          'get_cvars_request',
+          cvars,
+        )
+      ).data ?? ({} as { [cvar in TCvars]: string })
+    );
   }
 
   setCvar(cvar: Cvar, value: string): void {
@@ -52,7 +54,7 @@ export class WsSrcdsApi implements SrcdsApi {
   }
 
   async getMaps(): Promise<string[]> {
-    return (await this.request<never, string[]>('get_maps_request')).data;
+    return (await this.request<never, string[]>('get_maps_request')).data ?? [];
   }
 
   changelevel(token: string, mapName: string): void {
@@ -61,8 +63,9 @@ export class WsSrcdsApi implements SrcdsApi {
 
   async getOnlinePlayers(): Promise<OnlinePlayerInfo[]> {
     return (
-      await this.request<never, OnlinePlayerInfo[]>('get_players_request')
-    ).data;
+      (await this.request<never, OnlinePlayerInfo[]>('get_players_request'))
+        .data ?? []
+    );
   }
 
   startMatch(

diff --git a/packages/server/src/ws/index.ts b/packages/server/src/ws/index.ts
@@ -132,7 +132,7 @@ export class WsApi {
     data?: TData,
     guid?: string,
   ) {
-    const { ws } = this.remotesBySessionId[sessionId];
+    const ws = this.remotesBySessionId[sessionId]?.ws;
 
     if (!ws?.OPEN) {
       throw new Error(