Merge pull request #586 from TaloDev/develop

Release 0.84.1

Author: tudddorrr

codecov.yml

@@ -1,3 +1,4 @@
 ignore:
-  - '/src/config'
-  - '/src/migrations'
+  - "/src/config"
+  - "/src/migrations"
+  - "vitest.config.mts"

package-lock.json

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

package.json

@@ -4,11 +4,11 @@ import subscribers from '../entities/subscribers'
 import migrationsList from '../migrations'
 import { TsMorphMetadataProvider } from '@mikro-orm/reflection'
 import { Migrator } from '@mikro-orm/migrations'
-import { defineConfig } from '@mikro-orm/mysql'
+import { defineConfig, MikroORM } from '@mikro-orm/mysql'
 import { RedisCacheAdapter } from 'mikro-orm-cache-adapter-redis'
 import redisConfig from './redis.config'
 
-export default defineConfig({
+const ormConfig = defineConfig({
   entities,
   host: process.env.DB_HOST,
   port: Number(process.env.DB_PORT),
@@ -33,3 +33,13 @@ export default defineConfig({
     options: redisConfig
   }
 })
+
+export default ormConfig // loaded in package.json
+
+let orm: Awaited<ReturnType<typeof MikroORM.init>>
+export async function getMikroORM() {
+  if (!orm || !(await orm.checkConnection())) {
+    orm = await MikroORM.init(ormConfig)
+  }
+  return orm
+}

src/config/mikro-orm.config.ts

@@ -1,6 +1,5 @@
 import Koa from 'koa'
-import ormConfig from './mikro-orm.config'
-import { MikroORM } from '@mikro-orm/mysql'
+import { getMikroORM } from './mikro-orm.config'
 import createEmailQueue from '../lib/queues/createEmailQueue'
 import createClickHouseClient from '../lib/clickhouse/createClient'
 import { runClickHouseMigrations } from '../migrations/clickhouse'
@@ -10,7 +9,7 @@ import { createRedisConnection } from './redis.config'
 
 export default async function initProviders(app: Koa, isTest: boolean) {
   try {
-    const orm = await MikroORM.init(ormConfig)
+    const orm = await getMikroORM()
     app.context.em = orm.em
 
     if (!isTest) {

src/config/providers.ts

@@ -1,4 +1,4 @@
-import Redis from 'ioredis'
+import Redis, { RedisOptions } from 'ioredis'
 
 const redisConfig = {
   host: process.env.REDIS_HOST ?? 'redis',
@@ -8,6 +8,9 @@ const redisConfig = {
 
 export default redisConfig
 
-export function createRedisConnection(): Redis {
-  return new Redis(redisConfig)
+export function createRedisConnection(opts?: RedisOptions): Redis {
+  return new Redis({
+    ...redisConfig,
+    ...(opts ?? {})
+  })
 }

src/config/redis.config.ts

@@ -48,7 +48,7 @@ export default class PlayerSession extends ClickHouseEntity<ClickHousePlayerSess
 
   async hydrate(em: EntityManager, data: ClickHousePlayerSession): Promise<this> {
     const player = await em.repo(Player).findOneOrFail(data.player_id, {
-      ...getResultCacheOptions(`hydrate-player-session-${data.player_id}`, 60_000),
+      ...getResultCacheOptions(`hydrate-player-session-${data.player_id}`),
       populate: ['game']
     })
 

src/entities/player-session.ts

@@ -65,5 +65,6 @@ export default class PlayerGroupSubscriber implements EventSubscriber {
     if (playersMap.size > 0) {
       await checkGroupsForPlayers(em, Array.from(playersMap.values()))
     }
+    em.clear()
   }
 }

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

@@ -1,12 +1,45 @@
-import Redis from 'ioredis'
+import { Redis } from 'ioredis'
 
-export default async function checkRateLimitExceeded(redis: Redis, key: string, maxRequests: number): Promise<boolean> {
-  const redisKey = `requests.${key}`
-  const current = await redis.incr(redisKey)
+const cache = new Map<string, { count: number, expires: number }>()
 
-  if (current === 1) {
-    // this is the first request in the window, so set the key to expire
-    await redis.expire(redisKey, 1)
+setInterval(() => {
+  const now = Date.now()
+  for (const [key, value] of cache.entries()) {
+    if (now > value.expires) {
+      cache.delete(key)
+    }
+  }
+}, 5000)
+
+const script = `
+  local current = redis.call('INCR', KEYS[1])
+  if current == 1 then
+    redis.call('EXPIRE', KEYS[1], ARGV[1])
+  end
+  return current
+`
+
+export default async function checkRateLimitExceeded(
+  redis: Redis,
+  key: string,
+  maxRequests: number
+): Promise<boolean> {
+  // Skip cache in test environment for predictable behavior
+  if (process.env.NODE_ENV !== 'test') {
+    const cached = cache.get(key)
+    if (cached && Date.now() < cached.expires) {
+      return cached.count > maxRequests
+    }
+  }
+
+  const current = await redis.eval(script, 1, key, 1) as number
+
+  // Only cache in production
+  if (process.env.NODE_ENV !== 'test') {
+    cache.set(key, {
+      count: current,
+      expires: Date.now() + 500
+    })
   }
 
   return current > maxRequests

src/lib/errors/checkRateLimitExceeded.ts

@@ -1,6 +1,6 @@
 type CacheKey = { cache: [string, number] } | undefined
 
-export function getResultCacheOptions(key: string, cacheExpiration = 10_000): CacheKey {
+export function getResultCacheOptions(key: string, cacheExpiration = 60_000): CacheKey {
   return {
     cache: [key, cacheExpiration]
   }