jp.ms.common.engine 1.0.21 → 2.0.0

package/dist/utils/circle-list.js

@@ -3,14 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CircleList = exports.CircleListNode = void 0;
 const lodash_1 = require("lodash");
 class CircleListNode {
-    constructor(data) {
-        this.data = data;
-    }
-    getData() {
-        return this.data;
-    }
-    setData(data) {
-        this.data = data;
+    constructor() {
+        this.next = null;
+        this.prev = null;
     }
     getNext() {
         return this.next;
@@ -39,17 +34,13 @@ class CircleList {
     get(index) {
         return this.list[index];
     }
-    getData(index) {
-        var _a;
-        return (_a = this.get(index)) === null || _a === void 0 ? void 0 : _a.getData();
-    }
     getNextChain(first) {
         const chain = [];
         let firstNode = this.list[first];
         let nextNode = firstNode.getNext();
-        chain.push(firstNode.getData());
+        chain.push(firstNode);
         while (firstNode !== nextNode && nextNode) {
-            chain.push(nextNode.getData());
+            chain.push(nextNode);
             nextNode = nextNode.getNext();
         }
         return chain;
@@ -58,9 +49,9 @@ class CircleList {
         const chain = [];
         let firstNode = this.list[first];
         let prevNode = firstNode.getPrev();
-        chain.push(firstNode.getData());
+        chain.push(firstNode);
         while (firstNode !== prevNode && prevNode) {
-            chain.push(prevNode.getData());
+            chain.push(prevNode);
             prevNode = prevNode.getPrev();
         }
         return chain;
@@ -69,14 +60,14 @@ class CircleList {
         return this.list.length;
     }
     getSlice(start, end) {
-        return (0, lodash_1.slice)(this.list, start, end).map((item) => item.getData());
+        return (0, lodash_1.slice)(this.list, start, end).map((item) => item);
     }
-    push(data) {
-        this.list.push(new CircleListNode(data));
+    push(node) {
+        this.list.push(node);
         this.connect();
     }
     toArray() {
-        return this.list.map((item) => item.getData());
+        return this.list.map((item) => item);
     }
     connect() {
         var _a, _b;

package/dist/utils/circle-list.js.map

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

package/dist/utils/tests/circle-list.test.d.ts

@@ -1,2 +1,6 @@
-export {};
+import { CircleListNode } from '../circle-list';
+export declare class CircleListNodeTest extends CircleListNode {
+    id: number;
+    constructor(id: number);
+}
 //# sourceMappingURL=circle-list.test.d.ts.map

package/dist/utils/tests/circle-list.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circle-list.test.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/circle-list.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"circle-list.test.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/circle-list.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE5D,qBAAa,kBAAmB,SAAQ,cAAc;IAClD,EAAE,EAAE,MAAM,CAAC;gBAEE,EAAE,EAAE,MAAM;CAI1B"}

package/dist/utils/tests/circle-list.test.js

@@ -1,26 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CircleListNodeTest = void 0;
 const circle_list_1 = require("../circle-list");
+class CircleListNodeTest extends circle_list_1.CircleListNode {
+    constructor(id) {
+        super();
+        this.id = id;
+    }
+}
+exports.CircleListNodeTest = CircleListNodeTest;
 describe('circle list', () => {
-    const item1 = { id: 1 };
-    const item2 = { id: 2 };
-    const item3 = { id: 3 };
+    const item1 = new CircleListNodeTest(1);
+    const item2 = new CircleListNodeTest(2);
+    const item3 = new CircleListNodeTest(3);
     const list = new circle_list_1.CircleList();
     list.push(item1);
     list.push(item2);
     list.push(item3);
     it('circle list', () => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f;
         expect(list.getSize()).toBe(3);
-        expect((_a = list.get(0)) === null || _a === void 0 ? void 0 : _a.getData()).toBe(item1);
-        expect((_b = list.get(0)) === null || _b === void 0 ? void 0 : _b.getNext()).toBe(list.get(1));
-        expect((_c = list.get(0)) === null || _c === void 0 ? void 0 : _c.getPrev()).toBe(list.get(2));
-        expect((_d = list.get(1)) === null || _d === void 0 ? void 0 : _d.getData()).toBe(item2);
-        expect((_e = list.get(1)) === null || _e === void 0 ? void 0 : _e.getNext()).toBe(list.get(2));
-        expect((_f = list.get(1)) === null || _f === void 0 ? void 0 : _f.getPrev()).toBe(list.get(0));
-        expect((_g = list.get(2)) === null || _g === void 0 ? void 0 : _g.getData()).toBe(item3);
-        expect((_h = list.get(2)) === null || _h === void 0 ? void 0 : _h.getNext()).toBe(list.get(0));
-        expect((_j = list.get(2)) === null || _j === void 0 ? void 0 : _j.getPrev()).toBe(list.get(1));
+        expect(list.get(0)).toBe(item1);
+        expect((_a = list.get(0)) === null || _a === void 0 ? void 0 : _a.getNext()).toBe(list.get(1));
+        expect((_b = list.get(0)) === null || _b === void 0 ? void 0 : _b.getPrev()).toBe(list.get(2));
+        expect(list.get(1)).toBe(item2);
+        expect((_c = list.get(1)) === null || _c === void 0 ? void 0 : _c.getNext()).toBe(list.get(2));
+        expect((_d = list.get(1)) === null || _d === void 0 ? void 0 : _d.getPrev()).toBe(list.get(0));
+        expect(list.get(2)).toBe(item3);
+        expect((_e = list.get(2)) === null || _e === void 0 ? void 0 : _e.getNext()).toBe(list.get(0));
+        expect((_f = list.get(2)) === null || _f === void 0 ? void 0 : _f.getPrev()).toBe(list.get(1));
     });
     it('getNextChain', () => {
         const nextChain0 = list.getNextChain(0);

package/dist/utils/tests/circle-list.test.js.map

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

package/dist/utils/timer.d.ts

@@ -0,0 +1,2 @@
+export declare function getRemainTime(timerDate: Date | null, timeout: number): number;
+//# sourceMappingURL=timer.d.ts.map

package/dist/utils/timer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../src/utils/timer.ts"],"names":[],"mappings":"AAIA,wBAAgB,aAAa,CAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,UASrE"}

package/dist/utils/timer.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRemainTime = getRemainTime;
+const lodash_1 = require("lodash");
+const const_1 = require("../const");
+function getRemainTime(timerDate, timeout) {
+    if (timerDate === null || timeout === 0) {
+        return 0;
+    }
+    else {
+        const timeFromStartChecking = new Date().getTime() - timerDate.getTime();
+        const secondsFromStart = (0, lodash_1.round)(timeFromStartChecking / const_1.ONE_SECOND);
+        return timeout - secondsFromStart;
+    }
+}
+//# sourceMappingURL=timer.js.map

package/dist/utils/timer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/utils/timer.ts"],"names":[],"mappings":";;AAIA,sCASC;AAbD,mCAA+B;AAE/B,oCAAsC;AAEtC,SAAgB,aAAa,CAAE,SAAsB,EAAE,OAAe;IAClE,IAAI,SAAS,KAAK,IAAI,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,CAAC,CAAC;IACb,CAAC;SAAM,CAAC;QACJ,MAAM,qBAAqB,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QACzE,MAAM,gBAAgB,GAAG,IAAA,cAAK,EAAC,qBAAqB,GAAG,kBAAU,CAAC,CAAC;QAEnE,OAAO,OAAO,GAAG,gBAAgB,CAAC;IACtC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.ms.common.engine",
-  "version": "1.0.21",
+  "version": "2.0.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,8 +8,10 @@
   "license": "ISC",
   "dependencies": {
     "dayjs": "1.11.18",
+    "jp.common.models": "1.0.7",
     "lodash": "4.17.21",
     "node-schedule": "2.1.1",
+    "rxjs": "7.8.2",
     "seedrandom": "3.0.5",
     "shuffle-array": "1.0.1",
     "uuid": "11.1.0"

package/src/base/base-figure-type.enum.ts

@@ -0,0 +1,3 @@
+export enum BaseFigureTypeEnum {
+    CARD = 'CARD',
+}

package/src/base/base-figure.ts

@@ -0,0 +1,23 @@
+export abstract class BaseFigure {
+    private readonly _id: number;
+    private readonly _type: string;
+
+    protected constructor (id: number, type: string) {
+        this._id = id;
+        this._type = type;
+    }
+
+    abstract getName (): string;
+
+    get id () {
+        return this._id;
+    }
+
+    getId () {
+        return this._id;
+    }
+
+    get type () {
+        return this._type;
+    }
+}

package/src/base/base-move-data.ts

@@ -1,11 +1,13 @@
-export abstract class BaseMoveData {
-    private readonly action: string;
+import { IBaseMoveData } from 'jp.common.models';
+
+export abstract class BaseMoveData implements IBaseMoveData {
+    private readonly _action: string;
 
     protected constructor (action: string) {
-        this.action = action;
+        this._action = action;
     }
 
-    getAction () {
-        return this.action;
+    get action () {
+        return this._action;
     }
 }

package/src/base/base-player-move-factory.ts

@@ -0,0 +1,18 @@
+import { IBaseMoveData } from 'jp.common.models';
+
+import { GameMaster, GamePlayer } from './';
+import { BasePlayerMove } from './base-player-move';
+
+export abstract class BasePlayerMoveFactory {
+    constructor (master: GameMaster) {
+        this._master = master;
+    }
+
+    private readonly _master: GameMaster;
+
+    get master () {
+        return this._master;
+    }
+
+    abstract createMove (player: GamePlayer, moveData: IBaseMoveData): BasePlayerMove;
+}

package/src/base/base-player-move.ts

@@ -0,0 +1,37 @@
+import { IBaseMoveData } from 'jp.common.models';
+
+import { GamePlayer } from './game-player';
+import { GameMaster } from './game-master';
+import { BaseMoveData } from './base-move-data';
+
+export abstract class BasePlayerMove implements IBaseMoveData {
+    private readonly _moveData: BaseMoveData;
+    private readonly _player: GamePlayer;
+    private readonly _master: GameMaster;
+
+    constructor (master: GameMaster, player: GamePlayer, moveData: BaseMoveData) {
+        this._moveData = moveData;
+        this._player = player;
+        this._master = master;
+    }
+
+    getMoveData<T extends BaseMoveData> () {
+        return this._moveData as T;
+    }
+
+    get action () {
+        return this._moveData.action;
+    }
+
+    getPlayer<T extends GamePlayer> () {
+        return this._player as T;
+    }
+
+    getMaster<T extends GameMaster> () {
+        return this._master as T;
+    }
+
+    abstract isValid (): boolean;
+
+    abstract commit (): void;
+}

package/src/base/game-control-player-turn.ts

@@ -1,11 +1,12 @@
 import { ONE_SECOND } from '../const';
+import { getRemainTime } from '../utils/timer';
 
 import { GamePlayer } from './game-player';
 
 export class GameControlPlayerTurn {
     private readonly playersTurnTimeout: number;
     private playerTurnTimerId?: NodeJS.Timeout;
-    private playerTurnTimerDate: Date | null;
+    private playerTurnTimerDate: Date | null = null;
     private readonly handleTurnTimeout: (player: GamePlayer) => void;
 
     constructor (
@@ -33,7 +34,12 @@ export class GameControlPlayerTurn {
     clearPlayerTurnTimeout (player: GamePlayer | null) {
         if (this.playerTurnTimerId) {
             clearTimeout(this.playerTurnTimerId);
+            this.playerTurnTimerId = undefined;
             this.playerTurnTimerDate = null;
         }
     }
+
+    getTimerRemain () {
+        return getRemainTime(this.playerTurnTimerDate, this.playersTurnTimeout);
+    }
 }

package/src/base/game-control-restart.ts

@@ -1,9 +1,10 @@
 import { ONE_SECOND } from '../const';
+import { getRemainTime } from '../utils/timer';
 
 export class GameControlRestart {
     private readonly restartTimeout: number;
     private restartTimerId?: NodeJS.Timeout;
-    private restartTimerDate: Date | null;
+    private restartTimerDate: Date | null = null;
     private readonly handleRestartTimeout: () => void;
 
     constructor (
@@ -20,6 +21,7 @@ export class GameControlRestart {
 
     setRestartTimeout () {
         this.restartTimerDate = new Date();
+
         if (this.isEnableTimer()) {
             this.restartTimerId = setTimeout(
                 this.handleRestartTimeout,
@@ -27,4 +29,8 @@ export class GameControlRestart {
             );
         }
     }
+
+    getTimerRemain () {
+        return getRemainTime(this.restartTimerDate, this.restartTimeout);
+    }
 }