trucoshi 0.3.5 → 0.3.52

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

@@ -4,23 +4,25 @@ import { IPlayInstance } from "./Play";
 import { IPlayer } from "./Player";
 import { ITeam } from "./Team";
 export type IWinnerCallback = (winner: ITeam, teams: [ITeam, ITeam]) => Promise<void>;
-export type ITurnCallback = (play: IPlayInstance, newHandJustStarted: boolean) => Promise<void>;
+export type ITurnCallback = (play: IPlayInstance) => Promise<void>;
 export type ITrucoCallback = (play: IPlayInstance) => Promise<void>;
+export type IHandFinishedCallback = (hand: IHand | null) => Promise<void>;
 export type IEnvidoCallback = (play: IPlayInstance, pointsRound: boolean) => Promise<void>;
 export interface IGameLoop {
     _onTruco: ITrucoCallback;
     _onTurn: ITurnCallback;
     _onWinner: IWinnerCallback;
     _onEnvido: IEnvidoCallback;
+    _onHandFinished: IHandFinishedCallback;
     currentPlayer: IPlayer | null;
     currentHand: IHand | null;
-    lastCheckedHand: number | null;
     teams: Array<ITeam>;
     winner: ITeam | null;
     onTurn: (callback: ITurnCallback) => IGameLoop;
     onWinner: (callback: IWinnerCallback) => IGameLoop;
     onTruco: (callback: ITrucoCallback) => IGameLoop;
     onEnvido: (callback: IEnvidoCallback) => IGameLoop;
+    onHandFinished: (callback: IHandFinishedCallback) => IGameLoop;
     begin: () => Promise<void>;
 }
 export declare const GameLoop: (match: IMatch) => IGameLoop;

package/dist/lib/classes/GameLoop.js

@@ -17,11 +17,15 @@ const GameLoop = (match) => {
         _onTruco: () => Promise.resolve(),
         _onTurn: () => Promise.resolve(),
         _onWinner: () => Promise.resolve(),
+        _onHandFinished: () => Promise.resolve(),
         teams: [],
         winner: null,
         currentPlayer: null,
         currentHand: null,
-        lastCheckedHand: null,
+        onHandFinished: (callback) => {
+            gameloop._onHandFinished = callback;
+            return gameloop;
+        },
         onTruco: (callback) => {
             gameloop._onTruco = callback;
             return gameloop;
@@ -39,13 +43,21 @@ const GameLoop = (match) => {
             return gameloop;
         },
         begin() {
-            var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
                 gameloop.teams = match.teams;
                 while (!match.winner) {
                     const play = match.play();
                     gameloop.currentHand = match.currentHand;
-                    if (!play || !play.player) {
+                    if (!play) {
+                        try {
+                            yield gameloop._onHandFinished(match.prevHand);
+                        }
+                        catch (e) {
+                            console.error("GAME LOOP ERROR - ON HAND FINISHED");
+                        }
+                        continue;
+                    }
+                    if (!play.player) {
                         continue;
                     }
                     gameloop.currentPlayer = play.player;
@@ -83,10 +95,7 @@ const GameLoop = (match) => {
                     if (play.state === types_1.EHandState.WAITING_PLAY) {
                         try {
                             play.player.setTurn(true);
-                            const newHandJustStarted = gameloop.lastCheckedHand !== ((_a = play.prevHand) === null || _a === void 0 ? void 0 : _a.idx) &&
-                                ((_b = gameloop.currentHand) === null || _b === void 0 ? void 0 : _b.rounds[0].cards.length) === 0;
-                            gameloop.lastCheckedHand = play.prevHand ? play.prevHand.idx : null;
-                            yield gameloop._onTurn(play, newHandJustStarted);
+                            yield gameloop._onTurn(play);
                             play.player.setTurn(false);
                         }
                         catch (e) {

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

@@ -2,21 +2,25 @@ import { IGameLoop } from "./GameLoop";
 import { IPlayer } from "./Player";
 import { ITable } from "./Table";
 import { ITeam } from "./Team";
+import { IQueue } from "./Queue";
 export interface IPrivateLobby {
     gameLoop?: IGameLoop;
     lastTeamIdx: 0 | 1;
     _players: Array<IPlayer | {
         id?: undefined;
         session?: undefined;
+        teamIdx?: undefined;
     }>;
     get players(): Array<IPlayer>;
     teams: Array<ITeam>;
     maxPlayers: number;
     table: ITable | null;
+    queue: IQueue;
     full: boolean;
     ready: boolean;
     started: boolean;
-    addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): IPlayer;
+    _addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): IPlayer;
+    addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): Promise<IPlayer>;
     removePlayer(session: string): ILobby;
     calculateReady(): boolean;
     calculateFull(): boolean;

package/dist/lib/classes/Lobby.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lobby = void 0;
 const constants_1 = require("../constants");
@@ -8,6 +17,7 @@ const Match_1 = require("./Match");
 const Player_1 = require("./Player");
 const Table_1 = require("./Table");
 const Team_1 = require("./Team");
+const Queue_1 = require("./Queue");
 function Lobby(teamSize) {
     const lobby = {
         lastTeamIdx: 1,
@@ -16,6 +26,7 @@ function Lobby(teamSize) {
             return lobby._players.filter((player) => Boolean(player && player.id));
         },
         teams: [],
+        queue: (0, Queue_1.Queue)(),
         table: null,
         maxPlayers: teamSize ? teamSize * 2 : 6,
         full: false,
@@ -34,8 +45,14 @@ function Lobby(teamSize) {
             lobby.full = lobby.players.length >= lobby.maxPlayers;
             return lobby.full;
         },
-        addPlayer(key, id, session, teamIdx, isOwner) {
+        addPlayer(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return lobby.queue.queue(() => lobby._addPlayer(...params));
+            });
+        },
+        _addPlayer(key, id, session, teamIdx, isOwner) {
             const exists = lobby.players.find((player) => player.session === session);
+            const hasMovedSlots = Boolean(exists);
             if (exists) {
                 if (exists.teamIdx === teamIdx) {
                     return exists;
@@ -56,7 +73,8 @@ function Lobby(teamSize) {
             }
             const player = (0, Player_1.Player)(key, id, teamIdx !== undefined ? teamIdx : Number(!lobby.lastTeamIdx), isOwner);
             player.setSession(session);
-            lobby.lastTeamIdx = Number(!lobby.lastTeamIdx);
+            lobby.lastTeamIdx = player.teamIdx;
+            // Find team available slot
             for (let i = 0; i < lobby._players.length; i++) {
                 if (!lobby._players[i].id) {
                     if (player.teamIdx === 0 && i % 2 === 0) {
@@ -69,6 +87,21 @@ function Lobby(teamSize) {
                     }
                 }
             }
+            if (hasMovedSlots) {
+                // Reorder other players to fit possible empty slot left by this player
+                for (let i = 0; i < lobby._players.length; i++) {
+                    if (!lobby._players[i].id) {
+                        for (let j = i + 2; j < lobby._players.length; j = j + 2) {
+                            if (lobby._players[j].id) {
+                                const p = Object.assign({}, lobby._players[j]);
+                                lobby._players[j] = {};
+                                lobby._players[i] = p;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
             lobby.calculateFull();
             lobby.calculateReady();
             return player;

package/dist/lib/classes/Match.js

@@ -21,8 +21,10 @@ function Match(table, teams = [], matchPoint = 9) {
                 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.setCurrentHand(null);
+            yield match;
+            const hand = match.setCurrentHand((0, Hand_1.Hand)(match, deck, match.hands.length + 1));
             match.pushHand(hand);
             while (!hand.finished()) {
                 const { value } = hand.getNextPlayer();

package/dist/lib/classes/Player.js

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Player = void 0;
-const types_1 = require("../../types");
-const filterEnvidoCommands = (command) => Object.values(types_1.EEnvidoCommand).includes(command) ||
-    Object.values(types_1.EAnswerCommand).includes(command) ||
-    Object.values(types_1.EEnvidoAnswerCommand).includes(command);
-const filterNotEnvidoCommands = (command) => !Object.values(types_1.EEnvidoCommand).includes(command) &&
-    !Object.values(types_1.EEnvidoAnswerCommand).includes(command);
 function Player(key, id, teamIdx, isOwner = false) {
     const player = {
         key,
@@ -74,15 +68,9 @@ function Player(key, id, teamIdx, isOwner = false) {
             const hand = player.hand.map((c) => {
                 let num = c.charAt(0);
                 const palo = c.charAt(1);
-                if (num === "p") {
+                if (num === "p" || num === "c" || num === "r") {
                     num = "10";
                 }
-                if (num === "c") {
-                    num = "11";
-                }
-                if (num === "r") {
-                    num = "12";
-                }
                 if (flor === null || flor === palo) {
                     flor = palo;
                 }

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

@@ -0,0 +1,5 @@
+export interface IQueue {
+    promise: Promise<any>;
+    queue(operation: () => any): Promise<any>;
+}
+export declare const Queue: () => IQueue;

package/dist/lib/classes/Queue.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Queue = void 0;
+const Queue = () => {
+    const queue = {
+        promise: Promise.resolve(true),
+        queue(operation) {
+            return new Promise((resolve) => {
+                queue.promise = queue.promise.then(operation).then(resolve).catch(resolve);
+            });
+        },
+    };
+    return queue;
+};
+exports.Queue = Queue;

package/dist/types.d.ts

@@ -34,15 +34,17 @@ export interface IChatMessage {
     };
     system?: boolean;
     command?: boolean;
+    card?: boolean;
     content: string;
 }
 export interface IChatRoom {
     id: string;
     messages: Array<IChatMessage>;
     send(user: IChatMessage["user"], message: string): void;
-    system(message: string): void;
+    card(user: IChatMessage["user"], command: ICard): void;
     command(team: 0 | 1, command: ECommand | number): void;
-    emit(): void;
+    system(message: string): void;
+    emit(message?: IChatMessage): void;
 }
 export declare enum EChatSystem {
     TEAM_0 = 0,
@@ -139,7 +141,7 @@ export interface ServerToClientEvents {
     [EServerEvent.PONG]: (msg: string) => void;
     [EServerEvent.WAITING_POSSIBLE_SAY]: (match: IPublicMatch, callback: (data: IWaitingSayData) => void) => void;
     [EServerEvent.PREVIOUS_HAND]: (value: IMatchPreviousHand, callback: () => void) => void;
-    [EServerEvent.UPDATE_CHAT]: (room: IPublicChatRoom) => void;
+    [EServerEvent.UPDATE_CHAT]: (room: IPublicChatRoom, message?: IChatMessage) => void;
     [EServerEvent.UPDATE_MATCH]: (match: IPublicMatch) => void;
     [EServerEvent.PLAYER_USED_CARD]: (match: IPublicMatch, card: IPlayedCard) => void;
     [EServerEvent.PLAYER_SAID_COMMAND]: (match: IPublicMatch, command: ISaidCommand) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "0.3.5",
+  "version": "0.3.52",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "scripts": {