trucoshi 0.2.4 → 0.2.5

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

@@ -1,6 +1,7 @@
 import { IHand } from "./Hand";
 import { IMatch } from "./Match";
 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) => Promise<void>;
@@ -9,6 +10,7 @@ export interface IGameLoop {
     _onTruco: ITrucoCallback;
     _onTurn: ITurnCallback;
     _onWinner: IWinnerCallback;
+    currentPlayer: IPlayer | null;
     teams: Array<ITeam>;
     hands: Array<IHand>;
     winner: ITeam | null;

package/dist/lib/classes/GameLoop.js

@@ -18,6 +18,7 @@ const GameLoop = (match) => {
         _onWinner: () => Promise.resolve(),
         teams: [],
         winner: null,
+        currentPlayer: null,
         hands: [],
         onTruco: (callback) => {
             gameloop._onTruco = callback;
@@ -40,6 +41,7 @@ const GameLoop = (match) => {
                     if (!play || !play.player) {
                         continue;
                     }
+                    gameloop.currentPlayer = play.player;
                     if (play.state === types_1.EHandState.WAITING_FOR_TRUCO_ANSWER) {
                         yield gameloop._onTruco(play);
                         continue;
@@ -52,6 +54,7 @@ const GameLoop = (match) => {
                     }
                 }
                 gameloop.winner = match.winner;
+                gameloop.currentPlayer = null;
                 yield gameloop._onWinner(match.winner, match.teams);
             });
         },

package/dist/lib/classes/Hand.js

@@ -41,7 +41,7 @@ function Hand(match, deck, idx) {
                 }
                 const player = match.table.player(hand.turn);
                 hand.setCurrentPlayer(player);
-                if (player.disabled) {
+                if (player.disabled || !player.ready) {
                     hand.setCurrentPlayer(null);
                 }
                 yield hand;

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

@@ -17,7 +17,7 @@ export interface IPrivateLobby {
     ready: boolean;
     started: boolean;
     addPlayer(key: string, id: string, session: string, teamIdx?: 0 | 1, isOwner?: boolean): IPlayer;
-    removePlayer(id: string): ILobby;
+    removePlayer(session: string): ILobby;
     calculateReady(): boolean;
     calculateFull(): boolean;
     startMatch(matchPoint?: 9 | 12 | 15): IGameLoop;

package/dist/lib/classes/Lobby.js

@@ -40,6 +40,7 @@ function Lobby(teamSize) {
                 if (exists.teamIdx === teamIdx) {
                     return exists;
                 }
+                isOwner = exists.isOwner;
                 lobby.removePlayer(exists.session);
             }
             if (lobby.started) {

package/dist/lib/classes/Match.js

@@ -3,6 +3,7 @@ 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;
@@ -11,6 +12,14 @@ function Match(table, teams = [], matchPoint = 9) {
     }
     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);

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

@@ -13,15 +13,17 @@ export interface IPlayer {
     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" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn" | "isOwner">;
+export type IPublicPlayer = Pick<IPlayer, "id" | "key" | "disabled" | "ready" | "connected" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn" | "isOwner">;
 export declare function Player(key: string, id: string, teamIdx: number, isOwner?: boolean): IPlayer;

package/dist/lib/classes/Player.js

@@ -14,6 +14,7 @@ function Player(key, id, teamIdx, isOwner = false) {
         isOwner,
         isTurn: false,
         disabled: false,
+        connected: false,
         ready: false,
         setOwner(owner) {
             player.isOwner = owner;
@@ -22,10 +23,11 @@ function Player(key, id, teamIdx, isOwner = false) {
             player.isTurn = turn;
         },
         getPublicPlayer() {
-            const { id, key, disabled, ready, usedHand, prevHand, teamIdx, isTurn, isOwner } = player;
+            const { id, key, connected, disabled, ready, usedHand, prevHand, teamIdx, isTurn, isOwner } = player;
             return {
                 id,
                 key,
+                connected,
                 disabled,
                 ready,
                 usedHand,
@@ -46,6 +48,9 @@ function Player(key, id, teamIdx, isOwner = false) {
         disable() {
             player.disabled = true;
         },
+        setConnected(connected) {
+            player.connected = connected;
+        },
         setReady(ready) {
             player.ready = ready;
         },

package/dist/lib/classes/Truco.js

@@ -7,7 +7,7 @@ function Truco() {
         while (i < truco.players.length && truco.answer === null) {
             const player = truco.players[truco.turn];
             truco.setCurrentPlayer(player);
-            if (player.disabled) {
+            if (player.disabled || !player.ready) {
                 truco.setCurrentPlayer(null);
             }
             if (truco.turn >= truco.players.length - 1) {

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 import { ICard, IHandPoints, IPlayedCard, IPlayer, IPublicPlayer, IPublicTeam, ITeam } from "./lib";
+import { IPublicChatRoom } from "./server/classes/Chat";
 export interface IPublicMatch {
     state: EMatchTableState;
     winner: ITeam | null;
@@ -79,18 +80,21 @@ export declare enum EClientEvent {
     START_MATCH = "START_MATCH",
     SET_PLAYER_READY = "SET_PLAYER_READY",
     SET_SESSION = "SET_SESSION",
-    FETCH_MATCH = "FETCH_MATCH"
+    FETCH_MATCH = "FETCH_MATCH",
+    CHAT = "CHAT"
 }
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
 } & T) => void;
 export interface ServerToClientEvents {
     [EServerEvent.PONG]: (msg: string) => void;
+    [EServerEvent.UPDATE_CHAT]: (room: IPublicChatRoom) => void;
     [EServerEvent.UPDATE_MATCH]: (match: IPublicMatch) => void;
     [EServerEvent.WAITING_PLAY]: (match: IPublicMatch, callback: (data: IWaitingPlayData) => void) => void;
 }
 export interface ClientToServerEvents {
     [EClientEvent.PING]: (msg: string) => void;
+    [EClientEvent.CHAT]: (matchId: string, msg: string, callback: () => void) => void;
     [EClientEvent.CREATE_MATCH]: (callback: IEventCallback<{
         match?: IPublicMatch;
     }>) => void;
@@ -119,7 +123,8 @@ export interface ClientToServerEvents {
 export declare enum EServerEvent {
     PONG = "PONG",
     UPDATE_MATCH = "UPDATE_MATCH",
-    WAITING_PLAY = "WAITING_PLAY"
+    WAITING_PLAY = "WAITING_PLAY",
+    UPDATE_CHAT = "UPDAET_CHAT"
 }
 export declare enum ETrucoshiMatchState {
     UNREADY = 0,
@@ -136,3 +141,10 @@ export type IWaitingPlayData = {
     command: ECommand;
 };
 export type IWaitingPlayCallback = (data: IWaitingPlayData) => void | null;
+export interface TMap<K, V> extends Map<K, V> {
+    find(finder: (value: V) => boolean): V | void;
+}
+export declare class TMap<K, V> extends Map<K, V> {
+    findAll(finder: (value: V) => boolean): V[];
+    getOrThrow(key?: K): NonNullable<V>;
+}

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ETrucoshiMatchState = exports.EServerEvent = exports.EClientEvent = exports.GAME_ERROR = exports.EHandState = exports.EEnvidoCommand = exports.ESayCommand = exports.EMatchTableState = void 0;
+exports.TMap = exports.ETrucoshiMatchState = exports.EServerEvent = exports.EClientEvent = exports.GAME_ERROR = exports.EHandState = exports.EEnvidoCommand = exports.ESayCommand = exports.EMatchTableState = void 0;
 var EMatchTableState;
 (function (EMatchTableState) {
     EMatchTableState[EMatchTableState["UNREADY"] = 0] = "UNREADY";
@@ -50,12 +50,14 @@ var EClientEvent;
     EClientEvent["SET_PLAYER_READY"] = "SET_PLAYER_READY";
     EClientEvent["SET_SESSION"] = "SET_SESSION";
     EClientEvent["FETCH_MATCH"] = "FETCH_MATCH";
+    EClientEvent["CHAT"] = "CHAT";
 })(EClientEvent = exports.EClientEvent || (exports.EClientEvent = {}));
 var EServerEvent;
 (function (EServerEvent) {
     EServerEvent["PONG"] = "PONG";
     EServerEvent["UPDATE_MATCH"] = "UPDATE_MATCH";
     EServerEvent["WAITING_PLAY"] = "WAITING_PLAY";
+    EServerEvent["UPDATE_CHAT"] = "UPDAET_CHAT";
 })(EServerEvent = exports.EServerEvent || (exports.EServerEvent = {}));
 var ETrucoshiMatchState;
 (function (ETrucoshiMatchState) {
@@ -63,3 +65,33 @@ var ETrucoshiMatchState;
     ETrucoshiMatchState[ETrucoshiMatchState["STARTED"] = 1] = "STARTED";
     ETrucoshiMatchState[ETrucoshiMatchState["FINISHED"] = 2] = "FINISHED";
 })(ETrucoshiMatchState = exports.ETrucoshiMatchState || (exports.ETrucoshiMatchState = {}));
+class TMap extends Map {
+    find(finder) {
+        let result = undefined;
+        for (let value of this.values()) {
+            const find = finder(value);
+            if (!result && find) {
+                result = value;
+            }
+        }
+        return result;
+    }
+    findAll(finder) {
+        let result = [];
+        for (let value of this.values()) {
+            const find = finder(value);
+            if (find) {
+                result.push(value);
+            }
+        }
+        return result;
+    }
+    getOrThrow(key) {
+        const result = key && this.get(key);
+        if (!result) {
+            throw new Error(`getOrThrow(${key}) not found`);
+        }
+        return result;
+    }
+}
+exports.TMap = TMap;

package/package.json

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