fix circular deps

src/index.ts

@@ -27,19 +27,18 @@ export default async function init(): Promise<Koa> {
   app.use(bodyParser())
   app.use(helmet())
   app.use(corsMiddleware)
-  app.use(requestContextMiddleware)
   app.use(devDataMiddleware)
+  app.use(requestContextMiddleware)
 
   configureProtectedRoutes(app)
   configurePublicRoutes(app)
   configureAPIRoutes(app)
 
   app.use(cleanupMiddleware)
 
-  const server = createServer(app.callback())
-  app.context.wss = new Socket(server, app.context.em)
-
   if (!isTest) {
+    const server = createServer(app.callback())
+    app.context.wss = new Socket(server, app.context.em)
     server.listen(80, () => console.info('Listening on port 80'))
   }
 

src/services/api/game-channel-api.service.ts

@@ -25,16 +25,16 @@ async function sendMessageToChannelMembers<T>(req: Request, channel: GameChannel
 }
 
 export default class GameChannelAPIService extends APIService {
-  @ForwardTo('games.game-channel', 'index')
+  @ForwardTo('games.game-channels', 'index')
   async index(req: Request): Promise<Response> {
     return forwardRequest(req)
   }
 
-  @HasPermission(GameChannelAPIPolicy, 'post')
   @Validate({
     headers: ['x-talo-alias'],
     body: [GameChannel]
   })
+  @HasPermission(GameChannelAPIPolicy, 'post')
   async post(req: Request): Promise<Response> {
     const { name, props } = req.body
     const em: EntityManager = req.ctx.em
@@ -74,11 +74,11 @@ export default class GameChannelAPIService extends APIService {
     }
   }
 
-  @HasPermission(GameChannelAPIPolicy, 'join')
   @Validate({
     headers: ['x-talo-alias'],
     body: ['name']
   })
+  @HasPermission(GameChannelAPIPolicy, 'join')
   async join(req: Request): Promise<Response> {
     const { name } = req.body
     const em: EntityManager = req.ctx.em
@@ -117,11 +117,11 @@ export default class GameChannelAPIService extends APIService {
     }
   }
 
-  @HasPermission(GameChannelAPIPolicy, 'leave')
   @Validate({
     headers: ['x-talo-alias'],
     body: ['name']
   })
+  @HasPermission(GameChannelAPIPolicy, 'leave')
   async leave(req: Request): Promise<Response> {
     const { name } = req.body
     const em: EntityManager = req.ctx.em

src/socket/listeners/gameChannelListeners.ts

@@ -1,6 +1,6 @@
 import { z, ZodType } from 'zod'
-import { SocketMessageListener } from '../router/socketRoutes'
-import { createListener } from '../router/socketRouter'
+import { SocketMessageListener } from '../router/createListener'
+import createListener from '../router/createListener'
 import { RequestContext } from '@mikro-orm/core'
 import GameChannel from '../../entities/game-channel'
 import { sendMessages } from '../messages/socketMessage'

src/socket/listeners/playerListeners.ts

@@ -1,11 +1,11 @@
 import { z, ZodType } from 'zod'
-import { createListener } from '../router/socketRouter'
+import createListener from '../router/createListener'
 import { sendMessage } from '../messages/socketMessage'
 import Redis from 'ioredis'
 import redisConfig from '../../config/redis.config'
 import { RequestContext } from '@mikro-orm/core'
 import PlayerAlias from '../../entities/player-alias'
-import { SocketMessageListener } from '../router/socketRoutes'
+import { SocketMessageListener } from '../router/createListener'
 import SocketError, { sendError } from '../messages/socketError'
 
 const playerListeners: SocketMessageListener<ZodType>[] = [

src/socket/router/socketRoutes.ts → src/socket/router/createListener.ts

@@ -2,8 +2,6 @@ import { z, ZodType } from 'zod'
 import { SocketMessageRequest } from '../messages/socketMessage'
 import SocketConnection from '../socketConnection'
 import Socket from '..'
-import playerListeners from '../listeners/playerListeners'
-import gameChannelListeners from '../listeners/gameChannelListeners'
 
 type SocketMessageListenerHandlerParams<T> = {
   conn: SocketConnection
@@ -12,8 +10,8 @@ type SocketMessageListenerHandlerParams<T> = {
   socket: Socket
 }
 
-export type SocketMessageListenerHandler<T> = (params: SocketMessageListenerHandlerParams<T>) => void | Promise<void>
-export type SocketMessageListenerOptions = {
+type SocketMessageListenerHandler<T> = (params: SocketMessageListenerHandlerParams<T>) => void | Promise<void>
+type SocketMessageListenerOptions = {
   requirePlayer?: boolean
   apiKeyScopes?: string[]
 }
@@ -25,9 +23,16 @@ export type SocketMessageListener<T extends ZodType> = {
   options: SocketMessageListenerOptions
 }
 
-const routes: SocketMessageListener<ZodType>[][] = [
-  playerListeners,
-  gameChannelListeners
-]
-
-export default routes
+export default function createListener<T extends ZodType>(
+  req: SocketMessageRequest,
+  validator: T,
+  handler: SocketMessageListenerHandler<z.infer<T>>,
+  options?: SocketMessageListenerOptions
+): SocketMessageListener<T> {
+  return {
+    req,
+    validator,
+    handler,
+    options
+  }
+}

src/socket/router/socketRouter.ts

@@ -1,26 +1,14 @@
 import { z, ZodError, ZodType } from 'zod'
 import Socket from '..'
-import { SocketMessageRequest, requests } from '../messages/socketMessage'
+import { requests } from '../messages/socketMessage'
 import SocketConnection from '../socketConnection'
 import { RawData } from 'ws'
 import { addBreadcrumb } from '@sentry/node'
-import routes, { SocketMessageListener, SocketMessageListenerHandler, SocketMessageListenerOptions } from './socketRoutes'
+import { SocketMessageListener } from './createListener'
 import SocketError, { sendError } from '../messages/socketError'
 import { APIKeyScope } from '../../entities/api-key'
-
-export function createListener<T extends ZodType>(
-  req: SocketMessageRequest,
-  validator: T,
-  handler: SocketMessageListenerHandler<z.infer<T>>,
-  options?: SocketMessageListenerOptions
-): SocketMessageListener<T> {
-  return {
-    req,
-    validator,
-    handler,
-    options
-  }
-}
+import playerListeners from '../listeners/playerListeners'
+import gameChannelListeners from '../listeners/gameChannelListeners'
 
 const socketMessageValidator = z.object({
   req: z.enum(requests),
@@ -29,6 +17,11 @@ const socketMessageValidator = z.object({
 
 type SocketMessage = z.infer<typeof socketMessageValidator>
 
+const routes: SocketMessageListener<ZodType>[][] = [
+  playerListeners,
+  gameChannelListeners
+]
+
 export default class SocketRouter {
   constructor(readonly socket: Socket) {}