trucoshi 5.1.2 → 5.3.0

package/dist/events.d.ts

@@ -1,6 +1,6 @@
 import { EMatchState } from "@trucoshi/prisma";
 import { SocketError } from "./server";
-import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IMatchPreviousHand, IPlayedCard, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, ISaidCommand, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
+import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IMatchPreviousHand, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
 import { User } from "lightning-accounts";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
@@ -9,14 +9,13 @@ export type IEventCallback<T = {}> = (args: {
 export declare enum EServerEvent {
     PONG = "PONG",
     SET_SESSION = "SET_SESSION",
+    REFRESH_IDENTITY = "REFRESH_IDENTITY",
     PREVIOUS_HAND = "PREVIOUS_HAND",
     UPDATE_MATCH = "UPDATE_MATCH",
     MATCH_DELETED = "MATCH_DELETED",
     WAITING_PLAY = "WAITING_PLAY",
     KICK_PLAYER = "PLAYER_KICKED",
     UPDATE_ACTIVE_MATCHES = "UPDATE_ACTIVE_MATCHES",
-    PLAYER_USED_CARD = "PLAYER_USED_CARD",
-    PLAYER_SAID_COMMAND = "PLAYER_SAID_COMMAND",
     WAITING_POSSIBLE_SAY = "WAITING_POSSIBLE_SAY",
     UPDATE_CHAT = "UPDAET_CHAT"
 }
@@ -26,13 +25,12 @@ export interface ServerToClientEvents {
     [EServerEvent.UPDATE_CHAT]: (room: IPublicChatRoom, message?: IChatMessage) => void;
     [EServerEvent.UPDATE_ACTIVE_MATCHES]: (activeMatches: IPublicMatchInfo[]) => void;
     [EServerEvent.UPDATE_MATCH]: (match: IPublicMatch, callback?: () => void) => void;
-    [EServerEvent.PLAYER_USED_CARD]: (match: IPublicMatch, card: IPlayedCard) => void;
-    [EServerEvent.PLAYER_SAID_COMMAND]: (match: IPublicMatch, command: ISaidCommand) => 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;
     [EServerEvent.WAITING_POSSIBLE_SAY]: (match: IPublicMatch, callback: (data: IWaitingSayData) => void) => void;
     [EServerEvent.WAITING_PLAY]: (match: IPublicMatch, callback: (data: IWaitingPlayData) => void) => void;
+    [EServerEvent.REFRESH_IDENTITY]: (userId: number, callback: (identityJwt: string | null) => void) => void;
 }
 export declare enum EClientEvent {
     LOGIN = "LOGIN",
@@ -61,7 +59,7 @@ export interface ClientToServerEvents {
         match?: IPublicMatch;
         activeMatches?: IPublicMatchInfo[];
     }>) => void;
-    [EClientEvent.SET_MATCH_OPTIONS]: (identityJwt: string | null, matchSessionId: string, options: Partial<ILobbyOptions>, callback: IEventCallback<{
+    [EClientEvent.SET_MATCH_OPTIONS]: (matchSessionId: string, options: Partial<ILobbyOptions>, callback: IEventCallback<{
         match?: IPublicMatch;
         activeMatches?: IPublicMatchInfo[];
     }>) => void;
@@ -72,7 +70,7 @@ export interface ClientToServerEvents {
         match?: IPublicMatch;
         activeMatches?: IPublicMatchInfo[];
     }>) => void;
-    [EClientEvent.START_MATCH]: (identityJwt: string | null, matchSessionId: string, callback: IEventCallback<{
+    [EClientEvent.START_MATCH]: (matchSessionId: string, callback: IEventCallback<{
         matchSessionId?: string;
     }>) => void;
     [EClientEvent.KICK_PLAYER]: (matchSessionId: string, key: string, callback: IEventCallback) => void;

package/dist/events.js

@@ -2,14 +2,13 @@ export var EServerEvent;
 (function (EServerEvent) {
     EServerEvent["PONG"] = "PONG";
     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";
     EServerEvent["KICK_PLAYER"] = "PLAYER_KICKED";
     EServerEvent["UPDATE_ACTIVE_MATCHES"] = "UPDATE_ACTIVE_MATCHES";
-    EServerEvent["PLAYER_USED_CARD"] = "PLAYER_USED_CARD";
-    EServerEvent["PLAYER_SAID_COMMAND"] = "PLAYER_SAID_COMMAND";
     EServerEvent["WAITING_POSSIBLE_SAY"] = "WAITING_POSSIBLE_SAY";
     EServerEvent["UPDATE_CHAT"] = "UPDAET_CHAT";
 })(EServerEvent || (EServerEvent = {}));

package/dist/lib/constants.js

@@ -1,4 +1,4 @@
-export const PLAYER_ABANDON_TIMEOUT = 1000 * 45;
+export const PLAYER_ABANDON_TIMEOUT = 1000 * 60;
 export const PLAYER_TURN_TIMEOUT = 1000 * 30;
 export const PREVIOUS_HAND_ACK_TIMEOUT = 1000 * 5;
 export const CARDS = {

package/dist/types.d.ts

@@ -49,6 +49,7 @@ export interface IPublicMatch {
     options: ILobbyOptions;
     busy: boolean;
     state: EMatchState;
+    handState: EHandState | null;
     winner: ITeam | null;
     matchSessionId: string;
     ownerKey: string;
@@ -127,6 +128,7 @@ export declare enum EHandState {
     WAITING_FOR_TRUCO_ANSWER = "WAITING_FOR_TRUCO_ANSWER",
     WAITING_ENVIDO_ANSWER = "WAITING_ENVIDO_ANSWER",
     WAITING_ENVIDO_POINTS_ANSWER = "WAITING_ENVIDO_POINTS_ANSWER",
+    BEFORE_FINISHED = "BEFORE_FINISHED",
     FINISHED = "FINISHED"
 }
 export type ECommand = ESayCommand | EEnvidoCommand | EAnswerCommand | EEnvidoAnswerCommand | ETrucoCommand | EFlorCommand;

package/dist/types.js

@@ -50,6 +50,7 @@ export var EHandState;
     EHandState["WAITING_FOR_TRUCO_ANSWER"] = "WAITING_FOR_TRUCO_ANSWER";
     EHandState["WAITING_ENVIDO_ANSWER"] = "WAITING_ENVIDO_ANSWER";
     EHandState["WAITING_ENVIDO_POINTS_ANSWER"] = "WAITING_ENVIDO_POINTS_ANSWER";
+    EHandState["BEFORE_FINISHED"] = "BEFORE_FINISHED";
     EHandState["FINISHED"] = "FINISHED";
 })(EHandState || (EHandState = {}));
 export var GAME_ERROR;

package/package.json

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