trucoshi 7.0.0-rc.9 → 7.1.0

package/dist/lib/classes/Deck.js

@@ -1,4 +1,4 @@
-import { BURNT_CARD, CARDS } from "../../types";
+import { BURNT_CARD, CARDS } from "../constants";
 import { Random } from "./Random";
 export function Deck() {
     const deck = {

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

@@ -1,18 +1,22 @@
 import { IRandom } from "../../types";
 export declare const Random: () => IRandom;
 export interface IRng {
-    combine(client: string, server: string, nonce: number): string;
+    combine(client: string, server: string, bitcoinHash: string, nonce: number): string;
     sha512(string: string): string;
     generateServerSeed(): string;
+    getBitcoinLatestBlockHash(): Promise<{
+        hash: string;
+        height: number;
+    }>;
     hexToBytes(hex: string): Uint8Array;
-    byteGenerator(clientseed: string, serverseed: string, nonce: number): Uint8Array;
-    generateInteger(clientSeed: string, serverSeed: string, nonce: number, min: number, max: number): number;
-    generateFloat(clientSeed: string, serverSeed: string, nonce: number, precision?: number): number;
-    generateBool(clientSeed: string, serverSeed: string, nonce: number): boolean;
+    byteGenerator(clientseed: string, serverseed: string, bitcoinHash: string, nonce: number): Uint8Array;
+    generateInteger(clientSeed: string, serverSeed: string, bitcoinHash: string, nonce: number, min: number, max: number): number;
+    generateFloat(clientSeed: string, serverSeed: string, bitcoinHash: string, nonce: number, precision?: number): number;
+    generateBool(clientSeed: string, serverSeed: string, bitcoinHash: string, nonce: number): boolean;
     selectRandomObject<T extends {
         probability: number;
     } = {
         probability: number;
         [x: string]: any;
-    }>(clientSeed: string, serverSeed: string, nonce: number, objects: Array<T>): T | null;
+    }>(clientSeed: string, serverSeed: string, bitcoinHash: string, nonce: number, objects: Array<T>): T | null;
 }

package/dist/lib/classes/Random.js

@@ -1,18 +1,42 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { accountsApi } from "../../accounts/client";
 import forge from "node-forge";
 const rnd = Rng();
 export const Random = () => {
     const random = {
         secret: rnd.generateServerSeed(),
         clients: [],
+        bitcoinHash: "",
+        bitcoinHeight: 0,
         nonce: 0,
+        getLatestBitcoinBlock() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { hash, height } = yield rnd.getBitcoinLatestBlockHash();
+                random.bitcoinHash = hash;
+                random.bitcoinHeight = height;
+            });
+        },
         pick(key, max) {
-            return rnd.generateInteger(random.clients[key], random.secret, random.nonce, 0, max);
+            return rnd.generateInteger(random.clients[key], random.secret, random.bitcoinHash, random.nonce, 0, max);
         },
         next() {
             random.nonce++;
         },
         reveal() {
-            return { secret: random.secret, clients: [...random.clients] };
+            return {
+                secret: random.secret,
+                clients: [...random.clients],
+                bitcoinHash: random.bitcoinHash,
+                bitcoinHeight: random.bitcoinHeight,
+            };
         },
     };
     return random;
@@ -22,12 +46,13 @@ function Rng() {
         /**
          * Generates a random 256 long hex hash
          *
-         * @param   {string} clientSeed - the clientSeed
-         * @param   {string} serverSeed - the serverSeed
-         * @param   {number} nonce      - the nonce
+         * @param   {string} clientSeed  - the clientSeed
+         * @param   {string} serverSeed  - the serverSeed
+         * @param   {string} bitcoinHash - The latest bitcoin block hash.
+         * @param   {number} nonce       - the nonce
          * @returns {string} combined string
          */
-        combine: (clientSeed, serverSeed, nonce) => clientSeed + serverSeed + nonce,
+        combine: (clientSeed, serverSeed, bitcoinHash, nonce) => clientSeed + serverSeed + bitcoinHash + nonce,
         /**
          * Generates a sha512 hash from a string
          *
@@ -62,11 +87,12 @@ function Rng() {
          *
          * @param {string} clientseed - The clientseed to use.
          * @param {string} serverseed - The serverseed to use.
+         * @param {string} bitcoinHash - The latest bitcoin block hash.
          * @param {number} nonce - The nonce to use.
          * @returns {Uint8Array} - The generated bytes as a Uint8Array.
          */
-        byteGenerator: function (clientseed, serverseed, nonce) {
-            const preHash = this.combine(clientseed, serverseed, nonce);
+        byteGenerator: function (clientseed, serverseed, bitcoinHash, nonce) {
+            const preHash = this.combine(clientseed, serverseed, bitcoinHash, nonce);
             const hash = this.sha512(preHash);
             return this.hexToBytes(hash.slice(0, 64));
         },
@@ -75,27 +101,29 @@ function Rng() {
          *
          * @param {string} clientSeed - The client seed.
          * @param {string} serverSeed - The server seed.
+         * @param {string} bitcoinHash - The latest bitcoin block hash.
          * @param {number} nonce - The nonce.
          * @param {number} min - The minimum value of the range.
          * @param {number} max - The maximum value of the range.
          * @returns {number} A random integer between min and max (inclusive).
          */
-        generateInteger: function (clientSeed, serverSeed, nonce, min, max) {
-            const preHash = this.combine(clientSeed, serverSeed, nonce);
+        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, 8), 16) % range) + min;
+            return (parseInt(hash.slice(0, 16), 16) % range) + min;
         },
         /**
          * Generates a random float between 0 and 1 using the fairjs library.
          * @param {string} clientSeed - The client seed to use for the random number generation.
          * @param {string} serverSeed - The server seed to use for the random number generation.
+         * @param {string} bitcoinHash - The latest bitcoin block hash.
          * @param {number} nonce - The nonce to use for the random number generation.
          * @param {number} [precision=2] - The number of decimal places to include in the result.
          * @returns {number} - The random float between 0 and 1.
          */
-        generateFloat: function (clientSeed, serverSeed, nonce, precision = 2) {
-            const bytes = this.byteGenerator(clientSeed, serverSeed, nonce);
+        generateFloat: function (clientSeed, serverSeed, bitcoinHash, nonce, precision = 2) {
+            const bytes = this.byteGenerator(clientSeed, serverSeed, bitcoinHash, nonce);
             const float = parseFloat("0." + bytes.join(""));
             return parseFloat(float.toFixed(precision));
         },
@@ -107,25 +135,28 @@ function Rng() {
          * @param {number} nonce       - The nonce.
          * @returns {float, boolean} random boolean true/false
          */
-        generateBool: function (clientSeed, serverSeed, nonce) {
-            return this.generateFloat(clientSeed, serverSeed, nonce, 10) <= 0.5 ? true : false;
+        generateBool: function (clientSeed, serverSeed, bitcoinHash, nonce) {
+            return this.generateFloat(clientSeed, serverSeed, bitcoinHash, nonce, 10) <= 0.5
+                ? true
+                : false;
         },
         /**
          * Selects a random object from an array of objects based on their probabilities.
          *
          * @param {string} clientSeed - The client seed.
          * @param {string} serverSeed - The server seed.
+         * @param {string} bitcoinHash - The latest bitcoin block hash.
          * @param {number} nonce      - The nonce.
          * @param {Array}  objects    - An array of objects with an ID and a probability property.
          * @returns {String} The ID of the randomly selected object.
          */
-        selectRandomObject: function (clientSeed, serverSeed, nonce, objects) {
+        selectRandomObject: function (clientSeed, serverSeed, bitcoinHash, nonce, objects) {
             let totalProbability = 0;
             for (const obj of objects) {
                 totalProbability += obj.probability;
             }
             const normalizedProbabilities = objects.map((obj) => obj.probability / totalProbability);
-            const randomFloat = this.generateFloat(clientSeed, serverSeed, nonce, 10);
+            const randomFloat = this.generateFloat(clientSeed, serverSeed, bitcoinHash, nonce, 10);
             let index = 0;
             for (let i = 0; i < normalizedProbabilities.length; i++) {
                 index += normalizedProbabilities[i];
@@ -136,5 +167,23 @@ function Rng() {
             // If no object is selected, return null
             return null;
         },
+        /**
+         * Gets the latest Bitcoin block hash from the LND node
+         *
+         * @returns {Promise<string>} The latest Bitcoin block hash
+         */
+        getBitcoinLatestBlockHash: function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!accountsApi.instance.defaults.baseURL) {
+                        return { hash: "", height: 0 };
+                    }
+                    return (yield accountsApi.wallet.getLatestBitcoinBlock()).data || { hash: "", height: 0 };
+                }
+                catch (error) {
+                    return { hash: "", height: 0 };
+                }
+            });
+        },
     };
 }

package/dist/lib/classes/Table.js

@@ -1,48 +1,35 @@
-import logger from "../../utils/logger";
-const log = logger.child({ class: "Table" });
 export function Table(players) {
-    log.trace({ playerKeys: players.map((p) => p.key) }, "Creating new table");
     const table = {
         players,
         cards: [],
         forehandIdx: 0,
         nextHand() {
-            log.trace({ currentForehandIdx: table.forehandIdx }, "nextHand called");
             if (table.forehandIdx < table.players.length - 1) {
                 table.forehandIdx++;
             }
             else {
                 table.forehandIdx = 0;
             }
-            log.trace({ newForehandIdx: table.forehandIdx }, "nextHand updated");
             const nextPlayer = table.getPlayerByPosition();
-            log.trace({ playerKey: nextPlayer.key }, "nextHand returning player");
             return nextPlayer;
         },
         getPlayerPosition(key, forehandFirst = false) {
-            log.trace({ key, forehandFirst }, "getPlayerPosition called");
             const array = forehandFirst ? table.getPlayersForehandFirst() : table.players;
             const position = array.findIndex((p) => p.key === key);
-            log.trace({ key, position }, "getPlayerPosition result");
             return position;
         },
         getPlayersForehandFirst(forehand) {
             const idx = forehand !== undefined ? forehand : table.forehandIdx;
-            log.trace({ forehandIdx: idx }, "getPlayersForehandFirst called");
             const cut = players.slice(idx, table.players.length);
             const end = players.slice(0, idx);
             const result = cut.concat(end);
-            log.trace({ playerKeys: result.map((p) => p.key) }, "getPlayersForehandFirst result");
             return result;
         },
         getPlayerByPosition(idx, forehandFirst = false) {
-            log.trace({ idx, forehandFirst }, "getPlayerByPosition called");
             const array = forehandFirst ? table.getPlayersForehandFirst() : table.players;
             const player = idx !== undefined ? array[idx] : array[0];
-            log.trace({ playerKey: player.key }, "getPlayerByPosition result");
             return player;
         },
     };
-    log.trace({ forehandIdx: table.forehandIdx }, "Table initialization complete");
     return table;
 }

package/dist/lib/constants.d.ts

@@ -0,0 +1,89 @@
+export declare const PLAYER_ABANDON_TIMEOUT: number;
+export declare const PLAYER_TURN_TIMEOUT: number;
+export declare const PREVIOUS_HAND_ACK_TIMEOUT: number;
+export declare const CARDS: {
+    "1e": number;
+    "1b": number;
+    "7e": number;
+    "7o": number;
+    "3e": number;
+    "3o": number;
+    "3b": number;
+    "3c": number;
+    "2e": number;
+    "2o": number;
+    "2b": number;
+    "2c": number;
+    "1o": number;
+    "1c": number;
+    re: number;
+    ro: number;
+    rb: number;
+    rc: number;
+    ce: number;
+    co: number;
+    cb: number;
+    cc: number;
+    pe: number;
+    po: number;
+    pb: number;
+    pc: number;
+    "7b": number;
+    "7c": number;
+    "6e": number;
+    "6o": number;
+    "6b": number;
+    "6c": number;
+    "5e": number;
+    "5o": number;
+    "5b": number;
+    "5c": number;
+    "4e": number;
+    "4o": number;
+    "4b": number;
+    "4c": number;
+};
+export declare const BURNT_CARD: "rb" | "1e" | "1b" | "7e" | "7o" | "3e" | "3o" | "3b" | "3c" | "2e" | "2o" | "2b" | "2c" | "1o" | "1c" | "re" | "ro" | "rc" | "ce" | "co" | "cb" | "cc" | "pe" | "po" | "pb" | "pc" | "7b" | "7c" | "6e" | "6o" | "6b" | "6c" | "5e" | "5o" | "5b" | "5c" | "4e" | "4o" | "4b" | "4c";
+export declare const CARDS_HUMAN_READABLE: {
+    "1e": string;
+    "1b": string;
+    "7e": string;
+    "7o": string;
+    "3e": string;
+    "3o": string;
+    "3b": string;
+    "3c": string;
+    "2e": string;
+    "2o": string;
+    "2b": string;
+    "2c": string;
+    "1o": string;
+    "1c": string;
+    re: string;
+    ro: string;
+    rb: string;
+    rc: string;
+    ce: string;
+    co: string;
+    cb: string;
+    cc: string;
+    pe: string;
+    po: string;
+    pb: string;
+    pc: string;
+    "7b": string;
+    "7c": string;
+    "6e": string;
+    "6o": string;
+    "6b": string;
+    "6c": string;
+    "5e": string;
+    "5o": string;
+    "5b": string;
+    "5c": string;
+    "4e": string;
+    "4o": string;
+    "4b": string;
+    "4c": string;
+};
+export declare const TEAM_SIZE_VALUES: number[];

package/dist/lib/constants.js

@@ -0,0 +1,89 @@
+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 = {
+    "1e": 13,
+    "1b": 12,
+    "7e": 11,
+    "7o": 10,
+    "3e": 9,
+    "3o": 9,
+    "3b": 9,
+    "3c": 9,
+    "2e": 8,
+    "2o": 8,
+    "2b": 8,
+    "2c": 8,
+    "1o": 7,
+    "1c": 7,
+    re: 6,
+    ro: 6,
+    rb: 6,
+    rc: 6,
+    ce: 5,
+    co: 5,
+    cb: 5,
+    cc: 5,
+    pe: 4,
+    po: 4,
+    pb: 4,
+    pc: 4,
+    "7b": 3,
+    "7c": 3,
+    "6e": 2,
+    "6o": 2,
+    "6b": 2,
+    "6c": 2,
+    "5e": 1,
+    "5o": 1,
+    "5b": 1,
+    "5c": 1,
+    "4e": 0,
+    "4o": 0,
+    "4b": 0,
+    "4c": 0,
+};
+export const BURNT_CARD = "xx";
+export const CARDS_HUMAN_READABLE = {
+    "1e": "1🗡️",
+    "1b": "1🌵",
+    "7e": "7🗡️",
+    "7o": "7💰",
+    "3e": "3🗡️",
+    "3o": "3💰",
+    "3b": "3🌵",
+    "3c": "3🍷",
+    "2e": "2🗡️",
+    "2o": "2💰",
+    "2b": "2🌵",
+    "2c": "2🍷",
+    "1o": "1💰",
+    "1c": "1🍷",
+    re: "12🗡️",
+    ro: "12💰",
+    rb: "12🌵",
+    rc: "12🍷",
+    ce: "11🗡️",
+    co: "11💰",
+    cb: "11🌵",
+    cc: "11🍷",
+    pe: "10🗡️",
+    po: "10💰",
+    pb: "10🌵",
+    pc: "10🍷",
+    "7b": "7🌵",
+    "7c": "7🍷",
+    "6e": "6🗡️",
+    "6o": "6💰",
+    "6b": "6🌵",
+    "6c": "6🍷",
+    "5e": "5🗡️",
+    "5o": "5💰",
+    "5b": "5🌵",
+    "5c": "5🍷",
+    "4e": "4🗡️",
+    "4o": "4💰",
+    "4b": "4🌵",
+    "4c": "4🍷",
+};
+export const TEAM_SIZE_VALUES = [1, 2, 3];

package/dist/lib/index.d.ts

@@ -1,2 +1,2 @@
 export * from "./classes";
-export * from "../constants";
+export * from "./constants";

package/dist/lib/index.js

@@ -1,2 +1,2 @@
 export * from "./classes";
-export * from "../constants";
+export * from "./constants";

package/dist/lib/utils.js

@@ -1,4 +1,4 @@
-import { CARDS } from "../constants";
+import { CARDS } from "./constants";
 export function getMaxNumberIndex(array) {
     return array.reduce((accumulator, current, index) => {
         return current > array[accumulator] ? index : accumulator;

package/dist/types.d.ts

@@ -1,9 +1,9 @@
 export * from "./events";
-export { CARDS, CARDS_HUMAN_READABLE, BURNT_CARD } from "./constants";
+export { CARDS, CARDS_HUMAN_READABLE, BURNT_CARD } from "./lib/constants";
 import { User } from "lightning-accounts";
-import { CARDS } from "./lib";
 import { Match, MatchPlayer, MatchHand, UserStats } from "@trucoshi/prisma";
 import { IHand } from "./truco";
+import { CARDS } from "./lib";
 export declare enum EMatchState {
     UNREADY = "UNREADY",
     READY = "READY",
@@ -237,12 +237,17 @@ export interface IHandPoints {
 export interface IRandom {
     secret: string;
     clients: string[];
+    bitcoinHash: string;
+    bitcoinHeight: number;
     nonce: number;
+    getLatestBitcoinBlock(): Promise<void>;
     next(): void;
     pick(idx: number, max: number): number;
     reveal(): {
         secret: string;
         clients: string[];
+        bitcoinHash: string;
+        bitcoinHeight: number;
     };
 }
 export type IPublicPlayer = Pick<IPlayer, "idx" | "key" | "name" | "abandonedTime" | "accountId" | "avatarUrl" | "disabled" | "abandoned" | "ready" | "hand" | "usedHand" | "prevHand" | "teamIdx" | "isTurn" | "turnExpiresAt" | "turnExtensionExpiresAt" | "isEnvidoTurn" | "isOwner"> & ({

package/dist/types.js

@@ -1,5 +1,5 @@
 export * from "./events";
-export { CARDS, CARDS_HUMAN_READABLE, BURNT_CARD } from "./constants";
+export { CARDS, CARDS_HUMAN_READABLE, BURNT_CARD } from "./lib/constants";
 export var EMatchState;
 (function (EMatchState) {
     EMatchState["UNREADY"] = "UNREADY";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "7.0.0-rc.9",
+  "version": "7.1.0",
   "description": "Lightning Truco Server",
   "main": "dist/types.js",
   "license": "GPL-3.0",
@@ -76,7 +76,7 @@
     "dotenv-cli": "^7.3.0",
     "form-data": "^4.0.0",
     "jsonwebtoken": "^9.0.2",
-    "lightning-accounts": "^4.1.0",
+    "lightning-accounts": "4.3.0",
     "node-forge": "^1.3.1",
     "path-scurry": "^1.9.2",
     "pino": "^9.3.2",