Merge pull request #724 from TaloDev/develop

Release 0.98.0

Author: tudddorrr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "game-services",
-  "version": "0.97.4",
+  "version": "0.98.0",
   "description": "",
   "main": "src/index.ts",
   "scripts": {

package.json

@@ -160,7 +160,7 @@ export default class Player {
       return (
         conn.hasScope(APIKeyScope.READ_PLAYER_PRESENCE) &&
         !!conn.playerAliasId &&
-        this.game.id === conn.game.id
+        this.game.id === conn.gameId
       )
     })
     await sendMessages(conns, 'v1.players.presence.updated', {

src/entities/player.ts

@@ -18,6 +18,7 @@ import Socket from './socket'
 import httpTracingMiddleware from './middleware/http-tracing-middleware'
 import { secondsToMilliseconds } from 'date-fns'
 import compress from 'koa-compress'
+import { EntityManager } from '@mikro-orm/mysql'
 
 const isTest = process.env.NODE_ENV === 'test'
 
@@ -49,7 +50,7 @@ export default async function init(): Promise<Koa> {
     keepAliveTimeout: secondsToMilliseconds(60)
   }, app.callback())
 
-  app.context.wss = new Socket(server, app.context.em)
+  app.context.wss = new Socket(server, (app.context.em as EntityManager).fork())
 
   if (!isTest) {
     server.listen(80, () => console.info('Listening on port 80'))

src/index.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/lib/queues/createDeleteClickHousePlayerDataQueue.ts

@@ -24,9 +24,8 @@ export async function postFlushCheckMemberships(playerIds: string[]) {
   const em = orm.em.fork() as EntityManager
   try {
     const players = await em.repo(Player).find({ id: { $in: playerIds } })
-    for (const player of players) {
-      await player.checkGroupMemberships(em.fork())
-    }
+    const promises = players.map((player) => player.checkGroupMemberships(em))
+    await Promise.all(promises)
   } finally {
     em.clear()
   }