jp.ms.common.modules 1.0.24 → 1.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapter/base-table-game-state-adapter.d.ts +3 -1
- package/dist/adapter/base-table-game-state-adapter.js +11 -0
- package/dist/adapter/base-table-game-state-adapter.js.map +1 -1
- package/dist/adapter/card-table-game-state-adapter.d.ts +4 -2
- package/dist/adapter/card-table-game-state-adapter.js +15 -4
- package/dist/adapter/card-table-game-state-adapter.js.map +1 -1
- package/dist/config/cert.js +35 -2
- package/dist/config/cert.js.map +1 -1
- package/dist/config/cors.js +34 -1
- package/dist/config/cors.js.map +1 -1
- package/dist/dto/common/find-free-table.dto.d.ts +3 -0
- package/dist/dto/common/find-free-table.dto.js +8 -0
- package/dist/dto/common/find-free-table.dto.js.map +1 -0
- package/dist/dto/common/index.d.ts +1 -0
- package/dist/dto/common/index.js +3 -1
- package/dist/dto/common/index.js.map +1 -1
- package/dist/dto/table-game/base/base-table-game-state.dto.d.ts +3 -0
- package/dist/dto/table-game/base/base-table-game-state.dto.js +19 -0
- package/dist/dto/table-game/base/base-table-game-state.dto.js.map +1 -1
- package/dist/dto/table-game/cards/cards-panel.dto.d.ts +2 -1
- package/dist/dto/table-game/cards/cards-panel.dto.js +14 -3
- package/dist/dto/table-game/cards/cards-panel.dto.js.map +1 -1
- package/dist/modules/anti-freeze-system/anti-freeze-system.module.js +4 -1
- package/dist/modules/anti-freeze-system/anti-freeze-system.module.js.map +1 -1
- package/dist/modules/anti-freeze-system/anti-freeze-system.service.js +2 -2
- package/dist/modules/anti-freeze-system/anti-freeze-system.service.js.map +1 -1
- package/dist/modules/base-achievements/base-achievements.module.d.ts +1 -1
- package/dist/modules/base-achievements/base-achievements.module.js +12 -12
- package/dist/modules/base-achievements/base-achievements.module.js.map +1 -1
- package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.d.ts +1 -1
- package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.js.map +1 -1
- package/dist/modules/logger/jp-logger.service.js +34 -1
- package/dist/modules/logger/jp-logger.service.js.map +1 -1
- package/dist/modules/main/main-tables-list-screen.view.js +1 -1
- package/dist/modules/main/main-tables-list-screen.view.js.map +1 -1
- package/dist/modules/main/main.controller.d.ts +2 -2
- package/dist/modules/main/main.controller.js +4 -3
- package/dist/modules/main/main.controller.js.map +1 -1
- package/dist/modules/main/main.module.js +2 -2
- package/dist/modules/main/main.module.js.map +1 -1
- package/dist/modules/main/main.service.d.ts +2 -2
- package/dist/modules/main/main.service.js +11 -5
- package/dist/modules/main/main.service.js.map +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.module.js +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.module.js.map +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.service.js +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.service.js.map +1 -1
- package/dist/modules/menu/menu-screen.view.d.ts +5 -3
- package/dist/modules/menu/menu-screen.view.js +10 -2
- package/dist/modules/menu/menu-screen.view.js.map +1 -1
- package/dist/modules/menu/menu.module.js +2 -1
- package/dist/modules/menu/menu.module.js.map +1 -1
- package/dist/modules/menu/menu.service.d.ts +3 -2
- package/dist/modules/menu/menu.service.js +8 -4
- package/dist/modules/menu/menu.service.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.d.ts +6 -1
- package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js +52 -3
- package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament.controller.d.ts +4 -5
- package/dist/modules/one-table-tournament/one-table-tournament.controller.js +8 -9
- package/dist/modules/one-table-tournament/one-table-tournament.controller.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament.module.js +2 -2
- package/dist/modules/one-table-tournament/one-table-tournament.module.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament.service.d.ts +6 -7
- package/dist/modules/one-table-tournament/one-table-tournament.service.js +10 -17
- package/dist/modules/one-table-tournament/one-table-tournament.service.js.map +1 -1
- package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.d.ts +2 -1
- package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js +30 -5
- package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js.map +1 -1
- package/dist/modules/support/dump.service.js +4 -1
- package/dist/modules/support/dump.service.js.map +1 -1
- package/dist/modules/support/metric.service.js +34 -1
- package/dist/modules/support/metric.service.js.map +1 -1
- package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.js +33 -10
- package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.js.map +1 -1
- package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.js +21 -5
- package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/game-table-result.d.ts +3 -2
- package/dist/utils/game-table-result.js +14 -1
- package/dist/utils/game-table-result.js.map +1 -1
- package/dist/views/index.d.ts +1 -0
- package/dist/views/index.js +3 -1
- package/dist/views/index.js.map +1 -1
- package/dist/views/simple-room-conifrm-exit-dialog.view.d.ts +4 -0
- package/dist/views/simple-room-conifrm-exit-dialog.view.js +11 -0
- package/dist/views/simple-room-conifrm-exit-dialog.view.js.map +1 -0
- package/dist/views/tournament-buy-ticket-dialog.view.d.ts +2 -2
- package/dist/views/tournament-buy-ticket-dialog.view.js +1 -1
- package/dist/views/tournament-buy-ticket-dialog.view.js.map +1 -1
- package/package.json +4 -4
- package/src/adapter/base-table-game-state-adapter.ts +23 -5
- package/src/adapter/card-table-game-state-adapter.ts +28 -4
- package/src/dto/common/find-free-table.dto.ts +3 -0
- package/src/dto/common/index.ts +1 -0
- package/src/dto/table-game/base/base-table-game-state.dto.ts +16 -0
- package/src/dto/table-game/cards/cards-panel.dto.ts +12 -3
- package/src/modules/anti-freeze-system/anti-freeze-system.service.ts +3 -3
- package/src/modules/base-achievements/base-achievements.module.ts +12 -10
- package/src/modules/event-bus/events-bus.main-tables.subscribe.service.ts +1 -1
- package/src/modules/main/main-tables-list-screen.view.ts +2 -2
- package/src/modules/main/main.controller.ts +4 -4
- package/src/modules/main/main.module.ts +5 -5
- package/src/modules/main/main.service.ts +20 -10
- package/src/modules/many-tables-tournament/many-tables-tournament.module.ts +1 -1
- package/src/modules/many-tables-tournament/many-tables-tournament.service.ts +2 -1
- package/src/modules/menu/menu-screen.view.ts +33 -11
- package/src/modules/menu/menu.module.ts +3 -2
- package/src/modules/menu/menu.service.ts +5 -2
- package/src/modules/one-table-tournament/one-table-tournament-status-screen.view.ts +76 -10
- package/src/modules/one-table-tournament/one-table-tournament.controller.ts +8 -8
- package/src/modules/one-table-tournament/one-table-tournament.module.ts +2 -2
- package/src/modules/one-table-tournament/one-table-tournament.service.ts +20 -28
- package/src/modules/simple-rooms-manager/simple-rooms-manager.service.ts +64 -14
- package/src/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.ts +42 -17
- package/src/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.ts +37 -15
- package/src/utils/game-table-result.ts +18 -3
- package/src/views/index.ts +2 -1
- package/src/views/simple-room-conifrm-exit-dialog.view.ts +21 -0
- package/src/views/tournament-buy-ticket-dialog.view.ts +11 -11
|
@@ -15,20 +15,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.OneTableTournamentController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const one_table_tournament_service_1 = require("./one-table-tournament.service");
|
|
18
|
-
const join_tournament_dto_1 = require("../../dto/common/join-tournament.dto");
|
|
19
18
|
let OneTableTournamentController = class OneTableTournamentController {
|
|
20
19
|
tournamentService;
|
|
21
20
|
constructor(tournamentService) {
|
|
22
21
|
this.tournamentService = tournamentService;
|
|
23
22
|
}
|
|
24
23
|
getStatusScreen(tournamentId, headers) {
|
|
25
|
-
return this.tournamentService.getStatusScreen(tournamentId, headers.client_language);
|
|
24
|
+
return this.tournamentService.getStatusScreen(tournamentId, headers.client_language, headers.client_auth_token);
|
|
26
25
|
}
|
|
27
26
|
subscribeOnStatusScreen(tournamentId, headers) {
|
|
28
|
-
return this.tournamentService.subscribeOnStatusScreen(tournamentId, headers.
|
|
27
|
+
return this.tournamentService.subscribeOnStatusScreen(tournamentId, headers.client_auth_token);
|
|
29
28
|
}
|
|
30
29
|
unsubscribeFromStatusScreen(tournamentId, headers) {
|
|
31
|
-
return this.tournamentService.unsubscribeFromStatusScreen(tournamentId, headers.
|
|
30
|
+
return this.tournamentService.unsubscribeFromStatusScreen(tournamentId, headers.client_auth_token);
|
|
32
31
|
}
|
|
33
32
|
watchTheTable(tableId, headers) {
|
|
34
33
|
return this.tournamentService.watchTheTable(tableId, headers.client_auth_token);
|
|
@@ -37,7 +36,7 @@ let OneTableTournamentController = class OneTableTournamentController {
|
|
|
37
36
|
return this.tournamentService.moveOnTheTable(tableId, headers.client_auth_token, baseMoveData);
|
|
38
37
|
}
|
|
39
38
|
joinTournament(tournamentId, headers) {
|
|
40
|
-
return this.tournamentService.joinTournament(tournamentId, headers
|
|
39
|
+
return this.tournamentService.joinTournament(tournamentId, headers);
|
|
41
40
|
}
|
|
42
41
|
leaveTournament(tournamentId, headers) {
|
|
43
42
|
return this.tournamentService.leaveTournament(tournamentId, headers.client_auth_token);
|
|
@@ -58,7 +57,7 @@ __decorate([
|
|
|
58
57
|
__param(1, (0, common_1.Headers)()),
|
|
59
58
|
__metadata("design:type", Function),
|
|
60
59
|
__metadata("design:paramtypes", [String, Object]),
|
|
61
|
-
__metadata("design:returntype",
|
|
60
|
+
__metadata("design:returntype", void 0)
|
|
62
61
|
], OneTableTournamentController.prototype, "subscribeOnStatusScreen", null);
|
|
63
62
|
__decorate([
|
|
64
63
|
(0, common_1.Get)('status/unsubscribe/:tournamentId'),
|
|
@@ -66,7 +65,7 @@ __decorate([
|
|
|
66
65
|
__param(1, (0, common_1.Headers)()),
|
|
67
66
|
__metadata("design:type", Function),
|
|
68
67
|
__metadata("design:paramtypes", [String, Object]),
|
|
69
|
-
__metadata("design:returntype",
|
|
68
|
+
__metadata("design:returntype", void 0)
|
|
70
69
|
], OneTableTournamentController.prototype, "unsubscribeFromStatusScreen", null);
|
|
71
70
|
__decorate([
|
|
72
71
|
(0, common_1.Post)('table/watch/:tableId'),
|
|
@@ -94,7 +93,7 @@ __decorate([
|
|
|
94
93
|
__param(1, (0, common_1.Headers)()),
|
|
95
94
|
__metadata("design:type", Function),
|
|
96
95
|
__metadata("design:paramtypes", [String, Object]),
|
|
97
|
-
__metadata("design:returntype",
|
|
96
|
+
__metadata("design:returntype", Object)
|
|
98
97
|
], OneTableTournamentController.prototype, "joinTournament", null);
|
|
99
98
|
__decorate([
|
|
100
99
|
(0, common_1.Post)('leave/:tournamentId'),
|
|
@@ -103,7 +102,7 @@ __decorate([
|
|
|
103
102
|
__param(1, (0, common_1.Headers)()),
|
|
104
103
|
__metadata("design:type", Function),
|
|
105
104
|
__metadata("design:paramtypes", [String, Object]),
|
|
106
|
-
__metadata("design:returntype",
|
|
105
|
+
__metadata("design:returntype", void 0)
|
|
107
106
|
], OneTableTournamentController.prototype, "leaveTournament", null);
|
|
108
107
|
exports.OneTableTournamentController = OneTableTournamentController = __decorate([
|
|
109
108
|
(0, common_1.Controller)('tournament/one_table'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-table-tournament.controller.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmG;AAGnG,iFAA2E;
|
|
1
|
+
{"version":3,"file":"one-table-tournament.controller.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmG;AAGnG,iFAA2E;AAIpE,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAEhB;IADrB,YACqB,iBAA4C;QAA5C,sBAAiB,GAAjB,iBAAiB,CAA2B;IAEjE,CAAC;IAGD,eAAe,CACY,YAAoB,EAChC,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACpH,CAAC;IAGD,uBAAuB,CACI,YAAoB,EAChC,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnG,CAAC;IAGD,2BAA2B,CACA,YAAoB,EAChC,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACvG,CAAC;IAID,aAAa,CACS,OAAe,EACtB,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACpF,CAAC;IAID,cAAc,CACQ,OAAe,EACzB,YAA2B,EACxB,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IACnG,CAAC;IAID,cAAc,CACa,YAAoB,EAChC,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAID,eAAe,CACY,YAAoB,EAChC,OAAoB;QAE/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;CACJ,CAAA;AAlEY,oEAA4B;AAOrC;IADC,IAAA,YAAG,EAAC,sBAAsB,CAAC;IAEvB,WAAA,IAAA,cAAK,EAAC,cAAc,CAAC,CAAA;IACrB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;mEAGb;AAGD;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;IAEjC,WAAA,IAAA,cAAK,EAAC,cAAc,CAAC,CAAA;IACrB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;2EAGb;AAGD;IADC,IAAA,YAAG,EAAC,kCAAkC,CAAC;IAEnC,WAAA,IAAA,cAAK,EAAC,cAAc,CAAC,CAAA;IACrB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+EAGb;AAID;IAFC,IAAA,aAAI,EAAC,sBAAsB,CAAC;IAC5B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAEnB,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;iEAGb;AAID;IAFC,IAAA,aAAI,EAAC,qBAAqB,CAAC;IAC3B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAEnB,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;kEAGb;AAID;IAFC,IAAA,aAAI,EAAC,oBAAoB,CAAC;IAC1B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAEnB,WAAA,IAAA,cAAK,EAAC,cAAc,CAAC,CAAA;IACrB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;kEAGb;AAID;IAFC,IAAA,aAAI,EAAC,qBAAqB,CAAC;IAC3B,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IAEnB,WAAA,IAAA,cAAK,EAAC,cAAc,CAAC,CAAA;IACrB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;mEAGb;uCAjEQ,4BAA4B;IADxC,IAAA,mBAAU,EAAC,sBAAsB,CAAC;qCAGS,wDAAyB;GAFxD,4BAA4B,CAkExC"}
|
|
@@ -47,8 +47,8 @@ let OneTableTournamentModule = OneTableTournamentModule_1 = class OneTableTourna
|
|
|
47
47
|
}
|
|
48
48
|
onHandleStatusRoomChange = (event) => {
|
|
49
49
|
this.oneTableRoomsManagerService.getRoomById(event.roomId)?.getStatusScreenWatchers().forEach((subscriber) => {
|
|
50
|
-
const screen = this.oneTableTournamentService.getStatusScreen(event.roomId, subscriber.language);
|
|
51
|
-
subscriber.sendMessage(new jp_ms_common_engine_1.OneTableTournamentUpdateStatusWsEvent(screen.screen));
|
|
50
|
+
const screen = this.oneTableTournamentService.getStatusScreen(event.roomId, subscriber.language, subscriber.id);
|
|
51
|
+
subscriber.sendMessage(new jp_ms_common_engine_1.OneTableTournamentUpdateStatusWsEvent(event.game, screen.screen));
|
|
52
52
|
});
|
|
53
53
|
};
|
|
54
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-table-tournament.module.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,iDAAwH;AACxH,6DAA8G;AAE9G,iJAAyI;AACzI,4CAA2E;AAE3E,uFAAiF;AACjF,iFAA2E;AAC3E,qFAAgF;AAUzE,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAEZ;IACA;IACA;IAHrB,YACqB,2BAAkE,EAClE,2CAAwF,EACxF,yBAAoD;QAFpD,gCAA2B,GAA3B,2BAA2B,CAAuC;QAClE,gDAA2C,GAA3C,2CAA2C,CAA6C;QACxF,8BAAyB,GAAzB,yBAAyB,CAA2B;IACrE,CAAC;IAEL,MAAM,CAAC,YAAY,CAAC,OAAwC;QACxD,OAAO;YACH,MAAM,EAAE,0BAAwB;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,6DAA4B;oBACrC,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;iBACnB;aAChB;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY;QACd,IAAI,CAAC,2CAA2C,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC9F,CAAC;IAEO,wBAAwB,GAAG,CAAC,KAA2B,EAAE,EAAE;QAC/D,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YACrH,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"one-table-tournament.module.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,iDAAwH;AACxH,6DAA8G;AAE9G,iJAAyI;AACzI,4CAA2E;AAE3E,uFAAiF;AACjF,iFAA2E;AAC3E,qFAAgF;AAUzE,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAEZ;IACA;IACA;IAHrB,YACqB,2BAAkE,EAClE,2CAAwF,EACxF,yBAAoD;QAFpD,gCAA2B,GAA3B,2BAA2B,CAAuC;QAClE,gDAA2C,GAA3C,2CAA2C,CAA6C;QACxF,8BAAyB,GAAzB,yBAAyB,CAA2B;IACrE,CAAC;IAEL,MAAM,CAAC,YAAY,CAAC,OAAwC;QACxD,OAAO;YACH,MAAM,EAAE,0BAAwB;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,6DAA4B;oBACrC,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;iBACnB;aAChB;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY;QACd,IAAI,CAAC,2CAA2C,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC9F,CAAC;IAEO,wBAAwB,GAAG,CAAC,KAA2B,EAAE,EAAE;QAC/D,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YACrH,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;YAChH,UAAU,CAAC,WAAW,CAAC,IAAI,2DAAqC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACjG,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;CACJ,CAAA;AA/BY,4DAAwB;mCAAxB,wBAAwB;IAPpC,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,sCAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,4CAA4B,EAAE,CAAC,CAAC;SAC3G;QACD,WAAW,EAAE,CAAC,8DAA4B,CAAC;QAC3C,SAAS,EAAE,CAAC,wDAAyB,EAAE,iDAAiC,CAAC;KAC5E,CAAC;qCAGoD,kFAAqC;QACrB,uDAA2C;QAC7D,wDAAyB;GAJhE,wBAAwB,CA+BpC"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
|
-
import { IBaseMoveData, IBaseTableGameState } from 'jp.common.models';
|
|
1
|
+
import { IAppHeaders, IBaseAppScreen, IBaseMoveData, IBaseTableGameState } from 'jp.common.models';
|
|
2
2
|
import { BaseAppScreenDto } from '../../dto';
|
|
3
3
|
import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service';
|
|
4
4
|
import { PlayersManagerService } from '../players-manager/players-manager.service';
|
|
5
|
-
import { JoinTournamentDto } from '../../dto/common/join-tournament.dto';
|
|
6
5
|
import { OneTableTournamentFactoryOptions } from './one-table-tournament.interfaces';
|
|
7
6
|
export declare class OneTableTournamentService {
|
|
8
7
|
private readonly oneTableRoomsManagerService;
|
|
9
8
|
private readonly playersManager;
|
|
10
9
|
private readonly options;
|
|
11
10
|
constructor(oneTableRoomsManagerService: TournamentOneTableRoomsManagerService, playersManager: PlayersManagerService, options: OneTableTournamentFactoryOptions);
|
|
12
|
-
getStatusScreen(tournamentId: string, lang: string): BaseAppScreenDto;
|
|
13
|
-
subscribeOnStatusScreen(tournamentId: string, clientAuthToken: string):
|
|
14
|
-
unsubscribeFromStatusScreen(tournamentId: string, clientAuthToken: string):
|
|
11
|
+
getStatusScreen(tournamentId: string, lang: string, playerId: string): BaseAppScreenDto;
|
|
12
|
+
subscribeOnStatusScreen(tournamentId: string, clientAuthToken: string): void;
|
|
13
|
+
unsubscribeFromStatusScreen(tournamentId: string, clientAuthToken: string): void;
|
|
15
14
|
watchTheTable(tableId: string, clientAuthToken: string): IBaseTableGameState;
|
|
16
15
|
moveOnTheTable(tableId: string, clientAuthToken: string, moveDto: IBaseMoveData): IBaseTableGameState;
|
|
17
|
-
joinTournament(tournamentId: string,
|
|
18
|
-
leaveTournament(tournamentId: string, clientAuthToken: string):
|
|
16
|
+
joinTournament(tournamentId: string, headers: IAppHeaders): IBaseAppScreen;
|
|
17
|
+
leaveTournament(tournamentId: string, clientAuthToken: string): void;
|
|
19
18
|
}
|
|
@@ -18,7 +18,6 @@ const jp_common_models_1 = require("jp.common.models");
|
|
|
18
18
|
const dto_1 = require("../../dto");
|
|
19
19
|
const tournament_one_table_rooms_manager_service_1 = require("../tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service");
|
|
20
20
|
const players_manager_service_1 = require("../players-manager/players-manager.service");
|
|
21
|
-
const join_tournament_dto_1 = require("../../dto/common/join-tournament.dto");
|
|
22
21
|
const one_table_tournament_constants_1 = require("./one-table-tournament.constants");
|
|
23
22
|
const one_table_tournament_status_screen_view_1 = require("./one-table-tournament-status-screen.view");
|
|
24
23
|
let OneTableTournamentService = class OneTableTournamentService {
|
|
@@ -30,18 +29,19 @@ let OneTableTournamentService = class OneTableTournamentService {
|
|
|
30
29
|
this.playersManager = playersManager;
|
|
31
30
|
this.options = options;
|
|
32
31
|
}
|
|
33
|
-
getStatusScreen(tournamentId, lang) {
|
|
32
|
+
getStatusScreen(tournamentId, lang, playerId) {
|
|
34
33
|
const tournament = this.oneTableRoomsManagerService.getRoomById(tournamentId);
|
|
35
34
|
if (!tournament) {
|
|
36
35
|
throw new common_1.InternalServerErrorException();
|
|
37
36
|
}
|
|
38
|
-
return new dto_1.BaseAppScreenDto(new jp_common_models_1.BaseAppScreen(new one_table_tournament_status_screen_view_1.OneTableTournamentStatusScreenView(this.options.i18n, lang, tournament).build()));
|
|
37
|
+
return new dto_1.BaseAppScreenDto(new jp_common_models_1.BaseAppScreen(new one_table_tournament_status_screen_view_1.OneTableTournamentStatusScreenView(this.options.i18n, lang, tournament, playerId).build()));
|
|
39
38
|
}
|
|
40
39
|
subscribeOnStatusScreen(tournamentId, clientAuthToken) {
|
|
41
40
|
const player = this.playersManager.getPlayerById(clientAuthToken);
|
|
42
41
|
const tournament = this.oneTableRoomsManagerService.getRoomById(tournamentId);
|
|
43
42
|
if (player && tournament) {
|
|
44
43
|
tournament.addToStatusScreenWatchers(player);
|
|
44
|
+
return;
|
|
45
45
|
}
|
|
46
46
|
throw new common_1.InternalServerErrorException();
|
|
47
47
|
}
|
|
@@ -50,6 +50,7 @@ let OneTableTournamentService = class OneTableTournamentService {
|
|
|
50
50
|
const tournament = this.oneTableRoomsManagerService.getRoomById(tournamentId);
|
|
51
51
|
if (player && tournament) {
|
|
52
52
|
tournament.removeFromStatusScreenWatchers(player);
|
|
53
|
+
return;
|
|
53
54
|
}
|
|
54
55
|
throw new common_1.InternalServerErrorException();
|
|
55
56
|
}
|
|
@@ -73,29 +74,21 @@ let OneTableTournamentService = class OneTableTournamentService {
|
|
|
73
74
|
}
|
|
74
75
|
throw new common_1.InternalServerErrorException();
|
|
75
76
|
}
|
|
76
|
-
joinTournament(tournamentId,
|
|
77
|
-
const player = this.playersManager.getPlayerById(
|
|
77
|
+
joinTournament(tournamentId, headers) {
|
|
78
|
+
const player = this.playersManager.getPlayerById(headers.client_auth_token);
|
|
78
79
|
const tournament = this.oneTableRoomsManagerService.getRoomByTableId(tournamentId);
|
|
79
|
-
|
|
80
|
-
if (player && tournament && master) {
|
|
80
|
+
if (player && tournament) {
|
|
81
81
|
tournament.handleJoinTournament(player);
|
|
82
|
-
|
|
83
|
-
const onlyTableId = tournament.getFirstMaster()?.getTable()?.getId() ?? '';
|
|
84
|
-
return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.router.getOneTableTournamentTablePath(onlyTableId), player.id);
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.router.getOneTableTournamentStatusPath(tournament.getId()), player.id);
|
|
88
|
-
}
|
|
82
|
+
return this.getStatusScreen(tournamentId, headers.client_language, headers.client_auth_token);
|
|
89
83
|
}
|
|
90
84
|
throw new common_1.InternalServerErrorException();
|
|
91
85
|
}
|
|
92
86
|
leaveTournament(tournamentId, clientAuthToken) {
|
|
93
87
|
const player = this.playersManager.getPlayerById(clientAuthToken);
|
|
94
88
|
const tournament = this.oneTableRoomsManagerService.getRoomByTableId(tournamentId);
|
|
95
|
-
|
|
96
|
-
if (player && tournament && master) {
|
|
89
|
+
if (player && tournament) {
|
|
97
90
|
tournament.handleLeaveTournament(player);
|
|
98
|
-
return
|
|
91
|
+
return;
|
|
99
92
|
}
|
|
100
93
|
throw new common_1.InternalServerErrorException();
|
|
101
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-table-tournament.service.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"one-table-tournament.service.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,8 @@ export declare class SimpleRoomsManagerService {
|
|
|
23
23
|
getTables(): Array<GameMaster>;
|
|
24
24
|
addRoom(room: SimpleRoom): void;
|
|
25
25
|
hydrateRoomsFromDB(): Promise<void>;
|
|
26
|
-
|
|
26
|
+
getFreeFastGameRoom(): GameMaster | undefined;
|
|
27
|
+
private simpleRoomDocumentToRoom;
|
|
27
28
|
private handleRoomEvent;
|
|
28
29
|
private handleRoomTableGameFinished;
|
|
29
30
|
private handleRoomStatusUpdated;
|
|
@@ -68,11 +68,31 @@ let SimpleRoomsManagerService = class SimpleRoomsManagerService {
|
|
|
68
68
|
async hydrateRoomsFromDB() {
|
|
69
69
|
const templates = await this.roomsRepository.findRooms(this.gameType);
|
|
70
70
|
templates.forEach((item) => {
|
|
71
|
-
const newRoom = this.options.createRoom(this.
|
|
71
|
+
const newRoom = this.options.createRoom(this.simpleRoomDocumentToRoom(item));
|
|
72
72
|
this.addRoom(newRoom);
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
|
-
|
|
75
|
+
getFreeFastGameRoom() {
|
|
76
|
+
if (this.getRooms().some((item) => item.isTechBreak())) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const tables = this.getTables();
|
|
80
|
+
let freeTable = tables.find((master) => master.getTable().remainOnePlayer() && master.getTable().getPlayers()[0].hasOpenConnection());
|
|
81
|
+
if (!freeTable) {
|
|
82
|
+
freeTable = tables.find((master) => master.getTable().hasMinPlayers() && !master.getTable().isFullWithQueue());
|
|
83
|
+
}
|
|
84
|
+
if (!freeTable) {
|
|
85
|
+
freeTable = tables.filter((item) => item.getRoom().getEnableForFastGame()).find((master) => !master.getTable().isFullWithQueue());
|
|
86
|
+
}
|
|
87
|
+
if (!freeTable) {
|
|
88
|
+
const fastGameRoom = this.getRooms().find((item) => item.getEnableForFastGame());
|
|
89
|
+
if (fastGameRoom) {
|
|
90
|
+
freeTable = fastGameRoom.addMaster();
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return freeTable;
|
|
94
|
+
}
|
|
95
|
+
simpleRoomDocumentToRoom(room) {
|
|
76
96
|
const restartGameTimeout = this.options.configService.get('RESTART_GAME_TIMEOUT') || 0;
|
|
77
97
|
const playersTurnTimeout = this.options.configService.get('PLAYERS_TURN_TIMEOUT') || 0;
|
|
78
98
|
return {
|
|
@@ -87,21 +107,26 @@ let SimpleRoomsManagerService = class SimpleRoomsManagerService {
|
|
|
87
107
|
title: room.title,
|
|
88
108
|
subtitle: room.subtitle,
|
|
89
109
|
description: room.description,
|
|
110
|
+
enableForFastGame: room.enableForFastGame,
|
|
90
111
|
turnTimeout: playersTurnTimeout,
|
|
91
112
|
restartTimeout: restartGameTimeout,
|
|
92
113
|
localeService: this.options.i18n,
|
|
93
114
|
startStrategy: new jp_ms_common_engine_1.MinPlayersStartStrategy(),
|
|
94
115
|
onRoomEvent: this.handleRoomEvent,
|
|
95
|
-
onRoomTableGameFinished: this.handleRoomTableGameFinished,
|
|
96
|
-
onRoomStatusUpdated: this.handleRoomStatusUpdated,
|
|
97
116
|
};
|
|
98
117
|
}
|
|
99
118
|
handleRoomEvent = (event) => {
|
|
100
119
|
this.logger.log(event.toLog());
|
|
120
|
+
if (event instanceof jp_ms_common_engine_1.GameTableFinishedEvent) {
|
|
121
|
+
this.handleRoomTableGameFinished(event.master);
|
|
122
|
+
}
|
|
123
|
+
else if (event instanceof jp_ms_common_engine_1.GamePlayerEnteredTheTableEvent || event instanceof jp_ms_common_engine_1.GamePlayerExitedTheTableEvent) {
|
|
124
|
+
this.handleRoomStatusUpdated(new jp_ms_common_engine_1.RoomUpdateStateEvent(event.gameType, event.roomId));
|
|
125
|
+
}
|
|
101
126
|
};
|
|
102
127
|
handleRoomTableGameFinished = async (master) => {
|
|
103
128
|
await (0, game_table_result_1.saveGameTablesResult)(master, this.connection, this.gameResultRepository, this.usersRepository, true);
|
|
104
|
-
this.eventsBusAppSubscribeService.pushNewEvent(new jp_ms_common_engine_1.UserWonTheGameAppEvent('123'));
|
|
129
|
+
this.eventsBusAppSubscribeService.pushNewEvent(new jp_ms_common_engine_1.UserWonTheGameAppEvent(this.gameType, '123'));
|
|
105
130
|
};
|
|
106
131
|
handleRoomStatusUpdated = (event) => {
|
|
107
132
|
this.eventsBusMainTablesSubscribeService.pushNewRoomState(event);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-rooms-manager.service.js","sourceRoot":"","sources":["../../../src/modules/simple-rooms-manager/simple-rooms-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+CAAoD;AACpD,uCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"simple-rooms-manager.service.js","sourceRoot":"","sources":["../../../src/modules/simple-rooms-manager/simple-rooms-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.DumpService = void 0;
|
|
13
16
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const v8_1 = require("v8");
|
|
17
|
+
const v8_1 = __importDefault(require("v8"));
|
|
15
18
|
let DumpService = class DumpService {
|
|
16
19
|
constructor() {
|
|
17
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dump.service.js","sourceRoot":"","sources":["../../../src/modules/support/dump.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dump.service.js","sourceRoot":"","sources":["../../../src/modules/support/dump.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,4CAAoB;AAGb,IAAM,WAAW,GAAjB,MAAM,WAAW;IACpB;IACA,CAAC;IAED,KAAK,CAAC,OAAO;QACT,OAAO,YAAE,CAAC,eAAe,EAAE,CAAC;IAChC,CAAC;CACJ,CAAA;AAPY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;;GACA,WAAW,CAOvB"}
|
|
@@ -1,10 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
2
18
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
8
41
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
42
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
43
|
};
|
|
@@ -14,7 +47,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
48
|
exports.MetricService = void 0;
|
|
16
49
|
const common_1 = require("@nestjs/common");
|
|
17
|
-
const client = require("prom-client");
|
|
50
|
+
const client = __importStar(require("prom-client"));
|
|
18
51
|
const prom_client_1 = require("prom-client");
|
|
19
52
|
const players_manager_service_1 = require("../players-manager/players-manager.service");
|
|
20
53
|
const support_constants_1 = require("./support.constants");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metric.service.js","sourceRoot":"","sources":["../../../src/modules/support/metric.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metric.service.js","sourceRoot":"","sources":["../../../src/modules/support/metric.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,oDAAsC;AACtC,6CAAwD;AAExD,wFAAmF;AAEnF,2DAAsD;AAI/C,IAAM,aAAa,GAAnB,MAAM,aAAa;IAMe;IAChB;IANJ,QAAQ,CAAW;IACnB,gBAAgB,CAAQ;IACxB,kBAAkB,CAAQ;IAE3C,YACqC,OAAuB,EACvC,cAAqC;QADrB,YAAO,GAAP,OAAO,CAAgB;QACvC,mBAAc,GAAd,cAAc,CAAuB;QAEtD,IAAI,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,sBAAQ,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,qBAAqB,CAAC,EAAE,QAAQ,EAAR,sBAAQ,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,gBAAgB,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC;YACrC,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE,wBAAwB;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC;YACvC,IAAI,EAAE,wBAAwB;YAC9B,IAAI,EAAE,0BAA0B;SACnC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAA;QAGlE,OAAO,sBAAQ,CAAC;IACpB,CAAC;CACJ,CAAA;AA9BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;IAOJ,WAAA,IAAA,eAAM,EAAC,mCAAe,CAAC,CAAA;6CACS,+CAAqB;GAPjD,aAAa,CA8BzB"}
|
|
@@ -11,6 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
+
};
|
|
14
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
18
|
exports.TournamentManyTablesRoomsManagerService = void 0;
|
|
16
19
|
const common_1 = require("@nestjs/common");
|
|
@@ -18,8 +21,8 @@ const jp_ms_common_engine_1 = require("jp.ms.common.engine");
|
|
|
18
21
|
const jp_db_schemas_1 = require("jp.db.schemas");
|
|
19
22
|
const mongoose_1 = require("@nestjs/mongoose");
|
|
20
23
|
const mongoose_2 = require("mongoose");
|
|
21
|
-
const
|
|
22
|
-
const
|
|
24
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
25
|
+
const node_schedule_1 = __importDefault(require("node-schedule"));
|
|
23
26
|
const game_table_result_1 = require("../../utils/game-table-result");
|
|
24
27
|
const logger_1 = require("../logger");
|
|
25
28
|
const date_1 = require("../../utils/date");
|
|
@@ -79,7 +82,7 @@ let TournamentManyTablesRoomsManagerService = class TournamentManyTablesRoomsMan
|
|
|
79
82
|
const dailyTournamentTime = this.options.configService.get('DAILY_TOURNAMENT_TIME');
|
|
80
83
|
if (dailyTournamentScheduleTaskTime && dailyTournamentTime) {
|
|
81
84
|
await this.createDailyTournament(dailyTournamentTime);
|
|
82
|
-
this.createDailyTournamentJob =
|
|
85
|
+
this.createDailyTournamentJob = node_schedule_1.default.scheduleJob(dailyTournamentScheduleTaskTime, () => this.createDailyTournament(dailyTournamentTime));
|
|
83
86
|
}
|
|
84
87
|
}
|
|
85
88
|
async createTournament(createTournamentDto) {
|
|
@@ -88,7 +91,7 @@ let TournamentManyTablesRoomsManagerService = class TournamentManyTablesRoomsMan
|
|
|
88
91
|
}
|
|
89
92
|
async updateTournament(tournamentId, updateTournamentDto) {
|
|
90
93
|
const updatedTournament = await this.tournamentRepository.updateTournament(tournamentId, updateTournamentDto);
|
|
91
|
-
this.getRoomById(tournamentId)?.
|
|
94
|
+
this.getRoomById(tournamentId)?.getRoomMaster().cancelTournament();
|
|
92
95
|
this.addRoom(this.options.createTournamentRoom(this.manyTablesTournamentDocumentToTournamentRoom(updatedTournament)));
|
|
93
96
|
}
|
|
94
97
|
async removeTournament(tournamentId) {
|
|
@@ -117,6 +120,7 @@ let TournamentManyTablesRoomsManagerService = class TournamentManyTablesRoomsMan
|
|
|
117
120
|
title: tournamentDocument.title,
|
|
118
121
|
subtitle: tournamentDocument.subtitle,
|
|
119
122
|
description: tournamentDocument.description,
|
|
123
|
+
enableForFastGame: false,
|
|
120
124
|
scheduleDate: tournamentDocument.scheduleDate,
|
|
121
125
|
turnTimeout: playersTurnTimeout,
|
|
122
126
|
restartTimeout: restartGameTimeout,
|
|
@@ -134,7 +138,26 @@ let TournamentManyTablesRoomsManagerService = class TournamentManyTablesRoomsMan
|
|
|
134
138
|
};
|
|
135
139
|
}
|
|
136
140
|
handleRoomEvent = (event) => {
|
|
137
|
-
|
|
141
|
+
if (event instanceof jp_ms_common_engine_1.GameTableFinishedEvent) {
|
|
142
|
+
this.handleRoomTableGameFinished(event.master);
|
|
143
|
+
}
|
|
144
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentStartedEvent) {
|
|
145
|
+
this.handleTournamentRoomStarted(event.room.getRoomMaster());
|
|
146
|
+
}
|
|
147
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentCancelledEvent) {
|
|
148
|
+
this.handleTournamentRoomCancelled(event.room.getRoomMaster());
|
|
149
|
+
}
|
|
150
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentFinishedEvent) {
|
|
151
|
+
this.handleTournamentRoomFinished(event.room.getRoomMaster());
|
|
152
|
+
}
|
|
153
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentPlayerJoinedTheTournamentEvent &&
|
|
154
|
+
event instanceof jp_ms_common_engine_1.GameTournamentPlayerLeavedTheTournamentEvent &&
|
|
155
|
+
event instanceof jp_ms_common_engine_1.GameTournamentCancelledEvent &&
|
|
156
|
+
event instanceof jp_ms_common_engine_1.GameTournamentWaitedEvent &&
|
|
157
|
+
event instanceof jp_ms_common_engine_1.GameTournamentStartedEvent &&
|
|
158
|
+
event instanceof jp_ms_common_engine_1.GameTournamentFinishedEvent) {
|
|
159
|
+
this.handleRoomStatusUpdated(new jp_ms_common_engine_1.RoomUpdateStateEvent(event.gameType, event.roomId));
|
|
160
|
+
}
|
|
138
161
|
};
|
|
139
162
|
handleRoomTableGameFinished = async (master) => {
|
|
140
163
|
await (0, game_table_result_1.saveGameTablesResult)(master, this.connection, this.gameResultRepository, this.usersRepository, false);
|
|
@@ -155,11 +178,11 @@ let TournamentManyTablesRoomsManagerService = class TournamentManyTablesRoomsMan
|
|
|
155
178
|
createDailyTournament = async (dailyTournamentTime) => {
|
|
156
179
|
const hour = (0, date_1.getHours)(dailyTournamentTime);
|
|
157
180
|
const minutes = (0, date_1.getMinutes)(dailyTournamentTime);
|
|
158
|
-
const jobEveningDate =
|
|
159
|
-
const addingDay =
|
|
160
|
-
const startDate =
|
|
161
|
-
const endDate =
|
|
162
|
-
const tournamentDate =
|
|
181
|
+
const jobEveningDate = (0, dayjs_1.default)().set('hour', hour).set('minute', minutes).set('second', 0);
|
|
182
|
+
const addingDay = (0, dayjs_1.default)().isBefore(jobEveningDate) ? 0 : 1;
|
|
183
|
+
const startDate = (0, dayjs_1.default)().add(addingDay, 'day').startOf('day');
|
|
184
|
+
const endDate = (0, dayjs_1.default)().add(addingDay, 'day').endOf('day');
|
|
185
|
+
const tournamentDate = (0, dayjs_1.default)()
|
|
163
186
|
.add(addingDay, 'day')
|
|
164
187
|
.set('hour', hour)
|
|
165
188
|
.set('minute', minutes);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tournament-many-tables-rooms-manager.service.js","sourceRoot":"","sources":["../../../src/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tournament-many-tables-rooms-manager.service.js","sourceRoot":"","sources":["../../../src/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,22 +91,38 @@ let TournamentOneTableRoomsManagerService = class TournamentOneTableRoomsManager
|
|
|
91
91
|
title: tournamentDocument.title,
|
|
92
92
|
subtitle: tournamentDocument.subtitle,
|
|
93
93
|
description: tournamentDocument.description,
|
|
94
|
+
enableForFastGame: false,
|
|
94
95
|
turnTimeout: playersTurnTimeout,
|
|
95
96
|
restartTimeout: restartGameTimeout,
|
|
96
97
|
localeService: this.options.i18n,
|
|
97
98
|
startStrategy: new jp_ms_common_engine_1.NoStartStrategy(),
|
|
98
99
|
onRoomEvent: this.handleRoomEvent,
|
|
99
|
-
onRoomTableGameFinished: this.handleRoomTableGameFinished,
|
|
100
|
-
onTournamentRoomStarted: this.handleTournamentRoomStarted,
|
|
101
|
-
onTournamentRoomFinished: this.handleTournamentRoomFinished,
|
|
102
|
-
onTournamentRoomCancelled: this.handleTournamentRoomCancelled,
|
|
103
|
-
onRoomStatusUpdated: this.handleRoomStatusUpdated,
|
|
104
100
|
tournamentPrizeTable: this.options.tournamentPrizeTable,
|
|
105
101
|
tournamentInitialStatus: tournamentDocument.status,
|
|
106
102
|
};
|
|
107
103
|
}
|
|
108
104
|
handleRoomEvent = (event) => {
|
|
109
105
|
this.logger.log(event.toLog());
|
|
106
|
+
if (event instanceof jp_ms_common_engine_1.GameTableFinishedEvent) {
|
|
107
|
+
this.handleRoomTableGameFinished(event.master);
|
|
108
|
+
}
|
|
109
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentStartedEvent) {
|
|
110
|
+
this.handleTournamentRoomStarted(event.room.getRoomMaster());
|
|
111
|
+
}
|
|
112
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentCancelledEvent) {
|
|
113
|
+
this.handleTournamentRoomCancelled(event.room.getRoomMaster());
|
|
114
|
+
}
|
|
115
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentFinishedEvent) {
|
|
116
|
+
this.handleTournamentRoomFinished(event.room.getRoomMaster());
|
|
117
|
+
}
|
|
118
|
+
else if (event instanceof jp_ms_common_engine_1.GameTournamentPlayerJoinedTheTournamentEvent &&
|
|
119
|
+
event instanceof jp_ms_common_engine_1.GameTournamentPlayerLeavedTheTournamentEvent &&
|
|
120
|
+
event instanceof jp_ms_common_engine_1.GameTournamentCancelledEvent &&
|
|
121
|
+
event instanceof jp_ms_common_engine_1.GameTournamentWaitedEvent &&
|
|
122
|
+
event instanceof jp_ms_common_engine_1.GameTournamentStartedEvent &&
|
|
123
|
+
event instanceof jp_ms_common_engine_1.GameTournamentFinishedEvent) {
|
|
124
|
+
this.handleRoomStatusUpdated(new jp_ms_common_engine_1.RoomUpdateStateEvent(event.gameType, event.roomId));
|
|
125
|
+
}
|
|
110
126
|
};
|
|
111
127
|
handleRoomTableGameFinished = async (master) => {
|
|
112
128
|
await (0, game_table_result_1.saveGameTablesResult)(master, this.connection, this.gameResultRepository, this.usersRepository, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tournament-one-table-rooms-manager.service.js","sourceRoot":"","sources":["../../../src/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"tournament-one-table-rooms-manager.service.js","sourceRoot":"","sources":["../../../src/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6DAe6B;AAC7B,iDAKuB;AACvB,+CAAoD;AACpD,uCAAsC;AAEtC,mEAA8D;AAC9D,qEAAyH;AACzH,4CAAgH;AAEhH,iHAA4G;AAIrG,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAI7B;IACA;IACA;IACA;IACA;IACoD;IAChC;IACV;IAVZ,KAAK,CAAsC;IAE5D,YACmB,oBAAuD,EACvD,eAAgC,EAChC,oBAA0C,EAC1C,mCAAwE,EACxE,2CAAwF,EACpC,OAA8C,EAC9E,UAAsB,EAChC,MAAuB;QAPjC,yBAAoB,GAApB,oBAAoB,CAAmC;QACvD,oBAAe,GAAf,eAAe,CAAiB;QAChC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wCAAmC,GAAnC,mCAAmC,CAAqC;QACxE,gDAA2C,GAA3C,2CAA2C,CAA6C;QACpC,YAAO,GAAP,OAAO,CAAuC;QAC9E,eAAU,GAAV,UAAU,CAAY;QAChC,WAAM,GAAN,MAAM,CAAiB;QAElD,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAkC,CAAC;IACzD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAS,WAAW,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,WAAW,CAAE,MAAc;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,gBAAgB,CAAE,OAAe;QAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,gCAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ;QACN,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAC3B,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;YACvB,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QACnD,CAAC,EACD,EAAuB,CACxB,CAAC;IACJ,CAAC;IAED,OAAO,CAAE,IAA4B;QACnC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/F,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,oBAAoB,CAAC,kCAAkC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjF,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC5C,IAAI,CAAC,0CAA0C,CAAC,IAAI,CAAC,CACtD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,0CAA0C,CAAE,kBAAkD;QACpG,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAS,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC/F,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAS,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAE/F,OAAO;YACL,EAAE,EAAE,kBAAkB,CAAC,YAAY;YACnC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;YACrC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;YACrC,SAAS,EAAE,kBAAkB,CAAC,SAAS;YACvC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;YACrC,SAAS,EAAE,kBAAkB,CAAC,SAAS;YACvC,GAAG,EAAE,kBAAkB,CAAC,GAAG;YAC3B,WAAW,EAAE,kBAAkB,CAAC,WAAW;YAC3C,KAAK,EAAE,kBAAkB,CAAC,KAAK;YAC/B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;YACrC,WAAW,EAAE,kBAAkB,CAAC,WAAW;YAC3C,iBAAiB,EAAE,KAAK;YACxB,WAAW,EAAE,kBAAkB;YAC/B,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAChC,aAAa,EAAE,IAAI,qCAAe,EAAE;YACpC,WAAW,EAAE,IAAI,CAAC,eAAe;YACjC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB;YACvD,uBAAuB,EAAE,kBAAkB,CAAC,MAAM;SAC3B,CAAC;IAC5B,CAAC;IAEO,eAAe,GAAG,CAAC,KAAoB,EAAE,EAAE;QACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAE/B,IAAI,KAAK,YAAY,4CAAsB,EAAE,CAAC;YAC5C,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,MAAQ,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,KAAK,YAAY,gDAA0B,EAAE,CAAC;YACvD,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC/D,CAAC;aAAM,IAAI,KAAK,YAAY,kDAA4B,EAAE,CAAC;YACzD,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,KAAK,YAAY,iDAA2B,EAAE,CAAC;YACxD,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAChE,CAAC;aAAM,IACL,KAAK,YAAY,kEAA4C;YAC7D,KAAK,YAAY,kEAA4C;YAC7D,KAAK,YAAY,kDAA4B;YAC7C,KAAK,YAAY,+CAAyB;YAC1C,KAAK,YAAY,gDAA0B;YAC3C,KAAK,YAAY,iDAA2B,EAC5C,CAAC;YACD,IAAI,CAAC,uBAAuB,CAAC,IAAI,0CAAoB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACvF,CAAC;IACH,CAAC,CAAC;IAEM,2BAA2B,GAAG,KAAK,EAAE,MAAkB,EAAE,EAAE;QACjE,MAAM,IAAA,wCAAoB,EACxB,MAAM,EACN,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,eAAe,EACpB,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;IAEM,2BAA2B,GAAG,KAAK,EAAE,MAAwB,EAAE,EAAE;QACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QACrD,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAE3B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAC7C,MAAM,CAAC,eAAe,EAAE,EACxB,MAAM,CAAC,OAAO,EAAE,CAAC,eAAe,EAAE,CACnC,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,kCAAkC,CACtF,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,CAC/B,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC5C,IAAI,CAAC,0CAA0C,CAAC,aAAa,CAAC,CAC/D,CAAC,CAAC;YAEH,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;YACjC,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC,CAAA;IAEO,6BAA6B,GAAG,KAAK,EAAE,MAAwB,EAAE,EAAE;QACzE,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;IAC7E,CAAC,CAAA;IAEO,4BAA4B,GAAG,KAAK,EAAE,MAAwB,EAAE,EAAE;QACxE,MAAM,IAAA,wCAAoB,EACxB,MAAM,EACN,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,eAAe,CACrB,CAAC;IACJ,CAAC,CAAA;IAEO,uBAAuB,GAAG,KAAK,EAAE,KAA2B,EAAE,EAAE;QACtE,IAAI,CAAC,mCAAmC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,2CAA2C,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC3E,CAAC,CAAA;CACF,CAAA;AArKY,sFAAqC;gDAArC,qCAAqC;IADjD,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,yFAA0C,CAAC,CAAA;IAClD,WAAA,IAAA,2BAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,eAAM,GAAE,CAAA;qCAP8B,iDAAiC;QACtC,+BAAe;QACV,oCAAoB;QACL,+CAAmC;QAC3B,uDAA2C,UAExD,qBAAU;QACxB,mCAAe;GAXzC,qCAAqC,CAqKjD"}
|