texas-poker-core 1.4.2 → 1.4.4

package/README.md

@@ -409,4 +409,12 @@ bufix
 重命名变量
 
 ## 1.4.2
-分离职责到业务层
+
+分离职责到业务层
+
+## 1.4.3
+
+导出 fatal code 判断方法
+
+## 1.4.4
+增加一些单元测试

package/dist/Controller/index.js

@@ -63,6 +63,9 @@ var Controller = /*#__PURE__*/function () {
       throw error;
     };
     _classCallCheck(this, Controller);
+    /**
+     * ① 仅剩一名玩家未弃牌（至少两人局才有「独赢」）
+     */
     _classPrivateMethodInitSpec(this, _Controller_brand);
     _classPrivateFieldInitSpec(this, _status, 'idle');
     _classPrivateFieldInitSpec(this, _stage, StageEnum.PRE_FLOP);
@@ -103,6 +106,22 @@ var Controller = /*#__PURE__*/function () {
     get: function get() {
       return _classPrivateFieldGet(_activePlayer, this);
     }
+  }, {
+    key: "shouldShowDown",
+    value:
+    /**
+     * ② 结束条件（没人还能操作）：
+     * - 场上只剩 out / allIn（无 waiting）=> 直接结束（可能发生在任意街：多人全下）
+     * - 河牌圈且所有仍可行动玩家都不可 actionable（即便 status 仍为 waiting）=> 结束
+     */
+    function shouldShowDown() {
+      var playersCanAct = _classPrivateFieldGet(_dealer, this).getPlayersCanAct();
+
+      // 只剩 1 名未弃牌玩家时由 `#isWinByExclusiveFold` 先结束，不会走到此处。
+      return playersCanAct.length === 0 || _classPrivateFieldGet(_stage, this) === StageEnum.RIVER && playersCanAct.every(function (player) {
+        return !player.actionable();
+      });
+    }
   }, {
     key: "transferControlTo",
     value:
@@ -111,7 +130,7 @@ var Controller = /*#__PURE__*/function () {
      * @param player
      */
     function transferControlTo(player) {
-      if (_classPrivateFieldGet(_activePlayer, this) === player) return this.fail(new _TexasError.default(_TexasError.TexasCoreErrorCode.CTRL_DUPLICATE_CONTROL));
+      if (player !== null && _classPrivateFieldGet(_activePlayer, this) === player) return this.fail(new _TexasError.default(_TexasError.TexasCoreErrorCode.CTRL_DUPLICATE_CONTROL));
       _classPrivateFieldSet(_activePlayer, this, player);
       player === null || player === void 0 || player.getControl();
     }
@@ -125,18 +144,14 @@ var Controller = /*#__PURE__*/function () {
   }, {
     key: "tryToEndGame",
     value: function tryToEndGame() {
-      var otherPlayersFold = _classPrivateFieldGet(_dealer, this).filter(function (player) {
-        return player.getStatus() === 'out';
-      }).length === _classPrivateFieldGet(_dealer, this).count - 1;
-
-      // 其他玩家都弃牌了
-      if (otherPlayersFold) {
+      if (_assertClassBrand(_Controller_brand, this, _isWinByExclusiveFold).call(this)) {
         var _classPrivateFieldGet2;
         this.end();
         _classPrivateFieldSet(_endAt, this, _classPrivateFieldGet(_stage, this));
         (_classPrivateFieldGet2 = _classPrivateFieldGet(_callbackOfEnd, this)) === null || _classPrivateFieldGet2 === void 0 || _classPrivateFieldGet2.call(this, {
-          restCommonPokes: this.getCommonPokes(_classPrivateFieldGet(_stage, this), _classPrivateFieldGet(_endAt, this)),
+          pokesToReveal: this.getCommonPokes(_classPrivateFieldGet(_stage, this), _classPrivateFieldGet(_endAt, this)),
           currentStage: _classPrivateFieldGet(_stage, this),
+          endStage: _classPrivateFieldGet(_endAt, this),
           showHandPokes: false
         });
         _TexasEngineContext.TexasEngineContext.emitTrace({
@@ -148,13 +163,7 @@ var Controller = /*#__PURE__*/function () {
         });
         return true;
       }
-
-      // 可以行动的人数(非allIn & out) <= 1 && 可以行动的人采取了行动
-      var playersCanAct = _classPrivateFieldGet(_dealer, this).getPlayersCanAct();
-      var shouldEndGame = playersCanAct.length === 0 || playersCanAct.length === 1 && !playersCanAct[0].actionable() || _classPrivateFieldGet(_dealer, this).every(function (player) {
-        return !player.actionable();
-      }) && _classPrivateFieldGet(_stage, this) === StageEnum.RIVER;
-      if (shouldEndGame) {
+      if (this.shouldShowDown()) {
         var _classPrivateFieldGet4;
         this.end();
         _classPrivateFieldSet(_endAt, this, this.stage);
@@ -162,11 +171,12 @@ var Controller = /*#__PURE__*/function () {
           rankCategory = _classPrivateFieldGet3.rankCategory,
           pokes = _classPrivateFieldGet3.pokes;
         (_classPrivateFieldGet4 = _classPrivateFieldGet(_callbackOfEnd, this)) === null || _classPrivateFieldGet4 === void 0 || _classPrivateFieldGet4.call(this, {
+          bestPokes: pokes,
           showHandPokes: true,
           currentStage: _classPrivateFieldGet(_stage, this),
-          restCommonPokes: this.getCommonPokes(_classPrivateFieldGet(_stage, this), StageEnum.RIVER),
-          bestPokes: pokes,
-          bestRankCategory: rankCategory
+          endStage: StageEnum.RIVER,
+          bestRankCategory: rankCategory,
+          pokesToReveal: this.getCommonPokes(_classPrivateFieldGet(_stage, this), StageEnum.RIVER)
         });
         _TexasEngineContext.TexasEngineContext.emitTrace({
           channel: 'controller',
@@ -196,6 +206,7 @@ var Controller = /*#__PURE__*/function () {
         var index = stages.findIndex(function (stage) {
           return stage === _classPrivateFieldGet(_stage, _this);
         });
+        if (index < 0 || index >= stages.length - 1) return false;
         var currentStage = _classPrivateFieldGet(_stage, this);
         var nextStage = stages[index + 1];
         _classPrivateFieldSet(_stage, this, nextStage);
@@ -205,7 +216,7 @@ var Controller = /*#__PURE__*/function () {
         (_classPrivateFieldGet5 = _classPrivateFieldGet(_callbackOnNextStage, this)) === null || _classPrivateFieldGet5 === void 0 || _classPrivateFieldGet5.call(this, {
           stage: nextStage,
           lastStage: currentStage,
-          commonPokes: this.getCommonPokes(currentStage, nextStage)
+          pokesToReveal: this.getCommonPokes(currentStage, nextStage)
         });
         _TexasEngineContext.TexasEngineContext.emitTrace({
           channel: 'controller',
@@ -409,6 +420,16 @@ var Controller = /*#__PURE__*/function () {
     }
   }]);
 }();
+function _isWinByExclusiveFold() {
+  var n = _classPrivateFieldGet(_dealer, this).count;
+  if (n < 2) return this.fail(new _TexasError.default(_TexasError.TexasCoreErrorCode.CTRL_ENDGAME_INVARIANT_DEALER_LT_2, {
+    count: n
+  }));
+  var folded = _classPrivateFieldGet(_dealer, this).filter(function (p) {
+    return p.getStatus() === 'out';
+  }).length;
+  return folded === n - 1;
+}
 function _getPokeEndIndex(stage) {
   if (stage === StageEnum.PRE_FLOP) return 0;
   if (stage === StageEnum.FLOP) return 3;

package/dist/Player/index.js

@@ -1007,17 +1007,21 @@ var Player = exports.Player = /*#__PURE__*/function () {
     }
 
     /**
-     * @description 获取行动前的min~max 下注金额范围
+     * @description 获取行动前的 min~max 下注金额范围
+     * - max：当前玩家剩余筹码（可全下上限）
+     * - min：大盲、本家余额、当轮桌上「已下注额」正数最小值 三者取小（有人短码只下 300 时，后续玩家 min 可低至 300）
      */
   }, {
     key: "getRestrict",
     value: function getRestrict() {
-      var max = Math.min(this.getMaxAllInAmount() - _classPrivateFieldGet(_currentStageTotalAmount, this), this.balance);
-
-      // 计算出跟注的金额
-      var moneyShouldCall = this.getOthersMaxBetAmountAtCurrentStage() - _classPrivateFieldGet(_currentStageTotalAmount, this);
-      // 如果跟注金额小于0, 则使用盲注金额
-      var min = moneyShouldCall <= 0 ? Math.min(_classPrivateFieldGet(_lowestBetAmount, this), this.balance) : moneyShouldCall;
+      var max = this.balance;
+      var positiveStageTotals = _classPrivateFieldGet(_dealer, this).map(function (p) {
+        return _classPrivateFieldGet(_currentStageTotalAmount, p);
+      }).filter(function (n) {
+        return n > 0;
+      });
+      var minBetOnTableThisRound = positiveStageTotals.length > 0 ? Math.min.apply(Math, _toConsumableArray(positiveStageTotals)) : _classPrivateFieldGet(_lowestBetAmount, this);
+      var min = Math.min(_classPrivateFieldGet(_lowestBetAmount, this), this.balance, minBetOnTableThisRound);
       return {
         min: min,
         max: max

package/dist/TexasError/codes.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TexasCoreErrorCode = void 0;
 exports.formatTexasErrorMessage = formatTexasErrorMessage;
+exports.getTexasErrorSeverity = getTexasErrorSeverity;
+exports.isFatalTexasErrorCode = isFatalTexasErrorCode;
 /**
  * 错误码分段（建议业务按段做文案/i18n）：
  * 3100–3199 房间 / 座位
@@ -40,6 +42,8 @@ var TexasCoreErrorCode = exports.TexasCoreErrorCode = {
   CTRL_END_NOT_IN_HAND: 3303,
   CTRL_SB_BB_MISSING: 3305,
   CTRL_START_NO_ACTIVE: 3306,
+  /** tryToEndGame：Dealer 人数不足 2，流程损坏 */
+  CTRL_ENDGAME_INVARIANT_DEALER_LT_2: 3307,
   PLAYER_ACTION_INVALID: 3401,
   PLAYER_CANNOT_CHECK: 3402,
   PLAYER_CANNOT_FOLD: 3403,
@@ -68,8 +72,21 @@ var TexasCoreErrorCode = exports.TexasCoreErrorCode = {
   DEALER_COUNT_OUT_OF_RANGE: 3605,
   INTERNAL_NO_NEXT_PLAYER: 3901
 };
+/**
+ * 错误严重程度分级（用于 server 侧错误路由）：
+ * - recoverable: 业务校验失败/重复请求/时序不匹配，可仅拒绝当前动作
+ * - fatal: 核心不变量或流程损坏，建议中止当前对局并广播异常
+ */
+function getTexasErrorSeverity(code) {
+  var fatalCodes = new Set([TexasCoreErrorCode.CTRL_SB_BB_MISSING, TexasCoreErrorCode.CTRL_START_NO_ACTIVE, TexasCoreErrorCode.CTRL_ENDGAME_INVARIANT_DEALER_LT_2, TexasCoreErrorCode.POOL_PAY_INVALID, TexasCoreErrorCode.INTERNAL_NO_NEXT_PLAYER, TexasCoreErrorCode.DEALER_BUTTON_HANDOFF_INVALID]);
+  if (fatalCodes.has(code)) return 'fatal';
+  return 'recoverable';
+}
+function isFatalTexasErrorCode(code) {
+  return getTexasErrorSeverity(code) === 'fatal';
+}
 function formatTexasErrorMessage(code, payload) {
-  var _p$min, _p$detail;
+  var _p$min, _p$count, _p$detail;
   var p = payload !== null && payload !== void 0 ? payload : {};
   switch (code) {
     case TexasCoreErrorCode.ROOM_READY_MIN_SEATED:
@@ -118,6 +135,8 @@ function formatTexasErrorMessage(code, payload) {
       return '游戏进程异常: 小盲或大盲玩家不存在';
     case TexasCoreErrorCode.CTRL_START_NO_ACTIVE:
       return '游戏进程异常';
+    case TexasCoreErrorCode.CTRL_ENDGAME_INVARIANT_DEALER_LT_2:
+      return "\u6E38\u620F\u8FDB\u7A0B\u5F02\u5E38: \u8FDB\u884C\u4E2D\u624B\u724C Dealer \u4EBA\u6570\u4E0D\u8DB3 (".concat((_p$count = p.count) !== null && _p$count !== void 0 ? _p$count : '?', ")");
     case TexasCoreErrorCode.PLAYER_ACTION_INVALID:
       return String((_p$detail = p.detail) !== null && _p$detail !== void 0 ? _p$detail : '玩家行为异常');
     case TexasCoreErrorCode.PLAYER_CANNOT_CHECK:

package/dist/TexasError/index.js

@@ -16,6 +16,18 @@ Object.defineProperty(exports, "formatTexasErrorMessage", {
     return _codes.formatTexasErrorMessage;
   }
 });
+Object.defineProperty(exports, "getTexasErrorSeverity", {
+  enumerable: true,
+  get: function get() {
+    return _codes.getTexasErrorSeverity;
+  }
+});
+Object.defineProperty(exports, "isFatalTexasErrorCode", {
+  enumerable: true,
+  get: function get() {
+    return _codes.isFatalTexasErrorCode;
+  }
+});
 Object.defineProperty(exports, "texasErrorCategory", {
   enumerable: true,
   get: function get() {

package/dist/index.js

@@ -35,6 +35,8 @@ var _exportNames = {
   texasErrorMap: true,
   TexasCoreErrorCode: true,
   texasErrorCategory: true,
+  getTexasErrorSeverity: true,
+  isFatalTexasErrorCode: true,
   formatTexasErrorMessage: true
 };
 Object.defineProperty(exports, "Action", {
@@ -199,6 +201,18 @@ Object.defineProperty(exports, "getStrengthFromRankSignature", {
     return _core.getStrengthFromRankSignature;
   }
 });
+Object.defineProperty(exports, "getTexasErrorSeverity", {
+  enumerable: true,
+  get: function get() {
+    return _TexasError.getTexasErrorSeverity;
+  }
+});
+Object.defineProperty(exports, "isFatalTexasErrorCode", {
+  enumerable: true,
+  get: function get() {
+    return _TexasError.isFatalTexasErrorCode;
+  }
+});
 Object.defineProperty(exports, "roleMap", {
   enumerable: true,
   get: function get() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "texas-poker-core",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "德州扑克核心功能",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/Controller/index.d.ts

@@ -10,14 +10,17 @@ export declare enum StageEnum {
 }
 export type Stage = StageEnum;
 export type CallbackOfGameEnd = (params: {
-    restCommonPokes: Poke[];
+    /** 与 `onNextStage` 中 `pokesToReveal` 一致：`getCommonPokes(fromStage, toStage)` 本段新亮出的公牌 */
+    pokesToReveal: Poke[];
     currentStage: Stage;
-    showHandPokes: boolean;
+    /** 本手结束所在街；摊牌结束为河牌 */
+    endStage: Stage;
     bestPokes?: Poke[][];
     bestRankCategory?: RankCategory;
+    showHandPokes: boolean;
 }) => void;
 export type CallbackOnNextStage = (params: {
-    commonPokes: Poke[];
+    pokesToReveal: Poke[];
     stage: Stage;
     lastStage: Stage;
 }) => void;
@@ -43,6 +46,12 @@ declare class Controller implements GameComponent {
     get stage(): StageEnum;
     get endAt(): StageEnum;
     get activePlayer(): Player | null;
+    /**
+     * ② 结束条件（没人还能操作）：
+     * - 场上只剩 out / allIn（无 waiting）=> 直接结束（可能发生在任意街：多人全下）
+     * - 河牌圈且所有仍可行动玩家都不可 actionable（即便 status 仍为 waiting）=> 结束
+     */
+    shouldShowDown(): boolean;
     /**
      * @description 将控制器移交给指定玩家
      * @param player

package/types/Player/index.d.ts

@@ -142,7 +142,9 @@ export declare class Player implements GameComponent {
     pause(): void;
     removeControl(): void;
     /**
-     * @description 获取行动前的min~max 下注金额范围
+     * @description 获取行动前的 min~max 下注金额范围
+     * - max：当前玩家剩余筹码（可全下上限）
+     * - min：大盲、本家余额、当轮桌上「已下注额」正数最小值 三者取小（有人短码只下 300 时，后续玩家 min 可低至 300）
      */
     getRestrict(): {
         min: number;

package/types/Texas/index.d.ts

@@ -1,11 +1,11 @@
+import type { Poke } from '../Deck/constant';
 import Pool from '../Pool';
 import Room from '../Room';
 import Dealer from '../Dealer';
 import TexasError from '../TexasError';
-import Player, { User, ActionType, CallbackOfAction, Role } from '../Player';
+import Player, { User, Role, ActionType, CallbackOfAction } from '../Player';
 import Controller, { CallbackOfGameEnd, CallbackOnNextStage } from '../Controller';
 import { type TexasEngineGlobalOptions } from '../TexasEngineContext';
-import type { Poke } from '../Deck/constant';
 export interface CreateRoomInputArgs {
     lowestBetAmount: number;
     /** 单桌最大入座人数（不超过引擎支持上限） */

package/types/TexasError/codes.d.ts

@@ -32,6 +32,8 @@ export declare const TexasCoreErrorCode: {
     readonly CTRL_END_NOT_IN_HAND: 3303;
     readonly CTRL_SB_BB_MISSING: 3305;
     readonly CTRL_START_NO_ACTIVE: 3306;
+    /** tryToEndGame：Dealer 人数不足 2，流程损坏 */
+    readonly CTRL_ENDGAME_INVARIANT_DEALER_LT_2: 3307;
     readonly PLAYER_ACTION_INVALID: 3401;
     readonly PLAYER_CANNOT_CHECK: 3402;
     readonly PLAYER_CANNOT_FOLD: 3403;
@@ -62,4 +64,12 @@ export declare const TexasCoreErrorCode: {
 };
 export type TexasErrorCode = (typeof TexasCoreErrorCode)[keyof typeof TexasCoreErrorCode];
 export type TexasErrorPayload = Record<string, unknown>;
+export type TexasErrorSeverity = 'recoverable' | 'fatal';
+/**
+ * 错误严重程度分级（用于 server 侧错误路由）：
+ * - recoverable: 业务校验失败/重复请求/时序不匹配，可仅拒绝当前动作
+ * - fatal: 核心不变量或流程损坏，建议中止当前对局并广播异常
+ */
+export declare function getTexasErrorSeverity(code: TexasErrorCode): TexasErrorSeverity;
+export declare function isFatalTexasErrorCode(code: TexasErrorCode): boolean;
 export declare function formatTexasErrorMessage(code: TexasErrorCode, payload?: TexasErrorPayload): string;

package/types/TexasError/index.d.ts

@@ -6,6 +6,7 @@ declare class TexasError extends Error {
 }
 export default TexasError;
 export type { TexasErrorCode, TexasErrorPayload };
-export { TexasCoreErrorCode, formatTexasErrorMessage } from './codes';
+export { TexasCoreErrorCode, formatTexasErrorMessage, getTexasErrorSeverity, isFatalTexasErrorCode } from './codes';
+export type { TexasErrorSeverity } from './codes';
 export { texasErrorCategory, texasErrorMap } from './constant';
 export type { TexasErrorCodeLegacy } from './constant';

package/types/index.d.ts

@@ -8,9 +8,9 @@ import { Stage, StageEnum, HandLifecycle } from './Controller';
 import { RoomStatus, default as Room, PlayerSeatStatus, type RoomCreateOptions } from './Room';
 import { TexasEngineContext, type TexasTraceEvent, type TexasSimulationFlags, type TexasEngineGlobalOptions } from './TexasEngineContext';
 import { User, Role, Action, RoleEnum, ActionType, OnlineStatus, ActionTypeEnum, default as Player, type PlayerActionPolicy } from './Player';
-import TexasError, { texasErrorMap, TexasCoreErrorCode, texasErrorCategory, type TexasErrorCode, type TexasErrorPayload, formatTexasErrorMessage, type TexasErrorCodeLegacy } from './TexasError';
+import TexasError, { texasErrorMap, TexasCoreErrorCode, texasErrorCategory, type TexasErrorCode, getTexasErrorSeverity, isFatalTexasErrorCode, type TexasErrorPayload, type TexasErrorSeverity, formatTexasErrorMessage, type TexasErrorCodeLegacy } from './TexasError';
 export * from './Deck/constant';
 export { getBestPokesRankSignature, compareRankSignature, getFiveCardsStrength, getStrengthFromRankSignature } from './Deck/core';
-export { Player, User, ActionType, ActionTypeEnum, Role, RoleEnum, Action, roleMap, ActionTypeMap, Stage, StageEnum, HandLifecycle, stageMap, Dealer, Deck, Room, RoomStatus, PlayerSeatStatus, type RoomCreateOptions, formatterPoke, TexasError, TexasErrorCode, TexasErrorPayload, TexasCoreErrorCode, formatTexasErrorMessage, texasErrorMap, texasErrorCategory, TexasEngineContext, Texas, OnlineStatus, type PlayerActionPolicy, type TexasEngineGlobalOptions, type TexasSimulationFlags, type TexasTraceEvent, 
+export { Player, User, ActionType, ActionTypeEnum, Role, RoleEnum, Action, roleMap, ActionTypeMap, Stage, StageEnum, HandLifecycle, stageMap, Dealer, Deck, Room, RoomStatus, PlayerSeatStatus, type RoomCreateOptions, formatterPoke, TexasError, TexasErrorCode, TexasErrorPayload, TexasErrorSeverity, TexasCoreErrorCode, formatTexasErrorMessage, getTexasErrorSeverity, isFatalTexasErrorCode, texasErrorMap, texasErrorCategory, TexasEngineContext, Texas, OnlineStatus, type PlayerActionPolicy, type TexasEngineGlobalOptions, type TexasSimulationFlags, type TexasTraceEvent, 
 /** @deprecated 旧版宽泛 code 类型，请逐步迁移到 TexasErrorCode */
 type TexasErrorCodeLegacy };