trucoshi 12.0.2 → 12.1.0

package/dist/events.d.ts

@@ -1,5 +1,5 @@
 import { SocketError } from "./server";
-import { EMatchState, IAdminCreateChestRewardCodeInput, IAdminCreateChestRewardCodeResult, IAdminDashboard, IAdminSetNoticeBannerInput, IAdminSetNoticeBannerResult, IAccountDetails, CardSkinId, ICard, IChatMessage, IEquippedDeck, ILobbyOptions, IInventoryCardGroup, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IPublicMatchStats, IJoinQueueOptions, IQueueMatchFound, IQueueStatus, IRewardCodeRedeemResult, IPublicNoticeBanner, ITreasureOpenResult, ITreasureStatus, ITrucoshiStats, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
+import { EMatchState, IAdminCreateChestRewardCodeInput, IAdminCreateChestRewardCodeResult, IAdminDashboard, IAdminSetNoticeBannerInput, IAdminSetNoticeBannerResult, IAccountDetails, CardSkinId, ICard, IChatMessage, IEquippedDeck, ILobbyOptions, IInventoryCardGroup, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IPublicMatchStats, IJoinQueueOptions, IQueueMatchFound, IQueueMatchCancelled, IQueueMatchStarting, IQueueReadyUpdate, IQueueStatus, IRewardCodeRedeemResult, IPublicNoticeBanner, ITreasureOpenResult, ITreasureStatus, ITrucoshiStats, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
     error?: SocketError;
@@ -23,6 +23,9 @@ export declare enum EServerEvent {
     UPDATE_STATS = "UPDATE_STATS",
     QUEUE_UPDATE = "QUEUE_UPDATE",
     QUEUE_MATCH_FOUND = "QUEUE_MATCH_FOUND",
+    QUEUE_READY_UPDATE = "QUEUE_READY_UPDATE",
+    QUEUE_MATCH_STARTING = "QUEUE_MATCH_STARTING",
+    QUEUE_MATCH_CANCELLED = "QUEUE_MATCH_CANCELLED",
     UPDATE_NOTICE_BANNER = "UPDATE_NOTICE_BANNER"
 }
 export interface ServerToClientEvents {
@@ -31,6 +34,9 @@ export interface ServerToClientEvents {
     [EServerEvent.UPDATE_STATS]: (room: ITrucoshiStats) => void;
     [EServerEvent.QUEUE_UPDATE]: (status: IQueueStatus) => void;
     [EServerEvent.QUEUE_MATCH_FOUND]: (match: IQueueMatchFound) => void;
+    [EServerEvent.QUEUE_READY_UPDATE]: (update: IQueueReadyUpdate) => void;
+    [EServerEvent.QUEUE_MATCH_STARTING]: (starting: IQueueMatchStarting) => void;
+    [EServerEvent.QUEUE_MATCH_CANCELLED]: (cancelled: IQueueMatchCancelled) => void;
     [EServerEvent.UPDATE_NOTICE_BANNER]: (noticeBanner: IPublicNoticeBanner | null) => void;
     [EServerEvent.NEW_MESSAGE]: (roomId: string, message?: IChatMessage) => void;
     [EServerEvent.UPDATE_ACTIVE_MATCHES]: (activeMatches: IPublicMatchInfo[]) => void;
@@ -62,6 +68,8 @@ export declare enum EClientEvent {
     PLAY_AGAIN = "PLAY_AGAIN",
     JOIN_QUEUE = "JOIN_QUEUE",
     LEAVE_QUEUE = "LEAVE_QUEUE",
+    CONFIRM_QUEUE_MATCH = "CONFIRM_QUEUE_MATCH",
+    DECLINE_QUEUE_MATCH = "DECLINE_QUEUE_MATCH",
     FETCH_INVENTORY = "FETCH_INVENTORY",
     SET_DECK_CARD_SKIN = "SET_DECK_CARD_SKIN",
     FETCH_TREASURE_STATUS = "FETCH_TREASURE_STATUS",
@@ -125,6 +133,10 @@ export interface ClientToServerEvents {
         status?: IQueueStatus;
     }>) => void;
     [EClientEvent.LEAVE_QUEUE]: (callback?: IEventCallback<{}>) => void;
+    [EClientEvent.CONFIRM_QUEUE_MATCH]: (proposalId: string, callback?: IEventCallback<{
+        update?: IQueueReadyUpdate;
+    }>) => void;
+    [EClientEvent.DECLINE_QUEUE_MATCH]: (proposalId: string, callback?: IEventCallback<{}>) => void;
     [EClientEvent.FETCH_INVENTORY]: (callback: IEventCallback<{
         inventory: IInventoryCardGroup[];
         equippedDeck: IEquippedDeck;

package/dist/events.js

@@ -18,6 +18,9 @@ export var EServerEvent;
     EServerEvent["UPDATE_STATS"] = "UPDATE_STATS";
     EServerEvent["QUEUE_UPDATE"] = "QUEUE_UPDATE";
     EServerEvent["QUEUE_MATCH_FOUND"] = "QUEUE_MATCH_FOUND";
+    EServerEvent["QUEUE_READY_UPDATE"] = "QUEUE_READY_UPDATE";
+    EServerEvent["QUEUE_MATCH_STARTING"] = "QUEUE_MATCH_STARTING";
+    EServerEvent["QUEUE_MATCH_CANCELLED"] = "QUEUE_MATCH_CANCELLED";
     EServerEvent["UPDATE_NOTICE_BANNER"] = "UPDATE_NOTICE_BANNER";
 })(EServerEvent || (EServerEvent = {}));
 export var EClientEvent;
@@ -37,6 +40,8 @@ export var EClientEvent;
     EClientEvent["PLAY_AGAIN"] = "PLAY_AGAIN";
     EClientEvent["JOIN_QUEUE"] = "JOIN_QUEUE";
     EClientEvent["LEAVE_QUEUE"] = "LEAVE_QUEUE";
+    EClientEvent["CONFIRM_QUEUE_MATCH"] = "CONFIRM_QUEUE_MATCH";
+    EClientEvent["DECLINE_QUEUE_MATCH"] = "DECLINE_QUEUE_MATCH";
     EClientEvent["FETCH_INVENTORY"] = "FETCH_INVENTORY";
     EClientEvent["SET_DECK_CARD_SKIN"] = "SET_DECK_CARD_SKIN";
     EClientEvent["FETCH_TREASURE_STATUS"] = "FETCH_TREASURE_STATUS";

package/dist/types.d.ts

@@ -59,12 +59,40 @@ export interface IQueueStatus {
     queuedAt: number;
     botFallbackAt?: number;
 }
+export interface IQueueProposalParticipant {
+    accountId?: number;
+    session: string;
+    name: string;
+    avatarUrl?: string | null;
+    bot: boolean;
+    ready: boolean;
+}
 export interface IQueueMatchFound {
+    proposalId: string;
     matchSessionId: string;
     maxPlayers: 2 | 4 | 6;
     humanPlayers: number;
     botPlayers: number;
     filledWithBots: boolean;
+    readyExpiresAt: number;
+    lobbyOptions: ILobbyOptions;
+    participants: IQueueProposalParticipant[];
+}
+export interface IQueueReadyUpdate {
+    proposalId: string;
+    matchSessionId: string;
+    readyExpiresAt: number;
+    participants: IQueueProposalParticipant[];
+}
+export interface IQueueMatchStarting {
+    proposalId: string;
+    matchSessionId: string;
+    startsAt: number;
+}
+export interface IQueueMatchCancelled {
+    proposalId: string;
+    matchSessionId: string;
+    reason: "declined" | "timeout" | "cancelled" | "error";
 }
 export interface ISaidCommand {
     player: IPlayer | IPublicPlayer;

package/package.json

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