trucoshi 7.1.0 → 7.2.1

package/dist/events.d.ts

@@ -1,6 +1,6 @@
 import { EMatchState } from "@trucoshi/prisma";
 import { SocketError } from "./server";
-import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IMatchPreviousHand, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
+import { IAccountDetails, IChatMessage, ILobbyOptions, IMatchDetails, IMatchPreviousHand, IPlayerRanking, IPublicChatRoom, IPublicMatch, IPublicMatchInfo, IUserData, IWaitingPlayData, IWaitingSayData } from "./types";
 import { User } from "lightning-accounts";
 export type IEventCallback<T = {}> = (args: {
     success: boolean;
@@ -43,6 +43,7 @@ export declare enum EClientEvent {
     FETCH_MATCH_DETAILS = "FETCH_MATCH_DETAILS",
     SET_MATCH_OPTIONS = "SET_MATCH_OPTIONS",
     LIST_MATCHES = "LIST_MATCHES",
+    LIST_RANKING = "LIST_RANKING",
     JOIN_MATCH = "JOIN_MATCH",
     START_MATCH = "START_MATCH",
     SET_PLAYER_READY = "SET_PLAYER_READY",
@@ -90,6 +91,9 @@ export interface ClientToServerEvents {
     }, callback: IEventCallback<{
         matches: Array<IPublicMatchInfo>;
     }>) => void;
+    [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

@@ -23,6 +23,7 @@ export var EClientEvent;
     EClientEvent["FETCH_MATCH_DETAILS"] = "FETCH_MATCH_DETAILS";
     EClientEvent["SET_MATCH_OPTIONS"] = "SET_MATCH_OPTIONS";
     EClientEvent["LIST_MATCHES"] = "LIST_MATCHES";
+    EClientEvent["LIST_RANKING"] = "LIST_RANKING";
     EClientEvent["JOIN_MATCH"] = "JOIN_MATCH";
     EClientEvent["START_MATCH"] = "START_MATCH";
     EClientEvent["SET_PLAYER_READY"] = "SET_PLAYER_READY";

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

@@ -1,10 +1,15 @@
+import { RequestParams } from "lightning-accounts";
 import { IRandom } from "../../types";
+import { AxiosResponse } from "axios";
 export declare const Random: () => IRandom;
 export interface IRng {
     combine(client: string, server: string, bitcoinHash: string, nonce: number): string;
     sha512(string: string): string;
     generateServerSeed(): string;
-    getBitcoinLatestBlockHash(): Promise<{
+    getBitcoinLatestBlockHash(fn: (params?: RequestParams) => Promise<AxiosResponse<{
+        hash: string;
+        height: number;
+    }, any>>): Promise<{
         hash: string;
         height: number;
     }>;

package/dist/lib/classes/Random.js

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { accountsApi } from "../../accounts/client";
 import forge from "node-forge";
 const rnd = Rng();
 export const Random = () => {
@@ -17,9 +16,9 @@ export const Random = () => {
         bitcoinHash: "",
         bitcoinHeight: 0,
         nonce: 0,
-        getLatestBitcoinBlock() {
+        getLatestBitcoinBlock(fn) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { hash, height } = yield rnd.getBitcoinLatestBlockHash();
+                const { hash, height } = yield rnd.getBitcoinLatestBlockHash(fn);
                 random.bitcoinHash = hash;
                 random.bitcoinHeight = height;
             });
@@ -52,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
          *
@@ -172,13 +176,10 @@ function Rng() {
          *
          * @returns {Promise<string>} The latest Bitcoin block hash
          */
-        getBitcoinLatestBlockHash: function () {
+        getBitcoinLatestBlockHash: function (fn) {
             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 };
+                    return (yield fn()).data || { hash: "", height: 0 };
                 }
                 catch (error) {
                     return { hash: "", height: 0 };

package/dist/types.d.ts

@@ -1,15 +1,17 @@
 export * from "./events";
 export { CARDS, CARDS_HUMAN_READABLE, BURNT_CARD } from "./lib/constants";
-import { User } from "lightning-accounts";
+import { RequestParams, User } from "lightning-accounts";
 import { Match, MatchPlayer, MatchHand, UserStats } from "@trucoshi/prisma";
 import { IHand } from "./truco";
 import { CARDS } from "./lib";
+import { AxiosResponse } from "axios";
 export declare enum EMatchState {
     UNREADY = "UNREADY",
     READY = "READY",
     STARTED = "STARTED",
     FINISHED = "FINISHED"
 }
+export type IPlayerRanking = Omit<UserStats, "id" | "satsBet" | "satsWon" | "satsLost"> & Pick<User, "name" | "avatarUrl">;
 export interface IMatchDetails extends Match {
     players: Array<Pick<MatchPlayer, "id" | "accountId" | "teamIdx" | "name" | "idx">>;
     hands: Array<MatchHand>;
@@ -240,7 +242,10 @@ export interface IRandom {
     bitcoinHash: string;
     bitcoinHeight: number;
     nonce: number;
-    getLatestBitcoinBlock(): Promise<void>;
+    getLatestBitcoinBlock(fn: (params?: RequestParams) => Promise<AxiosResponse<{
+        hash: string;
+        height: number;
+    }, any>>): Promise<void>;
     next(): void;
     pick(idx: number, max: number): number;
     reveal(): {

package/package.json

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