Yaml config

Author: enchantinggg4

.gitignore

@@ -10,6 +10,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+config.yaml
 
 matches/*
 # OS

bun.lockb

@@ -47,7 +47,9 @@
     "cache-manager-redis-yet": "^5.1.4",
     "cheerio": "^1.0.0",
     "dotenv": "^16.4.5",
+    "fluent-logger": "^3.4.1",
     "ioredis": "^5.4.1",
+    "js-yaml": "^4.1.0",
     "pg": "^8.13.1",
     "pg-hstore": "^2.3.4",
     "reflect-metadata": "^0.2.2",
@@ -57,7 +59,8 @@
     "sequelize": "^6.37.5",
     "sqlite3": "^5.1.7",
     "swagger-ui-express": "^5.0.1",
-    "typeorm": "^0.3.20"
+    "typeorm": "^0.3.20",
+    "winston": "^3.17.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.4.8",
@@ -69,6 +72,7 @@
     "@types/cron": "^2.4.3",
     "@types/express": "^5.0.0",
     "@types/jest": "29.5.14",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.10.0",
     "@types/supertest": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "8.16.0",

package.json

@@ -1,12 +1,11 @@
 import { Module } from '@nestjs/common';
 import { AppService } from 'app.service';
 import { CqrsModule } from '@nestjs/cqrs';
-import { ClientsModule, Transport } from '@nestjs/microservices';
-import { REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REDIS_URL } from 'env';
+import { ClientsModule, RedisOptions, Transport } from '@nestjs/microservices';
 import { GameServerDomain } from 'gameserver';
 import { CoreController } from 'core.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Entities, prodDbConfig } from 'util/typeorm-config';
+import { Entities } from 'util/typeorm-config';
 import { QueryController } from 'query.controller';
 import { Mapper } from 'rest/mapper';
 import { PlayerController } from 'rest/player.controller';
@@ -17,7 +16,6 @@ import { MetaController } from 'rest/meta/meta.controller';
 import { MetaService } from 'rest/meta/meta.service';
 import { GetUserInfoQuery } from 'gateway/queries/GetUserInfo/get-user-info.query';
 import { outerQuery } from 'gateway/util/outerQuery';
-import { QueryCache } from 'rcache';
 import { CacheModule } from '@nestjs/cache-manager';
 import { MatchService } from 'rest/match/match.service';
 import { MatchMapper } from 'rest/match/match.mapper';
@@ -26,36 +24,55 @@ import { MetaMapper } from 'rest/meta/meta.mapper';
 import { InfoMapper } from 'rest/info/info.mapper';
 import { InfoService } from 'rest/info/info.service';
 import { CrimeController } from 'rest/crime/crime.controller';
-
-
-export function qCache<T, B>() {
-  return new QueryCache<T, B>({
-    url: REDIS_URL(),
-    password: REDIS_PASSWORD(),
-    ttl: 10,
-  });
-}
+import configuration from 'util/configuration';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { TypeOrmModuleOptions } from '@nestjs/typeorm/dist/interfaces/typeorm-options.interface';
 
 @Module({
   imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [configuration],
+    }),
     CacheModule.register(),
     ScheduleModule.forRoot(),
     CqrsModule,
-    TypeOrmModule.forRoot(
-      prodDbConfig
-    ),
+    TypeOrmModule.forRootAsync({
+      useFactory(config: ConfigService): TypeOrmModuleOptions {
+        return {
+          type: "postgres",
+          database: "postgres",
+          host: config.get("postgres.host"),
+          username: config.get("postgres.username"),
+          password: config.get("postgres.password"),
+          entities: Entities,
+
+          port: 5432,
+          synchronize: true,
+          dropSchema: false,
+          poolSize: 50,
+
+          ssl: false,
+        };
+      },
+      imports: [],
+      inject: [ConfigService],
+    }),
     TypeOrmModule.forFeature(Entities),
-    ClientsModule.register([
+    ClientsModule.registerAsync([
       {
-        name: 'QueryCore',
-        transport: Transport.REDIS,
-        options: {
-          host: REDIS_HOST(),
-          port: parseInt(REDIS_PORT() as string),
-          retryAttempts: Infinity,
-          password: REDIS_PASSWORD(),
-          retryDelay: 5000,
+        name: "QueryCore",
+        useFactory(config: ConfigService): RedisOptions {
+          return {
+            transport: Transport.REDIS,
+            options: {
+              host: config.get("redis.host"),
+              password: config.get("redis.password"),
+            },
+          };
         },
+        inject: [ConfigService],
+        imports: [],
       },
     ]),
   ],
@@ -66,7 +83,7 @@ export function qCache<T, B>() {
     PlayerController,
     InfoController,
     MetaController,
-    CrimeController
+    CrimeController,
   ],
   providers: [
     AppService,
@@ -79,7 +96,7 @@ export function qCache<T, B>() {
     InfoService,
     Mapper,
     ...GameServerDomain,
-    outerQuery(GetUserInfoQuery, 'QueryCore', qCache())
+    outerQuery(GetUserInfoQuery, "QueryCore"),
   ],
 })
 export class AppModule {}

src/app.module.ts

@@ -10,25 +10,27 @@ import { PlayerBanHammeredEvent } from 'gateway/events/bans/player-ban-hammered.
 import { ServerSessionSyncEvent } from 'gateway/events/gs/server-session-sync.event';
 import { PlayerNotLoadedEvent } from 'gateway/events/bans/player-not-loaded.event';
 import { PlayerDeclinedGameEvent } from 'gateway/events/mm/player-declined-game.event';
-import { isDev } from 'env';
 import { TournamentGameReadyEvent } from 'gateway/events/tournament/tournament-game-ready.event';
 import { LiveMatchUpdateEvent } from 'gateway/events/gs/live-match-update.event';
 import { StartFakeMatchEvent } from 'gateway/events/start-fake-match.event';
 import { ServerStatusEvent } from 'gateway/events/gs/server-status.event';
 import { MatchFailedEvent } from 'gateway/events/match-failed.event';
 import { PlayerAbandonedEvent } from 'gateway/events/bans/player-abandoned.event';
 import { LobbyReadyEvent } from 'gateway/events/lobby-ready.event';
-
+import { ConfigService } from '@nestjs/config';
 
 @Controller()
 export class CoreController {
-  constructor(private readonly ebus: EventBus) {}
+  constructor(
+    private readonly ebus: EventBus,
+    private readonly config: ConfigService,
+  ) {}
   private readonly logger = new Logger(CoreController.name);
 
   private event<T>(constructor: Constructor<T>, data: any) {
     const buff = data;
     buff.__proto__ = constructor.prototype;
-    if (!isDev) this.ebus.publish(buff);
+    if (this.config.get("prod")) this.ebus.publish(buff);
   }
 
   @EventPattern(RoomReadyEvent.name)