jp.ms.common.modules 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.ms.common.modules",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     "jp.common.models": "1.0.7",
     "jp.common.utils": "1.0.2",
     "jp.db.schemas": "2.0.1",
-    "jp.ms.common.engine": "2.0.1",
+    "jp.ms.common.engine": "2.0.2",
     "mongoose": "9.1.5",
     "nestjs-i18n": "10.5.1",
     "reflect-metadata": "0.2.2",

package/src/dto/common/log.dto.ts

@@ -0,0 +1,4 @@
+export interface LogDto {
+    description: string;
+    stack?: string;
+}

package/src/modules/index.ts

@@ -8,6 +8,8 @@ import { SimpleRoomsManagerModule } from './simple-rooms-manager/simple-rooms-ma
 import { SimpleRoomsManagerService } from './simple-rooms-manager/simple-rooms-manager.service';
 import { RoomsModule } from './rooms/rooms.module';
 import { SupportModule } from './support/support.module';
+import { JpLoggerModule } from './logger/jp-logger.module';
+import { JpLoggerService } from './logger/jp-logger.service';
 
 export {
     PlayersManagerModule,
@@ -20,4 +22,6 @@ export {
     SimpleRoomsManagerService,
     RoomsModule,
     SupportModule,
+    JpLoggerModule,
+    JpLoggerService,
 }

package/src/modules/logger/jp-logger.module.ts

@@ -0,0 +1,10 @@
+import { Global, Module } from '@nestjs/common';
+
+import { JpLoggerService } from './jp-logger.service';
+
+@Global()
+@Module({
+    providers: [JpLoggerService],
+    exports: [JpLoggerService],
+})
+export class JpLoggerModule {}

package/src/modules/logger/jp-logger.service.ts

@@ -0,0 +1,32 @@
+import { Injectable, Scope, ConsoleLogger, LogLevel } from '@nestjs/common';
+import * as process from 'process';
+
+@Injectable({ scope: Scope.TRANSIENT })
+export class JpLoggerService extends ConsoleLogger {
+    constructor () {
+        super({ json: true });
+    }
+
+    protected getTimestamp (): string {
+        return new Date().toISOString();
+    }
+
+    protected printAsJson (message: unknown, options: {
+        context: string;
+        logLevel: LogLevel;
+        writeStreamType?: "stdout" | "stderr";
+        errorStack?: unknown,
+    }) {
+        const logObject = {
+            level: options.logLevel,
+            pid: process.pid,
+            timestamp: this.getTimestamp(),
+            message,
+            context: options.context ? options.context : undefined,
+        };
+
+        const formattedMessage = JSON.stringify(logObject, this.stringifyReplacer);
+
+        process[options.writeStreamType ?? 'stdout'].write(`${formattedMessage}\n`);
+    }
+}

package/src/modules/simple-rooms-manager/simple-rooms-manager.module.ts

@@ -1,5 +1,5 @@
-import { ConsoleLogger, DynamicModule, Global, Inject, Module, Provider } from '@nestjs/common';
-import { MongooseModule,  InjectConnection } from '@nestjs/mongoose';
+import { DynamicModule, Global, Inject, Module, Provider } from '@nestjs/common';
+import { MongooseModule, InjectConnection } from '@nestjs/mongoose';
 import {
     Room,
     RoomSchema,
@@ -11,14 +11,11 @@ import {
     GameResultSchema,
     GameResultRepository,
 } from 'jp.db.schemas';
-import {
-    BaseGameEvent,
-    GameMaster,
-    GameRoomEvent,
-    MinPlayersStartStrategy,
-} from 'jp.ms.common.engine';
+import { BaseGameEvent, GameMaster, MinPlayersStartStrategy } from 'jp.ms.common.engine';
 import { Connection } from 'mongoose';
 
+import { JpLoggerService } from '../logger/jp-logger.service';
+
 import { SimpleRoomsManagerService } from './simple-rooms-manager.service';
 import { SimpleRoomsFactoryOptions, SimpleRoomsManagerOptions } from './simple-rooms-manager.interfaces';
 import { SIMPLE_ROOMS_MANAGER_OPTIONS } from './simple-rooms-manager.constants';
@@ -39,8 +36,6 @@ import { SIMPLE_ROOMS_MANAGER_OPTIONS } from './simple-rooms-manager.constants';
     exports: [SimpleRoomsManagerService],
 })
 export class SimpleRoomsManagerModule {
-    private readonly logger = new ConsoleLogger(SimpleRoomsManagerModule.name);
-
     constructor (
         private readonly roomsRepository: RoomsRepository,
         private readonly usersRepository: UsersRepository,
@@ -48,6 +43,7 @@ export class SimpleRoomsManagerModule {
         private readonly simpleRoomsManagerService: SimpleRoomsManagerService,
         @Inject(SIMPLE_ROOMS_MANAGER_OPTIONS) private readonly options: SimpleRoomsFactoryOptions,
         @InjectConnection() private readonly connection: Connection,
+        @Inject() private readonly logger: JpLoggerService,
     ) {
     }
 
@@ -99,11 +95,7 @@ export class SimpleRoomsManagerModule {
     }
 
     private handleRoomEvent = (event: BaseGameEvent) => {
-        if (event instanceof GameRoomEvent) {
-            this.logger.log(event.constructor.name, event.roomId);
-        } else {
-            this.logger.log(event.constructor.name);
-        }
+        this.logger.log(event.toLog());
     };
 
     private handleRoomTableGameFinished = async (master: GameMaster) => {

package/src/modules/support/support.controller.ts

@@ -1,11 +1,14 @@
-import { Controller, Get, Post, Res } from '@nestjs/common';
+import { Body, Controller, Get, Headers, Inject, Post, Res } from '@nestjs/common';
 import type { Response } from 'express';
+import { IAppHeaders } from 'jp.common.models';
 
 import { PlayerConnectedDto } from '../../dto/common/player-connected.dto';
+import { JpLoggerService } from '../logger/jp-logger.service';
 
 import { SupportService } from './support.service';
 import { MetricService } from './metric.service';
 import { DumpService } from './dump.service';
+import { LogDto } from '../../dto/common/log.dto';
 
 @Controller('support')
 export class SupportController {
@@ -13,6 +16,7 @@ export class SupportController {
         private readonly supportService: SupportService,
         private readonly metricService: MetricService,
         private readonly dumpService: DumpService,
+        @Inject() private readonly logger: JpLoggerService,
     ) {
     }
 
@@ -42,6 +46,15 @@ export class SupportController {
     }
 
     @Post('log')
-    addLog () {
+    addLog (@Headers() headers: IAppHeaders, @Body() message: LogDto) {
+        this.logger.log({
+            client_auth_token: headers.client_auth_token,
+            client_game: headers.client_game,
+            client_channel: headers.client_channel,
+            client_language: headers.client_language,
+            client_version: headers.client_version,
+            description: message.description,
+            stack: message.stack,
+        });
     }
 }

package/src/modules/support/support.service.ts

@@ -13,8 +13,4 @@ export class SupportService {
     async getUsers (): Promise<Array<PlayerConnectedDto>> {
         return this.playersManager.getPlayers().map((item) => PlayerConnectedDto.fromEntities(item));
     }
-
-    async getMetrics () {
-
-    }
 }