feature: csgo (#113)

lukepolo · web-flow · commit 4dce8da0eae8 · 2026-03-08T10:55:39.000-04:00
diff --git a/generated/schema.graphql b/generated/schema.graphql
diff --git a/generated/schema.ts b/generated/schema.ts
diff --git a/generated/types.ts b/generated/types.ts
diff --git a/hasura/functions/match/get_match_connection.sql b/hasura/functions/match/get_match_connection.sql
@@ -33,14 +33,21 @@ CREATE OR REPLACE FUNCTION public.get_match_connection_link(match public.matches
     AS $$
 DECLARE
     server_host text;
+    server_game text;
 BEGIN
     server_host := get_match_server_info(match);
 
     IF(server_host IS NULL OR is_in_lineup(match, hasura_session) = FALSE) THEN
         return NULL;
     END IF;
 
-    RETURN CONCAT('steam://run/730//+connect ', server_host);
+    SELECT s.game INTO server_game
+    FROM matches m
+    INNER JOIN servers s ON s.id = m.server_id
+    WHERE m.id = match.id
+    LIMIT 1;
+
+    RETURN CONCAT('steam://run/', CASE WHEN server_game = 'csgo' THEN '4465480' ELSE '730' END, '//+connect ', server_host);
 END;
 $$;
 
diff --git a/hasura/functions/servers/get_server_connection.sql b/hasura/functions/servers/get_server_connection.sql
@@ -38,7 +38,7 @@ BEGIN
 
     server_host := get_server_host(server);
 
-    RETURN CONCAT('steam://run/730//+connect ', server_host);
+    RETURN CONCAT('steam://run/', CASE WHEN server.game = 'csgo' THEN '4465480' ELSE '730' END, '//+connect ', server_host);
 END;
 $$;
 
diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql
@@ -324,6 +324,7 @@ type Mutation {
 type Mutation {
   updateCs(
     game_server_node_id: uuid
+    game: String
   ): SuccessOutput
 }
 
diff --git a/hasura/metadata/databases/default/tables/public_game_server_nodes.yaml b/hasura/metadata/databases/default/tables/public_game_server_nodes.yaml
@@ -60,6 +60,7 @@ select_permissions:
         - cpu_governor_info
         - cpu_sockets
         - cpu_threads_per_core
+        - csgo_build_id
         - demo_network_limiter
         - enabled
         - end_port_range
diff --git a/hasura/metadata/databases/default/tables/public_servers.yaml b/hasura/metadata/databases/default/tables/public_servers.yaml
@@ -71,6 +71,7 @@ select_permissions:
         - connect_password
         - connected
         - enabled
+        - game
         - game_server_node_id
         - host
         - id
@@ -98,6 +99,7 @@ select_permissions:
       columns:
         - connected
         - enabled
+        - game
         - host
         - id
         - label
@@ -124,6 +126,7 @@ select_permissions:
       columns:
         - connected
         - enabled
+        - game
         - host
         - id
         - is_dedicated
diff --git a/hasura/metadata/databases/default/tables/public_tournaments.yaml b/hasura/metadata/databases/default/tables/public_tournaments.yaml
@@ -62,28 +62,28 @@ computed_fields:
         name: can_close_tournament_registration
         schema: public
       session_argument: hasura_session
-  - name: can_pause
+  - name: can_join
     definition:
       function:
-        name: can_pause_tournament
+        name: can_join_tournament
         schema: public
       session_argument: hasura_session
-  - name: can_resume
+  - name: can_open_registration
     definition:
       function:
-        name: can_resume_tournament
+        name: can_open_tournament_registration
         schema: public
       session_argument: hasura_session
-  - name: can_join
+  - name: can_pause
     definition:
       function:
-        name: can_join_tournament
+        name: can_pause_tournament
         schema: public
       session_argument: hasura_session
-  - name: can_open_registration
+  - name: can_resume
     definition:
       function:
-        name: can_open_tournament_registration
+        name: can_resume_tournament
         schema: public
       session_argument: hasura_session
   - name: can_start
diff --git a/hasura/migrations/default/1772556089000_add_csgo_build_id_to_game_server_nodes/down.sql b/hasura/migrations/default/1772556089000_add_csgo_build_id_to_game_server_nodes/down.sql
@@ -0,0 +1 @@
+alter table "public"."game_server_nodes" drop column "csgo_build_id";
diff --git a/hasura/migrations/default/1772556089000_add_csgo_build_id_to_game_server_nodes/up.sql b/hasura/migrations/default/1772556089000_add_csgo_build_id_to_game_server_nodes/up.sql
@@ -0,0 +1 @@
+alter table "public"."game_server_nodes" add column "csgo_build_id" integer null;
diff --git a/hasura/migrations/default/1772556090000_add_game_to_servers/down.sql b/hasura/migrations/default/1772556090000_add_game_to_servers/down.sql
@@ -0,0 +1 @@
+alter table "public"."servers" drop column "game";
diff --git a/hasura/migrations/default/1772556090000_add_game_to_servers/up.sql b/hasura/migrations/default/1772556090000_add_game_to_servers/up.sql
@@ -0,0 +1 @@
+alter table "public"."servers" add column "game" text null default 'cs2';
diff --git a/src/dedicated-servers/dedicated-servers.service.ts b/src/dedicated-servers/dedicated-servers.service.ts
@@ -58,6 +58,7 @@ export class DedicatedServersService {
         type: true,
         port: true,
         tv_port: true,
+        game: true,
         max_players: true,
         api_password: true,
         rcon_password: true,
@@ -120,6 +121,10 @@ export class DedicatedServersService {
       }
 
       const sanitizedGameServerNodeId = gameServerNodeId.replaceAll(".", "-");
+      const serverfilesVolumeName =
+        server.game === "csgo"
+          ? `serverfiles-csgo-${sanitizedGameServerNodeId}`
+          : `serverfiles-${sanitizedGameServerNodeId}`;
 
       let pluginImage = this.gameServerConfig.serverImage;
 
@@ -206,6 +211,10 @@ export class DedicatedServersService {
                       { containerPort: server.tv_port, protocol: "UDP" },
                     ],
                     env: [
+                      {
+                        name: "GAME_ID",
+                        value: server.game === "csgo" ? "740" : "730",
+                      },
                       {
                         name: "SERVER_TYPE",
                         value: server.type,
@@ -263,7 +272,7 @@ export class DedicatedServersService {
                         mountPath: "/serverdata/steamcmd",
                       },
                       {
-                        name: `serverfiles-${sanitizedGameServerNodeId}`,
+                        name: serverfilesVolumeName,
                         mountPath: "/serverdata/serverfiles",
                       },
                       {
@@ -285,9 +294,9 @@ export class DedicatedServersService {
                     },
                   },
                   {
-                    name: `serverfiles-${sanitizedGameServerNodeId}`,
+                    name: serverfilesVolumeName,
                     persistentVolumeClaim: {
-                      claimName: `serverfiles-${sanitizedGameServerNodeId}-claim`,
+                      claimName: `${serverfilesVolumeName}-claim`,
                     },
                   },
                   {
@@ -430,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({
@@ -455,20 +490,21 @@ export class DedicatedServersService {
       });
     }
 
-    let steamId = null;
-    const status = JSON.parse(await rcon.send("status_json"));
-
-    const steamRelayeEnabled = server.server_region?.steam_relay;
-    if (steamRelayeEnabled) {
-      steamId = status.server.steamid;
-    }
+    // 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,
+    );
 
     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(),
       }),
     );
diff --git a/src/game-server-node/game-server-node.controller.ts b/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,
@@ -138,10 +140,14 @@ export class GameServerNodeController {
   }
 
   @HasuraAction()
-  public async updateCs(data: { game_server_node_id: string }) {
+  public async updateCs(data: {
+    game_server_node_id: string;
+    game?: "cs2" | "csgo";
+  }) {
     await this.gameServerNodeService.updateCsServer(
       data.game_server_node_id,
       true,
+      data.game ?? "cs2",
     );
 
     return {
@@ -218,6 +224,7 @@ export class GameServerNodeController {
         mkdir -p /opt/5stack/demos
         mkdir -p /opt/5stack/steamcmd
         mkdir -p /opt/5stack/serverfiles
+        mkdir -p /opt/5stack/serverfiles-csgo
         mkdir -p /opt/5stack/custom-plugins
 
         echo "Connecting to secure network";
diff --git a/src/game-server-node/game-server-node.service.ts b/src/game-server-node/game-server-node.service.ts

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ type Mutation {`
`324`	`324`	`type Mutation {`
`325`	`325`	`updateCs(`
`326`	`326`	`game_server_node_id: uuid`
	`327`	`+ game: String`
`327`	`328`	`): SuccessOutput`
`328`	`329`	`}`
`329`	`330`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+alter table "public"."game_server_nodes" drop column "csgo_build_id";`