trucoshi 0.0.20 → 0.0.22

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

@@ -1,3 +1,3 @@
 import { IPlayer } from "../types";
-export type IPublicPlayer = Pick<IPlayer, "id" | "disabled" | "ready" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session">;
+export type IPublicPlayer = Pick<IPlayer, "id" | "disabled" | "ready" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn">;
 export declare function Player(id: string, teamIdx: number): IPlayer;

package/dist/lib/classes/Player.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -19,8 +30,15 @@ function Player(id, teamIdx) {
         commands: [],
         usedHand: [],
         prevHand: [],
+        isTurn: false,
         disabled: false,
         ready: false,
+        setTurn: function (turn) {
+            player.isTurn = turn;
+        },
+        getPublicPlayer: function () {
+            return __assign(__assign({}, player), { hand: player.hand.map(function () { return "xx"; }), session: undefined });
+        },
         setSession: function (session) {
             player.session = session;
         },

package/dist/lib/classes/Team.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Team = void 0;
 function Team(players) {
@@ -12,6 +23,11 @@ function Team(players) {
             malas: 0,
             winner: false,
         },
+        getPublicTeam: function (playerSession) {
+            return __assign(__assign({}, team), { players: team.players.map(function (player) {
+                    return player.session === playerSession ? player : player.getPublicPlayer();
+                }) });
+        },
         isTeamDisabled: function () {
             return team.players.reduce(function (prev, curr) { return prev && curr.disabled; }, true);
         },

package/dist/lib/index.js

@@ -85,9 +85,11 @@ var GameLoop = function (match) {
                             return [3 /*break*/, 1];
                         case 3:
                             if (!(play.state === types_1.EHandState.WAITING_PLAY)) return [3 /*break*/, 5];
+                            play.player.setTurn(true);
                             return [4 /*yield*/, gameloop._onTurn(play)];
                         case 4:
                             _a.sent();
+                            play.player.setTurn(false);
                             return [3 /*break*/, 1];
                         case 5: return [3 /*break*/, 1];
                         case 6:

package/dist/lib/types.d.ts

@@ -21,8 +21,11 @@ export interface IPlayer {
     commands: Array<ECommand>;
     usedHand: Array<ICard>;
     prevHand: Array<ICard>;
+    isTurn: boolean;
     disabled: boolean;
     ready: boolean;
+    setTurn(turn: boolean): void;
+    getPublicPlayer(): IPlayer;
     setSession(session: string): void;
     enable(): void;
     disable(): void;
@@ -33,10 +36,11 @@ export interface IPlayer {
 export interface ITeam {
     _players: Map<string, IPlayer>;
     players: Array<IPlayer>;
-    points: TeamPoints;
+    points: ITeamPoints;
+    getPublicTeam(playerSession?: string): ITeam;
     isTeamDisabled(): boolean;
     disable(player: IPlayer): boolean;
-    addPoints(matchPoint: number, points: number): TeamPoints;
+    addPoints(matchPoint: number, points: number): ITeamPoints;
 }
 export interface IMatch {
     teams: [ITeam, ITeam];
@@ -45,22 +49,22 @@ export interface IMatch {
     currentHand: IHand | null;
     table: ITable;
     play(): IPlayInstance | null;
-    addPoints(points: HandPoints): [ITeam, ITeam];
+    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 interface TeamPoints {
+export interface ITeamPoints {
     buenas: number;
     malas: number;
     winner: boolean;
 }
-export interface HandPoints {
+export interface IHandPoints {
     0: number;
     1: number;
 }
-export interface RoundPoints {
+export interface IRoundPoints {
     0: number;
     1: number;
     ties: number;
@@ -127,7 +131,7 @@ export interface IHand {
     idx: number;
     state: EHandState;
     turn: number;
-    points: HandPoints;
+    points: IHandPoints;
     truco: ITruco;
     envido: EnvidoState;
     rounds: Array<IRound>;

package/dist/server/classes/MatchTable.d.ts

@@ -1,7 +1,8 @@
 import { IPublicPlayer } from "../../lib/classes/Player";
 import { IPublicTeam } from "../../lib/classes/Team";
-import { ILobby, IPlayedCard, ITeam } from "../../lib/types";
+import { IHandPoints, ILobby, IPlayedCard, ITeam } from "../../lib/types";
 export interface IPublicMatch {
+    state: EMatchTableState;
     winner: ITeam | null;
     matchSessionId: string;
     teams: Array<IPublicTeam>;
@@ -9,7 +10,7 @@ export interface IPublicMatch {
     me: IPublicPlayer;
     rounds: IPlayedCard[][];
     prevRounds: IPlayedCard[][] | null;
-    state: EMatchTableState;
+    prevHandPoints?: IHandPoints | null;
 }
 export interface IMatchTable {
     matchSessionId: string;

package/dist/server/classes/MatchTable.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MatchTable = exports.EMatchTableState = void 0;
 var lib_1 = require("../../lib");
@@ -48,34 +37,38 @@ function MatchTable(matchSessionId, teamSize) {
             return search || null;
         },
         getPublicMatch: function (userSession) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             var lobby = matchTable.lobby;
             var winner = ((_a = lobby.gameLoop) === null || _a === void 0 ? void 0 : _a.winner) || null;
             var lastHandIdx = (((_b = lobby.gameLoop) === null || _b === void 0 ? void 0 : _b.hands.length) || 1) - 1;
             var rounds = ((_d = (_c = lobby.gameLoop) === null || _c === void 0 ? void 0 : _c.hands[lastHandIdx]) === null || _d === void 0 ? void 0 : _d.rounds.map(function (round) { return round.cards; })) || [];
             var prevHandIdx = lastHandIdx - 1;
-            var prevRounds = prevHandIdx !== -1 && rounds[0].length === 0
-                ? (_f = (_e = lobby.gameLoop) === null || _e === void 0 ? void 0 : _e.hands[prevHandIdx]) === null || _f === void 0 ? void 0 : _f.rounds.map(function (round) { return round.cards; })
+            var hasPrevHand = prevHandIdx !== -1;
+            var newHandNotStarted = ((_e = rounds[0]) === null || _e === void 0 ? void 0 : _e.length) === 0;
+            var prevRounds = hasPrevHand && newHandNotStarted
+                ? (_g = (_f = lobby.gameLoop) === null || _f === void 0 ? void 0 : _f.hands[prevHandIdx]) === null || _g === void 0 ? void 0 : _g.rounds.map(function (round) { return round.cards; })
                 : null;
+            var prevHandPoints = prevRounds && ((_j = (_h = lobby.gameLoop) === null || _h === void 0 ? void 0 : _h.hands[prevHandIdx]) === null || _j === void 0 ? void 0 : _j.points);
             var players = lobby.players.filter(function (player) { return Boolean(player); });
             var currentPlayerIdx = players.findIndex(function (player) { return player && player.session === userSession; });
             var me = players[currentPlayerIdx];
             var cut = players.slice(currentPlayerIdx, players.length);
             var end = players.slice(0, currentPlayerIdx);
-            var publicPlayers = cut.concat(end).map(function (player) {
-                return (player === null || player === void 0 ? void 0 : player.session) === userSession
-                    ? player
-                    : __assign(__assign({}, player), { session: undefined, hand: player === null || player === void 0 ? void 0 : player.hand.map(function () { return "xx"; }) });
-            });
+            var publicPlayers = cut
+                .concat(end)
+                .map(function (player) { return ((player === null || player === void 0 ? void 0 : player.session) === userSession ? player : player.getPublicPlayer()); });
+            var teams = ((_k = lobby.gameLoop) === null || _k === void 0 ? void 0 : _k.teams) || lobby.teams;
+            var publicTeams = teams.map(function (team) { return team.getPublicTeam(userSession); });
             return {
                 me: me,
                 winner: winner,
                 matchSessionId: matchTable.matchSessionId,
                 state: matchTable.state(),
-                teams: [],
+                teams: publicTeams,
                 players: publicPlayers,
                 rounds: rounds || [[]],
                 prevRounds: prevRounds || null,
+                prevHandPoints: prevHandPoints,
             };
         },
     };

package/dist/server/index.js

@@ -344,10 +344,10 @@ io.on("connection", function (_socket) {
             users.set(session, updatedUser);
             socket.session = session;
             var currentTable = currentMatchId ? tables.get(currentMatchId) : null;
-            if (currentTable && currentTable.isSessionPlaying(session)) {
+            if (currentTable) {
                 addSocketToUser(session, socket.id, currentTable);
                 socket.join(currentTable.matchSessionId);
-                if (session === ((_a = currentTable.currentPlayer) === null || _a === void 0 ? void 0 : _a.session)) {
+                if (currentTable.isSessionPlaying(session) && session === ((_a = currentTable.currentPlayer) === null || _a === void 0 ? void 0 : _a.session)) {
                     try {
                         var _b = turns.get(currentTable.matchSessionId) || {}, play = _b.play, resolve = _b.resolve;
                         if (!play) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "main": "build/lib/trucoshi.js",
   "license": "GPL-3.0",
   "scripts": {