jp.ms.common.modules 1.0.46 → 1.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.ms.common.modules",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "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.52",
+    "jp.common.models": "1.1.53",
     "jp.common.utils": "1.0.8",
     "jp.db.schemas": "2.2.17",
-    "jp.ms.common.engine": "3.0.28",
+    "jp.ms.common.engine": "3.0.29",
     "mongoose": "9.1.5",
     "nestjs-i18n": "10.5.1",
     "node-schedule": "2.1.1",

package/src/modules/events/events.gateway.ts

@@ -31,6 +31,7 @@ export class EventsGateway
 
   async handleConnection(client: Socket) {
     const playerId = client.handshake.auth.token as string | undefined;
+    const timeOffset = client.handshake.auth.timeOffset as string | undefined;
 
     const player = this.playersManager.getPlayerById(playerId ?? '');
     if (player) {
@@ -48,6 +49,7 @@ export class EventsGateway
           level: user.level,
           language: user.normalizedLang,
           cardsSkin: user.cardSkin,
+          timeOffset: Number(timeOffset),
           onSendWsMessage: this.handleSendWsMessage,
           onGotWsMessageClientResponse: this.handleGotWsMessageClientResponse,
         });

package/src/modules/main/main-tables-list-screen.view.ts

@@ -27,7 +27,11 @@ import {
   TournamentMaster,
   TournamentRoom,
 } from 'jp.ms.common.engine';
-import { formatDate, formatTime, replacePattern } from 'jp.common.utils';
+import {
+  formatDate,
+  formatTimeWithOffset,
+  replacePattern,
+} from 'jp.common.utils';
 
 import { TournamentBuyTicketDialogView } from '../../views';
 
@@ -36,6 +40,7 @@ export class MainTablesListScreenView extends UniversalScreenView {
   private readonly oneTableTournamentRooms: Array<OneTableTournamentRoom>;
   private readonly manyTablesTournamentRooms: Array<ManyTablesTournamentRoom>;
   private readonly playerId: string;
+  private readonly timeOffset: number;
 
   constructor(
     localeService: ILocaleService,
@@ -44,12 +49,14 @@ export class MainTablesListScreenView extends UniversalScreenView {
     oneTableTournamentRooms: Array<OneTableTournamentRoom>,
     manyTablesTournamentRooms: Array<ManyTablesTournamentRoom>,
     playerId: string,
+    timeOffset: number,
   ) {
     super(localeService, lang);
     this.simpleRooms = simpleRooms;
     this.oneTableTournamentRooms = oneTableTournamentRooms;
     this.manyTablesTournamentRooms = manyTablesTournamentRooms;
     this.playerId = playerId;
+    this.timeOffset = timeOffset;
   }
 
   build(): IAppScreen {
@@ -233,7 +240,10 @@ export class MainTablesListScreenView extends UniversalScreenView {
               lang: this.lang,
             })
           : formatDate(tournament.getScheduleDate() ?? ''),
-        SCHEDULE_DATE: formatTime(tournament.getScheduleDate() ?? ''),
+        SCHEDULE_DATE: formatTimeWithOffset(
+          tournament.getScheduleDate() ?? '',
+          this.timeOffset,
+        ),
       });
     }
 

package/src/modules/main/main.controller.ts

@@ -26,6 +26,7 @@ export class MainController {
     return this.mainService.getScreen(
       headers.client_language,
       headers.client_auth_token,
+      Number(headers.client_time_offset),
     );
   }
 

package/src/modules/main/main.module.ts

@@ -64,6 +64,7 @@ export class MainModule {
         const screen = this.mainService.getScreen(
           subscriber.language,
           subscriber.id,
+          subscriber.timeOffset,
         );
         subscriber.sendMessage(
           new MainTablesUpdateListWsEvent(event.game, subscriber.id, screen),

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

@@ -15,6 +15,7 @@ import {
   AppScreenRoutesEnum,
   ErrorSnackbarComponent,
   AppScreenRouter,
+  IAppHeaders,
 } from 'jp.common.models';
 
 import {
@@ -51,7 +52,11 @@ export class MainService {
     dayjs.extend(isToday);
   }
 
-  getScreen(lang: string, clientAuthToken: string): BaseAppScreenDto {
+  getScreen(
+    lang: string,
+    authToken: string,
+    timeOffset: number,
+  ): BaseAppScreenDto {
     return new BaseAppScreenDto(
       new MainTablesListScreenView(
         this.options.i18n,
@@ -59,7 +64,8 @@ export class MainService {
         this.simpleRoomsManager.getRooms(),
         this.oneTableRoomsManagerService.getRooms(),
         this.manyTablesRoomsManagerService.getRooms(),
-        clientAuthToken,
+        authToken,
+        Number(timeOffset),
       ).buildBS(),
     );
   }

package/src/modules/many-tables-tournament/many-tables-tournament-status-screen.view.ts

@@ -17,7 +17,7 @@ import {
 import {
   formatChips,
   formatDate,
-  formatTime,
+  formatTimeWithOffset,
   replacePattern,
 } from 'jp.common.utils';
 import {
@@ -27,14 +27,17 @@ import {
 
 export class ManyTablesTournamentStatusScreenView extends UniversalScreenView {
   private readonly tournament: ManyTablesTournamentRoom;
+  private readonly timeOffset: number;
 
   constructor(
     localeService: ILocaleService,
     lang: string,
     tournament: ManyTablesTournamentRoom,
+    timeOffset: number,
   ) {
     super(localeService, lang);
     this.tournament = tournament;
+    this.timeOffset = timeOffset;
   }
 
   build(): IAppScreen {
@@ -134,7 +137,10 @@ export class ManyTablesTournamentStatusScreenView extends UniversalScreenView {
               lang: this.lang,
             })
           : formatDate(this.tournament.getScheduleDate() ?? ''),
-        SCHEDULE_DATE: formatTime(this.tournament.getScheduleDate() ?? ''),
+        SCHEDULE_DATE: formatTimeWithOffset(
+          this.tournament.getScheduleDate() ?? '',
+          this.timeOffset,
+        ),
       });
     }
 

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

@@ -36,6 +36,7 @@ export class ManyTablesTournamentController {
     return this.tournamentService.getStatusScreen(
       tournamentId,
       headers.client_language,
+      Number(headers.client_time_offset),
     );
   }
 

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

@@ -76,6 +76,7 @@ export class ManyTablesTournamentModule {
         const screen = this.manyTablesTournamentService.getStatusScreen(
           event.roomId,
           subscriber.language,
+          subscriber.timeOffset,
         );
         subscriber.sendMessage(
           new ManyTablesTournamentUpdateStatusWsEvent(

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

@@ -41,7 +41,11 @@ export class ManyTablesTournamentService {
     private readonly usersRepository: UsersRepository,
   ) {}
 
-  getStatusScreen(tournamentId: string, lang: string): BaseAppScreenDto {
+  getStatusScreen(
+    tournamentId: string,
+    lang: string,
+    timeOffset: number,
+  ): BaseAppScreenDto {
     const tournament =
       this.manyTablesRoomsManagerService.getRoomById(tournamentId);
 
@@ -54,6 +58,7 @@ export class ManyTablesTournamentService {
         this.options.i18n,
         lang,
         tournament,
+        timeOffset,
       ).buildBS(),
     );
   }