trucoshi 0.0.4 → 0.0.6

package/build/lib/index.js

@@ -39,11 +39,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trucoshi = void 0;
 var Match_1 = require("./classes/Match");
 var Player_1 = require("./classes/Player");
+var Table_1 = require("./classes/Table");
 var Team_1 = require("./classes/Team");
+var constants_1 = require("./constants");
+var types_1 = require("./types");
 var GameLoop = function (match) {
     var gameloop = {
+        _onTruco: function () { return Promise.resolve(); },
         _onTurn: function () { return Promise.resolve(); },
         _onWinner: function () { return Promise.resolve(); },
+        onTruco: function (callback) {
+            gameloop._onTruco = callback;
+            return gameloop;
+        },
         onTurn: function (callback) {
             gameloop._onTurn = callback;
             return gameloop;
@@ -52,23 +60,31 @@ var GameLoop = function (match) {
             gameloop._onWinner = callback;
             return gameloop;
         },
-        start: function () {
+        begin: function () {
             return __awaiter(this, void 0, void 0, function () {
                 var play;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!!match.winner) return [3 /*break*/, 2];
+                            if (!!match.winner) return [3 /*break*/, 5];
                             play = match.play();
                             if (!play || !play.player) {
                                 return [3 /*break*/, 0];
                             }
-                            return [4 /*yield*/, gameloop._onTurn(play)];
+                            if (!(play.state === types_1.EHandState.WAITING_FOR_TRUCO_ANSWER)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, gameloop._onTruco(play)];
                         case 1:
                             _a.sent();
                             return [3 /*break*/, 0];
-                        case 2: return [4 /*yield*/, gameloop._onWinner(match.winner, match.teams)];
+                        case 2:
+                            if (!(play.state === types_1.EHandState.WAITING_PLAY)) return [3 /*break*/, 4];
+                            return [4 /*yield*/, gameloop._onTurn(play)];
                         case 3:
+                            _a.sent();
+                            return [3 /*break*/, 0];
+                        case 4: return [3 /*break*/, 0];
+                        case 5: return [4 /*yield*/, gameloop._onWinner(match.winner, match.teams)];
+                        case 6:
                             _a.sent();
                             return [2 /*return*/];
                     }
@@ -78,11 +94,68 @@ var GameLoop = function (match) {
     };
     return gameloop;
 };
-function Trucoshi(idsTeam0, idsTeam1, matchPoint) {
-    var teams = [
-        (0, Team_1.Team)(idsTeam0.map(function (id) { return (0, Player_1.Player)(id, 0); })),
-        (0, Team_1.Team)(idsTeam1.map(function (id) { return (0, Player_1.Player)(id, 1); })),
-    ];
-    return GameLoop((0, Match_1.Match)(teams, matchPoint));
+function Trucoshi(teamSize) {
+    var trucoshi = {
+        lastTeamIdx: 1,
+        _players: new Map(),
+        get players() {
+            return Array.from(trucoshi._players.values());
+        },
+        teams: [],
+        table: null,
+        maxPlayers: teamSize ? teamSize * 2 : 6,
+        full: false,
+        ready: false,
+        calculateReady: function () {
+            trucoshi.ready = trucoshi.players.reduce(function (prev, curr) { return prev && curr.ready; }, true);
+            return trucoshi.ready;
+        },
+        calculateFull: function () {
+            trucoshi.full = trucoshi._players.size >= trucoshi.maxPlayers;
+            return trucoshi.full;
+        },
+        addPlayer: function (id, teamIdx) {
+            var maxSize = teamSize ? teamSize : 3;
+            if (trucoshi.full || trucoshi.players.filter(function (p) { return p.teamIdx === teamIdx; }).length > maxSize) {
+                throw new Error(constants_1.GAME_ERROR.TEAM_IS_FULL);
+            }
+            var player = (0, Player_1.Player)(id, teamIdx !== undefined ? teamIdx : Number(!trucoshi.lastTeamIdx));
+            trucoshi.lastTeamIdx = Number(!trucoshi.lastTeamIdx);
+            trucoshi._players.set(id, player);
+            trucoshi.calculateFull();
+            trucoshi.calculateReady();
+            return player;
+        },
+        removePlayer: function (id) {
+            trucoshi._players.delete(id);
+            trucoshi.calculateFull();
+            trucoshi.calculateReady();
+            return trucoshi;
+        },
+        startMatch: function (matchPoint) {
+            if (matchPoint === void 0) { matchPoint = 9; }
+            trucoshi.calculateReady();
+            var teamSize = trucoshi._players.size / 2;
+            if (!constants_1.TEAM_SIZE_VALUES.includes(teamSize)) {
+                throw new Error(constants_1.GAME_ERROR.UNEXPECTED_TEAM_SIZE);
+            }
+            if (!trucoshi.ready) {
+                throw new Error(constants_1.GAME_ERROR.TEAM_NOT_READY);
+            }
+            trucoshi.teams.push((0, Team_1.Team)(trucoshi.players.filter(function (p) { return p.teamIdx === 0; })));
+            trucoshi.teams.push((0, Team_1.Team)(trucoshi.players.filter(function (p) { return p.teamIdx === 1; })));
+            if (trucoshi.teams[0].players.length !== teamSize ||
+                trucoshi.teams[1].players.length !== teamSize) {
+                throw new Error(constants_1.GAME_ERROR.UNEXPECTED_TEAM_SIZE);
+            }
+            trucoshi.table = (0, Table_1.Table)(trucoshi.players, trucoshi.teams);
+            return GameLoop((0, Match_1.Match)(trucoshi.table, trucoshi.teams, matchPoint));
+        },
+    };
+    return {
+        addPlayer: trucoshi.addPlayer,
+        removePlayer: trucoshi.removePlayer,
+        startMatch: trucoshi.startMatch,
+    };
 }
 exports.Trucoshi = Trucoshi;

package/build/lib/types.d.ts

@@ -1,3 +1,4 @@
+import { IGameLoop } from ".";
 import { CARDS } from "./constants";
 export type ICard = keyof typeof CARDS;
 export interface IDeck {
@@ -14,7 +15,13 @@ export interface IPlayer {
     teamIdx: number;
     id: string;
     hand: Array<ICard>;
+    commands: Array<ECommand>;
     usedHand: Array<ICard>;
+    disabled: boolean;
+    ready: boolean;
+    enable(): void;
+    disable(): void;
+    setReady(ready: boolean): void;
     setHand(hand: Array<ICard>): Array<ICard>;
     useCard(idx: number): ICard | null;
 }
@@ -22,6 +29,8 @@ export interface ITeam {
     _players: Map<string, IPlayer>;
     players: Array<IPlayer>;
     points: TeamPoints;
+    isTeamDisabled(): boolean;
+    disable(player: IPlayer): boolean;
     addPoints(matchPoint: number, points: number): TeamPoints;
 }
 export interface IMatch {
@@ -52,6 +61,8 @@ export interface RoundPoints {
     ties: number;
 }
 export declare enum ESayCommand {
+    QUIERO = "QUIERO",
+    NO_QUIERO = "NO_QUIERO",
     TRUCO = "TRUCO",
     MAZO = "MAZO",
     FLOR = "FLOR",
@@ -64,9 +75,21 @@ export declare enum EEnvidoCommand {
     FALTA_ENVIDO = "FALTA_ENVIDO"
 }
 export type ECommand = ESayCommand | EEnvidoCommand;
-export interface TrucoState {
+export interface ITruco {
     state: 1 | 2 | 3 | 4;
     teamIdx: 0 | 1 | null;
+    answer: boolean | null;
+    turn: number;
+    players: Array<IPlayer>;
+    currentPlayer: IPlayer | null;
+    generator: Generator<ITruco, void, unknown>;
+    sayTruco(teamIdx: 0 | 1, players: Array<IPlayer>): ITruco;
+    setPlayers(players: Array<IPlayer>): void;
+    setAnswer(answer: boolean | null): ITruco;
+    setTurn(turn: number): number;
+    setTeam(idx: 0 | 1): 0 | 1;
+    setCurrentPlayer(player: IPlayer | null): IPlayer | null;
+    getNextPlayer(): IteratorResult<ITruco, ITruco | void>;
 }
 export interface EnvidoState {
     accept: number;
@@ -78,7 +101,7 @@ export interface IPlayInstance {
     handIdx: number;
     roundIdx: number;
     state: EHandState;
-    truco: TrucoState;
+    truco: ITruco;
     envido: EnvidoState;
     player: IPlayer | null;
     commands: Array<ECommand> | null;
@@ -100,15 +123,18 @@ export interface IHand {
     state: EHandState;
     turn: number;
     points: HandPoints;
-    truco: TrucoState;
+    truco: ITruco;
     envido: EnvidoState;
     rounds: Array<IRound>;
-    currentPlayer: IPlayer | null;
+    _currentPlayer: IPlayer | null;
+    get currentPlayer(): IPlayer | null;
+    set currentPlayer(player: IPlayer | null);
     currentRound: IRound | null;
-    disabledPlayerIds: Array<string>;
     commands: IHandCommands;
     finished: () => boolean;
     play(): IPlayInstance | null;
+    nextTurn(): void;
+    use(idx: number): ICard | null;
     pushRound(round: IRound): IRound;
     setTurn(turn: number): IPlayer;
     addPoints(team: 0 | 1, points: number): void;
@@ -118,6 +144,23 @@ export interface IHand {
     setState(state: EHandState): EHandState;
     getNextPlayer(): IteratorResult<IHand, IHand | void>;
 }
+export interface IPrivateTrucoshi {
+    lastTeamIdx: 0 | 1;
+    _players: Map<string, IPlayer>;
+    get players(): Array<IPlayer>;
+    teams: Array<ITeam>;
+    maxPlayers: number;
+    table: ITable | null;
+    ready: boolean;
+    full: boolean;
+    addPlayer(id: string, teamIdx?: 0 | 1): IPlayer;
+    removePlayer(id: string): ITrucoshi;
+    calculateReady(): boolean;
+    calculateFull(): boolean;
+    startMatch(matchPoint?: 9 | 12 | 15): IGameLoop;
+}
+export interface ITrucoshi extends Pick<IPrivateTrucoshi, 'addPlayer' | 'removePlayer' | 'startMatch'> {
+}
 export interface ITable {
     forehandIdx: number;
     cards: Array<Array<IPlayedCard>>;
@@ -131,6 +174,8 @@ export interface IRound {
     winner: IPlayer | null;
     highest: number;
     cards: Array<IPlayedCard>;
+    turn: number;
+    nextTurn(): void;
     use(playedCard: IPlayedCard): ICard;
 }
 export type IEnvidoCalculatorResult = {

package/build/lib/types.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EHandState = exports.EEnvidoCommand = exports.ESayCommand = void 0;
 var ESayCommand;
 (function (ESayCommand) {
+    ESayCommand["QUIERO"] = "QUIERO";
+    ESayCommand["NO_QUIERO"] = "NO_QUIERO";
     ESayCommand["TRUCO"] = "TRUCO";
     ESayCommand["MAZO"] = "MAZO";
     ESayCommand["FLOR"] = "FLOR";

package/build/lib/utils.d.ts

@@ -1,5 +1,5 @@
-import { ICard, IRound, ITeam } from "./types";
+import { ICard, IRound } from "./types";
 export declare function getMaxNumberIndex<T = number>(array: Array<T>): number;
 export declare function getCardValue(card: ICard): number;
 export declare function shuffleArray<T = unknown>(array: Array<T>): T[];
-export declare function checkHandWinner(rounds: Array<IRound>, forehandTeamIdx: 0 | 1, disabledPlayerIds: Array<string>, teams: [ITeam, ITeam]): null | 0 | 1;
+export declare function checkHandWinner(rounds: Array<IRound>, forehandTeamIdx: 0 | 1): null | 0 | 1;

package/build/lib/utils.js

@@ -23,25 +23,8 @@ function shuffleArray(array) {
     return array;
 }
 exports.shuffleArray = shuffleArray;
-function checkHandWinner(rounds, forehandTeamIdx, disabledPlayerIds, teams) {
+function checkHandWinner(rounds, forehandTeamIdx) {
     var _a, _b;
-    var winningTeamIdx = null;
-    // End hand if all players in one team go MAZO
-    if (disabledPlayerIds.length) {
-        var disabledTeams = teams.map(function (team) {
-            var forfeited = team.players.filter(function (player) { return disabledPlayerIds.includes(player.id); });
-            return forfeited.length === team.players.length;
-        });
-        if (disabledTeams[0] && disabledTeams[1]) {
-            return forehandTeamIdx;
-        }
-        if (disabledTeams[0]) {
-            return 1;
-        }
-        if (disabledTeams[1]) {
-            return 0;
-        }
-    }
     var roundsWon = {
         0: 0,
         1: 0,

package/build/server/match.js

@@ -0,0 +1 @@
+"use strict";

package/build/test/autoplay.js

@@ -38,8 +38,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var lib_1 = require("../lib");
 (function () { return __awaiter(void 0, void 0, void 0, function () {
+    var trucoshi;
     return __generator(this, function (_a) {
-        (0, lib_1.Trucoshi)(["lukini", "guada", "day"], ["denoph", "juli", "fran"], 9)
+        trucoshi = (0, lib_1.Trucoshi)();
+        trucoshi.addPlayer("lukini").setReady(true);
+        trucoshi.addPlayer("denoph").setReady(true);
+        trucoshi.addPlayer("guada").setReady(true);
+        trucoshi.addPlayer("juli").setReady(true);
+        trucoshi.addPlayer("day").setReady(true);
+        trucoshi.addPlayer("fran").setReady(true);
+        trucoshi
+            .startMatch()
             .onTurn(function (play) { return __awaiter(void 0, void 0, void 0, function () {
             var name, randomIdx, handString, card;
             var _a;
@@ -79,7 +88,7 @@ var lib_1 = require("../lib");
                 return [2 /*return*/];
             });
         }); })
-            .start();
+            .begin();
         return [2 /*return*/];
     });
 }); })();

package/build/test/play.js

@@ -70,7 +70,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var readline = __importStar(require("readline"));
 var lib_1 = require("../lib");
-var types_1 = require("../lib/types");
 var command = function (title, onLine) {
     var promise = function () {
         return new Promise(function (resolve) {
@@ -111,70 +110,90 @@ var command = function (title, onLine) {
     };
     return promise;
 };
+var playCommand = function (play) {
+    var _a, _b, _d;
+    return command("".concat((_a = play.player) === null || _a === void 0 ? void 0 : _a.id, " elije una carta [").concat((_b = play.player) === null || _b === void 0 ? void 0 : _b.hand.map(function (_c, i) { return i + 1; }), "]: ").concat(JSON.stringify((_d = play.player) === null || _d === void 0 ? void 0 : _d.hand), "\n"), function (idx) { return __awaiter(void 0, void 0, void 0, function () {
+        var playedCard, handString;
+        var _a;
+        return __generator(this, function (_b) {
+            playedCard = play.use(Number(idx) - 1);
+            if (!playedCard) {
+                return [2 /*return*/, Promise.reject()];
+            }
+            handString = JSON.stringify((_a = play.player) === null || _a === void 0 ? void 0 : _a.hand);
+            console.log("\n".concat(handString, "\nUsing ").concat(playedCard));
+            console.log(play.rounds && play.rounds.length
+                ? play.rounds.map(function (round) {
+                    return round.cards.length ? round.cards.map(function (c) { return [c.player.id, c.card]; }) : "";
+                })
+                : "");
+            return [2 /*return*/, Promise.resolve()];
+        });
+    }); });
+};
+var sayCommand = function (play, canPlay) {
+    var _a, _b;
+    return command("".concat((_a = play.player) === null || _a === void 0 ? void 0 : _a.id, " elije una accion [").concat(canPlay ? "0," : "").concat((_b = play.commands) === null || _b === void 0 ? void 0 : _b.map(function (_c, i) { return i + 1; }), "]: ").concat(canPlay ? JSON.stringify(__spreadArray(["CARTA"], (play.commands || []), true)) : JSON.stringify(play.commands), "\n"), function (idx, close) { return __awaiter(void 0, void 0, void 0, function () {
+        var selectedCommand;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    selectedCommand = (_a = play.commands) === null || _a === void 0 ? void 0 : _a[Number(idx) - 1];
+                    if (selectedCommand) {
+                        play.say(selectedCommand);
+                        return [2 /*return*/, Promise.resolve()];
+                    }
+                    if (!(idx === "0" && canPlay)) return [3 /*break*/, 2];
+                    close();
+                    return [4 /*yield*/, playCommand(play)()];
+                case 1:
+                    _b.sent();
+                    return [2 /*return*/, Promise.resolve()];
+                case 2: return [2 /*return*/, Promise.reject()];
+            }
+        });
+    }); });
+};
 (function () { return __awaiter(void 0, void 0, void 0, function () {
+    var trucoshi;
     return __generator(this, function (_a) {
-        (0, lib_1.Trucoshi)(["lukini", "guada"], ["denoph", "juli"], 9)
+        trucoshi = (0, lib_1.Trucoshi)();
+        trucoshi.addPlayer("lukini", 0).setReady(true);
+        trucoshi.addPlayer("guada", 0).setReady(true);
+        trucoshi.addPlayer("denoph", 1).setReady(true);
+        trucoshi.addPlayer("juli", 1).setReady(true);
+        trucoshi
+            .startMatch()
+            .onTruco(function (play) { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, sayCommand(play, false)()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); })
             .onTurn(function (play) { return __awaiter(void 0, void 0, void 0, function () {
-            var name, canPlay, sayCommand, playCommand;
-            var _a, _b, _d, _e, _f, _g;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var name;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         name = (_a = play.player) === null || _a === void 0 ? void 0 : _a.id.toUpperCase();
                         console.log("=== Mano ".concat(play.handIdx, " === Ronda ").concat(play.roundIdx, " === Turno de ").concat(name, " ==="));
                         play.teams.map(function (team, id) {
                             return console.log("=== Team ".concat(id, " = ").concat(team.points.malas, " malas ").concat(team.points.buenas, " buenas"));
                         });
-                        canPlay = play.state === types_1.EHandState.WAITING_PLAY;
                         console.log(play.rounds && play.rounds.length
                             ? play.rounds.map(function (round) {
                                 return round.cards.length ? round.cards.map(function (c) { return [c.player.id, c.card]; }) : "";
                             })
                             : "");
-                        sayCommand = command("".concat((_b = play.player) === null || _b === void 0 ? void 0 : _b.id, " elije una accion [").concat(canPlay ? "0," : "").concat((_d = play.commands) === null || _d === void 0 ? void 0 : _d.map(function (_c, i) { return i + 1; }), "]: ").concat(canPlay
-                            ? JSON.stringify(__spreadArray(["CARTA"], (play.commands || []), true))
-                            : JSON.stringify(play.commands), "\n"), function (idx, close) { return __awaiter(void 0, void 0, void 0, function () {
-                            var selectedCommand;
-                            var _a;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        selectedCommand = (_a = play.commands) === null || _a === void 0 ? void 0 : _a[Number(idx) - 1];
-                                        if (selectedCommand) {
-                                            play.say(selectedCommand);
-                                            return [2 /*return*/, Promise.resolve()];
-                                        }
-                                        if (!(idx === "0" && canPlay)) return [3 /*break*/, 2];
-                                        close();
-                                        return [4 /*yield*/, playCommand()];
-                                    case 1:
-                                        _b.sent();
-                                        return [2 /*return*/, Promise.resolve()];
-                                    case 2: return [2 /*return*/, Promise.reject()];
-                                }
-                            });
-                        }); });
-                        playCommand = command("".concat((_e = play.player) === null || _e === void 0 ? void 0 : _e.id, " elije una carta [").concat((_f = play.player) === null || _f === void 0 ? void 0 : _f.hand.map(function (_c, i) { return i + 1; }), "]: ").concat(JSON.stringify((_g = play.player) === null || _g === void 0 ? void 0 : _g.hand), "\n"), function (idx) { return __awaiter(void 0, void 0, void 0, function () {
-                            var playedCard, handString;
-                            var _a;
-                            return __generator(this, function (_b) {
-                                playedCard = play.use(Number(idx) - 1);
-                                if (!playedCard) {
-                                    return [2 /*return*/, Promise.reject()];
-                                }
-                                handString = JSON.stringify((_a = play.player) === null || _a === void 0 ? void 0 : _a.hand);
-                                console.log("\n".concat(handString, "\nUsing ").concat(playedCard));
-                                console.log(play.rounds && play.rounds.length
-                                    ? play.rounds.map(function (round) {
-                                        return round.cards.length ? round.cards.map(function (c) { return [c.player.id, c.card]; }) : "";
-                                    })
-                                    : "");
-                                return [2 /*return*/, Promise.resolve()];
-                            });
-                        }); });
-                        return [4 /*yield*/, sayCommand()];
+                        return [4 /*yield*/, sayCommand(play, true)()];
                     case 1:
-                        _h.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -188,7 +207,7 @@ var command = function (title, onLine) {
                 return [2 /*return*/];
             });
         }); })
-            .start();
+            .begin();
         return [2 /*return*/];
     });
 }); })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "main": "build/lib/trucoshi.js",
   "license": "GPL-3.0",
   "scripts": {
@@ -16,9 +16,10 @@
     "nodemon": "^2.0.20"
   },
   "dependencies": {
-    "socket.io": "^4.5.4",
     "rimraf": "^4.1.1",
+    "socket.io": "^4.5.4",
     "ts-node": "^10.9.1",
+    "tsc": "^2.0.4",
     "typescript": "^4.9.4"
   }
 }