trucoshi 0.2.13 → 0.2.15

package/dist/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./lib";
-export * from "./server";
 export * from "./types";

package/dist/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib"), exports);
-__exportStar(require("./server"), exports);
 __exportStar(require("./types"), exports);

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

@@ -4,7 +4,7 @@ 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>;
+export type ITurnCallback = (play: IPlayInstance, newHandJustStarted: boolean) => Promise<void>;
 export type ITrucoCallback = (play: IPlayInstance) => Promise<void>;
 export interface IGameLoop {
     _onTruco: ITrucoCallback;
@@ -12,7 +12,7 @@ export interface IGameLoop {
     _onWinner: IWinnerCallback;
     currentPlayer: IPlayer | null;
     currentHand: IHand | null;
-    previousHand: IHand | null;
+    lastCheckedHand: number | null;
     teams: Array<ITeam>;
     winner: ITeam | null;
     onTurn: (callback: ITurnCallback) => IGameLoop;

package/dist/lib/classes/GameLoop.js

@@ -20,7 +20,7 @@ const GameLoop = (match) => {
         winner: null,
         currentPlayer: null,
         currentHand: null,
-        previousHand: null,
+        lastCheckedHand: null,
         onTruco: (callback) => {
             gameloop._onTruco = callback;
             return gameloop;
@@ -34,6 +34,7 @@ const GameLoop = (match) => {
             return gameloop;
         },
         begin() {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 gameloop.teams = match.teams;
                 while (!match.winner) {
@@ -55,12 +56,13 @@ const GameLoop = (match) => {
                     if (play.state === types_1.EHandState.WAITING_PLAY) {
                         play.player.setTurn(true);
                         try {
-                            yield gameloop._onTurn(play);
+                            const newHandJustStarted = gameloop.lastCheckedHand !== ((_a = play.prevHand) === null || _a === void 0 ? void 0 : _a.idx);
+                            gameloop.lastCheckedHand = play.prevHand ? play.prevHand.idx : null;
+                            yield gameloop._onTurn(play, newHandJustStarted);
                         }
                         catch (e) {
                             console.error("GAME LOOP ERROR", e);
                         }
-                        gameloop.previousHand = match.prevHand;
                         play.player.setTurn(false);
                         continue;
                     }

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

@@ -14,19 +14,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" | "connected" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn" | "isOwner"> & {
+export type IPublicPlayer = Pick<IPlayer, "id" | "key" | "disabled" | "ready" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "session" | "isTurn" | "isOwner"> & {
     commands: Array<ECommand>;
 };
 export declare function Player(key: string, id: string, teamIdx: number, isOwner?: boolean): IPlayer;

package/dist/lib/classes/Player.js

@@ -14,7 +14,6 @@ function Player(key, id, teamIdx, isOwner = false) {
         isOwner,
         isTurn: false,
         disabled: false,
-        connected: false,
         ready: false,
         get commands() {
             return Array.from(player._commands.values());
@@ -26,11 +25,10 @@ function Player(key, id, teamIdx, isOwner = false) {
             player.isTurn = turn;
         },
         getPublicPlayer() {
-            const { id, key, commands, connected, disabled, ready, usedHand, prevHand, teamIdx, isTurn, isOwner, } = player;
+            const { id, key, commands, disabled, ready, usedHand, prevHand, teamIdx, isTurn, isOwner, } = player;
             return {
                 id,
                 key,
-                connected,
                 commands,
                 disabled,
                 ready,
@@ -52,9 +50,6 @@ function Player(key, id, teamIdx, isOwner = false) {
         disable() {
             player.disabled = true;
         },
-        setConnected(connected) {
-            player.connected = connected;
-        },
         setReady(ready) {
             player.ready = ready;
         },

package/dist/lib/types.d.ts

@@ -1,26 +1,12 @@
+import { ECommand, EEnvidoCommand } from "../types";
 import { IPlayer } from "./classes/Player";
 import { ITeam } from "./classes/Team";
-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",

package/dist/lib/types.js

@@ -1,22 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GAME_ERROR = exports.EHandState = exports.EEnvidoCommand = exports.ESayCommand = void 0;
-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 = {}));
+exports.GAME_ERROR = exports.EHandState = void 0;
 var EHandState;
 (function (EHandState) {
     EHandState["WAITING_PLAY"] = "WAITING_PLAY";

package/dist/types.d.ts

@@ -14,6 +14,7 @@ export interface IPublicMatch {
     rounds: IPlayedCard[][];
 }
 export interface IPublicMatchInfo {
+    ownerId: string;
     matchSessionId: string;
     players: number;
     maxPlayers: number;
@@ -26,7 +27,8 @@ export interface IChatMessage {
         id: string;
         key: string;
     };
-    system: boolean;
+    system?: boolean;
+    command?: boolean;
     content: string;
 }
 export interface IChatRoom {
@@ -34,8 +36,14 @@ export interface IChatRoom {
     messages: Array<IChatMessage>;
     send(user: IChatMessage["user"], message: string): void;
     system(message: string): void;
+    command(team: 0 | 1, command: ECommand): void;
     emit(): void;
 }
+export declare enum EChatSystem {
+    TEAM_0 = 0,
+    TEAM_1 = 1,
+    SYSTEM = "SYSTEM"
+}
 export declare enum EMatchTableState {
     UNREADY = 0,
     READY = 1,
@@ -93,6 +101,7 @@ export type IEnvidoCalculator = {
 export declare enum EClientEvent {
     PING = "PING",
     SAY = "SAY",
+    LEAVE_MATCH = "LEAVE_MATCH",
     CREATE_MATCH = "CREATE_MATCH",
     LIST_MATCHES = "LIST_MATCHES",
     JOIN_MATCH = "JOIN_MATCH",
@@ -116,6 +125,7 @@ export interface ServerToClientEvents {
 export interface ClientToServerEvents {
     [EClientEvent.PING]: (msg: string) => void;
     [EClientEvent.CHAT]: (matchId: string, msg: string, callback: () => void) => void;
+    [EClientEvent.LEAVE_MATCH]: (matchId: string) => void;
     [EClientEvent.CREATE_MATCH]: (callback: IEventCallback<{
         match?: IPublicMatch;
     }>) => void;
@@ -169,5 +179,4 @@ export interface TMap<K, V> extends Map<K, V> {
 export declare class TMap<K, V> extends Map<K, V> {
     findAll(finder: (value: V) => boolean): V[];
     getOrThrow(key?: K): NonNullable<V>;
-    update(key: K, value: Partial<V>): void;
 }

package/dist/types.js

@@ -1,6 +1,12 @@
 "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;
+exports.TMap = exports.ETrucoshiMatchState = exports.EServerEvent = exports.EClientEvent = exports.GAME_ERROR = exports.EHandState = exports.EEnvidoCommand = exports.ESayCommand = exports.EMatchTableState = exports.EChatSystem = void 0;
+var EChatSystem;
+(function (EChatSystem) {
+    EChatSystem[EChatSystem["TEAM_0"] = 0] = "TEAM_0";
+    EChatSystem[EChatSystem["TEAM_1"] = 1] = "TEAM_1";
+    EChatSystem["SYSTEM"] = "SYSTEM";
+})(EChatSystem = exports.EChatSystem || (exports.EChatSystem = {}));
 var EMatchTableState;
 (function (EMatchTableState) {
     EMatchTableState[EMatchTableState["UNREADY"] = 0] = "UNREADY";
@@ -43,6 +49,7 @@ var EClientEvent;
 (function (EClientEvent) {
     EClientEvent["PING"] = "PING";
     EClientEvent["SAY"] = "SAY";
+    EClientEvent["LEAVE_MATCH"] = "LEAVE_MATCH";
     EClientEvent["CREATE_MATCH"] = "CREATE_MATCH";
     EClientEvent["LIST_MATCHES"] = "LIST_MATCHES";
     EClientEvent["JOIN_MATCH"] = "JOIN_MATCH";
@@ -95,12 +102,5 @@ class TMap extends Map {
         }
         return result;
     }
-    update(key, value) {
-        const current = this.get(key);
-        if (!current) {
-            throw new Error(`update(${key}) not found`);
-        }
-        this.set(key, Object.assign(Object.assign({}, current), value));
-    }
 }
 exports.TMap = TMap;

package/package.json

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