trucoshi 7.3.1 → 7.4.1

package/dist/events.d.ts

@@ -1,6 +1,6 @@
 import { EMatchState } from "@trucoshi/prisma";
 import { SocketError } from "./server";
-import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IMatchPreviousHand, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
+import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
 import { User } from "lightning-accounts";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
@@ -11,7 +11,6 @@ export declare enum EServerEvent {
     NEW_MESSAGE = "NEW_MESSAGE",
     SET_SESSION = "SET_SESSION",
     REFRESH_IDENTITY = "REFRESH_IDENTITY",
-    PREVIOUS_HAND = "PREVIOUS_HAND",
     UPDATE_MATCH = "UPDATE_MATCH",
     MATCH_DELETED = "MATCH_DELETED",
     WAITING_PLAY = "WAITING_PLAY",
@@ -22,7 +21,6 @@ export declare enum EServerEvent {
 }
 export interface ServerToClientEvents {
     [EServerEvent.PONG]: (serverTime: number, clientTime: number) => void;
-    [EServerEvent.PREVIOUS_HAND]: (value: IMatchPreviousHand, callback: () => void) => void;
     [EServerEvent.UPDATE_CHAT]: (room: IPublicChatRoom) => void;
     [EServerEvent.NEW_MESSAGE]: (roomId: string, message?: IChatMessage) => void;
     [EServerEvent.UPDATE_ACTIVE_MATCHES]: (activeMatches: IPublicMatchInfo[]) => void;

package/dist/events.js

@@ -4,7 +4,6 @@ export var EServerEvent;
     EServerEvent["NEW_MESSAGE"] = "NEW_MESSAGE";
     EServerEvent["SET_SESSION"] = "SET_SESSION";
     EServerEvent["REFRESH_IDENTITY"] = "REFRESH_IDENTITY";
-    EServerEvent["PREVIOUS_HAND"] = "PREVIOUS_HAND";
     EServerEvent["UPDATE_MATCH"] = "UPDATE_MATCH";
     EServerEvent["MATCH_DELETED"] = "MATCH_DELETED";
     EServerEvent["WAITING_PLAY"] = "WAITING_PLAY";

package/dist/lib/constants.js

@@ -1,6 +1,6 @@
 export const PLAYER_ABANDON_TIMEOUT = 1000 * 60;
 export const PLAYER_TURN_TIMEOUT = 1000 * 30;
-export const PREVIOUS_HAND_ACK_TIMEOUT = 1000 * 3;
+export const PREVIOUS_HAND_ACK_TIMEOUT = 1000 * 10;
 export const CARDS = {
     "1e": 13,
     "1b": 12,

package/dist/lib/utils.d.ts

@@ -1,6 +1,6 @@
-import { IRound } from "../truco";
+import { IHand } from "../truco";
 import { ICard } from "../types";
 export declare function getMaxNumberIndex<T = number>(array: Array<T>): number;
 export declare function getMinNumberIndex<T = number>(array: Array<T>): number;
 export declare function getCardValue(card: ICard): number;
-export declare function checkHandWinner(rounds: Array<IRound>, forehandTeamIdx: 0 | 1): null | 0 | 1;
+export declare function checkHandWinner(hand: IHand, forehandTeamIdx: 0 | 1): null | 0 | 1;

package/dist/lib/utils.js

@@ -12,13 +12,17 @@ export function getMinNumberIndex(array) {
 export function getCardValue(card) {
     return CARDS[card] !== undefined ? CARDS[card] : -2;
 }
-export function checkHandWinner(rounds, forehandTeamIdx) {
+export function checkHandWinner(hand, forehandTeamIdx) {
     var _a, _b, _c, _d;
     const roundsWon = {
         0: 0,
         1: 0,
         ties: 0,
     };
+    const rounds = hand.rounds;
+    if (hand.flor.winner && hand.flor.state === 5) {
+        return hand.flor.winner.id;
+    }
     for (let i = 0; i < rounds.length; i++) {
         const round = rounds[i];
         if (round.tie) {

package/dist/types.d.ts

@@ -78,6 +78,7 @@ export interface IPublicMatch {
     state: EMatchState;
     handState: EHandState | null;
     florBattle: IMatchFlorBattle | null;
+    previousHand: IMatchPreviousHand | null;
     winner: ITeam | null;
     matchSessionId: string;
     forehandIdx: number;
@@ -163,7 +164,7 @@ export declare enum EHandState {
     WAITING_ENVIDO_POINTS_ANSWER = "WAITING_ENVIDO_POINTS_ANSWER",
     WAITING_FLOR_ANSWER = "WAITING_FLOR_ANSWER",
     DISPLAY_FLOR_BATTLE = "DISPLAY_FLOR_BATTLE",
-    BEFORE_FINISHED = "BEFORE_FINISHED",
+    DISPLAY_PREVIOUS_HAND = "DISPLAY_PREVIOUS_HAND",
     FINISHED = "FINISHED"
 }
 export type ECommand = ESayCommand | EEnvidoCommand | EAnswerCommand | EEnvidoAnswerCommand | ETrucoCommand | EFlorCommand;
@@ -340,6 +341,7 @@ export interface ITeam {
     name: string;
     players: Array<IPlayer>;
     points: ITeamPoints;
+    get activePlayers(): IPlayer[];
     setPlayers(players: IPlayer[]): ITeam;
     pointsToWin(matchPoint: number): number;
     getPublicTeam(playerSession?: string): IPublicTeam;

package/dist/types.js

@@ -53,7 +53,7 @@ export var EHandState;
     EHandState["WAITING_ENVIDO_POINTS_ANSWER"] = "WAITING_ENVIDO_POINTS_ANSWER";
     EHandState["WAITING_FLOR_ANSWER"] = "WAITING_FLOR_ANSWER";
     EHandState["DISPLAY_FLOR_BATTLE"] = "DISPLAY_FLOR_BATTLE";
-    EHandState["BEFORE_FINISHED"] = "BEFORE_FINISHED";
+    EHandState["DISPLAY_PREVIOUS_HAND"] = "DISPLAY_PREVIOUS_HAND";
     EHandState["FINISHED"] = "FINISHED";
 })(EHandState || (EHandState = {}));
 export var GAME_ERROR;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "7.3.1",
+  "version": "7.4.1",
   "description": "Lightning Truco Server",
   "main": "dist/types.js",
   "license": "GPL-3.0",