Merge pull request #1856 from gettakaro/fix-issue-with-stale-server-c…

…onnection-info

packages/app-api/src/lib/socketServer.ts

@@ -2,13 +2,14 @@ import { Server, Socket } from 'socket.io';
 import { IncomingMessage, Server as HttpServer, ServerResponse } from 'http';
 import { config } from '../config.js';
 import { ctx, errors, logger } from '@takaro/util';
-import { EventPayload, EventTypes } from '@takaro/modules';
+import { EventPayload, EventTypes, HookEvents } from '@takaro/modules';
 import { instrument } from '@socket.io/admin-ui';
 import { AuthenticatedRequest, AuthService } from '../service/AuthService.js';
 import { NextFunction, Response } from 'express';
 import { createAdapter } from '@socket.io/redis-adapter';
 import { Redis } from '@takaro/db';
 import { EventOutputDTO } from '../service/EventService.js';
+import { GameServerService } from '../service/GameServerService.js';
 
 interface ServerToClientEvents {
   gameEvent: (gameserverId: string, type: EventTypes, data: EventPayload) => void;
@@ -22,6 +23,7 @@ interface ClientToServerEvents {
 
 interface InterServerEvents {
   ping: () => void;
+  event: (event: EventOutputDTO) => void;
 }
 
 interface SocketData {
@@ -76,6 +78,22 @@ class SocketServer {
       });
     });
 
+    this.io.on('event', (event: EventOutputDTO) => {
+      const eventsToRefreshServerCache: EventTypes[] = [
+        HookEvents.GAMESERVER_CREATED,
+        HookEvents.GAMESERVER_DELETED,
+        HookEvents.GAMESERVER_UPDATED,
+      ];
+
+      if (eventsToRefreshServerCache.includes(event.eventName)) {
+        this.log.info(
+          `Received event from other node that indicates we need to refresh cache for gameserver ${event.gameserverId}`,
+        );
+        const gameserverService = new GameServerService(event.domain);
+        gameserverService.refreshGameInstance(event.gameserverId);
+      }
+    });
+
     this.log.info('Socket server started');
   }
 
@@ -92,6 +110,9 @@ class SocketServer {
     data: Parameters<ServerToClientEvents[keyof ServerToClientEvents]> = [],
   ) {
     this.io.to(domainId).emit(event, ...data);
+    if (event === 'event') {
+      this.io.serverSideEmit(event, data as unknown as EventOutputDTO);
+    }
   }
 
   private async routerMiddleware(

packages/app-api/src/service/GameServerService.ts

@@ -33,6 +33,9 @@ import {
   EventChatMessage,
   TakaroEventModuleInstalled,
   TakaroEventModuleUninstalled,
+  TakaroEventGameserverCreated,
+  TakaroEventGameserverUpdated,
+  TakaroEventGameserverDeleted,
   ChatChannel,
 } from '@takaro/modules';
 import { ITakaroQuery } from '@takaro/db';
@@ -156,6 +159,10 @@ export class GameServerService extends TakaroService<
     return new GameServerRepo(this.domainId);
   }
 
+  public refreshGameInstance(id: string) {
+    gameClassCache.delete(id);
+  }
+
   find(filters: ITakaroQuery<GameServerOutputDTO>): Promise<PaginatedOutput<GameServerOutputDTO>> {
     return this.repo.find(filters);
   }
@@ -168,6 +175,14 @@ export class GameServerService extends TakaroService<
     const isReachable = await this.testReachability(undefined, JSON.parse(item.connectionInfo), item.type);
     const createdServer = await this.repo.create(item);
 
+    const eventsService = new EventService(this.domainId);
+    await eventsService.create(
+      new EventCreateDTO({
+        eventName: EVENT_TYPES.GAMESERVER_CREATED,
+        gameserverId: createdServer.id,
+        meta: new TakaroEventGameserverCreated(),
+      }),
+    );
     await queueService.queues.connector.queue.add({
       domainId: this.domainId,
       gameServerId: createdServer.id,
@@ -192,7 +207,7 @@ export class GameServerService extends TakaroService<
     });
     await Promise.all(installedModules.map((mod) => this.uninstallModule(id, mod.moduleId)));
 
-    gameClassCache.delete(id);
+    this.refreshGameInstance(id);
 
     const gateway = new Pushgateway(config.get('metrics.pushgatewayUrl'), {});
     gateway.delete({ jobName: 'worker', groupings: { gameserver: id } });
@@ -204,6 +219,14 @@ export class GameServerService extends TakaroService<
       time: new Date().toISOString(),
     });
     await this.repo.delete(id);
+    const eventsService = new EventService(this.domainId);
+    await eventsService.create(
+      new EventCreateDTO({
+        eventName: EVENT_TYPES.GAMESERVER_DELETED,
+        gameserverId: id,
+        meta: new TakaroEventGameserverDeleted(),
+      }),
+    );
     await queueService.queues.system.queue.add(
       {
         domainId: this.domainId,
@@ -216,7 +239,15 @@ export class GameServerService extends TakaroService<
 
   async update(id: string, item: GameServerUpdateDTO): Promise<GameServerOutputDTO> {
     const updatedServer = await this.repo.update(id, item);
-    gameClassCache.delete(id);
+    this.refreshGameInstance(id);
+    const eventsService = new EventService(this.domainId);
+    await eventsService.create(
+      new EventCreateDTO({
+        eventName: EVENT_TYPES.GAMESERVER_UPDATED,
+        gameserverId: id,
+        meta: new TakaroEventGameserverUpdated(),
+      }),
+    );
     await queueService.queues.connector.queue.add({
       domainId: this.domainId,
       gameServerId: id,
@@ -252,7 +283,7 @@ export class GameServerService extends TakaroService<
 
       // When a user is trying to fix their connection info, it's important we don't cache stale/wrong connection info
       if (!reachability.connectable) {
-        gameClassCache.delete(id);
+        this.refreshGameInstance(id);
       }
 
       return reachability;

packages/lib-apiclient/src/generated/.openapi-generator/VERSION

@@ -1 +1 @@
-7.10.0
+7.8.0