trucoshi 9.3.0 → 10.0.0-rc2

package/dist/events.d.ts

@@ -1,6 +1,5 @@
-import { EMatchState } from "@trucoshi/prisma";
 import { SocketError } from "./server";
-import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IPublicMatchStats, ITrucoshiStats, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
+import { EMatchState, IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IPublicMatchStats, ITrucoshiStats, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
     error?: SocketError;
@@ -16,6 +15,9 @@ export declare enum EServerEvent {
     KICK_PLAYER = "PLAYER_KICKED",
     UPDATE_ACTIVE_MATCHES = "UPDATE_ACTIVE_MATCHES",
     UPDATE_PUBLIC_MATCHES = "UPDATE_PUBLIC_MATCHES",
+    PAUSE_MATCH_REQUEST = "PAUSE_MATCH_REQUEST",
+    UNPAUSE_STARTED = "UNPAUSE_STARTED",
+    PLAY_AGAIN_REQUEST = "PLAY_AGAIN_REQUEST",
     WAITING_POSSIBLE_SAY = "WAITING_POSSIBLE_SAY",
     UPDATE_CHAT = "UPDAET_CHAT",
     UPDATE_STATS = "UPDATE_STATS"
@@ -28,6 +30,9 @@ export interface ServerToClientEvents {
     [EServerEvent.UPDATE_ACTIVE_MATCHES]: (activeMatches: IPublicMatchInfo[]) => void;
     [EServerEvent.UPDATE_PUBLIC_MATCHES]: (publicMatches: IPublicMatchInfo[]) => void;
     [EServerEvent.UPDATE_MATCH]: (match: IPublicMatch, stats?: IPublicMatchStats, callback?: () => void) => void;
+    [EServerEvent.PAUSE_MATCH_REQUEST]: (roomId: string, fromOpponent: boolean, requestExpiresAt: number, answer: (answer: boolean) => void) => void;
+    [EServerEvent.PLAY_AGAIN_REQUEST]: (roomId: string, requestExpiresAt: number) => void;
+    [EServerEvent.UNPAUSE_STARTED]: (roomId: string, unpausesAt: number) => void;
     [EServerEvent.KICK_PLAYER]: (match: IPublicMatch, session: string, reason?: string) => void;
     [EServerEvent.MATCH_DELETED]: (matchSessionId: string) => void;
     [EServerEvent.SET_SESSION]: (userData: IUserData, serverVersion: string, activeMatches: Array<IPublicMatchInfo>) => void;
@@ -44,10 +49,12 @@ export declare enum EClientEvent {
     SET_MATCH_OPTIONS = "SET_MATCH_OPTIONS",
     LIST_MATCHES = "LIST_MATCHES",
     LIST_RANKING = "LIST_RANKING",
+    SET_PLAYER_READY = "SET_PLAYER_READY",
     JOIN_MATCH = "JOIN_MATCH",
     START_MATCH = "START_MATCH",
+    PAUSE_MATCH = "PAUSE_MATCH",
+    PLAY_AGAIN = "PLAY_AGAIN",
     ADD_BOT = "ADD_BOT",
-    SET_PLAYER_READY = "SET_PLAYER_READY",
     FETCH_MATCH = "FETCH_MATCH",
     FETCH_CHAT_ROOM = "FETCH_CHAT_ROOM",
     KICK_PLAYER = "KICK_PLAYER",
@@ -88,6 +95,12 @@ export interface ClientToServerEvents {
         matchSessionId?: string;
     }>) => void;
     [EClientEvent.KICK_PLAYER]: (matchSessionId: string, key: string, callback: IEventCallback) => void;
+    [EClientEvent.PAUSE_MATCH]: (matchSessionId: string, pause: boolean, callback?: IEventCallback<{
+        paused?: boolean;
+    }>) => void;
+    [EClientEvent.PLAY_AGAIN]: (matchSessionId: string, callback?: IEventCallback<{
+        newMatchSessionId?: string;
+    }>) => void;
     [EClientEvent.FETCH_MATCH]: (matchSessionId: string, callback: IEventCallback<{
         match: IPublicMatch | null;
     }>) => void;

package/dist/events.js

@@ -10,6 +10,9 @@ export var EServerEvent;
     EServerEvent["KICK_PLAYER"] = "PLAYER_KICKED";
     EServerEvent["UPDATE_ACTIVE_MATCHES"] = "UPDATE_ACTIVE_MATCHES";
     EServerEvent["UPDATE_PUBLIC_MATCHES"] = "UPDATE_PUBLIC_MATCHES";
+    EServerEvent["PAUSE_MATCH_REQUEST"] = "PAUSE_MATCH_REQUEST";
+    EServerEvent["UNPAUSE_STARTED"] = "UNPAUSE_STARTED";
+    EServerEvent["PLAY_AGAIN_REQUEST"] = "PLAY_AGAIN_REQUEST";
     EServerEvent["WAITING_POSSIBLE_SAY"] = "WAITING_POSSIBLE_SAY";
     EServerEvent["UPDATE_CHAT"] = "UPDAET_CHAT";
     EServerEvent["UPDATE_STATS"] = "UPDATE_STATS";
@@ -24,10 +27,12 @@ export var EClientEvent;
     EClientEvent["SET_MATCH_OPTIONS"] = "SET_MATCH_OPTIONS";
     EClientEvent["LIST_MATCHES"] = "LIST_MATCHES";
     EClientEvent["LIST_RANKING"] = "LIST_RANKING";
+    EClientEvent["SET_PLAYER_READY"] = "SET_PLAYER_READY";
     EClientEvent["JOIN_MATCH"] = "JOIN_MATCH";
     EClientEvent["START_MATCH"] = "START_MATCH";
+    EClientEvent["PAUSE_MATCH"] = "PAUSE_MATCH";
+    EClientEvent["PLAY_AGAIN"] = "PLAY_AGAIN";
     EClientEvent["ADD_BOT"] = "ADD_BOT";
-    EClientEvent["SET_PLAYER_READY"] = "SET_PLAYER_READY";
     EClientEvent["FETCH_MATCH"] = "FETCH_MATCH";
     EClientEvent["FETCH_CHAT_ROOM"] = "FETCH_CHAT_ROOM";
     EClientEvent["KICK_PLAYER"] = "KICK_PLAYER";

package/dist/lib/classes/Deck.js

@@ -60,7 +60,7 @@ export function dealCards(table, deck) {
     if (cheat_lots_of_flowers) {
         deck.shuffle(players[0].idx);
         for (const player of players) {
-            if (Math.random() > 0.5) {
+            if (Math.random() > 0.33) {
                 const first = deck.takeCard();
                 const second = deck.pick(deck.cards.find((c) => c.charAt(1) === first.charAt(1)));
                 const third = deck.pick(deck.cards.find((c) => c.charAt(1) === first.charAt(1)));

package/dist/lib/constants.d.ts

@@ -2,6 +2,8 @@ import { ICard } from "../types";
 export declare const PLAYER_ABANDON_TIMEOUT: number;
 export declare const PLAYER_TURN_TIMEOUT: number;
 export declare const PREVIOUS_HAND_ACK_TIMEOUT: number;
+export declare const PAUSE_REQUEST_TIMEOUT: number;
+export declare const UNPAUSE_TIME: number;
 export declare const CARDS: {
     "1e": number;
     "1b": number;

package/dist/lib/constants.js

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

package/dist/lib/utils.d.ts

@@ -1,8 +1,9 @@
 import { IHand } from "../truco";
-import { ICard } from "../types";
+import { ICard, IPlayer, ITeam } from "../types";
 import memoize from "lodash.memoize";
 export declare const memoizeMinute: typeof memoize;
 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 getOpponentTeam(teamIdx: 0 | 1 | number | Pick<ITeam, "id"> | Pick<IPlayer, "teamIdx"> | null): 0 | 1;
 export declare function checkHandWinner(hand: IHand, forehandTeamIdx: 0 | 1): null | 0 | 1;

package/dist/lib/utils.js

@@ -20,6 +20,13 @@ export function getMinNumberIndex(array) {
 export function getCardValue(card) {
     return CARDS[card] !== undefined ? CARDS[card] : -2;
 }
+export function getOpponentTeam(teamIdx) {
+    if (teamIdx === null) {
+        return 0;
+    }
+    const idx = typeof teamIdx === "number" ? teamIdx : "teamIdx" in teamIdx ? teamIdx.teamIdx : teamIdx.id;
+    return Number(!idx);
+}
 export function checkHandWinner(hand, forehandTeamIdx) {
     var _a, _b, _c, _d;
     const roundsWon = {

package/dist/types.d.ts

@@ -11,7 +11,8 @@ export declare enum EMatchState {
     UNREADY = "UNREADY",
     READY = "READY",
     STARTED = "STARTED",
-    FINISHED = "FINISHED"
+    FINISHED = "FINISHED",
+    PAUSED = "PAUSED"
 }
 export type IPlayerRanking = Omit<UserStats, "id" | "satsBet" | "satsWon" | "satsLost"> & Pick<User, "name" | "avatarUrl">;
 export interface IMatchDetails extends Match {
@@ -304,6 +305,7 @@ export interface IPlayer {
     session: string;
     payRequestId?: number;
     abandonedTime: number;
+    disconnectedAt: number | null;
     hand: Array<ICard>;
     usedHand: Array<ICard>;
     prevHand: Array<ICard>;
@@ -321,7 +323,9 @@ export interface IPlayer {
         value: number;
         cards: ICard[];
     } | null;
-    didSomething: boolean;
+    _didSomething: boolean;
+    get didSomething(): boolean;
+    set didSomething(value: boolean);
     hasSaidFlor: boolean;
     hasSaidEnvidoPoints: boolean;
     hasSaidTruco: boolean;
@@ -350,6 +354,7 @@ export interface IPlayer {
     setPayRequest(id?: number): void;
     setMatchPlayerId(id?: number): void;
     setTurn(turn: boolean): void;
+    delayTurnExpiration(ms: number): void;
     setTurnExpiration(...args: [number, number | null] | [null, null]): void;
     setEnvidoTurn(turn: boolean): void;
     getPublicPlayer(session?: string | "log"): IPublicPlayer;

package/dist/types.js

@@ -6,6 +6,7 @@ export var EMatchState;
     EMatchState["READY"] = "READY";
     EMatchState["STARTED"] = "STARTED";
     EMatchState["FINISHED"] = "FINISHED";
+    EMatchState["PAUSED"] = "PAUSED";
 })(EMatchState || (EMatchState = {}));
 export var EChatSystem;
 (function (EChatSystem) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "9.3.0",
+  "version": "10.0.0-rc2",
   "description": "Truco Game Server",
   "main": "dist/types.js",
   "license": "GPL-3.0",