Merge pull request #552 from TaloDev/develop

Release 0.80.4

Author: tudddorrr

package-lock.json

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

package.json

@@ -5,6 +5,8 @@ import LeaderboardEntry from '../leaderboard-entry'
 import PlayerGameStat from '../player-game-stat'
 import { createRedisConnection } from '../../config/redis.config'
 
+const enableLogging = process.env.NODE_ENV !== 'test'
+
 const changeSetFilters: ((cs: ChangeSet<Partial<unknown>>) => boolean)[] = [
   (cs) => [ChangeSetType.CREATE, ChangeSetType.UPDATE].includes(cs.type) && cs.entity instanceof Player,
   (cs) => [ChangeSetType.CREATE, ChangeSetType.UPDATE].includes(cs.type) && cs.entity instanceof LeaderboardEntry,
@@ -42,29 +44,45 @@ export default class PlayerGroupSubscriber implements EventSubscriber {
       redis = createRedisConnection()
     }
 
-    let shouldFlush = false
-
     for (const player of playersMap.values()) {
       const redisKey = `checkMembership:${player.id}`
-      let checkMembership = false
+      let lockCreated = false
 
       try {
         const setSuccess = await redis.set(redisKey, '1', 'EX', 30, 'NX')
         if (setSuccess === 'OK') {
-          checkMembership = true
+          lockCreated = true
+          /* v8 ignore next 3 */
+          if (enableLogging) {
+            console.info(`Group memberships lock created for ${player.id}`)
+          }
+
           if (await checkGroupMemberships(em, player)) {
-            shouldFlush = true
+            const label = `Flush group memberships for ${player.id}`
+
+            /* v8 ignore next 3 */
+            if (enableLogging) {
+              console.time(label)
+            }
+
+            await em.flush()
+
+            /* v8 ignore next 3 */
+            if (enableLogging) {
+              console.timeEnd(label)
+            }
           }
         }
       } finally {
-        if (checkMembership) {
+        if (lockCreated) {
+          /* v8 ignore next 3 */
+          if (enableLogging) {
+            console.info(`Group memberships lock released for ${player.id}`)
+          }
+
           await redis.del(redisKey)
         }
       }
     }
-
-    if (shouldFlush) {
-      await em.flush()
-    }
   }
 }

src/entities/subscribers/player-group.subscriber.ts

@@ -1,22 +1,20 @@
-import { EntityManager, UniqueConstraintViolationException } from '@mikro-orm/mysql'
+import { EntityManager } from '@mikro-orm/mysql'
 import Player from '../../entities/player'
 import PlayerGroup from '../../entities/player-group'
 
 const enableLogging = process.env.NODE_ENV !== 'test'
 
 export default async function checkGroupMemberships(em: EntityManager, player: Player): Promise<boolean> {
-  const groups = await em.getRepository(PlayerGroup).find({ game: player.game })
+  const groups = await em.repo(PlayerGroup).find({ game: player.game })
   if (groups.length === 0) {
     return false
   }
 
-  const startTime = Date.now()
-  const globalLabel = `Checking group memberships for ${player.id} (${startTime})`
-  const flushLabel = `Memberships flush ${player.id} (${startTime})`
+  const label = `Checking group memberships for ${player.id}`
 
   /* v8 ignore next 3 */
   if (enableLogging) {
-    console.time(globalLabel)
+    console.time(label)
   }
 
   let shouldFlush = false
@@ -52,30 +50,9 @@ export default async function checkGroupMemberships(em: EntityManager, player: P
     }
   }
 
-  try {
-    if (shouldFlush) {
-      /* v8 ignore next 3 */
-      if (enableLogging) {
-        console.time(flushLabel)
-      }
-    }
-  /* v8 ignore next 5 */
-  } catch (err) {
-    if (err instanceof UniqueConstraintViolationException) {
-      console.warn('This player is already in the group')
-    }
-  } finally {
-    if (shouldFlush) {
-      /* v8 ignore next 3 */
-      if (enableLogging) {
-        console.timeEnd(flushLabel)
-      }
-    }
-  }
-
   /* v8 ignore next 3 */
   if (enableLogging) {
-    console.timeEnd(globalLabel)
+    console.timeEnd(label)
   }
 
   return shouldFlush