feature: csgo

lukepolo · lukepolo · commit 05e18d71edfe · 2026-03-06T11:01:07.000-05: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/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_notifications.yaml b/hasura/metadata/databases/default/tables/public_notifications.yaml
@@ -25,7 +25,7 @@ select_permissions:
           - steam_id:
               _eq: X-Hasura-User-Id
           - role:
-              _is_null: false
+              _eq: administrator
     comment: ""
   - role: match_organizer
     permission:
@@ -100,13 +100,13 @@ update_permissions:
           - steam_id:
               _eq: X-Hasura-User-Id
           - role:
-              _is_null: false
+              _eq: administrator
       check:
         _or:
           - steam_id:
               _eq: X-Hasura-User-Id
           - role:
-              _is_null: false
+              _eq: administrator
     comment: ""
   - role: match_organizer
     permission:
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;
 
@@ -263,7 +268,7 @@ export class DedicatedServersService {
                         mountPath: "/serverdata/steamcmd",
                       },
                       {
-                        name: `serverfiles-${sanitizedGameServerNodeId}`,
+                        name: serverfilesVolumeName,
                         mountPath: "/serverdata/serverfiles",
                       },
                       {
@@ -285,9 +290,9 @@ export class DedicatedServersService {
                     },
                   },
                   {
-                    name: `serverfiles-${sanitizedGameServerNodeId}`,
+                    name: serverfilesVolumeName,
                     persistentVolumeClaim: {
-                      claimName: `serverfiles-${sanitizedGameServerNodeId}-claim`,
+                      claimName: `${serverfilesVolumeName}-claim`,
                     },
                   },
                   {
diff --git a/src/game-server-node/game-server-node.controller.ts b/src/game-server-node/game-server-node.controller.ts
@@ -138,10 +138,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 +222,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
@@ -47,8 +47,14 @@ export class GameServerNodeService {
     this.batchApi = kc.makeApiClient(BatchV1Api);
   }
 
-  public static GET_UPDATE_JOB_NAME(gameServerNodeId: string) {
-    return `update-cs-server-${gameServerNodeId.replaceAll(".", "-")}`;
+  public static GET_UPDATE_JOB_NAME(
+    gameServerNodeId: string,
+    game = "cs2",
+  ) {
+    const sanitized = gameServerNodeId.replaceAll(".", "-");
+    return game === "csgo"
+      ? `update-csgo-server-${sanitized}`
+      : `update-cs-server-${sanitized}`;
   }
 
   public static GET_NODE_STATS_KEY(nodeId: string) {
@@ -293,7 +299,11 @@ export class GameServerNodeService {
     }
   }
 
-  public async updateCsServer(gameServerNodeId: string, force = false) {
+  public async updateCsServer(
+    gameServerNodeId: string,
+    force = false,
+    game = "cs2",
+  ) {
     const { game_server_nodes_by_pk } = await this.hasura.query({
       game_server_nodes_by_pk: {
         __args: {
@@ -313,10 +323,10 @@ export class GameServerNodeService {
       throw new Error("Game server not found");
     }
 
-    const nodeBuildId = game_server_nodes_by_pk.build_id;
-    const pinBuildId = game_server_nodes_by_pk.pinned_version?.build_id;
+    if (game === "cs2" && !force) {
+      const nodeBuildId = game_server_nodes_by_pk.build_id;
+      const pinBuildId = game_server_nodes_by_pk.pinned_version?.build_id;
 
-    if (!force) {
       if (pinBuildId) {
         if (nodeBuildId === pinBuildId) {
           this.logger.log(
@@ -335,13 +345,17 @@ export class GameServerNodeService {
       }
     }
 
-    await this.createVolumes(gameServerNodeId);
+    await this.createVolumes(gameServerNodeId, game);
 
-    this.logger.log(`Updating CS2 on node ${gameServerNodeId}`);
+    this.logger.log(
+      `Updating ${game === "csgo" ? "CSGO" : "CS2"} on node ${gameServerNodeId}`,
+    );
 
-    const pod = await this.loggingService.getJobPod(
-      GameServerNodeService.GET_UPDATE_JOB_NAME(gameServerNodeId),
+    const jobName = GameServerNodeService.GET_UPDATE_JOB_NAME(
+      gameServerNodeId,
+      game,
     );
+    const pod = await this.loggingService.getJobPod(jobName);
 
     if (pod) {
       if (game_server_nodes_by_pk.update_status === null) {
@@ -360,11 +374,18 @@ export class GameServerNodeService {
         });
       }
 
-      await this.moitorUpdateStatus(gameServerNodeId);
+      await this.moitorUpdateStatus(gameServerNodeId, 0, game);
       return;
     }
 
     const sanitizedGameServerNodeId = gameServerNodeId.replaceAll(".", "-");
+    const gameId = game === "csgo" ? "4465480" : "730";
+    const pinBuildId = game_server_nodes_by_pk.pinned_version?.build_id;
+
+    const serverfilesVolumeName =
+      game === "csgo"
+        ? `serverfiles-csgo-${sanitizedGameServerNodeId}`
+        : `serverfiles-${sanitizedGameServerNodeId}`;
 
     try {
       await this.batchApi.createNamespacedJob({
@@ -373,7 +394,7 @@ export class GameServerNodeService {
           apiVersion: "batch/v1",
           kind: "Job",
           metadata: {
-            name: `update-cs-server-${sanitizedGameServerNodeId}`,
+            name: jobName,
           },
           spec: {
             template: {
@@ -416,7 +437,11 @@ export class GameServerNodeService {
                     image: "ghcr.io/5stackgg/game-server:latest",
                     command: ["/opt/scripts/update.sh"],
                     env: [
-                      ...(pinBuildId
+                      {
+                        name: "GAME_ID",
+                        value: gameId,
+                      },
+                      ...(game === "cs2" && pinBuildId
                         ? [
                             {
                               name: "BUILD_ID",
@@ -431,7 +456,8 @@ export class GameServerNodeService {
                             },
                           ]
                         : []),
-                      ...(pinBuildId &&
+                      ...(game === "cs2" &&
+                      pinBuildId &&
                       this.steamConfig.steamUser &&
                       this.steamConfig.steamPassword
                         ? [
@@ -452,7 +478,7 @@ export class GameServerNodeService {
                         mountPath: "/serverdata/steamcmd",
                       },
                       {
-                        name: `serverfiles-${sanitizedGameServerNodeId}`,
+                        name: serverfilesVolumeName,
                         mountPath: "/serverdata/serverfiles",
                       },
                       {
@@ -470,9 +496,9 @@ export class GameServerNodeService {
                     },
                   },
                   {
-                    name: `serverfiles-${sanitizedGameServerNodeId}`,
+                    name: serverfilesVolumeName,
                     persistentVolumeClaim: {
-                      claimName: `serverfiles-${sanitizedGameServerNodeId}-claim`,
+                      claimName: `${serverfilesVolumeName}-claim`,
                     },
                   },
                   {
@@ -505,7 +531,7 @@ export class GameServerNodeService {
       });
 
       setTimeout(() => {
-        void this.moitorUpdateStatus(gameServerNodeId, 3);
+        void this.moitorUpdateStatus(gameServerNodeId, 3, game);
       }, 5000);
     } catch (error) {
       this.logger.error(
@@ -516,7 +542,17 @@ export class GameServerNodeService {
     }
   }
 
-  private async createVolumes(gameServerNodeId: string) {
+  private async createVolumes(gameServerNodeId: string, game = "cs2") {
+    if (game === "csgo") {
+      await this.createVolume(
+        gameServerNodeId,
+        `/opt/5stack/serverfiles-csgo`,
+        `serverfiles-csgo`,
+        "75Gi",
+      );
+      return;
+    }
+
     await this.createVolume(
       gameServerNodeId,
       `/opt/5stack/demos`,
@@ -539,10 +575,14 @@ export class GameServerNodeService {
     );
   }
 
-  public async moitorUpdateStatus(gameServerNodeId: string, attempts = 0) {
+  public async moitorUpdateStatus(
+    gameServerNodeId: string,
+    attempts = 0,
+    game = "cs2",
+  ) {
     try {
       const pod = await this.loggingService.getJobPod(
-        GameServerNodeService.GET_UPDATE_JOB_NAME(gameServerNodeId),
+        GameServerNodeService.GET_UPDATE_JOB_NAME(gameServerNodeId, game),
       );
 
       if (!pod) {
@@ -640,6 +680,7 @@ export class GameServerNodeService {
               },
               _set: {
                 update_status: null,
+                ...(game === "csgo" ? { csgo_build_id: 1 } : {}),
               },
             },
             update_status: true,
@@ -652,7 +693,7 @@ export class GameServerNodeService {
       }
       if (attempts > 0) {
         setTimeout(() => {
-          void this.moitorUpdateStatus(gameServerNodeId, attempts - 1);
+          void this.moitorUpdateStatus(gameServerNodeId, attempts - 1, game);
         }, 5000);
         return;
       }

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";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+alter table "public"."servers" drop column "game";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+alter table "public"."servers" add column "game" text null default 'cs2';`