trucoshi 0.0.19 → 0.0.21

package/dist/lib/classes/Hand.js

@@ -172,16 +172,16 @@ function Hand(match, deck, idx) {
         play: function () {
             return (0, Play_1.PlayInstance)(hand, match.teams);
         },
-        use: function (idx) {
+        use: function (idx, card) {
             var player = hand.currentPlayer;
             var round = hand.currentRound;
             if (!player || !round) {
                 return null;
             }
-            var card = player.useCard(idx);
-            if (card) {
+            var playerCard = player.useCard(idx, card);
+            if (playerCard) {
                 hand.nextTurn();
-                return round.use((0, Deck_1.PlayedCard)(player, card));
+                return round.use((0, Deck_1.PlayedCard)(player, playerCard));
             }
             return null;
         },

package/dist/lib/classes/Play.js

@@ -14,8 +14,8 @@ function PlayInstance(hand, teams) {
         player: hand.currentPlayer,
         commands: [],
         rounds: hand.rounds,
-        use: function (idx) {
-            return hand.use(idx);
+        use: function (idx, card) {
+            return hand.use(idx, card);
         },
         say: function (command) {
             var _a;

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)) {
@@ -21,6 +32,9 @@ function Player(id, teamIdx) {
         prevHand: [],
         disabled: false,
         ready: false,
+        getPublicPlayer: function () {
+            return __assign(__assign({}, player), { hand: player.hand.map(function () { return "xx"; }), session: undefined });
+        },
         setSession: function (session) {
             player.session = session;
         },
@@ -39,11 +53,11 @@ function Player(id, teamIdx) {
             player.usedHand = [];
             return hand;
         },
-        useCard: function (idx) {
-            if (player.hand[idx]) {
-                var card = player.hand.splice(idx, 1)[0];
-                player.usedHand.push(card);
-                return card;
+        useCard: function (idx, card) {
+            if (player.hand[idx] && player.hand[idx] === card) {
+                var card_1 = player.hand.splice(idx, 1)[0];
+                player.usedHand.push(card_1);
+                return card_1;
             }
             return null;
         },

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/types.d.ts

@@ -23,20 +23,22 @@ export interface IPlayer {
     prevHand: Array<ICard>;
     disabled: boolean;
     ready: boolean;
+    getPublicPlayer(): IPlayer;
     setSession(session: string): void;
     enable(): void;
     disable(): void;
     setReady(ready: boolean): void;
     setHand(hand: Array<ICard>): Array<ICard>;
-    useCard(idx: number): ICard | null;
+    useCard(idx: number, card: ICard): ICard | null;
 }
 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 +47,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;
@@ -111,7 +113,7 @@ export interface IPlayInstance {
     player: IPlayer | null;
     commands: Array<ECommand> | null;
     rounds: Array<IRound> | null;
-    use(idx: number): ICard | null;
+    use(idx: number, card: ICard): ICard | null;
     say(command: ECommand): ECommand | null;
 }
 export declare enum EHandState {
@@ -127,7 +129,7 @@ export interface IHand {
     idx: number;
     state: EHandState;
     turn: number;
-    points: HandPoints;
+    points: IHandPoints;
     truco: ITruco;
     envido: EnvidoState;
     rounds: Array<IRound>;
@@ -139,7 +141,7 @@ export interface IHand {
     finished: () => boolean;
     play(): IPlayInstance | null;
     nextTurn(): void;
-    use(idx: number): ICard | null;
+    use(idx: number, card: ICard): ICard | null;
     pushRound(round: IRound): IRound;
     setTurn(turn: number): IPlayer;
     addPoints(team: 0 | 1, points: number): void;

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

@@ -82,6 +82,15 @@ var getTable = function (matchSessionId) {
 io.on("connection", function (_socket) {
     var socket = _socket;
     console.log("New socket", socket.id);
+    socket.on("disconnect", function (_reason) {
+        try {
+            var user = getUser(socket.session);
+            user.matchSocketIds.forEach(function (sockets) { return sockets.delete(socket.id); });
+        }
+        catch (e) {
+            console.error(e);
+        }
+    });
     var getTableSockets = function (table, callback) {
         return new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
             var sockets, _i, sockets_1, playerSocket;
@@ -158,43 +167,43 @@ io.on("connection", function (_socket) {
         callback({ success: false, error: new Error("Can't create match without an ID") });
     });
     var sendWaitingForPlay = function (table, play) { return __awaiter(void 0, void 0, void 0, function () {
+        var player, sock;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, getTableSockets(table, function (playerSocket) {
-                        return new Promise(function (resolve) {
-                            var _a;
+            player = null;
+            sock = null;
+            return [2 /*return*/, new Promise(function (resolve, reject) {
+                    return getTableSockets(table, function (playerSocket) { return __awaiter(void 0, void 0, void 0, function () {
+                        var _a;
+                        return __generator(this, function (_b) {
                             if (playerSocket.session && playerSocket.session === ((_a = play.player) === null || _a === void 0 ? void 0 : _a.session)) {
+                                sock = playerSocket.id;
+                                player = play.player;
                                 playerSocket.emit(types_1.EServerEvent.WAITING_PLAY, table.getPublicMatch(playerSocket.session), function (data) {
                                     if (!data) {
-                                        return;
+                                        return reject(new Error("Callback returned empty"));
                                     }
-                                    var cardIdx = data.cardIdx, command = data.command;
-                                    if (cardIdx !== undefined) {
-                                        var playedCard = play.use(cardIdx);
+                                    var cardIdx = data.cardIdx, card = data.card, command = data.command;
+                                    if (cardIdx !== undefined && card) {
+                                        var playedCard = play.use(cardIdx, card);
                                         if (playedCard) {
                                             return resolve();
                                         }
-                                        return console.error("ERROR", new Error("Couldnt play card"));
+                                        return reject(new Error("Invalid Card"));
                                     }
                                     if (command) {
                                         var saidCommand = play.say(command);
                                         if (saidCommand) {
                                             return resolve();
                                         }
-                                        return console.error("ERROR", new Error("Couldnt say command"));
+                                        return reject(new Error("Invalid Command"));
                                     }
-                                    return console.error("ERROR", new Error("Play callback didn't have data"));
+                                    return reject(new Error("Invalid Callback response"));
                                 });
                             }
-                            else {
-                                resolve();
-                            }
+                            return [2 /*return*/];
                         });
-                    })];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
+                    }); });
+                })];
         });
     }); };
     var startMatch = function (tableId) { return __awaiter(void 0, void 0, void 0, function () {
@@ -207,7 +216,7 @@ io.on("connection", function (_socket) {
                         .startMatch()
                         .onTurn(function (play) {
                         return new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
-                            var session, user, e_1;
+                            var session, user, e_1, e_2;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
@@ -216,7 +225,7 @@ io.on("connection", function (_socket) {
                                         turns.set(table_1.matchSessionId, { play: play, resolve: resolve });
                                         _b.label = 1;
                                     case 1:
-                                        _b.trys.push([1, 4, , 5]);
+                                        _b.trys.push([1, 7, , 8]);
                                         session = (_a = play.player) === null || _a === void 0 ? void 0 : _a.session;
                                         if (!session || !play) {
                                             throw new Error("Unexpected Error");
@@ -228,15 +237,23 @@ io.on("connection", function (_socket) {
                                         return [4 /*yield*/, emitMatchUpdate(table_1)];
                                     case 2:
                                         _b.sent();
-                                        return [4 /*yield*/, sendWaitingForPlay(table_1, play)];
+                                        _b.label = 3;
                                     case 3:
-                                        _b.sent();
-                                        return [2 /*return*/, resolve()];
+                                        _b.trys.push([3, 5, , 6]);
+                                        return [4 /*yield*/, sendWaitingForPlay(table_1, play)];
                                     case 4:
+                                        _b.sent();
+                                        return [3 /*break*/, 6];
+                                    case 5:
                                         e_1 = _b.sent();
-                                        console.error("ERROR", e_1);
-                                        return [3 /*break*/, 5];
-                                    case 5: return [2 /*return*/];
+                                        console.error(e_1);
+                                        return [2 /*return*/];
+                                    case 6: return [2 /*return*/, resolve()];
+                                    case 7:
+                                        e_2 = _b.sent();
+                                        console.error("ERROR", e_2);
+                                        return [3 /*break*/, 8];
+                                    case 8: return [2 /*return*/];
                                 }
                             });
                         }); });
@@ -267,7 +284,12 @@ io.on("connection", function (_socket) {
         }
     });
     var addSocketToUser = function (session, socketId, table) {
+        var _a;
         var user = getUser(session);
+        var socketIds = (_a = user.matchSocketIds) === null || _a === void 0 ? void 0 : _a.get(table.matchSessionId);
+        if (socketIds && socketIds.has(socketId)) {
+            return;
+        }
         console.log("User got new match socket", { socketId: socketId, session: session, matchId: table.matchSessionId });
         var currentMatchSockets = user.matchSocketIds.has(table.matchSessionId)
             ? user.matchSocketIds.get(table.matchSessionId)
@@ -331,7 +353,7 @@ io.on("connection", function (_socket) {
                         if (!play) {
                             throw new Error("Unexpected Error");
                         }
-                        sendWaitingForPlay(currentTable, play).then(resolve);
+                        sendWaitingForPlay(currentTable, play).then(resolve).catch(console.error);
                     }
                     catch (e) {
                         console.error("ERROR", e);

package/dist/server/types.d.ts

@@ -1,5 +1,5 @@
 import { Socket } from "socket.io";
-import { ECommand } from "../lib/types";
+import { ECommand, ICard } from "../lib/types";
 export declare enum EClientEvent {
     PING = "PING",
     PLAY = "PLAY",
@@ -25,9 +25,11 @@ export declare enum ETrucoshiMatchState {
 }
 export type IWaitingPlayData = {
     cardIdx: number;
+    card: ICard;
     command?: undefined;
 } | {
     cardIdx?: undefined;
+    card?: undefined;
     command: ECommand;
 };
 export type IWaitingPlayCallback = (data: IWaitingPlayData) => void | null;

package/dist/test/autoplay.js

@@ -68,7 +68,7 @@ var lib_1 = require("../lib");
                     : "");
                 randomIdx = Math.round(Math.random() * (play.player.hand.length - 1));
                 handString = JSON.stringify(play.player.hand);
-                card = play.use(randomIdx);
+                card = play.use(randomIdx, play.player.hand[randomIdx]);
                 console.log("\n".concat(handString, "\nUsing ").concat(card));
                 console.log(play.rounds && play.rounds.length
                     ? play.rounds.map(function (round) {

package/dist/test/play.js

@@ -113,14 +113,15 @@ var command = function (title, onLine) {
 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);
+        var card, playedCard, handString;
+        var _a, _b;
+        return __generator(this, function (_d) {
+            card = (_a = play.player) === null || _a === void 0 ? void 0 : _a.hand[Number(idx) - 1];
+            playedCard = play.use(Number(idx) - 1, card);
             if (!playedCard) {
                 return [2 /*return*/, Promise.reject()];
             }
-            handString = JSON.stringify((_a = play.player) === null || _a === void 0 ? void 0 : _a.hand);
+            handString = JSON.stringify((_b = play.player) === null || _b === void 0 ? void 0 : _b.hand);
             console.log("\n".concat(handString, "\nUsing ").concat(playedCard));
             console.log(play.rounds && play.rounds.length
                 ? play.rounds.map(function (round) {

package/package.json

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