trucoshi 0.2.3 → 0.2.5

package/dist/types.d.ts

@@ -1,138 +1,150 @@
-import { ICard, IHandPoints, IPlayedCard, IPlayer, IPublicPlayer, IPublicTeam, ITeam } from "./lib";
-export interface IPublicMatch {
-    state: EMatchTableState;
-    winner: ITeam | null;
-    matchSessionId: string;
-    teams: Array<IPublicTeam>;
-    players: Array<IPublicPlayer>;
-    me: IPublicPlayer;
-    rounds: IPlayedCard[][];
-    prevRounds: IPlayedCard[][] | null;
-    prevHandPoints?: IHandPoints | null;
-}
-export interface IPublicMatchInfo {
-    matchSessionId: string;
-    players: number;
-    maxPlayers: number;
-    state: EMatchTableState;
-}
-export declare enum EMatchTableState {
-    UNREADY = 0,
-    READY = 1,
-    STARTED = 2,
-    FINISHED = 3
-}
-export declare enum ESayCommand {
-    QUIERO = "QUIERO",
-    NO_QUIERO = "NO_QUIERO",
-    TRUCO = "TRUCO",
-    MAZO = "MAZO",
-    FLOR = "FLOR",
-    CONTRAFLOR = "CONTRAFLOR"
-}
-export declare enum EEnvidoCommand {
-    ENVIDO = "ENVIDO",
-    ENVIDO_ENVIDO = "ENVIDO_ENVIDO",
-    REAL_ENVIDO = "REAL_ENVIDO",
-    FALTA_ENVIDO = "FALTA_ENVIDO"
-}
-export declare enum EHandState {
-    WAITING_PLAY = "WAITING_PLAY",
-    WAITING_FOR_TRUCO_ANSWER = "WAITING_FOR_TRUCO_ANSWER",
-    WAITING_ENVIDO_ANSWER = "WAITING_ENVIDO_ANSWER",
-    FINISHED = "FINISHED"
-}
-export type ECommand = ESayCommand | EEnvidoCommand;
-export declare enum GAME_ERROR {
-    MATCH_ALREADY_STARTED = "MATCH_ALREADY_STARTED",
-    LOBBY_IS_FULL = "LOBBY_IS_FULL",
-    UNEXPECTED_TEAM_SIZE = "UNEXPECTED_TEAM_SIZE",
-    TEAM_NOT_READY = "TEAM_NOT_READY",
-    TEAM_IS_FULL = "TEAM_IS_FULL"
-}
-export interface EnvidoState {
-    accept: number;
-    decline: number;
-    teamIdx: 0 | 1 | null;
-}
-export type IHandCommands = {
-    [key in ECommand]: (player: IPlayer) => void;
-};
-export type IEnvidoCalculatorResult = {
-    accept: number;
-    decline: number;
-    next: Array<ECommand>;
-};
-export type IEnvidoCalculatorArgs = {
-    teams: [ITeam, ITeam];
-    matchPoint: number;
-};
-export type IEnvidoCalculator = {
-    [key in EEnvidoCommand]: (args?: IEnvidoCalculatorArgs) => IEnvidoCalculatorResult;
-};
-export declare enum EClientEvent {
-    PING = "PING",
-    PLAY = "PLAY",
-    CREATE_MATCH = "CREATE_MATCH",
-    LIST_MATCHES = "LIST_MATCHES",
-    JOIN_MATCH = "JOIN_MATCH",
-    START_MATCH = "START_MATCH",
-    SET_PLAYER_READY = "SET_PLAYER_READY",
-    SET_SESSION = "SET_SESSION",
-    FETCH_MATCH = "FETCH_MATCH"
-}
-export type IEventCallback<T = {}> = (args: {
-    success: boolean;
-} & T) => void;
-export interface ServerToClientEvents {
-    [EServerEvent.PONG]: (msg: string) => 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.CREATE_MATCH]: (callback: IEventCallback<{
-        match?: IPublicMatch;
-    }>) => void;
-    [EClientEvent.START_MATCH]: (callback: IEventCallback<{
-        matchSessionId?: string;
-    }>) => void;
-    [EClientEvent.FETCH_MATCH]: (session: string | null, matchId: string, callback: IEventCallback<{
-        match?: IPublicMatch | null;
-    }>) => void;
-    [EClientEvent.LIST_MATCHES]: (filters: {
-        state?: Array<EMatchTableState>;
-    }, callback: IEventCallback<{
-        matches: Array<IPublicMatchInfo>;
-    }>) => void;
-    [EClientEvent.SET_PLAYER_READY]: (matchSessionId: string, ready: boolean, callback: IEventCallback<{
-        match?: IPublicMatch;
-    }>) => void;
-    [EClientEvent.SET_SESSION]: (session: string | null, id: string | null, callback?: IEventCallback<{
-        session?: string;
-        activeMatches: Array<IPublicMatchInfo>;
-    }>) => void;
-    [EClientEvent.JOIN_MATCH]: (matchSessionId: string, teamIdx: 0 | 1 | undefined, callback: IEventCallback<{
-        match?: IPublicMatch;
-    }>) => void;
-}
-export declare enum EServerEvent {
-    PONG = "PONG",
-    UPDATE_MATCH = "UPDATE_MATCH",
-    WAITING_PLAY = "WAITING_PLAY"
-}
-export declare enum ETrucoshiMatchState {
-    UNREADY = 0,
-    STARTED = 1,
-    FINISHED = 2
-}
-export type IWaitingPlayData = {
-    cardIdx: number;
-    card: ICard;
-    command?: undefined;
-} | {
-    cardIdx?: undefined;
-    card?: undefined;
-    command: ECommand;
-};
-export type IWaitingPlayCallback = (data: IWaitingPlayData) => void | null;
+import { ICard, IHandPoints, IPlayedCard, IPlayer, IPublicPlayer, IPublicTeam, ITeam } from "./lib";
+import { IPublicChatRoom } from "./server/classes/Chat";
+export interface IPublicMatch {
+    state: EMatchTableState;
+    winner: ITeam | null;
+    matchSessionId: string;
+    teams: Array<IPublicTeam>;
+    players: Array<IPublicPlayer>;
+    me: IPublicPlayer;
+    rounds: IPlayedCard[][];
+    prevRounds: IPlayedCard[][] | null;
+    prevHandPoints?: IHandPoints | null;
+}
+export interface IPublicMatchInfo {
+    matchSessionId: string;
+    players: number;
+    maxPlayers: number;
+    state: EMatchTableState;
+}
+export declare enum EMatchTableState {
+    UNREADY = 0,
+    READY = 1,
+    STARTED = 2,
+    FINISHED = 3
+}
+export declare enum ESayCommand {
+    QUIERO = "QUIERO",
+    NO_QUIERO = "NO_QUIERO",
+    TRUCO = "TRUCO",
+    MAZO = "MAZO",
+    FLOR = "FLOR",
+    CONTRAFLOR = "CONTRAFLOR"
+}
+export declare enum EEnvidoCommand {
+    ENVIDO = "ENVIDO",
+    ENVIDO_ENVIDO = "ENVIDO_ENVIDO",
+    REAL_ENVIDO = "REAL_ENVIDO",
+    FALTA_ENVIDO = "FALTA_ENVIDO"
+}
+export declare enum EHandState {
+    WAITING_PLAY = "WAITING_PLAY",
+    WAITING_FOR_TRUCO_ANSWER = "WAITING_FOR_TRUCO_ANSWER",
+    WAITING_ENVIDO_ANSWER = "WAITING_ENVIDO_ANSWER",
+    FINISHED = "FINISHED"
+}
+export type ECommand = ESayCommand | EEnvidoCommand;
+export declare enum GAME_ERROR {
+    MATCH_ALREADY_STARTED = "MATCH_ALREADY_STARTED",
+    LOBBY_IS_FULL = "LOBBY_IS_FULL",
+    UNEXPECTED_TEAM_SIZE = "UNEXPECTED_TEAM_SIZE",
+    TEAM_NOT_READY = "TEAM_NOT_READY",
+    TEAM_IS_FULL = "TEAM_IS_FULL"
+}
+export interface EnvidoState {
+    accept: number;
+    decline: number;
+    teamIdx: 0 | 1 | null;
+}
+export type IHandCommands = {
+    [key in ECommand]: (player: IPlayer) => void;
+};
+export type IEnvidoCalculatorResult = {
+    accept: number;
+    decline: number;
+    next: Array<ECommand>;
+};
+export type IEnvidoCalculatorArgs = {
+    teams: [ITeam, ITeam];
+    matchPoint: number;
+};
+export type IEnvidoCalculator = {
+    [key in EEnvidoCommand]: (args?: IEnvidoCalculatorArgs) => IEnvidoCalculatorResult;
+};
+export declare enum EClientEvent {
+    PING = "PING",
+    PLAY = "PLAY",
+    CREATE_MATCH = "CREATE_MATCH",
+    LIST_MATCHES = "LIST_MATCHES",
+    JOIN_MATCH = "JOIN_MATCH",
+    START_MATCH = "START_MATCH",
+    SET_PLAYER_READY = "SET_PLAYER_READY",
+    SET_SESSION = "SET_SESSION",
+    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;
+    [EClientEvent.START_MATCH]: (callback: IEventCallback<{
+        matchSessionId?: string;
+    }>) => void;
+    [EClientEvent.FETCH_MATCH]: (session: string | null, matchId: string, callback: IEventCallback<{
+        match?: IPublicMatch | null;
+    }>) => void;
+    [EClientEvent.LIST_MATCHES]: (filters: {
+        state?: Array<EMatchTableState>;
+    }, callback: IEventCallback<{
+        matches: Array<IPublicMatchInfo>;
+    }>) => void;
+    [EClientEvent.SET_PLAYER_READY]: (matchSessionId: string, ready: boolean, callback: IEventCallback<{
+        match?: IPublicMatch;
+    }>) => void;
+    [EClientEvent.SET_SESSION]: (session: string | null, id: string | null, callback?: IEventCallback<{
+        session?: string;
+        activeMatches: Array<IPublicMatchInfo>;
+    }>) => void;
+    [EClientEvent.JOIN_MATCH]: (matchSessionId: string, teamIdx: 0 | 1 | undefined, callback: IEventCallback<{
+        match?: IPublicMatch;
+    }>) => void;
+}
+export declare enum EServerEvent {
+    PONG = "PONG",
+    UPDATE_MATCH = "UPDATE_MATCH",
+    WAITING_PLAY = "WAITING_PLAY",
+    UPDATE_CHAT = "UPDAET_CHAT"
+}
+export declare enum ETrucoshiMatchState {
+    UNREADY = 0,
+    STARTED = 1,
+    FINISHED = 2
+}
+export type IWaitingPlayData = {
+    cardIdx: number;
+    card: ICard;
+    command?: undefined;
+} | {
+    cardIdx?: undefined;
+    card?: undefined;
+    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,65 +1,97 @@
-"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;
-var EMatchTableState;
-(function (EMatchTableState) {
-    EMatchTableState[EMatchTableState["UNREADY"] = 0] = "UNREADY";
-    EMatchTableState[EMatchTableState["READY"] = 1] = "READY";
-    EMatchTableState[EMatchTableState["STARTED"] = 2] = "STARTED";
-    EMatchTableState[EMatchTableState["FINISHED"] = 3] = "FINISHED";
-})(EMatchTableState = exports.EMatchTableState || (exports.EMatchTableState = {}));
-var ESayCommand;
-(function (ESayCommand) {
-    ESayCommand["QUIERO"] = "QUIERO";
-    ESayCommand["NO_QUIERO"] = "NO_QUIERO";
-    ESayCommand["TRUCO"] = "TRUCO";
-    ESayCommand["MAZO"] = "MAZO";
-    ESayCommand["FLOR"] = "FLOR";
-    ESayCommand["CONTRAFLOR"] = "CONTRAFLOR";
-})(ESayCommand = exports.ESayCommand || (exports.ESayCommand = {}));
-var EEnvidoCommand;
-(function (EEnvidoCommand) {
-    EEnvidoCommand["ENVIDO"] = "ENVIDO";
-    EEnvidoCommand["ENVIDO_ENVIDO"] = "ENVIDO_ENVIDO";
-    EEnvidoCommand["REAL_ENVIDO"] = "REAL_ENVIDO";
-    EEnvidoCommand["FALTA_ENVIDO"] = "FALTA_ENVIDO";
-})(EEnvidoCommand = exports.EEnvidoCommand || (exports.EEnvidoCommand = {}));
-var EHandState;
-(function (EHandState) {
-    EHandState["WAITING_PLAY"] = "WAITING_PLAY";
-    EHandState["WAITING_FOR_TRUCO_ANSWER"] = "WAITING_FOR_TRUCO_ANSWER";
-    EHandState["WAITING_ENVIDO_ANSWER"] = "WAITING_ENVIDO_ANSWER";
-    EHandState["FINISHED"] = "FINISHED";
-})(EHandState = exports.EHandState || (exports.EHandState = {}));
-var GAME_ERROR;
-(function (GAME_ERROR) {
-    GAME_ERROR["MATCH_ALREADY_STARTED"] = "MATCH_ALREADY_STARTED";
-    GAME_ERROR["LOBBY_IS_FULL"] = "LOBBY_IS_FULL";
-    GAME_ERROR["UNEXPECTED_TEAM_SIZE"] = "UNEXPECTED_TEAM_SIZE";
-    GAME_ERROR["TEAM_NOT_READY"] = "TEAM_NOT_READY";
-    GAME_ERROR["TEAM_IS_FULL"] = "TEAM_IS_FULL";
-})(GAME_ERROR = exports.GAME_ERROR || (exports.GAME_ERROR = {}));
-var EClientEvent;
-(function (EClientEvent) {
-    EClientEvent["PING"] = "PING";
-    EClientEvent["PLAY"] = "PLAY";
-    EClientEvent["CREATE_MATCH"] = "CREATE_MATCH";
-    EClientEvent["LIST_MATCHES"] = "LIST_MATCHES";
-    EClientEvent["JOIN_MATCH"] = "JOIN_MATCH";
-    EClientEvent["START_MATCH"] = "START_MATCH";
-    EClientEvent["SET_PLAYER_READY"] = "SET_PLAYER_READY";
-    EClientEvent["SET_SESSION"] = "SET_SESSION";
-    EClientEvent["FETCH_MATCH"] = "FETCH_MATCH";
-})(EClientEvent = exports.EClientEvent || (exports.EClientEvent = {}));
-var EServerEvent;
-(function (EServerEvent) {
-    EServerEvent["PONG"] = "PONG";
-    EServerEvent["UPDATE_MATCH"] = "UPDATE_MATCH";
-    EServerEvent["WAITING_PLAY"] = "WAITING_PLAY";
-})(EServerEvent = exports.EServerEvent || (exports.EServerEvent = {}));
-var ETrucoshiMatchState;
-(function (ETrucoshiMatchState) {
-    ETrucoshiMatchState[ETrucoshiMatchState["UNREADY"] = 0] = "UNREADY";
-    ETrucoshiMatchState[ETrucoshiMatchState["STARTED"] = 1] = "STARTED";
-    ETrucoshiMatchState[ETrucoshiMatchState["FINISHED"] = 2] = "FINISHED";
-})(ETrucoshiMatchState = exports.ETrucoshiMatchState || (exports.ETrucoshiMatchState = {}));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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";
+    EMatchTableState[EMatchTableState["READY"] = 1] = "READY";
+    EMatchTableState[EMatchTableState["STARTED"] = 2] = "STARTED";
+    EMatchTableState[EMatchTableState["FINISHED"] = 3] = "FINISHED";
+})(EMatchTableState = exports.EMatchTableState || (exports.EMatchTableState = {}));
+var ESayCommand;
+(function (ESayCommand) {
+    ESayCommand["QUIERO"] = "QUIERO";
+    ESayCommand["NO_QUIERO"] = "NO_QUIERO";
+    ESayCommand["TRUCO"] = "TRUCO";
+    ESayCommand["MAZO"] = "MAZO";
+    ESayCommand["FLOR"] = "FLOR";
+    ESayCommand["CONTRAFLOR"] = "CONTRAFLOR";
+})(ESayCommand = exports.ESayCommand || (exports.ESayCommand = {}));
+var EEnvidoCommand;
+(function (EEnvidoCommand) {
+    EEnvidoCommand["ENVIDO"] = "ENVIDO";
+    EEnvidoCommand["ENVIDO_ENVIDO"] = "ENVIDO_ENVIDO";
+    EEnvidoCommand["REAL_ENVIDO"] = "REAL_ENVIDO";
+    EEnvidoCommand["FALTA_ENVIDO"] = "FALTA_ENVIDO";
+})(EEnvidoCommand = exports.EEnvidoCommand || (exports.EEnvidoCommand = {}));
+var EHandState;
+(function (EHandState) {
+    EHandState["WAITING_PLAY"] = "WAITING_PLAY";
+    EHandState["WAITING_FOR_TRUCO_ANSWER"] = "WAITING_FOR_TRUCO_ANSWER";
+    EHandState["WAITING_ENVIDO_ANSWER"] = "WAITING_ENVIDO_ANSWER";
+    EHandState["FINISHED"] = "FINISHED";
+})(EHandState = exports.EHandState || (exports.EHandState = {}));
+var GAME_ERROR;
+(function (GAME_ERROR) {
+    GAME_ERROR["MATCH_ALREADY_STARTED"] = "MATCH_ALREADY_STARTED";
+    GAME_ERROR["LOBBY_IS_FULL"] = "LOBBY_IS_FULL";
+    GAME_ERROR["UNEXPECTED_TEAM_SIZE"] = "UNEXPECTED_TEAM_SIZE";
+    GAME_ERROR["TEAM_NOT_READY"] = "TEAM_NOT_READY";
+    GAME_ERROR["TEAM_IS_FULL"] = "TEAM_IS_FULL";
+})(GAME_ERROR = exports.GAME_ERROR || (exports.GAME_ERROR = {}));
+var EClientEvent;
+(function (EClientEvent) {
+    EClientEvent["PING"] = "PING";
+    EClientEvent["PLAY"] = "PLAY";
+    EClientEvent["CREATE_MATCH"] = "CREATE_MATCH";
+    EClientEvent["LIST_MATCHES"] = "LIST_MATCHES";
+    EClientEvent["JOIN_MATCH"] = "JOIN_MATCH";
+    EClientEvent["START_MATCH"] = "START_MATCH";
+    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) {
+    ETrucoshiMatchState[ETrucoshiMatchState["UNREADY"] = 0] = "UNREADY";
+    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.3",
+  "version": "0.2.5",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "scripts": {