trucoshi 8.0.0 → 8.0.1

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/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",
@@ -283,7 +284,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 +316,7 @@ export interface IPlayer {
     ready: boolean;
     getRandomCard(): [number, ICard];
     getHighestCard(): [number, ICard];
+    getLowestCard(): [number, ICard];
     getHighestEnvido(): number;
     saidEnvidoPoints(): void;
     saidFlor(): void;

package/package.json

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