jp.ms.common.modules 1.0.41 → 1.0.43

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

@@ -1,76 +1,80 @@
-import { DynamicModule, Module, Provider } from '@nestjs/common';
-import { MongooseModule } from '@nestjs/mongoose';
-import {
-  OneTableTournamentRoom,
-  OneTableTournamentRoomSchema,
-  OneTableTournamentRoomsRepository,
-} from 'jp.db.schemas';
-import {
-  GamePlayer,
-  OneTableTournamentUpdateStatusWsEvent,
-  RoomUpdateStateEvent,
-} from 'jp.ms.common.engine';
-
-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';
-import { OneTableTournamentService } from './one-table-tournament.service';
-import { ONE_TABLE_TOURNAMENT_OPTIONS } from './one-table-tournament.constants';
-import { OneTableTournamentModuleOptions } from './one-table-tournament.interfaces';
-
-@Module({
-  imports: [
-    MongooseModule.forFeature([
-      {
-        name: OneTableTournamentRoom.name,
-        schema: OneTableTournamentRoomSchema,
-      },
-    ]),
-  ],
-  controllers: [OneTableTournamentController],
-  providers: [OneTableTournamentService, OneTableTournamentRoomsRepository],
-})
-export class OneTableTournamentModule {
-  constructor(
-    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
-    private readonly eventsBusOneTableTournamentSubscribeService: EventsBusOneTableTournamentSubscribeService,
-    private readonly oneTableTournamentService: OneTableTournamentService,
-  ) {}
-
-  static forRootAsync(options: OneTableTournamentModuleOptions): DynamicModule {
-    return {
-      module: OneTableTournamentModule,
-      imports: options.imports ?? [],
-      providers: [
-        {
-          provide: ONE_TABLE_TOURNAMENT_OPTIONS,
-          useFactory: options.useFactory,
-          inject: options.inject || [],
-        } as Provider,
-      ],
-    };
-  }
-
-  onModuleInit() {
-    this.eventsBusOneTableTournamentSubscribeService.subscribe(
-      this.onHandleStatusRoomChange,
-    );
-  }
-
-  private onHandleStatusRoomChange = (event: RoomUpdateStateEvent) => {
-    this.oneTableRoomsManagerService
-      .getRoomById(event.roomId)
-      ?.getStatusScreenWatchers()
-      .forEach((subscriber: GamePlayer) => {
-        const screen = this.oneTableTournamentService.getStatusScreen(
-          event.roomId,
-          subscriber.language,
-          subscriber.id,
-        );
-        subscriber.sendMessage(
-          new OneTableTournamentUpdateStatusWsEvent(event.game, screen.screen),
-        );
-      });
-  };
-}
+import { DynamicModule, Module, Provider } from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import {
+  OneTableTournamentRoom,
+  OneTableTournamentRoomSchema,
+  OneTableTournamentRoomsRepository,
+} from 'jp.db.schemas';
+import {
+  GamePlayer,
+  OneTableTournamentUpdateStatusWsEvent,
+  RoomUpdateStateEvent,
+} from 'jp.ms.common.engine';
+
+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';
+import { OneTableTournamentService } from './one-table-tournament.service';
+import { ONE_TABLE_TOURNAMENT_OPTIONS } from './one-table-tournament.constants';
+import { OneTableTournamentModuleOptions } from './one-table-tournament.interfaces';
+
+@Module({
+  imports: [
+    MongooseModule.forFeature([
+      {
+        name: OneTableTournamentRoom.name,
+        schema: OneTableTournamentRoomSchema,
+      },
+    ]),
+  ],
+  controllers: [OneTableTournamentController],
+  providers: [OneTableTournamentService, OneTableTournamentRoomsRepository],
+})
+export class OneTableTournamentModule {
+  constructor(
+    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
+    private readonly eventsBusOneTableTournamentSubscribeService: EventsBusOneTableTournamentSubscribeService,
+    private readonly oneTableTournamentService: OneTableTournamentService,
+  ) {}
+
+  static forRootAsync(options: OneTableTournamentModuleOptions): DynamicModule {
+    return {
+      module: OneTableTournamentModule,
+      imports: options.imports ?? [],
+      providers: [
+        {
+          provide: ONE_TABLE_TOURNAMENT_OPTIONS,
+          useFactory: options.useFactory,
+          inject: options.inject || [],
+        } as Provider,
+      ],
+    };
+  }
+
+  onModuleInit() {
+    this.eventsBusOneTableTournamentSubscribeService.subscribe(
+      this.onHandleStatusRoomChange,
+    );
+  }
+
+  private onHandleStatusRoomChange = (event: RoomUpdateStateEvent) => {
+    this.oneTableRoomsManagerService
+      .getRoomById(event.roomId)
+      ?.getStatusScreenWatchers()
+      .forEach((subscriber: GamePlayer) => {
+        const screen = this.oneTableTournamentService.getStatusScreen(
+          event.roomId,
+          subscriber.language,
+          subscriber.id,
+        );
+        subscriber.sendMessage(
+          new OneTableTournamentUpdateStatusWsEvent(
+            event.game,
+            subscriber.id,
+            screen.screen,
+          ),
+        );
+      });
+  };
+}

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

@@ -1,146 +1,146 @@
-import {
-  Inject,
-  Injectable,
-  InternalServerErrorException,
-} from '@nestjs/common';
-import {
-  IAppHeaders,
-  IBaseAppScreen,
-  IBaseMoveData,
-  IAppTableState,
-} from 'jp.common.models';
-
-import { BaseAppScreenDto } from '../../dto';
-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';
-import { ONE_TABLE_TOURNAMENT_OPTIONS } from './one-table-tournament.constants';
-import { OneTableTournamentStatusScreenView } from './one-table-tournament-status-screen.view';
-
-@Injectable()
-export class OneTableTournamentService {
-  constructor(
-    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
-    private readonly playersManager: PlayersManagerService,
-    @Inject(ONE_TABLE_TOURNAMENT_OPTIONS)
-    private readonly options: OneTableTournamentFactoryOptions,
-  ) {}
-
-  getStatusScreen(
-    tournamentId: string,
-    lang: string,
-    playerId: string,
-  ): BaseAppScreenDto {
-    const tournament =
-      this.oneTableRoomsManagerService.getRoomById(tournamentId);
-
-    if (!tournament) {
-      throw new InternalServerErrorException();
-    }
-
-    return new BaseAppScreenDto(
-      new OneTableTournamentStatusScreenView(
-        this.options.i18n,
-        lang,
-        tournament,
-        playerId,
-      ).buildBS(),
-    );
-  }
-
-  subscribeOnStatusScreen(tournamentId: string, clientAuthToken: string): void {
-    const player = this.playersManager.getPlayerById(clientAuthToken);
-    const tournament =
-      this.oneTableRoomsManagerService.getRoomById(tournamentId);
-
-    if (player && tournament) {
-      tournament.addToStatusScreenWatchers(player);
-
-      return;
-    }
-
-    throw new InternalServerErrorException();
-  }
-
-  unsubscribeFromStatusScreen(
-    tournamentId: string,
-    clientAuthToken: string,
-  ): void {
-    const player = this.playersManager.getPlayerById(clientAuthToken);
-    const tournament =
-      this.oneTableRoomsManagerService.getRoomById(tournamentId);
-
-    if (player && tournament) {
-      tournament.removeFromStatusScreenWatchers(player);
-
-      return;
-    }
-
-    throw new InternalServerErrorException();
-  }
-
-  watchTheTable(tableId: string, clientAuthToken: string): IAppTableState {
-    const player = this.playersManager.getPlayerById(clientAuthToken);
-    const room = this.oneTableRoomsManagerService.getRoomByTableId(tableId);
-    const master = room?.getMasterById(tableId);
-
-    if (player && room && master) {
-      room.handleWatchTheTable(player, tableId);
-
-      return master.createGameStateDto(player);
-    }
-
-    throw new InternalServerErrorException();
-  }
-
-  moveOnTheTable(
-    tableId: string,
-    clientAuthToken: string,
-    moveDto: IBaseMoveData,
-  ): IAppTableState {
-    const player = this.playersManager.getPlayerById(clientAuthToken);
-    const room = this.oneTableRoomsManagerService.getRoomByTableId(tableId);
-    const master = room?.getMasterById(tableId);
-
-    if (player && room && master) {
-      room.handleMoveOnTheTable(player, tableId, moveDto);
-
-      return master.createGameStateDto(player);
-    }
-
-    throw new InternalServerErrorException();
-  }
-
-  joinTournament(tournamentId: string, headers: IAppHeaders): IBaseAppScreen {
-    const player = this.playersManager.getPlayerById(headers.client_auth_token);
-    const tournament =
-      this.oneTableRoomsManagerService.getRoomByTableId(tournamentId);
-
-    if (player && tournament) {
-      tournament.handleJoinTournament(player);
-
-      return this.getStatusScreen(
-        tournamentId,
-        headers.client_language,
-        headers.client_auth_token,
-      );
-    }
-
-    throw new InternalServerErrorException();
-  }
-
-  leaveTournament(tournamentId: string, clientAuthToken: string): void {
-    const player = this.playersManager.getPlayerById(clientAuthToken);
-    const tournament =
-      this.oneTableRoomsManagerService.getRoomByTableId(tournamentId);
-
-    if (player && tournament) {
-      tournament.handleLeaveTournament(player);
-
-      return;
-    }
-
-    throw new InternalServerErrorException();
-  }
-}
+import {
+  Inject,
+  Injectable,
+  InternalServerErrorException,
+} from '@nestjs/common';
+import {
+  IAppHeaders,
+  IBaseAppScreen,
+  IBaseMoveData,
+  IAppTableState,
+} from 'jp.common.models';
+
+import { BaseAppScreenDto } from '../../dto';
+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';
+import { ONE_TABLE_TOURNAMENT_OPTIONS } from './one-table-tournament.constants';
+import { OneTableTournamentStatusScreenView } from './one-table-tournament-status-screen.view';
+
+@Injectable()
+export class OneTableTournamentService {
+  constructor(
+    private readonly oneTableRoomsManagerService: OneTableTournamentRoomsManagerService,
+    private readonly playersManager: PlayersManagerService,
+    @Inject(ONE_TABLE_TOURNAMENT_OPTIONS)
+    private readonly options: OneTableTournamentFactoryOptions,
+  ) {}
+
+  getStatusScreen(
+    tournamentId: string,
+    lang: string,
+    playerId: string,
+  ): BaseAppScreenDto {
+    const tournament =
+      this.oneTableRoomsManagerService.getRoomById(tournamentId);
+
+    if (!tournament) {
+      throw new InternalServerErrorException();
+    }
+
+    return new BaseAppScreenDto(
+      new OneTableTournamentStatusScreenView(
+        this.options.i18n,
+        lang,
+        tournament,
+        playerId,
+      ).buildBS(),
+    );
+  }
+
+  subscribeOnStatusScreen(tournamentId: string, clientAuthToken: string): void {
+    const player = this.playersManager.getPlayerById(clientAuthToken);
+    const tournament =
+      this.oneTableRoomsManagerService.getRoomById(tournamentId);
+
+    if (player && tournament) {
+      tournament.addToStatusScreenWatchers(player);
+
+      return;
+    }
+
+    throw new InternalServerErrorException();
+  }
+
+  unsubscribeFromStatusScreen(
+    tournamentId: string,
+    clientAuthToken: string,
+  ): void {
+    const player = this.playersManager.getPlayerById(clientAuthToken);
+    const tournament =
+      this.oneTableRoomsManagerService.getRoomById(tournamentId);
+
+    if (player && tournament) {
+      tournament.removeFromStatusScreenWatchers(player);
+
+      return;
+    }
+
+    throw new InternalServerErrorException();
+  }
+
+  watchTheTable(tableId: string, clientAuthToken: string): IAppTableState {
+    const player = this.playersManager.getPlayerById(clientAuthToken);
+    const room = this.oneTableRoomsManagerService.getRoomByTableId(tableId);
+    const master = room?.getMasterById(tableId);
+
+    if (player && room && master) {
+      room.handleWatchTheTable(player, tableId);
+
+      return master.createGameStateDto(player);
+    }
+
+    throw new InternalServerErrorException();
+  }
+
+  moveOnTheTable(
+    tableId: string,
+    clientAuthToken: string,
+    moveDto: IBaseMoveData,
+  ): IAppTableState {
+    const player = this.playersManager.getPlayerById(clientAuthToken);
+    const room = this.oneTableRoomsManagerService.getRoomByTableId(tableId);
+    const master = room?.getMasterById(tableId);
+
+    if (player && room && master) {
+      room.handleMoveOnTheTable(player, tableId, moveDto);
+
+      return master.createGameStateDto(player);
+    }
+
+    throw new InternalServerErrorException();
+  }
+
+  joinTournament(tournamentId: string, headers: IAppHeaders): IBaseAppScreen {
+    const player = this.playersManager.getPlayerById(headers.client_auth_token);
+    const tournament =
+      this.oneTableRoomsManagerService.getRoomByTableId(tournamentId);
+
+    if (player && tournament) {
+      tournament.handleJoinTournament(player);
+
+      return this.getStatusScreen(
+        tournamentId,
+        headers.client_language,
+        headers.client_auth_token,
+      );
+    }
+
+    throw new InternalServerErrorException();
+  }
+
+  leaveTournament(tournamentId: string, clientAuthToken: string): void {
+    const player = this.playersManager.getPlayerById(clientAuthToken);
+    const tournament =
+      this.oneTableRoomsManagerService.getRoomByTableId(tournamentId);
+
+    if (player && tournament) {
+      tournament.handleLeaveTournament(player);
+
+      return;
+    }
+
+    throw new InternalServerErrorException();
+  }
+}

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

@@ -1,2 +1,2 @@
-export { OneTableTournamentRoomsManagerModule } from './one-table-tournament-rooms-manager.module';
-export { OneTableTournamentRoomsManagerService } from './one-table-tournament-rooms-manager.service';
+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

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

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

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

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

@@ -1,66 +1,71 @@
-import { DynamicModule, Global, Module, Provider } from '@nestjs/common';
-import { MongooseModule } from '@nestjs/mongoose';
-import {
-  OneTableTournamentRoom,
-  OneTableTournamentRoomSchema,
-  OneTableTournamentRoomsRepository,
-  User,
-  UserSchema,
-  UsersRepository,
-  GameResult,
-  GameResultSchema,
-  GameResultRepository,
-} from 'jp.db.schemas';
-
-import { OneTableTournamentRoomsManagerService } from './one-table-tournament-rooms-manager.service';
-import { OneTableTournamentRoomsManagerOptions } from './one-table-tournament-rooms-manager.interfaces';
-import { ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS } from './one-table-tournament-rooms-manager.constants';
-
-@Global()
-@Module({
-  imports: [
-    MongooseModule.forFeature([
-      {
-        name: OneTableTournamentRoom.name,
-        schema: OneTableTournamentRoomSchema,
-      },
-    ]),
-    MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
-    MongooseModule.forFeature([
-      { name: GameResult.name, schema: GameResultSchema },
-    ]),
-  ],
-  providers: [
-    OneTableTournamentRoomsRepository,
-    UsersRepository,
-    OneTableTournamentRoomsManagerService,
-    GameResultRepository,
-  ],
-  exports: [OneTableTournamentRoomsManagerService],
-})
-export class OneTableTournamentRoomsManagerModule {
-  constructor(
-    private readonly managerService: OneTableTournamentRoomsManagerService,
-  ) {}
-
-  static forRootAsync(
-    options: OneTableTournamentRoomsManagerOptions,
-  ): DynamicModule {
-    return {
-      module: OneTableTournamentRoomsManagerModule,
-      imports: options.imports ?? [],
-      providers: [
-        {
-          provide: ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS,
-          useFactory: options.useFactory,
-          inject: options.inject || [],
-        } as Provider,
-      ],
-    };
-  }
-
-  async onModuleInit() {
-    await this.managerService.createMasterTournament();
-    await this.managerService.hydrateTournamentsFromDB();
-  }
-}
+import { DynamicModule, Global, Module, Provider } from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import {
+  OneTableTournamentRoom,
+  OneTableTournamentRoomSchema,
+  OneTableTournamentRoomsRepository,
+  User,
+  UserSchema,
+  UsersRepository,
+  GameResult,
+  GameResultSchema,
+  GameResultRepository,
+  Rating,
+  RatingSchema,
+  RatingRepository,
+} from 'jp.db.schemas';
+
+import { OneTableTournamentRoomsManagerService } from './one-table-tournament-rooms-manager.service';
+import { OneTableTournamentRoomsManagerOptions } from './one-table-tournament-rooms-manager.interfaces';
+import { ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS } from './one-table-tournament-rooms-manager.constants';
+
+@Global()
+@Module({
+  imports: [
+    MongooseModule.forFeature([
+      {
+        name: OneTableTournamentRoom.name,
+        schema: OneTableTournamentRoomSchema,
+      },
+    ]),
+    MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
+    MongooseModule.forFeature([
+      { name: GameResult.name, schema: GameResultSchema },
+    ]),
+    MongooseModule.forFeature([{ name: Rating.name, schema: RatingSchema }]),
+  ],
+  providers: [
+    OneTableTournamentRoomsRepository,
+    UsersRepository,
+    OneTableTournamentRoomsManagerService,
+    GameResultRepository,
+    RatingRepository,
+  ],
+  exports: [OneTableTournamentRoomsManagerService],
+})
+export class OneTableTournamentRoomsManagerModule {
+  constructor(
+    private readonly managerService: OneTableTournamentRoomsManagerService,
+  ) {}
+
+  static forRootAsync(
+    options: OneTableTournamentRoomsManagerOptions,
+  ): DynamicModule {
+    return {
+      module: OneTableTournamentRoomsManagerModule,
+      imports: options.imports ?? [],
+      providers: [
+        {
+          provide: ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS,
+          useFactory: options.useFactory,
+          inject: options.inject || [],
+        } as Provider,
+      ],
+    };
+  }
+
+  async onModuleInit() {
+    await this.managerService.createMasterTournament();
+    await this.managerService.hydrateTournamentsFromDB();
+  }
+}