trucoshi 8.0.0 → 8.1.0

package/dist/events.d.ts

@@ -1,7 +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 { User } from "lightning-accounts";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
     error?: SocketError;
@@ -17,10 +16,16 @@ export declare enum EServerEvent {
     KICK_PLAYER = "PLAYER_KICKED",
     UPDATE_ACTIVE_MATCHES = "UPDATE_ACTIVE_MATCHES",
     WAITING_POSSIBLE_SAY = "WAITING_POSSIBLE_SAY",
-    UPDATE_CHAT = "UPDAET_CHAT"
+    UPDATE_CHAT = "UPDAET_CHAT",
+    ERROR = "ERROR"
 }
 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.NEW_MESSAGE]: (roomId: string, message?: IChatMessage) => void;
     [EServerEvent.UPDATE_ACTIVE_MATCHES]: (activeMatches: IPublicMatchInfo[]) => void;
@@ -33,7 +38,6 @@ export interface ServerToClientEvents {
     [EServerEvent.REFRESH_IDENTITY]: (userId: number, callback: (identityJwt: string | null) => void) => void;
 }
 export declare enum EClientEvent {
-    LOGIN = "LOGIN",
     LOGOUT = "LOGOUT",
     LEAVE_MATCH = "LEAVE_MATCH",
     CREATE_MATCH = "CREATE_MATCH",
@@ -96,7 +100,4 @@ export interface ClientToServerEvents {
     [EClientEvent.LIST_RANKING]: (filters: {}, callback: IEventCallback<{
         ranking: Array<IPlayerRanking>;
     }>) => void;
-    [EClientEvent.LOGIN]: (user: User, identityToken: string, callback: IEventCallback<{
-        activeMatches?: IPublicMatchInfo[];
-    }>) => void;
 }

package/dist/events.js

@@ -11,10 +11,10 @@ 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 || (EServerEvent = {}));
 export var EClientEvent;
 (function (EClientEvent) {
-    EClientEvent["LOGIN"] = "LOGIN";
     EClientEvent["LOGOUT"] = "LOGOUT";
     EClientEvent["LEAVE_MATCH"] = "LEAVE_MATCH";
     EClientEvent["CREATE_MATCH"] = "CREATE_MATCH";

package/dist/lib/classes/Random.d.ts

@@ -1,6 +1,7 @@
 import { RequestParams } from "lightning-accounts";
 import { IRandom } from "../../types";
 import { AxiosResponse } from "axios";
+export declare const rng: IRng;
 export declare const Random: () => IRandom;
 export interface IRng {
     combine(client: string, server: string, bitcoinHash: string, nonce: number): string;

package/dist/lib/classes/Random.js

@@ -8,23 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import forge from "node-forge";
-const rnd = Rng();
+export const rng = Rng();
 export const Random = () => {
     const random = {
-        secret: rnd.generateServerSeed(),
+        secret: rng.generateServerSeed(),
         clients: [],
         bitcoinHash: "",
         bitcoinHeight: 0,
         nonce: 0,
         getLatestBitcoinBlock(fn) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { hash, height } = yield rnd.getBitcoinLatestBlockHash(fn);
+                const { hash, height } = yield rng.getBitcoinLatestBlockHash(fn);
                 random.bitcoinHash = hash;
                 random.bitcoinHeight = height;
             });
         },
         pick(key, max) {
-            return rnd.generateInteger(random.clients[key], random.secret, random.bitcoinHash, random.nonce, 0, max);
+            return rng.generateInteger(random.clients[key], random.secret, random.bitcoinHash, random.nonce, 0, max);
         },
         next() {
             random.nonce++;
@@ -111,11 +111,18 @@ function Rng() {
          * @param {number} max - The maximum value of the range.
          * @returns {number} A random integer between min and max (inclusive).
          */
-        generateInteger: function (clientSeed, serverSeed, bitcoinHash, nonce, min, max) {
-            const preHash = this.combine(clientSeed, serverSeed, bitcoinHash, nonce);
-            const hash = this.sha512(preHash);
-            const range = max - min + 1;
-            return (parseInt(hash.slice(0, 16), 16) % range) + min;
+        generateInteger(clientSeed, serverSeed, bitcoinHash, nonce, min, max) {
+            const range = BigInt(max - min + 1);
+            const maxHash = BigInt("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"); // 128-bit max (32 hex chars)
+            const threshold = maxHash - (maxHash % range); // Ensure divisibility
+            let localNonce = nonce;
+            let hash;
+            do {
+                const preHash = this.combine(clientSeed, serverSeed, bitcoinHash, localNonce);
+                hash = BigInt(`0x${this.sha512(preHash).slice(0, 32)}`); // Use 128 bits
+                localNonce++;
+            } while (hash >= threshold);
+            return Number(hash % range) + min;
         },
         /**
          * Generates a random float between 0 and 1 using the fairjs library.

package/dist/lib/constants.js

@@ -1,4 +1,4 @@
-export const PLAYER_ABANDON_TIMEOUT = 1000 * 60;
+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 CARDS = {

package/dist/types.d.ts

@@ -6,6 +6,7 @@ import { IHand, IPlayInstance } from "./truco";
 import { CARDS, ITable } from "./lib";
 import { AxiosResponse } from "axios";
 import { ITrucoshi } from "./server";
+import { BotProfile } from "./truco/Bot";
 export declare enum EMatchState {
     UNREADY = "UNREADY",
     READY = "READY",
@@ -196,7 +197,8 @@ export declare enum GAME_ERROR {
     INVALID_COMAND = "INVALID_COMAND",
     INSUFFICIENT_BALANCE = "INSUFFICIENT_BALANCE",
     GAME_REQUIRES_ACCOUNT = "GAME_REQUIRES_ACCOUNT",
-    NO_FLOR = "NO_FLOR"
+    NO_FLOR = "NO_FLOR",
+    INVALID_SESSION = "INVALID_SESSION"
 }
 export interface EnvidoState {
     accept: number;
@@ -283,7 +285,7 @@ export interface IPlayer {
     avatarUrl: string | undefined | null;
     name: string;
     key: string;
-    bot: boolean;
+    bot: BotProfile | null;
     session: string;
     payRequestId?: number;
     abandonedTime: number;
@@ -315,6 +317,7 @@ export interface IPlayer {
     ready: boolean;
     getRandomCard(): [number, ICard];
     getHighestCard(): [number, ICard];
+    getLowestCard(): [number, ICard];
     getHighestEnvido(): number;
     saidEnvidoPoints(): void;
     saidFlor(): void;

package/dist/types.js

@@ -73,6 +73,7 @@ export var GAME_ERROR;
     GAME_ERROR["INSUFFICIENT_BALANCE"] = "INSUFFICIENT_BALANCE";
     GAME_ERROR["GAME_REQUIRES_ACCOUNT"] = "GAME_REQUIRES_ACCOUNT";
     GAME_ERROR["NO_FLOR"] = "NO_FLOR";
+    GAME_ERROR["INVALID_SESSION"] = "INVALID_SESSION";
 })(GAME_ERROR || (GAME_ERROR = {}));
 export const DANGEROUS_COMMANDS = [
     ESayCommand.MAZO,

package/package.json

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