trucoshi 0.0.16 → 0.0.17

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

@@ -1,2 +1,3 @@
-import { IDeck } from "../types";
+import { ICard, IDeck, IPlayedCard, IPlayer } from "../types";
 export declare function Deck(): IDeck;
+export declare function PlayedCard(player: IPlayer, card: ICard): IPlayedCard;

package/dist/lib/classes/Deck.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Deck = void 0;
+exports.PlayedCard = exports.Deck = void 0;
 var constants_1 = require("../constants");
 var utils_1 = require("../utils");
 function Deck() {
@@ -25,3 +25,14 @@ function Deck() {
     return deck;
 }
 exports.Deck = Deck;
+function PlayedCard(player, card) {
+    var pc = {
+        player: player,
+        card: card,
+        get key() {
+            return card + player.session;
+        },
+    };
+    return pc;
+}
+exports.PlayedCard = PlayedCard;

package/dist/lib/classes/Hand.js

@@ -30,6 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hand = void 0;
 var types_1 = require("../types");
 var utils_1 = require("../utils");
+var Deck_1 = require("./Deck");
 var Play_1 = require("./Play");
 var Round_1 = require("./Round");
 var Truco_1 = require("./Truco");
@@ -72,7 +73,6 @@ function Hand(match, deck, idx) {
                     if (!(hand.state === types_1.EHandState.WAITING_FOR_TRUCO_ANSWER)) return [3 /*break*/, 6];
                     value = hand.truco.getNextPlayer().value;
                     if (!(value && value.currentPlayer)) return [3 /*break*/, 5];
-                    console.log({ value: value.currentPlayer });
                     hand.setCurrentPlayer(value.currentPlayer);
                     return [4 /*yield*/, hand];
                 case 4:
@@ -181,7 +181,7 @@ function Hand(match, deck, idx) {
             var card = player.useCard(idx);
             if (card) {
                 hand.nextTurn();
-                return round.use({ player: player, card: card });
+                return round.use((0, Deck_1.PlayedCard)(player, card));
             }
             return null;
         },

package/dist/lib/classes/Round.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Round = void 0;
 var utils_1 = require("../utils");
+var Deck_1 = require("./Deck");
 function Round(turn) {
     var round = {
         turn: turn,
@@ -24,7 +25,7 @@ function Round(turn) {
                 round.highest = value;
                 round.winner = player;
             }
-            round.cards.push({ card: card, player: player });
+            round.cards.push((0, Deck_1.PlayedCard)(player, card));
             return card;
         },
     };

package/dist/lib/types.d.ts

@@ -9,6 +9,7 @@ export interface IDeck {
     shuffle(): IDeck;
 }
 export interface IPlayedCard {
+    get key(): string;
     player: IPlayer & IPublicPlayer;
     card: ICard;
 }

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

@@ -2,6 +2,7 @@ import { IPublicPlayer } from "../../lib/classes/Player";
 import { IPublicTeam } from "../../lib/classes/Team";
 import { ILobby, IPlayedCard } from "../../lib/types";
 export interface IPublicMatch {
+    matchSessionId: string;
     teams: Array<IPublicTeam>;
     players: Array<IPublicPlayer>;
     rounds: IPlayedCard[][];

package/dist/server/classes/MatchTable.js

@@ -42,7 +42,7 @@ function MatchTable(matchSessionId, teamSize) {
             var lastHand = (((_a = lobby.gameLoop) === null || _a === void 0 ? void 0 : _a.hands.length) || 1) - 1;
             var rounds = (_c = (_b = lobby.gameLoop) === null || _b === void 0 ? void 0 : _b.hands[lastHand]) === null || _c === void 0 ? void 0 : _c.rounds.map(function (round) { return round.cards; });
             return {
-                matchSessionId: matchSessionId,
+                matchSessionId: matchTable.matchSessionId,
                 state: matchTable.state,
                 teams: [],
                 players: lobby.players.map(function (player) {

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

@@ -1,5 +1,5 @@
 export interface IUser {
     id: string;
-    socketId: string;
+    matchSocketIds: Map<string, Set<string>>;
 }
-export declare function User(id: string, socketId: string): IUser;
+export declare function User(id: string): IUser;

package/dist/server/classes/User.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
-function User(id, socketId) {
+function User(id) {
     var user = {
         id: id,
-        socketId: socketId,
+        matchSocketIds: new Map()
     };
     return user;
 }

package/dist/server/index.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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -69,9 +80,10 @@ var getTable = function (matchSessionId) {
 };
 io.on("connection", function (_socket) {
     var socket = _socket;
+    console.log("New socket", socket.id);
     var getTableSockets = function (table, callback) {
         return new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
-            var sockets, _i, sockets_1, socket_1;
+            var sockets, _i, sockets_1, playerSocket;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, io.sockets.adapter.fetchSockets({
@@ -83,8 +95,8 @@ io.on("connection", function (_socket) {
                         _a.label = 2;
                     case 2:
                         if (!(_i < sockets_1.length)) return [3 /*break*/, 5];
-                        socket_1 = sockets_1[_i];
-                        return [4 /*yield*/, callback(socket_1)];
+                        playerSocket = sockets_1[_i];
+                        return [4 /*yield*/, callback(playerSocket)];
                     case 3:
                         _a.sent();
                         _a.label = 4;
@@ -98,14 +110,21 @@ io.on("connection", function (_socket) {
             });
         }); });
     };
-    var emitMatchUpdate = function (table) {
-        table.lobby.players.map(function (player) {
-            var user = users.get(player.session);
-            if (user && user.socketId) {
-                io.to(user.socketId).emit(types_1.EServerEvent.UPDATE_MATCH, table.getPublicMatch(player.session));
+    var emitMatchUpdate = function (table) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getTableSockets(table, function (playerSocket) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            playerSocket.emit(types_1.EServerEvent.UPDATE_MATCH, table.getPublicMatch(playerSocket.session));
+                            return [2 /*return*/];
+                        });
+                    }); })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
             }
         });
-    };
+    }); };
     socket.on(types_1.EClientEvent.PING, function (msg) {
         socket.emit(types_1.EServerEvent.PONG, msg);
     });
@@ -125,6 +144,8 @@ io.on("connection", function (_socket) {
                 }
                 var table = (0, MatchTable_1.MatchTable)(socket.session);
                 table.lobby.addPlayer(user.id, socket.session);
+                socket.join(socket.session);
+                addSocketToUser(socket.session, socket.id, table);
                 tables.set(socket.session, table);
                 return callback({ success: true, match: table.getPublicMatch(user.id) });
             }
@@ -135,57 +156,51 @@ io.on("connection", function (_socket) {
         }
         callback({ success: false, error: new Error("Can't create match without an ID") });
     });
-    var sendWaitingForPlay = function (table, session, play) { return __awaiter(void 0, void 0, void 0, function () {
+    var sendWaitingForPlay = function (table, play) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, getTableSockets(table, function (playerSocket) { return __awaiter(void 0, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            playerSocket.emit(types_1.EServerEvent.UPDATE_MATCH, table.getPublicMatch(playerSocket.session));
-                            return [2 /*return*/];
-                        });
-                    }); })];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, getTableSockets(table, function (playerSocket) {
-                            return new Promise(function (resolve) {
-                                if (playerSocket.session === session) {
-                                    playerSocket.emit(types_1.EServerEvent.WAITING_PLAY, table.getPublicMatch(session));
-                                    playerSocket.once(types_1.EClientEvent.PLAY, function (_a) {
-                                        var cardIdx = _a.cardIdx, command = _a.command;
-                                        if (cardIdx !== undefined) {
-                                            var playedCard = play.use(cardIdx);
-                                            if (playedCard) {
-                                                return resolve();
-                                            }
-                                            return console.error("ERROR", new Error("Couldnt play card"));
+                case 0: return [4 /*yield*/, getTableSockets(table, function (playerSocket) {
+                        return new Promise(function (resolve) {
+                            var _a;
+                            if (playerSocket.session && playerSocket.session === ((_a = play.player) === null || _a === void 0 ? void 0 : _a.session)) {
+                                playerSocket.emit(types_1.EServerEvent.WAITING_PLAY, table.getPublicMatch(playerSocket.session), function (data) {
+                                    if (!data) {
+                                        return;
+                                    }
+                                    var cardIdx = data.cardIdx, command = data.command;
+                                    if (cardIdx !== undefined) {
+                                        var playedCard = play.use(cardIdx);
+                                        if (playedCard) {
+                                            return resolve();
                                         }
-                                        if (command) {
-                                            var saidCommand = play.say(command);
-                                            if (saidCommand) {
-                                                return resolve();
-                                            }
-                                            return console.error("ERROR", new Error("Couldnt say command"));
+                                        return console.error("ERROR", new Error("Couldnt play card"));
+                                    }
+                                    if (command) {
+                                        var saidCommand = play.say(command);
+                                        if (saidCommand) {
+                                            return resolve();
                                         }
-                                        return console.error("ERROR", new Error("Play callback didn't have data"));
-                                    });
-                                }
-                                else {
-                                    resolve();
-                                }
-                            });
-                        })];
-                case 2:
+                                        return console.error("ERROR", new Error("Couldnt say command"));
+                                    }
+                                    return console.error("ERROR", new Error("Play callback didn't have data"));
+                                });
+                            }
+                            else {
+                                resolve();
+                            }
+                        });
+                    })];
+                case 1:
                     _a.sent();
                     return [2 /*return*/];
             }
         });
     }); };
-    var startMatch = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var tableId_1, table_1;
+    var startMatch = function (tableId) { return __awaiter(void 0, void 0, void 0, function () {
+        var table_1;
         return __generator(this, function (_a) {
             try {
-                tableId_1 = socket.session;
-                table_1 = getTable(tableId_1);
+                table_1 = getTable(tableId);
                 if (table_1 && !table_1.lobby.gameLoop) {
                     table_1.setState(MatchTable_1.EMatchTableState.STARTED);
                     table_1.lobby
@@ -198,28 +213,30 @@ io.on("connection", function (_socket) {
                                 switch (_b.label) {
                                     case 0:
                                         table_1.setCurrentPlayer(play.player);
-                                        turns.set(tableId_1, { play: play, resolve: resolve });
+                                        turns.set(table_1.matchSessionId, { play: play, resolve: resolve });
                                         _b.label = 1;
                                     case 1:
-                                        _b.trys.push([1, 3, , 4]);
+                                        _b.trys.push([1, 4, , 5]);
                                         session = (_a = play.player) === null || _a === void 0 ? void 0 : _a.session;
-                                        if (!session) {
+                                        if (!session || !play) {
                                             throw new Error("Unexpected Error");
                                         }
                                         user = users.get(session);
                                         if (!user) {
                                             throw new Error("Unexpected Error");
                                         }
-                                        return [4 /*yield*/, sendWaitingForPlay(table_1, session, play)];
+                                        return [4 /*yield*/, emitMatchUpdate(table_1)];
                                     case 2:
                                         _b.sent();
-                                        resolve();
-                                        return [3 /*break*/, 4];
+                                        return [4 /*yield*/, sendWaitingForPlay(table_1, play)];
                                     case 3:
+                                        _b.sent();
+                                        return [2 /*return*/, resolve()];
+                                    case 4:
                                         e_1 = _b.sent();
                                         console.error("ERROR", e_1);
-                                        return [3 /*break*/, 4];
-                                    case 4: return [2 /*return*/];
+                                        return [3 /*break*/, 5];
+                                    case 5: return [2 /*return*/];
                                 }
                             });
                         }); });
@@ -246,9 +263,17 @@ io.on("connection", function (_socket) {
      */
     socket.on(types_1.EClientEvent.START_MATCH, function () {
         if (socket.session && users.has(socket.session)) {
-            startMatch();
+            startMatch(socket.session);
         }
     });
+    var addSocketToUser = function (session, socketId, table) {
+        var user = getUser(session);
+        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)
+            : new Set();
+        users.set(session, __assign(__assign({}, user), { matchSocketIds: user.matchSocketIds.set(table.matchSessionId, currentMatchSockets.add(socketId)) }));
+    };
     /**
      * Join Match
      */
@@ -259,7 +284,9 @@ io.on("connection", function (_socket) {
         var user = getUser(socket.session);
         var table = tables.get(matchSessionId);
         if (table && table.state === MatchTable_1.EMatchTableState.UNREADY) {
+            socket.join(matchSessionId);
             table.lobby.addPlayer(user.id || "satoshi", socket.session);
+            addSocketToUser(socket.session, socket.id, table);
             emitMatchUpdate(table);
             return callback({ success: true, match: table.getPublicMatch(socket.session) });
         }
@@ -278,58 +305,41 @@ io.on("connection", function (_socket) {
     /**
      * Set Session
      */
-    socket.on(types_1.EClientEvent.SET_SESSION, function (session, id, callback) {
+    socket.on(types_1.EClientEvent.SET_SESSION, function (session, id, currentMatchId, callback) {
+        var _a;
         if (id === void 0) { id = "satoshi"; }
+        if (currentMatchId === void 0) { currentMatchId = null; }
+        if (callback === void 0) { callback = function () { }; }
         var user = users.get(session);
         if (user) {
-            var updatedUser = {
-                id: id,
-                socketId: socket.id,
-            };
+            var updatedUser = __assign(__assign({}, user), { id: id });
             users.set(session, updatedUser);
             socket.session = session;
-            tables.forEach(function (table, id) { return __awaiter(void 0, void 0, void 0, function () {
-                var _a, play, resolve, session_1, user_1, e_2;
-                var _b, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            if (!table.isSessionPlaying(session)) return [3 /*break*/, 5];
-                            socket.join(id);
-                            if (!(session === ((_b = table.currentPlayer) === null || _b === void 0 ? void 0 : _b.session))) return [3 /*break*/, 4];
-                            _d.label = 1;
-                        case 1:
-                            _d.trys.push([1, 3, , 4]);
-                            _a = turns.get(id) || {}, play = _a.play, resolve = _a.resolve;
-                            session_1 = (_c = play === null || play === void 0 ? void 0 : play.player) === null || _c === void 0 ? void 0 : _c.session;
-                            if (!play || !session_1) {
-                                throw new Error("Unexpected Error");
-                            }
-                            user_1 = users.get(session_1);
-                            if (!user_1) {
-                                throw new Error("Unexpected Error");
-                            }
-                            return [4 /*yield*/, sendWaitingForPlay(table, session_1, play)];
-                        case 2:
-                            _d.sent();
-                            resolve === null || resolve === void 0 ? void 0 : resolve();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            e_2 = _d.sent();
-                            console.error("ERROR", e_2);
-                            return [3 /*break*/, 4];
-                        case 4:
-                            socket.emit(types_1.EServerEvent.UPDATE_MATCH, table.getPublicMatch(session));
-                            _d.label = 5;
-                        case 5: return [2 /*return*/];
+            var currentTable = currentMatchId ? tables.get(currentMatchId) : null;
+            if (currentTable && currentTable.isSessionPlaying(session)) {
+                addSocketToUser(session, socket.id, currentTable);
+                socket.join(currentTable.matchSessionId);
+                if (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) {
+                            throw new Error("Unexpected Error");
+                        }
+                        sendWaitingForPlay(currentTable, play).then(resolve);
                     }
-                });
-            }); });
+                    catch (e) {
+                        console.error("ERROR", e);
+                    }
+                }
+                else {
+                    socket.emit(types_1.EServerEvent.UPDATE_MATCH, currentTable.getPublicMatch(session));
+                }
+            }
             return callback({ success: true, session: session });
         }
         var newSession = (0, crypto_1.randomUUID)();
         socket.session = newSession;
-        users.set(newSession, (0, User_1.User)(id, socket.id));
+        users.set(newSession, (0, User_1.User)(id));
         callback({ success: true, session: newSession });
     });
     /**
@@ -341,9 +351,6 @@ io.on("connection", function (_socket) {
             var player = table.lobby.players.find(function (player) { return player.session === socket.session; });
             if (player) {
                 player.setReady(ready);
-                if (ready) {
-                    socket.join(matchSessionId);
-                }
                 emitMatchUpdate(table);
             }
         }

package/package.json

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