trucoshi 7.2.0 → 7.3.1

package/dist/lib/classes/Deck.js

@@ -37,8 +37,7 @@ export function Deck() {
 export const getAllCards = () => Object.keys(CARDS);
 export function dealCards(table, deck) {
     const cheat_lots_of_flowers = process.env.APP_CHEAT_LOTS_OF_FLOWERS_FOR_TESTING === "1";
-    const cheat_cards = process.env.APP_CHEAT_CARDS &&
-        JSON.parse(process.env.APP_CHEAT_CARDS);
+    const cheat_cards = process.env.APP_CHEAT_CARDS || "";
     const playerHands = [];
     const players = table.getPlayersForehandFirst();
     for (let i = 0; i < 3; i++) {
@@ -47,11 +46,17 @@ export function dealCards(table, deck) {
         }
     }
     if (cheat_cards) {
-        deck.shuffle(players[0].idx);
-        for (const [key, player] of players.entries()) {
-            playerHands[player.idx] = cheat_cards[key]
-                ? cheat_cards[key].map((c) => deck.pick(c) || deck.takeCard())
-                : deck.takeThree();
+        try {
+            const new_cards = JSON.parse(cheat_cards);
+            deck.shuffle(players[0].idx);
+            for (const [key, player] of players.entries()) {
+                playerHands[player.idx] = new_cards[key]
+                    ? new_cards[key].map((c) => deck.pick(c) || deck.takeCard())
+                    : deck.takeThree();
+            }
+        }
+        catch (_a) {
+            //noop
         }
     }
     if (cheat_lots_of_flowers) {

package/dist/lib/classes/Random.js

@@ -51,7 +51,12 @@ function Rng() {
          * @param   {number} nonce       - the nonce
          * @returns {string} combined string
          */
-        combine: (clientSeed, serverSeed, bitcoinHash, nonce) => clientSeed + serverSeed + bitcoinHash + nonce,
+        combine: (clientSeed, serverSeed, bitcoinHash, nonce) => {
+            if (bitcoinHash) {
+                return clientSeed + serverSeed + bitcoinHash + nonce;
+            }
+            return clientSeed + serverSeed + nonce;
+        },
         /**
          * Generates a sha512 hash from a string
          *

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

@@ -1,9 +1,8 @@
-import { IPlayedCard, IPlayer } from "../../types";
+import { IPlayer } from "../../types";
 export interface ITable<TPlayer extends {
     key: string;
 } = IPlayer> {
     forehandIdx: number;
-    cards: Array<Array<IPlayedCard>>;
     players: Array<TPlayer>;
     nextHand(): TPlayer;
     getPlayerByPosition(idx?: number, forehandFirst?: boolean): TPlayer;

package/dist/lib/classes/Table.js

@@ -1,7 +1,6 @@
 export function Table(players) {
     const table = {
         players,
-        cards: [],
         forehandIdx: 0,
         nextHand() {
             if (table.forehandIdx < table.players.length - 1) {

package/dist/lib/constants.js

@@ -1,6 +1,6 @@
 export const PLAYER_ABANDON_TIMEOUT = 1000 * 60;
 export const PLAYER_TURN_TIMEOUT = 1000 * 30;
-export const PREVIOUS_HAND_ACK_TIMEOUT = 1000 * 5;
+export const PREVIOUS_HAND_ACK_TIMEOUT = 1000 * 3;
 export const CARDS = {
     "1e": 13,
     "1b": 12,

package/dist/lib/utils.js

@@ -13,7 +13,7 @@ export function getCardValue(card) {
     return CARDS[card] !== undefined ? CARDS[card] : -2;
 }
 export function checkHandWinner(rounds, forehandTeamIdx) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const roundsWon = {
         0: 0,
         1: 0,
@@ -27,17 +27,21 @@ export function checkHandWinner(rounds, forehandTeamIdx) {
             roundsWon.ties = roundsWon.ties + 1;
             continue;
         }
-        if (((_a = round.winner) === null || _a === void 0 ? void 0 : _a.teamIdx) === 0) {
+        if (round.unbeatable) {
+            roundsWon[(_a = round.winner) === null || _a === void 0 ? void 0 : _a.teamIdx] += 1;
+            continue;
+        }
+        if (((_b = round.winner) === null || _b === void 0 ? void 0 : _b.teamIdx) === 0) {
             roundsWon[0] += 1;
         }
-        if (((_b = round.winner) === null || _b === void 0 ? void 0 : _b.teamIdx) === 1) {
+        if (((_c = round.winner) === null || _c === void 0 ? void 0 : _c.teamIdx) === 1) {
             roundsWon[1] += 1;
         }
     }
     if (roundsWon[0] > 2 && roundsWon[1] > 2) {
         return forehandTeamIdx;
     }
-    if (rounds.length > 2 && roundsWon.ties > 0 && ((_c = rounds[0]) === null || _c === void 0 ? void 0 : _c.winner)) {
+    if (rounds.length > 2 && roundsWon.ties > 0 && ((_d = rounds[0]) === null || _d === void 0 ? void 0 : _d.winner)) {
         return rounds[0].winner.teamIdx;
     }
     if (roundsWon[0] >= 2 && roundsWon[1] < 2) {

package/dist/types.d.ts

@@ -89,6 +89,7 @@ export interface IPublicMatch {
     rounds: IPlayedCard[][];
     lastCard?: ICard | null;
     lastCommand?: ECommand | number | null;
+    awardedSatsPerPlayer?: number;
 }
 export interface IPublicMatchInfo {
     ownerId: string;

package/package.json

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