trucoshi 8.1.0 → 8.3.1

package/dist/events.d.ts

@@ -1,6 +1,6 @@
 import { EMatchState } from "@trucoshi/prisma";
 import { SocketError } from "./server";
-import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
+import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, ITrucoshiStats, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
     error?: SocketError;
@@ -17,16 +17,12 @@ export declare enum EServerEvent {
     UPDATE_ACTIVE_MATCHES = "UPDATE_ACTIVE_MATCHES",
     WAITING_POSSIBLE_SAY = "WAITING_POSSIBLE_SAY",
     UPDATE_CHAT = "UPDAET_CHAT",
-    ERROR = "ERROR"
+    UPDATE_STATS = "UPDATE_STATS"
 }
 export interface ServerToClientEvents {
     [EServerEvent.PONG]: (serverTime: number, clientTime: number) => void;
-    [EServerEvent.ERROR]: (error: {
-        code: string;
-        message: string;
-        action: string;
-    }) => void;
     [EServerEvent.UPDATE_CHAT]: (room: IPublicChatRoom) => void;
+    [EServerEvent.UPDATE_STATS]: (room: ITrucoshiStats) => void;
     [EServerEvent.NEW_MESSAGE]: (roomId: string, message?: IChatMessage) => void;
     [EServerEvent.UPDATE_ACTIVE_MATCHES]: (activeMatches: IPublicMatchInfo[]) => void;
     [EServerEvent.UPDATE_MATCH]: (match: IPublicMatch, callback?: () => void) => void;
@@ -55,7 +51,9 @@ export declare enum EClientEvent {
     KICK_PLAYER = "KICK_PLAYER",
     CHAT = "CHAT",
     PING = "PING",
-    SAY = "SAY"
+    SAY = "SAY",
+    JOIN_ROOM = "JOIN_ROOM",
+    LEAVE_ROOM = "LEAVE_ROOM"
 }
 export interface ClientToServerEvents {
     [EClientEvent.LOGOUT]: (callback: IEventCallback<{}>) => void;
@@ -77,6 +75,8 @@ export interface ClientToServerEvents {
         match?: IPublicMatch;
         activeMatches?: IPublicMatchInfo[];
     }>) => void;
+    [EClientEvent.JOIN_ROOM]: (roomId: string) => void;
+    [EClientEvent.LEAVE_ROOM]: (roomId: string) => void;
     [EClientEvent.ADD_BOT]: (matchSessionId: string, teamIdx: 0 | 1 | undefined, callback: IEventCallback<{
         match?: IPublicMatch;
     }>) => void;

package/dist/events.js

@@ -11,7 +11,7 @@ export var EServerEvent;
     EServerEvent["UPDATE_ACTIVE_MATCHES"] = "UPDATE_ACTIVE_MATCHES";
     EServerEvent["WAITING_POSSIBLE_SAY"] = "WAITING_POSSIBLE_SAY";
     EServerEvent["UPDATE_CHAT"] = "UPDAET_CHAT";
-    EServerEvent["ERROR"] = "ERROR";
+    EServerEvent["UPDATE_STATS"] = "UPDATE_STATS";
 })(EServerEvent || (EServerEvent = {}));
 export var EClientEvent;
 (function (EClientEvent) {
@@ -33,4 +33,6 @@ export var EClientEvent;
     EClientEvent["CHAT"] = "CHAT";
     EClientEvent["PING"] = "PING";
     EClientEvent["SAY"] = "SAY";
+    EClientEvent["JOIN_ROOM"] = "JOIN_ROOM";
+    EClientEvent["LEAVE_ROOM"] = "LEAVE_ROOM";
 })(EClientEvent || (EClientEvent = {}));

package/dist/lib/classes/Deck.js

@@ -25,7 +25,7 @@ export function Deck() {
         shuffle(dealer) {
             deck.cards = getAllCards();
             deck.usedCards = [];
-            deck.cards = shuffleArray(deck.cards, (max) => deck.random.pick(dealer, max - 1));
+            deck.cards = shuffleArray(deck.cards, (max) => deck.random.pick(dealer, max));
             if (deck.cards.length !== 40) {
                 throw new Error("This is not good");
             }

package/dist/lib/classes/Random.js

@@ -24,7 +24,9 @@ export const Random = () => {
             });
         },
         pick(key, max) {
-            return rng.generateInteger(random.clients[key], random.secret, random.bitcoinHash, random.nonce, 0, max);
+            const result = rng.generateInteger(random.clients[key], random.secret, random.bitcoinHash, random.nonce, 0, max - 1);
+            random.next();
+            return result;
         },
         next() {
             random.nonce++;

package/dist/types.d.ts

@@ -46,6 +46,7 @@ export interface ISaidCommand {
 export interface IMatchFlorBattle {
     matchSessionId: string;
     playersWithFlor: {
+        team: 0 | 1;
         idx: number;
         cards?: ICard[];
         points: number;
@@ -337,6 +338,7 @@ export interface IPlayer {
     setSession(session: string): void;
     setIsOwner(isOwner: boolean): void;
     addDisconnectedTime(time: number): void;
+    rename(name: string): void;
     enable(): void;
     disable(): void;
     abandon(): void;
@@ -374,3 +376,6 @@ export type IHandRoundLog = {
 };
 export type IPublicUser = Pick<User, "id" | "email" | "name" | "role">;
 export declare const DANGEROUS_COMMANDS: ECommand[];
+export type ITrucoshiStats = {
+    onlinePlayers: number[];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "8.1.0",
+  "version": "8.3.1",
   "description": "Lightning Truco Server",
   "main": "dist/types.js",
   "license": "GPL-3.0",
@@ -67,6 +67,7 @@
     "@prisma/client": "^4.14.1",
     "@socket.io/redis-adapter": "^8.2.1",
     "@types/jsonwebtoken": "^9.0.5",
+    "@types/lodash.debounce": "^4.0.9",
     "@types/node-forge": "^1.3.11",
     "@types/pino": "^7.0.5",
     "@types/redis": "^4.0.11",
@@ -76,7 +77,8 @@
     "dotenv-cli": "^7.3.0",
     "form-data": "^4.0.0",
     "jsonwebtoken": "^9.0.2",
-    "lightning-accounts": "4.3.0",
+    "lightning-accounts": "4.3.1",
+    "lodash.debounce": "^4.0.8",
     "node-forge": "^1.3.1",
     "path-scurry": "^1.9.2",
     "pino": "^9.3.2",