wip

Author: lukepolo

src/dedicated-servers/dedicated-servers.service.ts

@@ -439,21 +439,47 @@ export class DedicatedServersService {
     }
   }
 
+  private async getServerStatusInfo(
+    serverId: string,
+    game: string,
+    steamRelayEnabled: boolean,
+  ): Promise<{ steamId: string | null; clients_human: number; map: string }> {
+    const rcon = await this.RconService.connect(serverId);
+    if (!rcon) {
+      return;
+    }
+
+    if (game === "csgo") {
+      const output = await rcon.send("status");
+      const mapMatch = output.match(/^map\s*:\s*(\S+)/m);
+      const playersMatch = output.match(/^players\s*:\s*(\d+)\s+humans/m);
+      return {
+        steamId: null,
+        clients_human: playersMatch ? parseInt(playersMatch[1]) : 0,
+        map: mapMatch ? mapMatch[1] : "unknown",
+      };
+    } else {
+      const status = JSON.parse(await rcon.send("status_json"));
+      return {
+        steamId: steamRelayEnabled ? status.server.steamid : null,
+        clients_human: status.server.clients_human,
+        map: status.server.map || "unknown",
+      };
+    }
+  }
+
   public async pingDedicatedServer(serverId: string): Promise<void> {
     const { servers_by_pk: server } = await this.hasura.query({
       servers_by_pk: {
         __args: { id: serverId },
+        game: true,
         connected: true,
         steam_relay: true,
         server_region: {
           steam_relay: true,
         },
       },
     });
-    const rcon = await this.RconService.connect(serverId);
-    if (!rcon) {
-      return;
-    }
 
     if (!server.connected) {
       await this.hasura.mutation({
@@ -464,20 +490,30 @@ export class DedicatedServersService {
       });
     }
 
-    let steamId = null;
-    const status = JSON.parse(await rcon.send("status_json"));
+    // TODO - fix steam relay for csgo
+    const steamRelayeEnabled =
+      server.game === "csgo" ? false : server.server_region?.steam_relay;
+    const { steamId, clients_human, map } = await this.getServerStatusInfo(
+      serverId,
+      server.game,
+      steamRelayeEnabled,
+    );
 
-    const steamRelayeEnabled = server.server_region?.steam_relay;
-    if (steamRelayeEnabled) {
-      steamId = status.server.steamid;
-    }
+    console.log({
+      serverId,
+      game: server.game,
+      steamId,
+      clients_human,
+      map,
+      steamRelayeEnabled,
+    });
 
     await this.redis.hset(
       "dedicated-servers:stats",
       serverId,
       JSON.stringify({
-        clients_human: status.server.clients_human,
-        map: status.server.map || "unknown",
+        clients_human,
+        map,
         last_ping: new Date().toISOString(),
       }),
     );

src/game-server-node/game-server-node.controller.ts

@@ -46,6 +46,7 @@ export class GameServerNodeController {
     nodeIP: string;
     publicIP: string;
     csBuild: number;
+    csgoBuild: number;
     supportsLowLatency: boolean;
     supportsCpuPinning: boolean;
     nodeStats: NodeStats;
@@ -80,6 +81,7 @@ export class GameServerNodeController {
       payload.lanIP,
       payload.publicIP,
       payload.csBuild,
+      payload.csgoBuild,
       payload.supportsCpuPinning,
       payload.supportsLowLatency,
       payload.nodeStats.cpuInfo,

src/game-server-node/game-server-node.service.ts

@@ -47,10 +47,7 @@ export class GameServerNodeService {
     this.batchApi = kc.makeApiClient(BatchV1Api);
   }
 
-  public static GET_UPDATE_JOB_NAME(
-    gameServerNodeId: string,
-    game = "cs2",
-  ) {
+  public static GET_UPDATE_JOB_NAME(gameServerNodeId: string, game = "cs2") {
     const sanitized = gameServerNodeId.replaceAll(".", "-");
     return game === "csgo"
       ? `update-csgo-server-${sanitized}`
@@ -131,6 +128,7 @@ export class GameServerNodeService {
     lanIP: string,
     publicIP: string,
     csBulid: number,
+    csgoBuildId: number,
     supportsCpuPinning: boolean,
     supportsLowLatency: boolean,
     cpuInfo: {
@@ -161,6 +159,7 @@ export class GameServerNodeService {
         lan_ip: true,
         node_ip: true,
         build_id: true,
+        csgo_build_id: true,
         public_ip: true,
         gpu: true,
         cpu_sockets: true,
@@ -178,7 +177,6 @@ export class GameServerNodeService {
       this.logger.log(`Creating volumes for node ${node}`);
       await this.createVolumes(node);
     }
-
     if (game_server_nodes_by_pk?.status === "NotAcceptingNewMatches") {
       status = "NotAcceptingNewMatches";
     }
@@ -198,6 +196,8 @@ export class GameServerNodeService {
       game_server_nodes_by_pk.status !== status ||
       (game_server_nodes_by_pk.build_id !== csBulid &&
         game_server_nodes_by_pk.update_status === null) ||
+      (game_server_nodes_by_pk.csgo_build_id !== csgoBuildId &&
+        game_server_nodes_by_pk.update_status === null) ||
       game_server_nodes_by_pk.supports_cpu_pinning !== supportsCpuPinning ||
       game_server_nodes_by_pk.supports_low_latency !== supportsLowLatency ||
       game_server_nodes_by_pk.gpu !== nvidiaGPU ||
@@ -228,6 +228,9 @@ export class GameServerNodeService {
               ...(game_server_nodes_by_pk.update_status === null
                 ? { build_id: csBulid }
                 : {}),
+              ...(game_server_nodes_by_pk.update_status === null
+                ? { csgo_build_id: csgoBuildId }
+                : {}),
               gpu: nvidiaGPU,
               cpu_sockets: cpuInfo.sockets,
               cpu_cores_per_socket: cpuInfo.coresPerSocket,
@@ -680,7 +683,6 @@ export class GameServerNodeService {
               },
               _set: {
                 update_status: null,
-                ...(game === "csgo" ? { csgo_build_id: 1 } : {}),
               },
             },
             update_status: true,