Many many more improvements

src/application/base/baseController.ts

@@ -1,6 +1,10 @@
 import { Request, Response } from 'express'
 
+import { Logger } from '#application/logger'
+
 export abstract class BaseController {
+  protected readonly logger: Logger = new Logger('http')
+
   protected sendSuccess(res: Response, data?: any, message?: string, status: number = 200) {
     return res.status(status).json({
       success: true,

src/application/base/baseEntity.ts

@@ -1,9 +1,11 @@
 import { EntityManager } from '@mikro-orm/core'
 
 import Database from '#application/database'
-import { appLogger } from '#application/logger'
+import { Logger } from '#application/logger'
 
 export abstract class BaseEntity {
+  protected readonly logger: Logger = new Logger('entity')
+
   private getEntityManager(): EntityManager {
     return Database.getEntityManager()
   }
@@ -35,7 +37,7 @@ export abstract class BaseEntity {
         throw error
       }
     } catch (error) {
-      appLogger.error(`Failed to ${actionDescription}: ${error instanceof Error ? error.message : String(error)}`)
+      this.logger.error(`Failed to ${actionDescription}: ${error instanceof Error ? error.message : String(error)}`)
       throw error
     }
   }

src/application/base/baseEvent.ts

@@ -1,8 +1,11 @@
 import { Server } from 'socket.io'
 
+import { Logger } from '#application/logger'
 import { TSocket } from '#application/types'
 
 export abstract class BaseEvent {
+  protected readonly logger: Logger = new Logger('game')
+
   constructor(
     readonly io: Server,
     readonly socket: TSocket

src/application/base/baseRepository.ts

@@ -2,7 +2,11 @@ import { EntityManager } from '@mikro-orm/core'
 
 import Database from '../database'
 
+import { Logger } from '#application/logger'
+
 export abstract class BaseRepository {
+  protected readonly logger: Logger = new Logger('repository')
+
   protected get em(): EntityManager {
     return Database.getEntityManager()
   }

src/application/base/baseService.ts

@@ -0,0 +1,5 @@
+import { Logger } from '#application/logger'
+
+export abstract class BaseService {
+  protected readonly logger: Logger = new Logger('game')
+}

src/application/logger.ts

@@ -1,68 +1,73 @@
-import fs from 'fs'
-
 import pino from 'pino'
 
 import { getRootPath } from './storage'
 
-// Array of log types
-const LOG_TYPES = ['http', 'game', 'gameMaster', 'app', 'queue', 'command'] as const
-type LogType = (typeof LOG_TYPES)[number]
+export class Logger {
+  private static readonly LOG_TYPES = ['http', 'game', 'gameMaster', 'app', 'queue', 'command', 'repository', 'entity'] as const
+  private readonly logger: ReturnType<typeof pino>
 
-const createLogger = (name: LogType) =>
-  pino({
-    level: process.env.LOG_LEVEL || 'debug',
-    transport: {
-      target: 'pino/file',
-      options: {
-        destination: `./logs/${name}.log`,
-        mkdir: true
-      }
-    },
-    formatters: {
-      level: (label) => {
-        return { level: label.toUpperCase() }
-      }
-    },
-    timestamp: pino.stdTimeFunctions.isoTime,
-    base: null
-  })
-
-// Create logger instances
-const loggers = Object.fromEntries(LOG_TYPES.map((type) => [type, createLogger(type)])) as Record<LogType, ReturnType<typeof createLogger>>
-
-const watchLogs = () => {
-  LOG_TYPES.forEach((type) => {
-    const logFile = getRootPath('logs', `${type}.log`)
-
-    // Get initial file size
-    const stats = fs.statSync(logFile)
-    let lastPosition = stats.size
-
-    fs.watch(logFile, (eventType) => {
-      if (eventType !== 'change') {
-        return
-      }
-
-      fs.stat(logFile, (err, stats) => {
-        if (err) return
-
-        if (stats.size > lastPosition) {
-          const stream = fs.createReadStream(logFile, {
-            start: lastPosition,
-            end: stats.size
-          })
-
-          stream.on('data', (chunk) => {
-            console.log(`[${type}]\n${chunk.toString()}`)
-          })
-
-          lastPosition = stats.size
+  constructor(type: (typeof Logger.LOG_TYPES)[number]) {
+    this.logger = pino({
+      level: process.env.LOG_LEVEL || 'debug',
+      transport: {
+        target: 'pino/file',
+        options: {
+          destination: `./logs/${type}.log`,
+          mkdir: true
         }
+      },
+      formatters: {
+        level: (label) => ({ level: label.toUpperCase() })
+      },
+      timestamp: pino.stdTimeFunctions.isoTime,
+      base: null
+    })
+  }
+
+  info(message: string) {
+    this.logger.info(message)
+  }
+
+  error(message: string) {
+    this.logger.error(message)
+  }
+
+  warn(message: string) {
+    this.logger.warn(message)
+  }
+
+  debug(message: string) {
+    this.logger.debug(message)
+  }
+
+  static watch() {
+    const fs = require('fs')
+
+    this.LOG_TYPES.forEach((type) => {
+      const logFile = getRootPath('logs', `${type}.log`)
+      const stats = fs.statSync(logFile)
+      let lastPosition = stats.size
+
+      fs.watch(logFile, (eventType: string) => {
+        if (eventType !== 'change') return
+
+        fs.stat(logFile, (err: Error, stats: { size: number }) => {
+          if (err) return
+
+          if (stats.size > lastPosition) {
+            const stream = fs.createReadStream(logFile, {
+              start: lastPosition,
+              end: stats.size
+            })
+
+            stream.on('data', (chunk: Buffer) => {
+              console.log(`[${type}]\n${chunk.toString()}`)
+            })
+
+            lastPosition = stats.size
+          }
+        })
       })
     })
-  })
+  }
 }
-
-export const { http: httpLogger, game: gameLogger, gameMaster: gameMasterLogger, app: appLogger, queue: queueLogger, command: commandLogger } = loggers
-
-export { watchLogs }