trucoshi 5.4.0 → 5.5.3

package/dist/lib/classes/Deck.js

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

package/dist/types.d.ts

@@ -40,6 +40,13 @@ export interface ISaidCommand {
     command: ECommand | number;
 }
 export interface IMatchPreviousHand {
+    envido: {
+        winner: IPublicPlayer;
+        data?: {
+            value: number;
+            cards: ICard[];
+        };
+    } | null;
     rounds: IPlayedCard[][];
     points: IHandPoints;
     matchSessionId: string;
@@ -104,6 +111,7 @@ export declare enum ESayCommand {
 export declare enum EFlorCommand {
     FLOR = "FLOR",
     CONTRAFLOR = "CONTRAFLOR",
+    CONTRAFLOR_AL_RESTO = "CONTRAFLOR_AL_RESTO",
     ACHICO = "ACHICO"
 }
 export declare enum ETrucoCommand {
@@ -128,6 +136,8 @@ export declare enum EHandState {
     WAITING_FOR_TRUCO_ANSWER = "WAITING_FOR_TRUCO_ANSWER",
     WAITING_ENVIDO_ANSWER = "WAITING_ENVIDO_ANSWER",
     WAITING_ENVIDO_POINTS_ANSWER = "WAITING_ENVIDO_POINTS_ANSWER",
+    WAITING_FLOR_ANSWER = "WAITING_FLOR_ANSWER",
+    WAITING_FLOR_POINTS_ANSWER = "WAITING_FLOR_POINTS_ANSWER",
     BEFORE_FINISHED = "BEFORE_FINISHED",
     FINISHED = "FINISHED"
 }
@@ -242,10 +252,14 @@ export interface IPlayer {
     hand: Array<ICard>;
     usedHand: Array<ICard>;
     prevHand: Array<ICard>;
-    envido: Array<number>;
+    envido: Array<{
+        value: number;
+        cards: ICard[];
+    }>;
     _commands: Set<ECommand>;
     get commands(): Array<ECommand>;
     isTurn: boolean;
+    hasSaidEnvidoPoints: boolean;
     turnExpiresAt: number | null;
     turnExtensionExpiresAt: number | null;
     hasFlor: boolean;
@@ -254,8 +268,12 @@ export interface IPlayer {
     disabled: boolean;
     abandoned: boolean;
     ready: boolean;
+    saidEnvidoPoints(): void;
     resetCommands(): void;
-    calculateEnvido(): Array<number>;
+    calculateEnvido(): Array<{
+        value: number;
+        cards: ICard[];
+    }>;
     setIdx(idx: number): void;
     setPayRequest(id?: number): void;
     setMatchPlayerId(id?: number): void;

package/dist/types.js

@@ -21,6 +21,7 @@ export var EFlorCommand;
 (function (EFlorCommand) {
     EFlorCommand["FLOR"] = "FLOR";
     EFlorCommand["CONTRAFLOR"] = "CONTRAFLOR";
+    EFlorCommand["CONTRAFLOR_AL_RESTO"] = "CONTRAFLOR_AL_RESTO";
     EFlorCommand["ACHICO"] = "ACHICO";
 })(EFlorCommand || (EFlorCommand = {}));
 export var ETrucoCommand;
@@ -50,6 +51,8 @@ export var EHandState;
     EHandState["WAITING_FOR_TRUCO_ANSWER"] = "WAITING_FOR_TRUCO_ANSWER";
     EHandState["WAITING_ENVIDO_ANSWER"] = "WAITING_ENVIDO_ANSWER";
     EHandState["WAITING_ENVIDO_POINTS_ANSWER"] = "WAITING_ENVIDO_POINTS_ANSWER";
+    EHandState["WAITING_FLOR_ANSWER"] = "WAITING_FLOR_ANSWER";
+    EHandState["WAITING_FLOR_POINTS_ANSWER"] = "WAITING_FLOR_POINTS_ANSWER";
     EHandState["BEFORE_FINISHED"] = "BEFORE_FINISHED";
     EHandState["FINISHED"] = "FINISHED";
 })(EHandState || (EHandState = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trucoshi",
-  "version": "5.4.0",
+  "version": "5.5.3",
   "description": "Lightning Truco Server",
   "main": "dist/types.js",
   "license": "GPL-3.0",
@@ -18,21 +18,26 @@
     ]
   },
   "scripts": {
-    "start": "nodemon",
-    "start:e2e": "yarn build && dotenv -e .env.e2e -- node ./bin/trucoshi-server ",
-    "profiler": "yarn build && node --prof ./bin/trucoshi-server",
     "build": "yarn prisma generate --generator distClient && yarn run rimraf ./build && yarn run tsc --project .",
     "build:dist": "yarn run rimraf ./dist && yarn prisma generate --generator distClient && yarn run tsc --project ./tsconfig.dist.json",
+    "start": "nodemon",
+    "start:migrate": "prisma db push && yarn start",
+    "start:prod": "node bin/trucoshi-server",
+    "start:prod:migrate": "prisma migrate deploy && yarn start:prod",
+    "docker": "docker compose -f docker-compose.yml --env-file .env up --build --abort-on-container-exit",
+    "docker:exec": "docker compose exec -i server yarn",
+    "docker:prod": "docker compose -f docker-compose.prod.yml --env-file .env up --build",
+    "docker:staging": "docker compose -f docker-compose.staging.yml --env-file .env up --build",
+    "docker:test": "docker compose -f docker-compose.e2e.yml --env-file .env.test up --build --abort-on-container-exit",
+    "test": "dotenv -e .env.test -- ts-mocha --exit ./test/lib/**/*.ts -t 50000",
+    "test:e2e": "prisma db push --force-reset && dotenv -e .env.test -- ts-mocha --exit ./test/**/*.ts -t 60000",
+    "profiler": "node --prof ./bin/trucoshi-server",
     "prepublishOnly": "yarn test && yarn build:dist",
-    "test": "dotenv -e .env.e2e -- yarn db:e2e:push --force-reset && dotenv -e .env.e2e -- ts-mocha --exit ./test/**/*.ts -t 50000",
     "cli:autoplay": "yarn run ts-node src/cli/autoplay",
     "cli:play": "yarn run ts-node src/cli/play",
     "db:push": "prisma db push",
     "db:studio": "prisma studio",
-    "db:migrate": "prisma migrate dev",
-    "db:e2e:push": "dotenv -e .env.e2e -- prisma db push",
-    "db:e2e:studio": "dotenv -e .env.e2e -- prisma studio",
-    "db:e2e:migrate": "dotenv -e .env.e2e -- prisma migrate dev"
+    "db:migrate": "prisma migrate dev"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",
@@ -74,8 +79,8 @@
     "lightning-accounts": "3.0.0",
     "node-forge": "^1.3.1",
     "path-scurry": "^1.9.2",
-    "pino": "^8.11.0",
-    "pino-pretty": "^10.0.0",
+    "pino": "^9.3.2",
+    "pino-pretty": "^11.2.2",
     "rimraf": "^4.1.1",
     "safe-rng": "^1.0.4",
     "socket.io": "^4.5.4",

package/prisma/client/index.js

@@ -243,7 +243,7 @@ const PrismaClient = getPrismaClient(config)
 exports.PrismaClient = PrismaClient
 Object.assign(exports, Prisma)
 
-path.join(__dirname, "libquery_engine-debian-openssl-1.1.x.so.node");
-path.join(process.cwd(), "prisma/client/libquery_engine-debian-openssl-1.1.x.so.node")
+path.join(__dirname, "libquery_engine-debian-openssl-3.0.x.so.node");
+path.join(process.cwd(), "prisma/client/libquery_engine-debian-openssl-3.0.x.so.node")
 path.join(__dirname, "schema.prisma");
 path.join(process.cwd(), "prisma/client/schema.prisma")