trucoshi 0.2.10 → 0.2.12

package/dist/lib/classes/Lobby.js

@@ -1,113 +1,113 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lobby = void 0;
-const constants_1 = require("../constants");
-const types_1 = require("../../types");
-const GameLoop_1 = require("./GameLoop");
-const Match_1 = require("./Match");
-const Player_1 = require("./Player");
-const Table_1 = require("./Table");
-const Team_1 = require("./Team");
-function Lobby(teamSize) {
-    const lobby = {
-        lastTeamIdx: 1,
-        _players: [],
-        get players() {
-            return lobby._players.filter((player) => Boolean(player && player.id));
-        },
-        teams: [],
-        table: null,
-        maxPlayers: teamSize ? teamSize * 2 : 6,
-        full: false,
-        ready: false,
-        started: false,
-        gameLoop: undefined,
-        calculateReady() {
-            const allPlayersReady = lobby.players.reduce((prev, curr) => Boolean(prev && curr && curr.ready), true);
-            const teamsSameSize = lobby.players.filter((player) => player.teamIdx === 0).length ===
-                lobby.players.filter((player) => player.teamIdx === 1).length;
-            const allTeamsComplete = lobby.players.length % 2 === 0;
-            lobby.ready = allPlayersReady && allTeamsComplete && teamsSameSize;
-            return lobby.ready;
-        },
-        calculateFull() {
-            lobby.full = lobby.players.length >= lobby.maxPlayers;
-            return lobby.full;
-        },
-        addPlayer(key, id, session, teamIdx, isOwner) {
-            const exists = lobby.players.find((player) => player.session === session);
-            if (exists) {
-                if (exists.teamIdx === teamIdx) {
-                    return exists;
-                }
-                isOwner = exists.isOwner;
-                lobby.removePlayer(exists.session);
-            }
-            if (lobby.started) {
-                throw new Error(types_1.GAME_ERROR.MATCH_ALREADY_STARTED);
-            }
-            if (lobby.full) {
-                throw new Error(types_1.GAME_ERROR.LOBBY_IS_FULL);
-            }
-            const maxSize = teamSize ? teamSize : 3;
-            if (lobby.full ||
-                lobby.players.filter((player) => player.teamIdx === teamIdx).length > maxSize) {
-                throw new Error(types_1.GAME_ERROR.TEAM_IS_FULL);
-            }
-            const player = (0, Player_1.Player)(key, id, teamIdx !== undefined ? teamIdx : Number(!lobby.lastTeamIdx), isOwner);
-            player.setSession(session);
-            lobby.lastTeamIdx = Number(!lobby.lastTeamIdx);
-            for (let i = 0; i < lobby._players.length; i++) {
-                if (!lobby._players[i].id) {
-                    if (player.teamIdx === 0 && i % 2 === 0) {
-                        lobby._players[i] = player;
-                        break;
-                    }
-                    if (player.teamIdx === 1 && i % 2 !== 0) {
-                        lobby._players[i] = player;
-                        break;
-                    }
-                }
-            }
-            lobby.calculateFull();
-            lobby.calculateReady();
-            return player;
-        },
-        removePlayer(session) {
-            const idx = lobby._players.findIndex((player) => player && player.session === session);
-            if (idx !== -1) {
-                lobby._players[idx] = {};
-                lobby.calculateFull();
-                lobby.calculateReady();
-            }
-            return lobby;
-        },
-        startMatch(matchPoint = 9) {
-            lobby.calculateReady();
-            const actualTeamSize = lobby.players.length / 2;
-            if (!constants_1.TEAM_SIZE_VALUES.includes(actualTeamSize)) {
-                throw new Error(types_1.GAME_ERROR.UNEXPECTED_TEAM_SIZE);
-            }
-            if (!lobby.ready) {
-                throw new Error(types_1.GAME_ERROR.TEAM_NOT_READY);
-            }
-            lobby.teams = [
-                (0, Team_1.Team)(lobby.players.filter((player) => player.teamIdx === 0)),
-                (0, Team_1.Team)(lobby.players.filter((player) => player.teamIdx === 1)),
-            ];
-            if (lobby.teams[0].players.length !== actualTeamSize ||
-                lobby.teams[1].players.length !== actualTeamSize) {
-                throw new Error(types_1.GAME_ERROR.UNEXPECTED_TEAM_SIZE);
-            }
-            lobby.table = (0, Table_1.Table)(lobby.players, lobby.teams);
-            lobby.gameLoop = (0, GameLoop_1.GameLoop)((0, Match_1.Match)(lobby.table, lobby.teams, matchPoint));
-            lobby.started = true;
-            return lobby.gameLoop;
-        },
-    };
-    for (let i = 0; i < lobby.maxPlayers; i++) {
-        lobby._players.push({});
-    }
-    return lobby;
-}
-exports.Lobby = Lobby;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Lobby = void 0;
+const constants_1 = require("../constants");
+const types_1 = require("../../types");
+const GameLoop_1 = require("./GameLoop");
+const Match_1 = require("./Match");
+const Player_1 = require("./Player");
+const Table_1 = require("./Table");
+const Team_1 = require("./Team");
+function Lobby(teamSize) {
+    const lobby = {
+        lastTeamIdx: 1,
+        _players: [],
+        get players() {
+            return lobby._players.filter((player) => Boolean(player && player.id));
+        },
+        teams: [],
+        table: null,
+        maxPlayers: teamSize ? teamSize * 2 : 6,
+        full: false,
+        ready: false,
+        started: false,
+        gameLoop: undefined,
+        calculateReady() {
+            const allPlayersReady = lobby.players.reduce((prev, curr) => Boolean(prev && curr && curr.ready), true);
+            const teamsSameSize = lobby.players.filter((player) => player.teamIdx === 0).length ===
+                lobby.players.filter((player) => player.teamIdx === 1).length;
+            const allTeamsComplete = lobby.players.length % 2 === 0;
+            lobby.ready = allPlayersReady && allTeamsComplete && teamsSameSize;
+            return lobby.ready;
+        },
+        calculateFull() {
+            lobby.full = lobby.players.length >= lobby.maxPlayers;
+            return lobby.full;
+        },
+        addPlayer(key, id, session, teamIdx, isOwner) {
+            const exists = lobby.players.find((player) => player.session === session);
+            if (exists) {
+                if (exists.teamIdx === teamIdx) {
+                    return exists;
+                }
+                isOwner = exists.isOwner;
+                lobby.removePlayer(exists.session);
+            }
+            if (lobby.started) {
+                throw new Error(types_1.GAME_ERROR.MATCH_ALREADY_STARTED);
+            }
+            if (lobby.full) {
+                throw new Error(types_1.GAME_ERROR.LOBBY_IS_FULL);
+            }
+            const maxSize = teamSize ? teamSize : 3;
+            if (lobby.full ||
+                lobby.players.filter((player) => player.teamIdx === teamIdx).length > maxSize) {
+                throw new Error(types_1.GAME_ERROR.TEAM_IS_FULL);
+            }
+            const player = (0, Player_1.Player)(key, id, teamIdx !== undefined ? teamIdx : Number(!lobby.lastTeamIdx), isOwner);
+            player.setSession(session);
+            lobby.lastTeamIdx = Number(!lobby.lastTeamIdx);
+            for (let i = 0; i < lobby._players.length; i++) {
+                if (!lobby._players[i].id) {
+                    if (player.teamIdx === 0 && i % 2 === 0) {
+                        lobby._players[i] = player;
+                        break;
+                    }
+                    if (player.teamIdx === 1 && i % 2 !== 0) {
+                        lobby._players[i] = player;
+                        break;
+                    }
+                }
+            }
+            lobby.calculateFull();
+            lobby.calculateReady();
+            return player;
+        },
+        removePlayer(session) {
+            const idx = lobby._players.findIndex((player) => player && player.session === session);
+            if (idx !== -1) {
+                lobby._players[idx] = {};
+                lobby.calculateFull();
+                lobby.calculateReady();
+            }
+            return lobby;
+        },
+        startMatch(matchPoint = 9) {
+            lobby.calculateReady();
+            const actualTeamSize = lobby.players.length / 2;
+            if (!constants_1.TEAM_SIZE_VALUES.includes(actualTeamSize)) {
+                throw new Error(types_1.GAME_ERROR.UNEXPECTED_TEAM_SIZE);
+            }
+            if (!lobby.ready) {
+                throw new Error(types_1.GAME_ERROR.TEAM_NOT_READY);
+            }
+            lobby.teams = [
+                (0, Team_1.Team)(lobby.players.filter((player) => player.teamIdx === 0)),
+                (0, Team_1.Team)(lobby.players.filter((player) => player.teamIdx === 1)),
+            ];
+            if (lobby.teams[0].players.length !== actualTeamSize ||
+                lobby.teams[1].players.length !== actualTeamSize) {
+                throw new Error(types_1.GAME_ERROR.UNEXPECTED_TEAM_SIZE);
+            }
+            lobby.table = (0, Table_1.Table)(lobby.players, lobby.teams);
+            lobby.gameLoop = (0, GameLoop_1.GameLoop)((0, Match_1.Match)(lobby.table, lobby.teams, matchPoint));
+            lobby.started = true;
+            return lobby.gameLoop;
+        },
+    };
+    for (let i = 0; i < lobby.maxPlayers; i++) {
+        lobby._players.push({});
+    }
+    return lobby;
+}
+exports.Lobby = Lobby;

package/dist/lib/classes/Match.d.ts

@@ -1,18 +1,20 @@
-import { IHand, IHandPoints } from "./Hand";
-import { IPlayInstance } from "./Play";
-import { ITable } from "./Table";
-import { ITeam } from "./Team";
-export interface IMatch {
-    teams: [ITeam, ITeam];
-    hands: Array<IHand>;
-    winner: ITeam | null;
-    currentHand: IHand | null;
-    table: ITable;
-    play(): IPlayInstance | null;
-    addPoints(points: IHandPoints): [ITeam, ITeam];
-    pushHand(hand: IHand): void;
-    setCurrentHand(hand: IHand | null): IHand | null;
-    setWinner(winner: ITeam): void;
-    getNextTurn(): IteratorResult<IMatch | null, IMatch | null | void>;
-}
-export declare function Match(table: ITable, teams?: Array<ITeam>, matchPoint?: number): IMatch;
+import { IHand, IHandPoints } from "./Hand";
+import { IPlayInstance } from "./Play";
+import { ITable } from "./Table";
+import { ITeam } from "./Team";
+export interface IMatch {
+    teams: [ITeam, ITeam];
+    hands: Array<IHand>;
+    winner: ITeam | null;
+    prevHand: IHand | null;
+    currentHand: IHand | null;
+    table: ITable;
+    play(): IPlayInstance | null;
+    addPoints(points: IHandPoints): [ITeam, ITeam];
+    pushHand(hand: IHand): void;
+    setPrevHand(hand: IHand | null): IHand | null;
+    setCurrentHand(hand: IHand | null): IHand | null;
+    setWinner(winner: ITeam): void;
+    getNextTurn(): IteratorResult<IMatch | null, IMatch | null | void>;
+}
+export declare function Match(table: ITable, teams?: Array<ITeam>, matchPoint?: number): IMatch;

package/dist/lib/classes/Match.js

@@ -1,81 +1,87 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Match = void 0;
-const Deck_1 = require("./Deck");
-const Hand_1 = require("./Hand");
-const playerIsNotReady = (player) => !player.ready;
-function Match(table, teams = [], matchPoint = 9) {
-    const deck = (0, Deck_1.Deck)().shuffle();
-    const size = teams[0].players.length;
-    if (size !== teams[1].players.length) {
-        throw new Error("Team size mismatch");
-    }
-    function* handsGeneratorSequence() {
-        while (!match.winner) {
-            if (match.teams[0].players.every(playerIsNotReady)) {
-                match.setWinner(match.teams[1]);
-                break;
-            }
-            if (match.teams[1].players.every(playerIsNotReady)) {
-                match.setWinner(match.teams[0]);
-                break;
-            }
-            deck.shuffle();
-            const hand = match.setCurrentHand((0, Hand_1.Hand)(match, deck, match.hands.length + 1));
-            match.pushHand(hand);
-            while (!hand.finished()) {
-                const { value } = hand.getNextPlayer();
-                if (value && value.finished()) {
-                    continue;
-                }
-                match.setCurrentHand(value);
-                yield match;
-            }
-            match.setCurrentHand(null);
-            const teams = match.addPoints(hand.points);
-            const winner = teams.find((team) => team.points.winner);
-            if (winner) {
-                match.setWinner(winner);
-                match.setCurrentHand(null);
-                break;
-            }
-            match.table.nextTurn();
-        }
-        yield match;
-    }
-    const handsGenerator = handsGeneratorSequence();
-    const match = {
-        winner: null,
-        teams: teams,
-        hands: [],
-        table,
-        currentHand: null,
-        play() {
-            match.getNextTurn();
-            if (!match.currentHand) {
-                return null;
-            }
-            return match.currentHand.play();
-        },
-        addPoints(points) {
-            match.teams[0].addPoints(matchPoint, points[0]);
-            match.teams[1].addPoints(matchPoint, points[1]);
-            return match.teams;
-        },
-        pushHand(hand) {
-            match.hands.push(hand);
-        },
-        setCurrentHand(hand) {
-            match.currentHand = hand;
-            return match.currentHand;
-        },
-        setWinner(winner) {
-            match.winner = winner;
-        },
-        getNextTurn() {
-            return handsGenerator.next();
-        },
-    };
-    return match;
-}
-exports.Match = Match;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Match = void 0;
+const Deck_1 = require("./Deck");
+const Hand_1 = require("./Hand");
+const playerIsNotReady = (player) => !player.ready;
+function Match(table, teams = [], matchPoint = 9) {
+    const deck = (0, Deck_1.Deck)().shuffle();
+    const size = teams[0].players.length;
+    if (size !== teams[1].players.length) {
+        throw new Error("Team size mismatch");
+    }
+    function* handsGeneratorSequence() {
+        while (!match.winner) {
+            if (match.teams[0].players.every(playerIsNotReady)) {
+                match.setWinner(match.teams[1]);
+                break;
+            }
+            if (match.teams[1].players.every(playerIsNotReady)) {
+                match.setWinner(match.teams[0]);
+                break;
+            }
+            deck.shuffle();
+            const hand = match.setCurrentHand((0, Hand_1.Hand)(match, deck, match.hands.length + 1));
+            match.setPrevHand(match.hands.at(-1) || null);
+            match.pushHand(hand);
+            while (!hand.finished()) {
+                const { value } = hand.getNextPlayer();
+                if (value && value.finished()) {
+                    continue;
+                }
+                match.setCurrentHand(value);
+                yield match;
+            }
+            match.setCurrentHand(null);
+            const teams = match.addPoints(hand.points);
+            const winner = teams.find((team) => team.points.winner);
+            if (winner) {
+                match.setWinner(winner);
+                match.setCurrentHand(null);
+                break;
+            }
+            match.table.nextTurn();
+        }
+        yield match;
+    }
+    const handsGenerator = handsGeneratorSequence();
+    const match = {
+        winner: null,
+        teams: teams,
+        hands: [],
+        table,
+        prevHand: null,
+        currentHand: null,
+        play() {
+            match.getNextTurn();
+            if (!match.currentHand) {
+                return null;
+            }
+            return match.currentHand.play(match.prevHand);
+        },
+        addPoints(points) {
+            match.teams[0].addPoints(matchPoint, points[0]);
+            match.teams[1].addPoints(matchPoint, points[1]);
+            return match.teams;
+        },
+        pushHand(hand) {
+            match.hands.push(hand);
+        },
+        setCurrentHand(hand) {
+            match.currentHand = hand;
+            return match.currentHand;
+        },
+        setPrevHand(hand) {
+            match.prevHand = hand;
+            return match.prevHand;
+        },
+        setWinner(winner) {
+            match.winner = winner;
+        },
+        getNextTurn() {
+            return handsGenerator.next();
+        },
+    };
+    return match;
+}
+exports.Match = Match;

package/dist/lib/classes/Play.d.ts

@@ -1,20 +1,21 @@
-import { ECommand, EHandState, EnvidoState } from "../../types";
-import { ICard } from "./Deck";
-import { IHand } from "./Hand";
-import { IPlayer } from "./Player";
-import { IRound } from "./Round";
-import { ITeam } from "./Team";
-import { ITruco } from "./Truco";
-export interface IPlayInstance {
-    teams: [ITeam, ITeam];
-    handIdx: number;
-    roundIdx: number;
-    state: EHandState;
-    truco: ITruco;
-    envido: EnvidoState;
-    player: IPlayer | null;
-    rounds: Array<IRound> | null;
-    use(idx: number, card: ICard): ICard | null;
-    say(command: ECommand, player: IPlayer): ECommand | null;
-}
-export declare function PlayInstance(hand: IHand, teams: [ITeam, ITeam]): IPlayInstance;
+import { ECommand, EHandState, EnvidoState } from "../../types";
+import { ICard } from "./Deck";
+import { IHand } from "./Hand";
+import { IPlayer } from "./Player";
+import { IRound } from "./Round";
+import { ITeam } from "./Team";
+import { ITruco } from "./Truco";
+export interface IPlayInstance {
+    teams: [ITeam, ITeam];
+    handIdx: number;
+    roundIdx: number;
+    state: EHandState;
+    truco: ITruco;
+    envido: EnvidoState;
+    player: IPlayer | null;
+    rounds: Array<IRound> | null;
+    prevHand: IHand | null;
+    use(idx: number, card: ICard): ICard | null;
+    say(command: ECommand, player: IPlayer): ECommand | null;
+}
+export declare function PlayInstance(hand: IHand, prevHand: IHand | null, teams: [ITeam, ITeam]): IPlayInstance;

package/dist/lib/classes/Play.js

@@ -1,26 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlayInstance = void 0;
-const types_1 = require("../../types");
-function PlayInstance(hand, teams) {
-    const instance = {
-        state: hand.state,
-        teams,
-        truco: hand.truco,
-        envido: hand.envido,
-        handIdx: hand.idx,
-        roundIdx: hand.rounds.length,
-        player: hand.currentPlayer,
-        rounds: hand.rounds,
-        use(idx, card) {
-            return hand.use(idx, card);
-        },
-        say(command, player) {
-            hand.commands[command](player);
-            return command;
-        },
-    };
-    teams.forEach((team) => team.players.forEach((player) => player._commands.add(types_1.ESayCommand.MAZO)));
-    return instance;
-}
-exports.PlayInstance = PlayInstance;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlayInstance = void 0;
+const types_1 = require("../../types");
+function PlayInstance(hand, prevHand, teams) {
+    const instance = {
+        state: hand.state,
+        teams,
+        truco: hand.truco,
+        envido: hand.envido,
+        handIdx: hand.idx,
+        roundIdx: hand.rounds.length,
+        player: hand.currentPlayer,
+        rounds: hand.rounds,
+        prevHand: prevHand && !hand.started && !hand.truco.waitingAnswer ? prevHand : null,
+        use(idx, card) {
+            return hand.use(idx, card);
+        },
+        say(command, player) {
+            hand.commands[command](player);
+            return command;
+        },
+    };
+    if (!hand.truco.waitingAnswer) {
+        teams.forEach((team) => team.players.forEach((player) => player._commands.add(types_1.ESayCommand.MAZO)));
+    }
+    return instance;
+}
+exports.PlayInstance = PlayInstance;

package/dist/lib/classes/Player.d.ts

@@ -1,32 +1,32 @@
-import { ECommand } from "../../types";
-import { ICard } from "./Deck";
-export interface IPlayer {
-    teamIdx: number;
-    id: string;
-    key: string;
-    session?: string;
-    hand: Array<ICard>;
-    _commands: Set<ECommand>;
-    get commands(): Array<ECommand>;
-    usedHand: Array<ICard>;
-    prevHand: Array<ICard>;
-    isTurn: boolean;
-    isOwner: boolean;
-    disabled: boolean;
-    ready: boolean;
-    connected: boolean;
-    setTurn(turn: boolean): void;
-    getPublicPlayer(): IPublicPlayer;
-    setSession(session: string): void;
-    enable(): void;
-    disable(): void;
-    setConnected(connected: boolean): void;
-    setOwner(owner: boolean): void;
-    setReady(ready: boolean): void;
-    setHand(hand: Array<ICard>): Array<ICard>;
-    useCard(idx: number, card: ICard): ICard | null;
-}
-export type IPublicPlayer = Pick<IPlayer, "id" | "key" | "disabled" | "ready" | "connected" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn" | "isOwner"> & {
-    commands: Array<ECommand>;
-};
-export declare function Player(key: string, id: string, teamIdx: number, isOwner?: boolean): IPlayer;
+import { ECommand } from "../../types";
+import { ICard } from "./Deck";
+export interface IPlayer {
+    teamIdx: number;
+    id: string;
+    key: string;
+    session?: string;
+    hand: Array<ICard>;
+    _commands: Set<ECommand>;
+    get commands(): Array<ECommand>;
+    usedHand: Array<ICard>;
+    prevHand: Array<ICard>;
+    isTurn: boolean;
+    isOwner: boolean;
+    disabled: boolean;
+    ready: boolean;
+    connected: boolean;
+    setTurn(turn: boolean): void;
+    getPublicPlayer(): IPublicPlayer;
+    setSession(session: string): void;
+    enable(): void;
+    disable(): void;
+    setConnected(connected: boolean): void;
+    setOwner(owner: boolean): void;
+    setReady(ready: boolean): void;
+    setHand(hand: Array<ICard>): Array<ICard>;
+    useCard(idx: number, card: ICard): ICard | null;
+}
+export type IPublicPlayer = Pick<IPlayer, "id" | "key" | "disabled" | "ready" | "connected" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn" | "isOwner"> & {
+    commands: Array<ECommand>;
+};
+export declare function Player(key: string, id: string, teamIdx: number, isOwner?: boolean): IPlayer;