jp.ms.common.modules 1.0.35 → 1.0.37

package/dist/utils/game-table-result.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from 'mongoose';
-import { GameResultRepository, TournamentManyTablesRoomsRepository, TournamentOneTableRoomsRepository, UsersRepository } from 'jp.db.schemas';
+import { GameResultRepository, OneTableTournamentRoomsRepository, ManyTablesTournamentRoomsRepository, UsersRepository } from 'jp.db.schemas';
 import { GameMaster, TournamentMaster } from 'jp.ms.common.engine';
 export declare function getGameTableResults(master: GameMaster): {
     gameType: string;
@@ -36,4 +36,4 @@ export declare function getGameTableResults(master: GameMaster): {
     }[];
 };
 export declare function saveGameTablesResult(master: GameMaster, connection: Connection, gameResultRepository: GameResultRepository, usersRepository: UsersRepository, saveNewBalance: boolean): Promise<void>;
-export declare function saveTournamentResult(master: TournamentMaster, connection: Connection, tournamentRepository: TournamentManyTablesRoomsRepository | TournamentOneTableRoomsRepository, usersRepository: UsersRepository): Promise<void>;
+export declare function saveTournamentResult(master: TournamentMaster, connection: Connection, tournamentRepository: OneTableTournamentRoomsRepository | ManyTablesTournamentRoomsRepository, usersRepository: UsersRepository): Promise<void>;

package/dist/utils/game-table-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"game-table-result.js","sourceRoot":"","sources":["../../src/utils/game-table-result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"game-table-result.js","sourceRoot":"","sources":["../../src/utils/game-table-result.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.ms.common.modules",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,10 +13,10 @@
     "@nestjs/mongoose": "11.0.4",
     "@nestjs/websockets": "11.1.9",
     "dayjs": "1.11.18",
-    "jp.common.models": "1.1.27",
+    "jp.common.models": "1.1.29",
     "jp.common.utils": "1.0.5",
-    "jp.db.schemas": "2.2.8",
-    "jp.ms.common.engine": "3.0.16",
+    "jp.db.schemas": "2.2.12",
+    "jp.ms.common.engine": "3.0.17",
     "mongoose": "9.1.5",
     "nestjs-i18n": "10.5.1",
     "node-schedule": "2.1.1",

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from './dto';
 export * from './modules';
-export * from './config';
 export * from './exception';
 export * from './views';

package/src/modules/anti-freeze-system/anti-freeze-system.interfaces.ts

@@ -2,7 +2,6 @@ import { ModuleMetadata } from '@nestjs/common';
 import { Type } from '@nestjs/common/interfaces/type.interface';
 import { DynamicModule } from '@nestjs/common/interfaces/modules/dynamic-module.interface';
 import { ForwardReference } from '@nestjs/common/interfaces/modules/forward-reference.interface';
-import { ConfigService } from '@nestjs/config';
 
 export interface AntiFreezeSystemOptions
   extends Pick<ModuleMetadata, 'imports'> {
@@ -10,9 +9,10 @@ export interface AntiFreezeSystemOptions
     Type<any> | DynamicModule | Promise<DynamicModule> | ForwardReference
   >;
   inject?: any[];
-  useFactory?: (...args: any[]) => Promise<any> | any;
+  useFactory?: (...args: any[]) => AntiFreezeSystemFactoryOptions;
 }
 
 export interface AntiFreezeSystemFactoryOptions {
-  configService: ConfigService;
+  antiFreezeSystemTime: string;
+  antiFreezeSystemCheckCount: number;
 }

package/src/modules/anti-freeze-system/anti-freeze-system.module.ts

@@ -7,14 +7,12 @@ import {
 } from '@nestjs/common';
 import schedule, { Job } from 'node-schedule';
 
-import { JpLoggerService } from '../logger';
-
+import { AntiFreezeSystemService } from './anti-freeze-system.service';
+import { ANTI_FREEZE_SYSTEM_OPTIONS } from './anti-freeze-system.constants';
 import {
   AntiFreezeSystemFactoryOptions,
   AntiFreezeSystemOptions,
 } from './anti-freeze-system.interfaces';
-import { AntiFreezeSystemService } from './anti-freeze-system.service';
-import { ANTI_FREEZE_SYSTEM_OPTIONS } from './anti-freeze-system.constants';
 
 @Global()
 @Module({
@@ -27,7 +25,6 @@ export class AntiFreezeSystemModule {
     private readonly antiFreezeSystemService: AntiFreezeSystemService,
     @Inject(ANTI_FREEZE_SYSTEM_OPTIONS)
     private readonly options: AntiFreezeSystemFactoryOptions,
-    @Inject() private readonly logger: JpLoggerService,
   ) {}
 
   static forRootAsync(options: AntiFreezeSystemOptions): DynamicModule {
@@ -45,13 +42,8 @@ export class AntiFreezeSystemModule {
   }
 
   onModuleInit() {
-    const antiFreezeSystemTime = this.options.configService.get<string>(
-      'ANTI_FREEZE_SYSTEM_TIME',
-    );
-    const antiFreezeSystemCheckCount =
-      this.options.configService.get<number>(
-        'ANTI_FREEZE_SYSTEM_CHECK_COUNT',
-      ) || 0;
+    const antiFreezeSystemTime = this.options.antiFreezeSystemTime;
+    const antiFreezeSystemCheckCount = this.options.antiFreezeSystemCheckCount;
 
     if (antiFreezeSystemTime) {
       this.antiFreezeSystemJob = schedule.scheduleJob(

package/src/modules/anti-freeze-system/anti-freeze-system.service.ts

@@ -7,8 +7,8 @@ import {
 } from 'jp.ms.common.engine';
 
 import { SimpleRoomsManagerService } from '../simple-rooms-manager/simple-rooms-manager.service';
-import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service';
-import { TournamentManyTablesRoomsManagerService } from '../tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service';
+import { OneTableTournamentRoomsManagerService } from '../one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service';
+import { ManyTablesTournamentRoomsManagerService } from '../many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service';
 
 export interface IRoomSetItem {
   tableId: string;
@@ -23,8 +23,8 @@ export class AntiFreezeSystemService {
 
   constructor(
     private readonly simpleRoomsManagerService: SimpleRoomsManagerService,
-    private readonly oneTableRoomsManagerService: TournamentOneTableRoomsManagerService,
-    private readonly manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService,
+    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
+    private readonly manyTablesRoomsManagerService: ManyTablesTournamentRoomsManagerService,
   ) {
     this.prevSet = new Map<string, IRoomSetItem>();
   }

package/src/modules/index.ts

@@ -13,13 +13,13 @@ export {
 } from './simple-rooms-manager';
 export { SupportModule } from './support';
 export {
-  TournamentManyTablesRoomsManagerService,
-  TournamentManyTablesRoomsManagerModule,
-} from './tournament-many-tables-rooms-manager';
+  ManyTablesTournamentRoomsManagerModule,
+  ManyTablesTournamentRoomsManagerService,
+} from './many-tables-tournament-rooms-manager';
 export {
-  TournamentOneTableRoomsManagerService,
-  TournamentOneTableRoomsManagerModule,
-} from './tournament-one-table-rooms-manager';
+  OneTableTournamentRoomsManagerModule,
+  OneTableTournamentRoomsManagerService,
+} from './one-table-tournament-rooms-manager';
 export {
   EventsBusModule,
   EventsBusMainTablesSubscribeService,

package/src/modules/main/main.service.ts

@@ -24,8 +24,8 @@ import {
 } from '../../dto';
 import { SimpleRoomsManagerService } from '../simple-rooms-manager';
 import { PlayersManagerService } from '../players-manager';
-import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager';
-import { TournamentManyTablesRoomsManagerService } from '../tournament-many-tables-rooms-manager';
+import { OneTableTournamentRoomsManagerService } from '../one-table-tournament-rooms-manager';
+import { ManyTablesTournamentRoomsManagerService } from '../many-tables-tournament-rooms-manager';
 import { EventsBusMainTablesSubscribeService } from '../event-bus/events-bus.main-tables.subscribe.service';
 import {
   ErrorCodeEnum,
@@ -41,8 +41,8 @@ import { MainTablesListScreenView } from './main-tables-list-screen.view';
 export class MainService {
   constructor(
     private readonly simpleRoomsManager: SimpleRoomsManagerService,
-    private readonly oneTableRoomsManagerService: TournamentOneTableRoomsManagerService,
-    private readonly manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService,
+    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
+    private readonly manyTablesRoomsManagerService: ManyTablesTournamentRoomsManagerService,
     private readonly playersManager: PlayersManagerService,
     private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
     private readonly usersRepository: UsersRepository,

package/src/modules/many-tables-tournament/many-tables-tournament.module.ts

@@ -1,9 +1,9 @@
 import { DynamicModule, Module, Provider } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import {
-  TournamentManyTablesRoom,
-  TournamentManyTablesRoomSchema,
-  TournamentManyTablesRoomsRepository,
+  ManyTablesTournamentRoom,
+  ManyTablesTournamentRoomSchema,
+  ManyTablesTournamentRoomsRepository,
 } from 'jp.db.schemas';
 import {
   GamePlayer,
@@ -11,7 +11,7 @@ import {
   RoomUpdateStateEvent,
 } from 'jp.ms.common.engine';
 
-import { TournamentManyTablesRoomsManagerService } from '../tournament-many-tables-rooms-manager';
+import { ManyTablesTournamentRoomsManagerService } from '../many-tables-tournament-rooms-manager';
 import { EventsBusManyTablesTournamentSubscribeService } from '../event-bus';
 
 import { ManyTablesTournamentController } from './many-tables-tournament.controller';
@@ -23,17 +23,17 @@ import { ManyTablesTournamentModuleOptions } from './many-tables-tournament.inte
   imports: [
     MongooseModule.forFeature([
       {
-        name: TournamentManyTablesRoom.name,
-        schema: TournamentManyTablesRoomSchema,
+        name: ManyTablesTournamentRoom.name,
+        schema: ManyTablesTournamentRoomSchema,
       },
     ]),
   ],
   controllers: [ManyTablesTournamentController],
-  providers: [ManyTablesTournamentService, TournamentManyTablesRoomsRepository],
+  providers: [ManyTablesTournamentService, ManyTablesTournamentRoomsRepository],
 })
 export class ManyTablesTournamentModule {
   constructor(
-    private readonly manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService,
+    private readonly manyTablesRoomsManagerService: ManyTablesTournamentRoomsManagerService,
     private readonly eventsBusManyTablesTournamentSubscribeService: EventsBusManyTablesTournamentSubscribeService,
     private readonly manyTablesTournamentService: ManyTablesTournamentService,
   ) {}

package/src/modules/many-tables-tournament/many-tables-tournament.service.ts

@@ -14,7 +14,7 @@ import {
 } from 'jp.ms.common.engine';
 
 import { BaseAppScreenDto } from '../../dto';
-import { TournamentManyTablesRoomsManagerService } from '../tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service';
+import { ManyTablesTournamentRoomsManagerService } from '../many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service';
 import { PlayersManagerService } from '../players-manager/players-manager.service';
 import { JoinTournamentDto } from '../../dto/common/join-tournament.dto';
 import { ManyTablesTournamentCreateDto } from '../../dto/common/many-tables-tournament-create.dto';
@@ -28,7 +28,7 @@ import { ManyTablesTournamentTablesListScreenView } from './many-tables-tourname
 @Injectable()
 export class ManyTablesTournamentService {
   constructor(
-    private readonly manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService,
+    private readonly manyTablesRoomsManagerService: ManyTablesTournamentRoomsManagerService,
     private readonly playersManager: PlayersManagerService,
     @Inject(MANY_TABLES_TOURNAMENT_OPTIONS)
     private readonly options: ManyTablesTournamentFactoryOptions,

package/src/modules/many-tables-tournament-rooms-manager/index.ts

@@ -0,0 +1,2 @@
+export { ManyTablesTournamentRoomsManagerModule } from './many-tables-tournament-rooms-manager.module';
+export { ManyTablesTournamentRoomsManagerService } from './many-tables-tournament-rooms-manager.service';

package/src/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.constants.ts

@@ -0,0 +1,3 @@
+export const MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS = Symbol(
+  'MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS',
+);

package/src/modules/{tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.interfaces.ts → many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.interfaces.ts}

@@ -8,22 +8,28 @@ import {
   ManyTablesTournamentRoom,
   IPrizeTableData,
 } from 'jp.ms.common.engine';
-import { ConfigService } from '@nestjs/config';
 
-export interface TournamentManyTablesRoomsManagerOptions
+export interface ManyTablesTournamentRoomsManagerOptions
   extends Pick<ModuleMetadata, 'imports'> {
   imports?: Array<
     Type | DynamicModule | Promise<DynamicModule> | ForwardReference
   >;
   inject?: any[];
-  useFactory?: (...args: any[]) => Promise<any> | any;
+  useFactory?: (...args: any[]) => ManyTablesTournamentRoomsFactoryOptions;
 }
 
-export interface TournamentManyTablesRoomsFactoryOptions {
-  i18n: I18nService;
-  configService: ConfigService;
-  tournamentPrizeTable: IPrizeTableData;
+export interface ManyTablesTournamentRoomsFactoryOptions {
+  i18n: I18nService | any;
   createTournamentRoom(
     room: ManyTablesTournamentRoomConfig,
   ): ManyTablesTournamentRoom;
+  gameType: string;
+  restartGameTimeout: number;
+  playersTurnTimeout: number;
+  instantFinishMode: boolean;
+  tournamentPrizeTable: IPrizeTableData;
+  dailyTournamentScheduleJobEnabled: boolean;
+  dailyTournamentScheduleTaskTime: string;
+  dailyTournamentTime: string;
+  minPlayersForMergeTables: number;
 }

package/src/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.module.ts

@@ -0,0 +1,84 @@
+import {
+  DynamicModule,
+  Global,
+  Inject,
+  Module,
+  Provider,
+} from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import {
+  ManyTablesTournamentRoom,
+  ManyTablesTournamentRoomSchema,
+  ManyTablesTournamentRoomsRepository,
+  User,
+  UserSchema,
+  UsersRepository,
+  GameResult,
+  GameResultSchema,
+  GameResultRepository,
+  Purchase,
+  PurchaseSchema,
+  PurchaseRepository,
+} from 'jp.db.schemas';
+
+import { ManyTablesTournamentRoomsManagerService } from './many-tables-tournament-rooms-manager.service';
+import { ManyTablesTournamentRoomsManagerOptions } from './many-tables-tournament-rooms-manager.interfaces';
+import { MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS } from './many-tables-tournament-rooms-manager.constants';
+import { ManyTablesTournamentRoomsFactoryOptions } from './many-tables-tournament-rooms-manager.interfaces';
+
+@Global()
+@Module({
+  imports: [
+    MongooseModule.forFeature([
+      {
+        name: ManyTablesTournamentRoom.name,
+        schema: ManyTablesTournamentRoomSchema,
+      },
+    ]),
+    MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
+    MongooseModule.forFeature([
+      { name: Purchase.name, schema: PurchaseSchema },
+    ]),
+    MongooseModule.forFeature([
+      { name: GameResult.name, schema: GameResultSchema },
+    ]),
+  ],
+  providers: [
+    ManyTablesTournamentRoomsRepository,
+    UsersRepository,
+    ManyTablesTournamentRoomsManagerService,
+    GameResultRepository,
+    PurchaseRepository,
+  ],
+  exports: [ManyTablesTournamentRoomsManagerService],
+})
+export class ManyTablesTournamentRoomsManagerModule {
+  constructor(
+    private readonly managerService: ManyTablesTournamentRoomsManagerService,
+    @Inject(MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS)
+    private readonly options: ManyTablesTournamentRoomsFactoryOptions,
+  ) {}
+
+  static forRootAsync(
+    options: ManyTablesTournamentRoomsManagerOptions,
+  ): DynamicModule {
+    return {
+      module: ManyTablesTournamentRoomsManagerModule,
+      imports: options.imports ?? [],
+      providers: [
+        {
+          provide: MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS,
+          useFactory: options.useFactory,
+          inject: options.inject || [],
+        } as Provider,
+      ],
+    };
+  }
+
+  async onModuleInit() {
+    if (this.options.dailyTournamentScheduleJobEnabled) {
+      await this.managerService.runDailyTournamentJob();
+    }
+    await this.managerService.hydrateTournamentsFromDB();
+  }
+}

package/src/modules/{tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.ts → many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service.ts}

@@ -18,6 +18,7 @@ import {
   GameTournamentPlayerLeavedTheTournamentEvent,
   GameTournamentStartedEvent,
   GameTournamentWaitedEvent,
+  LocalService,
   ManyTablesTournamentRoom,
   ManyTablesTournamentRoomConfig,
   NoStartStrategy,
@@ -27,8 +28,8 @@ import {
 import {
   GameResultRepository,
   PurchaseRepository,
-  TournamentManyTablesRoomDocument,
-  TournamentManyTablesRoomsRepository,
+  ManyTablesTournamentRoomDocument,
+  ManyTablesTournamentRoomsRepository,
   UsersRepository,
 } from 'jp.db.schemas';
 
@@ -45,23 +46,23 @@ import {
   EventsBusManyTablesTournamentSubscribeService,
 } from '../event-bus';
 
-import { TOURNAMENT_MANY_TABLES_ROOMS_MANAGER_OPTIONS } from './tournament-many-tables-rooms-manager.constants';
-import { TournamentManyTablesRoomsFactoryOptions } from './tournament-many-tables-rooms-manager.interfaces';
+import { MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS } from './many-tables-tournament-rooms-manager.constants';
+import { ManyTablesTournamentRoomsFactoryOptions } from './many-tables-tournament-rooms-manager.interfaces';
 
 @Injectable()
-export class TournamentManyTablesRoomsManagerService {
+export class ManyTablesTournamentRoomsManagerService {
   private readonly rooms: Map<string, ManyTablesTournamentRoom>;
   private createDailyTournamentJob: Job | null;
 
   constructor(
-    private readonly tournamentRepository: TournamentManyTablesRoomsRepository,
+    private readonly tournamentRepository: ManyTablesTournamentRoomsRepository,
     private readonly usersRepository: UsersRepository,
     private readonly gameResultRepository: GameResultRepository,
     private readonly purchaseRepository: PurchaseRepository,
     private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
     private readonly eventsBusManyTablesTournamentSubscribeService: EventsBusManyTablesTournamentSubscribeService,
-    @Inject(TOURNAMENT_MANY_TABLES_ROOMS_MANAGER_OPTIONS)
-    private readonly options: TournamentManyTablesRoomsFactoryOptions,
+    @Inject(MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS)
+    private readonly options: ManyTablesTournamentRoomsFactoryOptions,
     @InjectConnection() private readonly connection: Connection,
     @Inject() private readonly logger: JpLoggerService,
   ) {
@@ -70,7 +71,7 @@ export class TournamentManyTablesRoomsManagerService {
   }
 
   get gameType() {
-    return this.options.configService.get<string>('GAME_TYPE') || '';
+    return this.options.gameType;
   }
 
   getRoomById(roomId: string): ManyTablesTournamentRoom | undefined {
@@ -111,20 +112,15 @@ export class TournamentManyTablesRoomsManagerService {
   }
 
   async runDailyTournamentJob() {
-    const dailyTournamentScheduleTaskTime =
-      this.options.configService.get<string>(
-        'DAILY_TOURNAMENT_SCHEDULE_TASK_TIME',
-      );
-    const dailyTournamentTime = this.options.configService.get<string>(
-      'DAILY_TOURNAMENT_TIME',
-    );
-
-    if (dailyTournamentScheduleTaskTime && dailyTournamentTime) {
-      await this.createDailyTournament(dailyTournamentTime);
+    if (
+      this.options.dailyTournamentScheduleTaskTime &&
+      this.options.dailyTournamentTime
+    ) {
+      await this.createDailyTournament(this.options.dailyTournamentTime);
 
       this.createDailyTournamentJob = schedule.scheduleJob(
-        dailyTournamentScheduleTaskTime,
-        () => this.createDailyTournament(dailyTournamentTime),
+        this.options.dailyTournamentScheduleTaskTime,
+        () => this.createDailyTournament(this.options.dailyTournamentTime),
       );
     }
   }
@@ -206,16 +202,8 @@ export class TournamentManyTablesRoomsManagerService {
   }
 
   private manyTablesTournamentDocumentToTournamentRoom(
-    tournamentDocument: TournamentManyTablesRoomDocument,
+    tournamentDocument: ManyTablesTournamentRoomDocument,
   ): ManyTablesTournamentRoomConfig {
-    const restartGameTimeout =
-      this.options.configService.get<number>('RESTART_GAME_TIMEOUT') || 0;
-    const playersTurnTimeout =
-      this.options.configService.get<number>('PLAYERS_TURN_TIMEOUT') || 0;
-    const minPlayersForMergeTables = this.options.configService.get<string>(
-      'TOURNAMENT_MANY_TABLES_MIN_PLAYERS_FOR_MERGE_TABLES',
-    );
-
     return {
       id: tournamentDocument.tournamentId,
       gameType: tournamentDocument.gameType,
@@ -230,10 +218,11 @@ export class TournamentManyTablesRoomsManagerService {
       description: tournamentDocument.description,
       enableForFastGame: false,
       scheduleDate: tournamentDocument.scheduleDate,
-      turnTimeout: playersTurnTimeout,
-      restartTimeout: restartGameTimeout,
-      minPlayersForMergeTables: parseInt(minPlayersForMergeTables ?? '0', 10),
-      localeService: this.options.i18n,
+      turnTimeout: this.options.playersTurnTimeout,
+      restartTimeout: this.options.restartGameTimeout,
+      instantFinishMode: this.options.instantFinishMode,
+      minPlayersForMergeTables: this.options.minPlayersForMergeTables,
+      localeService: this.options.i18n as LocalService,
       startStrategy: new NoStartStrategy(),
       onRoomEvent: this.handleRoomEvent,
       tournamentPrizeTable: this.options.tournamentPrizeTable,

package/src/modules/menu/menu-screen.view.ts

@@ -40,7 +40,7 @@ export class MenuScreenView extends UniversalScreenView {
             (item) =>
               new MenuSectionListItemComponent(
                 item.code,
-                this.lang === 'ru' ? item.title : item.titleEn,
+                this.getDbResource(item.title),
                 new IconImageComponent(item.icon),
                 item.url,
               ),

package/src/modules/one-table-tournament/one-table-tournament.module.ts

@@ -1,9 +1,9 @@
 import { DynamicModule, Module, Provider } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import {
-  TournamentOneTableRoom,
-  TournamentOneTableRoomSchema,
-  TournamentOneTableRoomsRepository,
+  OneTableTournamentRoom,
+  OneTableTournamentRoomSchema,
+  OneTableTournamentRoomsRepository,
 } from 'jp.db.schemas';
 import {
   GamePlayer,
@@ -11,7 +11,7 @@ import {
   RoomUpdateStateEvent,
 } from 'jp.ms.common.engine';
 
-import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service';
+import { OneTableTournamentRoomsManagerService } from '../one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service';
 import { EventsBusOneTableTournamentSubscribeService } from '../event-bus';
 
 import { OneTableTournamentController } from './one-table-tournament.controller';
@@ -23,17 +23,17 @@ import { OneTableTournamentModuleOptions } from './one-table-tournament.interfac
   imports: [
     MongooseModule.forFeature([
       {
-        name: TournamentOneTableRoom.name,
-        schema: TournamentOneTableRoomSchema,
+        name: OneTableTournamentRoom.name,
+        schema: OneTableTournamentRoomSchema,
       },
     ]),
   ],
   controllers: [OneTableTournamentController],
-  providers: [OneTableTournamentService, TournamentOneTableRoomsRepository],
+  providers: [OneTableTournamentService, OneTableTournamentRoomsRepository],
 })
 export class OneTableTournamentModule {
   constructor(
-    private readonly oneTableRoomsManagerService: TournamentOneTableRoomsManagerService,
+    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
     private readonly eventsBusOneTableTournamentSubscribeService: EventsBusOneTableTournamentSubscribeService,
     private readonly oneTableTournamentService: OneTableTournamentService,
   ) {}

package/src/modules/one-table-tournament/one-table-tournament.service.ts

@@ -11,7 +11,7 @@ import {
 } from 'jp.common.models';
 
 import { BaseAppScreenDto } from '../../dto';
-import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service';
+import { OneTableTournamentRoomsManagerService } from '../one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service';
 import { PlayersManagerService } from '../players-manager/players-manager.service';
 
 import { OneTableTournamentFactoryOptions } from './one-table-tournament.interfaces';
@@ -21,7 +21,7 @@ import { OneTableTournamentStatusScreenView } from './one-table-tournament-statu
 @Injectable()
 export class OneTableTournamentService {
   constructor(
-    private readonly oneTableRoomsManagerService: TournamentOneTableRoomsManagerService,
+    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
     private readonly playersManager: PlayersManagerService,
     @Inject(ONE_TABLE_TOURNAMENT_OPTIONS)
     private readonly options: OneTableTournamentFactoryOptions,

package/src/modules/one-table-tournament-rooms-manager/index.ts

@@ -0,0 +1,2 @@
+export { OneTableTournamentRoomsManagerModule } from './one-table-tournament-rooms-manager.module';
+export { OneTableTournamentRoomsManagerService } from './one-table-tournament-rooms-manager.service';

package/src/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.constants.ts

@@ -0,0 +1,3 @@
+export const ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS = Symbol(
+  'ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS',
+);

package/src/modules/{tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.interfaces.ts → one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.interfaces.ts}

@@ -8,20 +8,22 @@ import {
   OneTableTournamentRoom,
   IPrizeTableData,
 } from 'jp.ms.common.engine';
-import { ConfigService } from '@nestjs/config';
 
-export interface TournamentOneTableRoomsManagerOptions
+export interface OneTableTournamentRoomsManagerOptions
   extends Pick<ModuleMetadata, 'imports'> {
   imports?: Array<
     Type<any> | DynamicModule | Promise<DynamicModule> | ForwardReference
   >;
   inject?: any[];
-  useFactory?: (...args: any[]) => Promise<any> | any;
+  useFactory?: (...args: any[]) => OneTableTournamentRoomsFactoryOptions;
 }
 
-export interface TournamentOneTableRoomsFactoryOptions {
-  i18n: I18nService;
-  configService: ConfigService;
-  tournamentPrizeTable: IPrizeTableData;
+export interface OneTableTournamentRoomsFactoryOptions {
+  i18n: I18nService | any;
   createTournamentRoom(room: TournamentRoomConfig): OneTableTournamentRoom;
+  gameType: string;
+  restartGameTimeout: number;
+  playersTurnTimeout: number;
+  instantFinishMode: boolean;
+  tournamentPrizeTable: IPrizeTableData;
 }