Remove socket events table, delete unfinished sessions

src/lib/queues/createDeleteClickHousePlayerDataQueue.ts

@@ -13,7 +13,6 @@ export function createDeleteClickHousePlayerDataQueue() {
       const queries: string[] = aliasIds.length > 0 ? [
         'DELETE FROM event_props WHERE event_id IN (SELECT id FROM events WHERE player_alias_id IN ({aliasIds:Array(UInt32)}))',
         'DELETE FROM events WHERE player_alias_id IN ({aliasIds:Array(UInt32)})',
-        'DELETE FROM socket_events WHERE player_alias_id IN ({aliasIds:Array(UInt32)})',
         'DELETE FROM player_game_stat_snapshots WHERE player_alias_id IN ({aliasIds:Array(UInt32)})',
         'DELETE FROM player_sessions WHERE player_id IN ({playerIds:Array(String)})'
       ] : []

src/migrations/clickhouse/index.ts

@@ -1,13 +1,12 @@
 import { ClickHouseClient } from '@clickhouse/client'
 import { CreateEventsTable } from './001CreateEventsTable'
 import { CreateEventPropsTable } from './002CreateEventPropsTable'
-import { CreateSocketEventsTable } from './003CreateSocketEventsTable'
 import { CreateMigrationsTable } from './000CreateMigrationsTable'
 import { formatDateForClickHouse } from '../../lib/clickhouse/formatDateTime'
-import { CreatePlayerGameStatSnapshotsTable } from './004CreatePlayerGameStatSnapshotsTable'
-import { MigrateEventsTimestampsToDate64 } from './005MigrateEventsTimestampsToDate64'
-import { CreatePlayerSessionsTable } from './006CreatePlayerSessionsTable'
-import { AddEventPropsEventIdIndex } from './007AddEventPropsEventIdIndex'
+import { CreatePlayerGameStatSnapshotsTable } from './003CreatePlayerGameStatSnapshotsTable'
+import { MigrateEventsTimestampsToDate64 } from './004MigrateEventsTimestampsToDate64'
+import { CreatePlayerSessionsTable } from './005CreatePlayerSessionsTable'
+import { AddEventPropsEventIdIndex } from './006AddEventPropsEventIdIndex'
 
 type ClickHouseMigration = {
   name: string
@@ -23,10 +22,6 @@ const migrations: ClickHouseMigration[] = [
     name: 'CreateEventPropsTable',
     sql: CreateEventPropsTable
   },
-  {
-    name: 'CreateSocketEventsTable',
-    sql: CreateSocketEventsTable
-  },
   {
     name: 'CreatePlayerGameStatSnapshotsTable',
     sql: CreatePlayerGameStatSnapshotsTable

src/socket/index.ts

@@ -6,13 +6,10 @@ import SocketConnection from './socketConnection'
 import SocketRouter from './router/socketRouter'
 import { sendMessage } from './messages/socketMessage'
 import { logConnection, logConnectionClosed } from './messages/socketLogger'
-import { SocketEventData } from './socketEvent'
 import Redis from 'ioredis'
 import { createRedisConnection } from '../config/redis.config'
 import SocketTicket from './socketTicket'
 import { getSocketTracer } from './socketTracer'
-import { FlushSocketEventsQueueHandler } from '../lib/queues/game-metrics/flush-socket-events-queue-handler'
-import { v4 } from 'uuid'
 import { enableSocketTracing } from './enableSocketTracing'
 
 type CloseConnectionOptions = {
@@ -26,7 +23,6 @@ export default class Socket {
   private readonly wss: WebSocketServer
   private connections: Map<WebSocket, SocketConnection> = new Map()
   private router: SocketRouter
-  private queueHandler: FlushSocketEventsQueueHandler
   redis: Redis
 
   constructor(server: Server, private readonly em: EntityManager) {
@@ -42,8 +38,6 @@ export default class Socket {
 
     this.router = new SocketRouter(this)
 
-    this.queueHandler = new FlushSocketEventsQueueHandler()
-
     const interval = this.heartbeat()
     this.wss.on('close', () => {
       clearInterval(interval)
@@ -88,15 +82,6 @@ export default class Socket {
               const connection = new SocketConnection(this, ws, ticket, req.socket.remoteAddress!)
               this.connections.set(ws, connection)
 
-              await this.trackEvent({
-                eventType: 'open',
-                reqOrRes: 'req',
-                code: null,
-                gameId: connection.gameId,
-                playerAliasId: null,
-                devBuild: ticket.devBuild
-              })
-
               await sendMessage(connection, 'v1.connected', {})
             } else {
               await this.closeConnection(ws)
@@ -163,15 +148,6 @@ export default class Socket {
 
     logConnectionClosed(connection, preclosed, code, options.reason)
 
-    await this.trackEvent({
-      eventType: 'close',
-      reqOrRes: preclosed ? 'req' : 'res',
-      code: preclosed ? null : code.toString(),
-      gameId: connection.gameId,
-      playerAliasId: connection.playerAliasId,
-      devBuild: connection.isDevBuild()
-    })
-
     this.connections.delete(ws)
   }
 
@@ -182,13 +158,4 @@ export default class Socket {
   findConnections(filter: (conn: SocketConnection) => boolean): SocketConnection[] {
     return Array.from(this.connections.values()).filter(filter)
   }
-
-  async trackEvent(data: Omit<SocketEventData, 'id'>): Promise<void> {
-    if (process.env.DISABLE_SOCKET_EVENTS === '1') {
-      return
-    }
-
-    /* v8 ignore next - tests mock this implementation */
-    await this.queueHandler.add({ id: v4(), ...data })
-  }
 }

src/socket/router/socketRouter.ts

@@ -74,15 +74,6 @@ export default class SocketRouter {
   }
 
   async routeMessage(conn: SocketConnection, message: SocketMessage): Promise<boolean> {
-    await this.wss.trackEvent({
-      eventType: message.req,
-      reqOrRes: 'req',
-      code: null,
-      gameId: conn.gameId,
-      playerAliasId: conn.playerAliasId,
-      devBuild: conn.isDevBuild()
-    })
-
     for (const route of routes) {
       for await (const listener of route) {
         if (listener.req === message.req) {

src/socket/socketConnection.ts

@@ -8,7 +8,7 @@
 import Socket from '.'
 import { SocketMessageResponse } from './messages/socketMessage'
 import { logResponse } from './messages/socketLogger'
 import { SocketErrorCode } from './messages/socketError'
 import SocketTicket from './socketTicket'
 import { setTraceAttributes } from '@hyperdx/node-opentelemetry'
 import { getSocketTracer } from './socketTracer'
@@ -102,15 +102,6 @@
 
           logResponse(this, res, message)
 
-          await this.wss.trackEvent({
-            eventType: res,
-            reqOrRes: 'res',
-            code: 'errorCode' in data ? (data.errorCode as SocketErrorCode) : null,
-            gameId: this.gameId,
-            playerAliasId: this.playerAliasId,
-            devBuild: devBuild
-          })
-
           this.ws.send(message)
         }
       } finally {