texas-poker-core 1.2.7 → 1.2.8

package/README.md

@@ -383,4 +383,7 @@ bufix
 修复行动前下注金额错误计算逻辑
 
 ## 1.2.7
-不使用core.js
+不使用core.js
+
+## 1.2.8
+增加deck.core下部分函数导出

package/dist/Controller/index.js

@@ -7,6 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _TexasError = _interopRequireDefault(require("../TexasError"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -130,13 +136,18 @@ var Controller = /*#__PURE__*/function () {
         return !player.actionable();
       }) && _classPrivateFieldGet(_stage, this) === 'river';
       if (shouldEndGame) {
-        var _classPrivateFieldGet3;
+        var _classPrivateFieldGet4;
         this.end();
         _classPrivateFieldSet(_endAt, this, this.stage);
-        (_classPrivateFieldGet3 = _classPrivateFieldGet(_callbackOfEnd, this)) === null || _classPrivateFieldGet3 === void 0 || _classPrivateFieldGet3.call(this, {
-          restCommonPokes: this.getCommonPokes(_classPrivateFieldGet(_stage, this), 'river'),
+        var _classPrivateFieldGet3 = _classPrivateFieldGet(_dealer, this).deck.getMaxPresentationAndPokes(),
+          presentation = _classPrivateFieldGet3.presentation,
+          pokes = _classPrivateFieldGet3.pokes;
+        (_classPrivateFieldGet4 = _classPrivateFieldGet(_callbackOfEnd, this)) === null || _classPrivateFieldGet4 === void 0 || _classPrivateFieldGet4.call(this, {
+          showHandPokes: true,
           currentStage: _classPrivateFieldGet(_stage, this),
-          showHandPokes: true
+          restCommonPokes: this.getCommonPokes(_classPrivateFieldGet(_stage, this), 'river'),
+          maxPokes: pokes,
+          maxPresentation: presentation[0]
         });
         console.log('游戏结束(shouldEndGame):', _classPrivateFieldGet(_endAt, this));
         return true;
@@ -156,21 +167,21 @@ var Controller = /*#__PURE__*/function () {
         return !player.actionable();
       });
       if (canPushToNextStage) {
-        var _classPrivateFieldGet4, _classPrivateFieldGet5;
-        console.log('推进到下个阶段, 触发人', (_classPrivateFieldGet4 = _classPrivateFieldGet(_activePlayer, this)) === null || _classPrivateFieldGet4 === void 0 ? void 0 : _classPrivateFieldGet4.getUserInfo().name);
+        var _classPrivateFieldGet5, _classPrivateFieldGet6;
+        console.log('推进到下个阶段, 触发人', (_classPrivateFieldGet5 = _classPrivateFieldGet(_activePlayer, this)) === null || _classPrivateFieldGet5 === void 0 ? void 0 : _classPrivateFieldGet5.getUserInfo().name);
         var index = stages.findIndex(function (stage) {
           return stage === _classPrivateFieldGet(_stage, _this);
         });
-        var lastStage = _classPrivateFieldGet(_stage, this);
+        var currentStage = _classPrivateFieldGet(_stage, this);
         var nextStage = stages[index + 1];
         _classPrivateFieldSet(_stage, this, nextStage);
         _classPrivateFieldGet(_dealer, this).resetCurrentStageTotalAmount();
         _classPrivateFieldGet(_dealer, this).resetActionsOfPlayers();
         _classPrivateFieldGet(_dealer, this).resetActionsHistory();
-        (_classPrivateFieldGet5 = _classPrivateFieldGet(_callbackOnNextStage, this)) === null || _classPrivateFieldGet5 === void 0 || _classPrivateFieldGet5.call(this, {
+        (_classPrivateFieldGet6 = _classPrivateFieldGet(_callbackOnNextStage, this)) === null || _classPrivateFieldGet6 === void 0 || _classPrivateFieldGet6.call(this, {
           stage: nextStage,
-          lastStage: lastStage,
-          commonPokes: this.getCommonPokes(lastStage, nextStage)
+          lastStage: currentStage,
+          commonPokes: this.getCommonPokes(currentStage, nextStage)
         });
         console.log('游戏进入下一个阶段 => ', _classPrivateFieldGet(_stage, this));
         this.resetActivePlayer();
@@ -215,71 +226,77 @@ var Controller = /*#__PURE__*/function () {
     }
 
     // 大盲小盲的默认下注行为
+    // 在双人竞技中, 庄家需要下小盲注, 同时率先开始行动
   }, {
     key: "takeActionInPreFlop",
     value: function () {
-      var _takeActionInPreFlop = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _classPrivateFieldGet6, _current;
-        var current, amount, _amount, activePlayer, _classPrivateFieldGet7;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _takeActionInPreFlop = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this2 = this;
+        var takeDefaultActionPlayers, _takeDefaultActionPla, bigBlind, activePlayer, _classPrivateFieldGet7;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              console.log('takeActionInPreFlop');
-              current = (_classPrivateFieldGet6 = _classPrivateFieldGet(_dealer, this).button) === null || _classPrivateFieldGet6 === void 0 ? void 0 : _classPrivateFieldGet6.getNextPlayer();
-              if (current) {
-                amount = _classPrivateFieldGet(_dealer, this).count === 2 ? _classPrivateFieldGet(_dealer, this).lowestBetAmount : _classPrivateFieldGet(_dealer, this).lowestBetAmount / 2;
-                current.bet(amount, true);
-                _classPrivateFieldGet(_defaultBets, this).push({
-                  userId: current.getUserInfo().id,
-                  balance: current.balance,
-                  amount: amount
-                });
-                if (_classPrivateFieldGet(_dealer, this).count > 2) {
-                  current = current.getNextPlayer();
-                  if (current) {
-                    _amount = _classPrivateFieldGet(_dealer, this).lowestBetAmount;
-                    current.bet(_amount, true);
-                    _classPrivateFieldGet(_defaultBets, this).push({
-                      userId: current.getUserInfo().id,
-                      balance: current.balance,
-                      amount: _amount
-                    });
-                  }
-                }
-              }
-              activePlayer = (_current = current) === null || _current === void 0 ? void 0 : _current.getNextPlayer();
+              takeDefaultActionPlayers = _assertClassBrand(_Controller_brand, this, _getSmallBindAndBigBind).call(this);
+              takeDefaultActionPlayers.forEach(/*#__PURE__*/function () {
+                var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(player, index) {
+                  var amount;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        if (player) {
+                          amount = index === 0 ? _classPrivateFieldGet(_dealer, _this2).lowestBetAmount / 2 : _classPrivateFieldGet(_dealer, _this2).lowestBetAmount;
+                          player.bet(amount, true);
+                          _classPrivateFieldGet(_defaultBets, _this2).push({
+                            userId: player.getUserInfo().id,
+                            balance: player.balance,
+                            amount: amount
+                          });
+                        }
+                      case 1:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                return function (_x, _x2) {
+                  return _ref.apply(this, arguments);
+                };
+              }());
+              _takeDefaultActionPla = _slicedToArray(takeDefaultActionPlayers, 2), bigBlind = _takeDefaultActionPla[1];
+              activePlayer = bigBlind === null || bigBlind === void 0 ? void 0 : bigBlind.getNextPlayer();
               if (!activePlayer) {
-                _context.next = 10;
+                _context2.next = 10;
                 break;
               }
-              _context.next = 7;
+              _context2.next = 7;
               return (_classPrivateFieldGet7 = _classPrivateFieldGet(_callbackOfGameStart, this)) === null || _classPrivateFieldGet7 === void 0 ? void 0 : _classPrivateFieldGet7.call(this);
             case 7:
               this.transferControlTo(activePlayer);
-              _context.next = 11;
+              _context2.next = 11;
               break;
             case 10:
               this.reportError(new _TexasError.default(2000, '游戏进程异常'));
             case 11:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function takeActionInPreFlop() {
         return _takeActionInPreFlop.apply(this, arguments);
       }
       return takeActionInPreFlop;
-    }()
+    }() // 获取小盲,大盲玩家
+  }, {
+    key: "start",
+    value: (
     /**
      * @description 开始计时器, 将控制权移交给第一个可以行动的玩家
      */
-  }, {
-    key: "start",
-    value: (function () {
-      var _start = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+    function () {
+      var _start = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _classPrivateFieldSet(_status, this, 'on');
               _classPrivateFieldSet(_stage, this, 'pre_flop');
@@ -287,15 +304,15 @@ var Controller = /*#__PURE__*/function () {
 
               // 测试环境保持玩家balance起始不变
               if (process.env.PROJECT_ENV === 'dev') _classPrivateFieldGet(_dealer, this).reset();
-              _context2.next = 6;
+              _context3.next = 6;
               return this.takeActionInPreFlop();
             case 6:
               this.startTimer();
             case 7:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function start() {
         return _start.apply(this, arguments);
@@ -310,12 +327,12 @@ var Controller = /*#__PURE__*/function () {
   }, {
     key: "startTimer",
     value: function startTimer() {
-      var _this2 = this;
+      var _this3 = this;
       // 避免重复开启计时器
       if (_classPrivateFieldGet(_timer, this)) return;
       _classPrivateFieldSet(_timer, this, setInterval(function () {
         var _this$count, _this$count2;
-        _classPrivateFieldSet(_count, _this2, (_this$count = _classPrivateFieldGet(_count, _this2), _this$count2 = _this$count++, _this$count)), _this$count2;
+        _classPrivateFieldSet(_count, _this3, (_this$count = _classPrivateFieldGet(_count, _this3), _this$count2 = _this$count++, _this$count)), _this$count2;
       }, 1000));
     }
 
@@ -392,4 +409,15 @@ function _getPokeEndIndex(stage) {
   if (stage === 'turn') return 4;
   if (stage === 'river') return 5;
 }
+function _getSmallBindAndBigBind() {
+  var _classPrivateFieldGet10;
+  var smallBind =
+  // 在双人游戏中, 庄家同时支付小盲注
+  _classPrivateFieldGet(_dealer, this).count === 2 ? _classPrivateFieldGet(_dealer, this).button : (_classPrivateFieldGet10 = _classPrivateFieldGet(_dealer, this).button) === null || _classPrivateFieldGet10 === void 0 ? void 0 : _classPrivateFieldGet10.getNextPlayer();
+  var result = [smallBind, smallBind === null || smallBind === void 0 ? void 0 : smallBind.getNextPlayer()];
+  if (result.some(function (player) {
+    return !player;
+  })) this.reportError(new _TexasError.default(2000, '游戏进程异常: 小盲或大盲玩家不存在'));
+  return result;
+}
 var _default = exports.default = Controller;

package/dist/Dealer/index.js

@@ -110,7 +110,7 @@ var Dealer = /*#__PURE__*/function () {
         handPokes = _classPrivateFieldGet2.handPokes;
       this.loop(function (player, i) {
         player.setHandPokes(handPokes[i]);
-      }, _classPrivateFieldGet(_button, this));
+      }, _classPrivateFieldGet(_button, this).getNextPlayer());
     }
   }, {
     key: "addAction",

package/dist/Deck/core.js

@@ -7,6 +7,8 @@ exports.formatterPoke = exports.comparePresentation = exports.compareFn = void 0
 exports.getBestHand = getBestHand;
 exports.getBestPokesPresentation = getBestPokesPresentation;
 exports.getHandPresentation = getHandPresentation;
+exports.getMaxPresentationAndPokes = getMaxPresentationAndPokes;
+exports.getSortedAllHandPokesCombinations = getSortedAllHandPokesCombinations;
 exports.isStraight = exports.getWinners = void 0;
 var _ramda = require("ramda");
 var _constant = require("./constant");
@@ -244,6 +246,18 @@ function getBestHand(pokes, commonPokes) {
   return maxOne;
 }
 
+/**
+ * @description 获取多个手牌组合中的所有牌型组合, 按照降序排列
+ * @param handPokes
+ * @param commonPokes
+ * @returns
+ */
+function getSortedAllHandPokesCombinations(handPokes, commonPokes) {
+  var allCombinations = handPokes.map(function (pokes) {
+    return getCombinations([].concat(_toConsumableArray(pokes), _toConsumableArray(commonPokes)));
+  }).flat(1).sort(compareFn);
+  return allCombinations;
+}
 /**
  * @description 获取多个手牌组合中的最大牌力值
  * @param handPokes
@@ -251,14 +265,33 @@ function getBestHand(pokes, commonPokes) {
  * @returns
  */
 function getBestPokesPresentation(handPokes, commonPokes) {
-  var _handPokes$map$flat$s = handPokes.map(function (pokes) {
-      return getCombinations([].concat(_toConsumableArray(pokes), _toConsumableArray(commonPokes)));
-    }).flat(1).sort(compareFn),
-    _handPokes$map$flat$s2 = _slicedToArray(_handPokes$map$flat$s, 1),
-    maxOne = _handPokes$map$flat$s2[0];
+  var _getSortedAllHandPoke = getSortedAllHandPokesCombinations(handPokes, commonPokes),
+    _getSortedAllHandPoke2 = _slicedToArray(_getSortedAllHandPoke, 1),
+    maxOne = _getSortedAllHandPoke2[0];
   return getHandPresentation(maxOne);
 }
 
+// 获取最大牌型与牌力值
+function getMaxPresentationAndPokes(handPokes, commonPokes) {
+  var allCombinations = getSortedAllHandPokesCombinations(handPokes, commonPokes);
+  var maxPresentation = getHandPresentation(allCombinations[0]);
+
+  // 以下方法可以使用reduce实现, 在目前不影响性能的情况下, 先这样实现
+  var maxPokes = allCombinations.map(function (combination) {
+    return {
+      presentation: getHandPresentation(combination),
+      pokes: combination
+    };
+  }).filter(function (item) {
+    return item.presentation === maxPresentation;
+  }).map(function (item) {
+    return item.pokes;
+  });
+  return {
+    presentation: maxPresentation,
+    pokes: maxPokes
+  };
+}
 /**
  * @description 格式化展示牌信息
  * @param input

package/dist/Deck/index.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _core = require("./core");
 var _constant = require("./constant");
+var _core = require("./core");
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -127,6 +127,18 @@ var Deck = /*#__PURE__*/function () {
       var presentation = (0, _core.getBestPokesPresentation)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this));
       return presentation[0];
     }
+  }, {
+    key: "getMaxPokeCombinations",
+    value: function getMaxPokeCombinations() {
+      return (0, _core.getMaxPresentationAndPokes)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this)).pokes;
+    }
+
+    // 该方法是getMaxPokeCombinations&getMaxPresentation的组合
+  }, {
+    key: "getMaxPresentationAndPokes",
+    value: function getMaxPresentationAndPokes() {
+      return (0, _core.getMaxPresentationAndPokes)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this));
+    }
   }]);
 }();
 function _createDeck() {

package/dist/Player/index.js

@@ -46,6 +46,8 @@ var _countDownTime = /*#__PURE__*/new WeakMap();
 var _action = /*#__PURE__*/new WeakMap();
 var _lowestBetAmount = /*#__PURE__*/new WeakMap();
 var _currentStageTotalAmount = /*#__PURE__*/new WeakMap();
+var _totalBetAmount = /*#__PURE__*/new WeakMap();
+var _wager = /*#__PURE__*/new WeakMap();
 var _lastPlayer = /*#__PURE__*/new WeakMap();
 var _nextPlayer = /*#__PURE__*/new WeakMap();
 var _timer = /*#__PURE__*/new WeakMap();
@@ -76,8 +78,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
       } : _ref$reportError;
     _classCallCheck(this, Player);
     /**
-     * @description 获取玩家允许的行动列表
-     * 防止预期外的行为
+     * 翻牌前大盲的「选项」: 已下大盲且无人加注, 轮到大盲选择过牌/加注/弃牌(无需再跟注)
      */
     _classPrivateMethodInitSpec(this, _Player_brand);
     /**
@@ -114,6 +115,14 @@ var Player = exports.Player = /*#__PURE__*/function () {
      * 当前阶段的下注总额, 全押筹码不够时可以小于此金额
      */
     _classPrivateFieldInitSpec(this, _currentStageTotalAmount, 0);
+    /**
+     * 对局总下注额度
+     */
+    _classPrivateFieldInitSpec(this, _totalBetAmount, 0);
+    /**
+     * 输赢情况
+     */
+    _classPrivateFieldInitSpec(this, _wager, 0);
     /**
      * 指针指向上一个玩家, 庄家位的`lastPlayer`为`null`
      */
@@ -163,6 +172,22 @@ var Player = exports.Player = /*#__PURE__*/function () {
     set: function set(value) {
       _classPrivateFieldSet(_currentStageTotalAmount, this, value);
     }
+  }, {
+    key: "totalBetAmount",
+    get: function get() {
+      return _classPrivateFieldGet(_totalBetAmount, this);
+    },
+    set: function set(value) {
+      _classPrivateFieldSet(_totalBetAmount, this, value);
+    }
+  }, {
+    key: "wager",
+    get: function get() {
+      return _classPrivateFieldGet(_wager, this);
+    },
+    set: function set(value) {
+      _classPrivateFieldSet(_wager, this, value);
+    }
   }, {
     key: "id",
     get: function get() {
@@ -245,6 +270,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
     value: function reset() {
       this.resetAction();
       this.resetCurrentStageTotalAmount();
+      _classPrivateFieldSet(_totalBetAmount, this, 0);
       _classPrivateFieldSet(_handPokes, this, []);
       _classPrivateFieldSet(_presentation, this, undefined);
       _classPrivateFieldSet(_status, this, 'waiting');
@@ -372,6 +398,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this.checkIfCanAct();
+              // 当前轮的最多下注额
               maxBetAmount = Math.max.apply(Math, _toConsumableArray(_classPrivateFieldGet(_dealer, this).filter(function (p) {
                 return p !== _this;
               }).map(function (p) {
@@ -442,6 +469,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
               if (moneyShouldPay > this.balance) {
                 this.reportError(new _TexasError.default(2003, '跟注金额不可大于筹码总数'));
               }
+              if (moneyShouldPay === this.balance) {
+                this.reportError(new _TexasError.default(2003, '跟注金额等于筹码总数, 应该全押, 不该调用call方法'));
+              }
               _classPrivateFieldSet(_action, this, {
                 type: 'call',
                 payload: {
@@ -450,12 +480,12 @@ var Player = exports.Player = /*#__PURE__*/function () {
               });
               _classPrivateFieldGet(_pool, this).add(this, moneyShouldPay);
               _classPrivateFieldGet(_dealer, this).addAction(this);
-              _context5.next = 11;
+              _context5.next = 12;
               return (_classPrivateFieldGet6 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet6 === void 0 ? void 0 : _classPrivateFieldGet6.call(this, this);
-            case 11:
+            case 12:
               console.log(_classPrivateFieldGet(_userInfo, this).name, '跟注:', moneyShouldPay);
               this.transferControl();
-            case 13:
+            case 14:
             case "end":
               return _context5.stop();
           }
@@ -566,6 +596,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
       if (_classPrivateFieldGet(_status, this) === 'allIn' || _classPrivateFieldGet(_status, this) === 'out') return false;
       if (!_classPrivateFieldGet(_action, this)) return true;
 
+      // 翻牌前大盲具有最后行动权: 仅下过盲注视为未行动, 须给一次选择机会
+      if (_assertClassBrand(_Player_brand, this, _isBigBlindOptionInPreFlop).call(this) && _classPrivateFieldGet(_action, this).type === 'bet') return true;
+
       // 当前的下注金额已经等于最大下注额
       return _classPrivateFieldGet(_currentStageTotalAmount, this) !== this.getMaxBetAmountAtCurrentStage();
     }
@@ -654,6 +687,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
     key: "earn",
     value: function earn(money) {
       this.balance += money;
+      _classPrivateFieldSet(_wager, this, money - this.totalBetAmount);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '分得奖池金额:', money);
     }
 
@@ -801,6 +835,13 @@ var Player = exports.Player = /*#__PURE__*/function () {
   }]);
 }();
 _Player = Player;
+function _isBigBlindOptionInPreFlop() {
+  return _classPrivateFieldGet(_controller, this).stage === 'pre_flop' && _classPrivateFieldGet(_role, this) === 'big-blind' && _classPrivateFieldGet(_currentStageTotalAmount, this) >= this.getMaxBetAmountAtCurrentStage();
+}
+/**
+ * @description 获取玩家允许的行动列表
+ * 防止预期外的行为
+ */
 function _getAllowedActions() {
   var _this4 = this;
   var _helper = function helper(lastPlayer) {
@@ -842,6 +883,7 @@ function _getAllowedActions() {
     return ['call', 'raise', 'fold', 'allIn'];
   };
   var result = _helper(_classPrivateFieldGet(_dealer, this).actionHistory[_classPrivateFieldGet(_dealer, this).actionHistory.length - 1]);
+  if (_assertClassBrand(_Player_brand, this, _isBigBlindOptionInPreFlop).call(this) && result.includes('call')) return ['check', 'raise', 'fold', 'allIn'];
   return result;
 }
 var _default = exports.default = Player;

package/dist/Pool/index.js

@@ -80,7 +80,9 @@ var Pool = /*#__PURE__*/function () {
       if (amount <= 0) this.reportError(new _TexasError.default(2001, '下注金额不可小于零'));
       if (player.balance < amount) this.reportError(new _TexasError.default(2003, '玩家余额不足'));
       player.balance -= amount;
+      player.wager -= amount;
       player.currentStageTotalAmount += amount;
+      player.totalBetAmount += amount;
       _classPrivateFieldSet(_totalAmount, this, _classPrivateFieldGet(_totalAmount, this) + amount);
       _classPrivateFieldGet(_players, this).add(player);
       _classPrivateFieldGet(_betRecords, this).set(player, (_classPrivateFieldGet(_betRecords, this).get(player) || 0) + amount);

package/dist/index.js

@@ -9,6 +9,8 @@ var _exportNames = {
   TexasError: true,
   Deck: true,
   formatterPoke: true,
+  getBestPokesPresentation: true,
+  comparePresentation: true,
   Dealer: true,
   stageMap: true,
   roleMap: true,
@@ -129,12 +131,24 @@ Object.defineProperty(exports, "actionMap", {
     return _constant.actionMap;
   }
 });
+Object.defineProperty(exports, "comparePresentation", {
+  enumerable: true,
+  get: function get() {
+    return _core.comparePresentation;
+  }
+});
 Object.defineProperty(exports, "formatterPoke", {
   enumerable: true,
   get: function get() {
     return _core.formatterPoke;
   }
 });
+Object.defineProperty(exports, "getBestPokesPresentation", {
+  enumerable: true,
+  get: function get() {
+    return _core.getBestPokesPresentation;
+  }
+});
 Object.defineProperty(exports, "roleMap", {
   enumerable: true,
   get: function get() {

package/dist/utils/index.js

@@ -21,13 +21,9 @@ var filterMap = exports.filterMap = function filterMap(callback, map) {
   return result;
 };
 var everyMap = exports.everyMap = function everyMap(callback, map) {
-  var result = undefined;
+  var result = true;
   map.forEach(function (value, key) {
-    if (result === undefined) {
-      result = callback(value, key);
-    } else {
-      result && (result = callback(value, key));
-    }
+    result && (result = callback(value, key));
   });
   return result;
 };

package/package.json

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

package/types/Controller/index.d.ts

@@ -1,12 +1,14 @@
 import Dealer from '../Dealer';
 import { Player } from '../Player';
-import { Poke } from '../Deck/constant';
+import { Poke, handPokeType } from '../Deck/constant';
 import { GameComponent, TexasErrorCallback } from '../Texas';
 export type Stage = 'pre_flop' | 'flop' | 'turn' | 'river';
 export type CallbackOfGameEnd = (params: {
     restCommonPokes: Poke[];
     currentStage: Stage;
     showHandPokes: boolean;
+    maxPokes?: Poke[][];
+    maxPresentation?: handPokeType;
 }) => void;
 export type CallbackOnNextStage = (params: {
     commonPokes: Poke[];

package/types/Deck/core.d.ts

@@ -30,6 +30,13 @@ export declare function getHandPresentation(input: Poke[]): string;
  * @returns
  */
 export declare function getBestHand(pokes: Poke[], commonPokes: Poke[]): Poke[];
+/**
+ * @description 获取多个手牌组合中的所有牌型组合, 按照降序排列
+ * @param handPokes
+ * @param commonPokes
+ * @returns
+ */
+export declare function getSortedAllHandPokesCombinations(handPokes: Poke[][], commonPokes: Poke[]): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
 /**
  * @description 获取多个手牌组合中的最大牌力值
  * @param handPokes
@@ -37,6 +44,10 @@ export declare function getBestHand(pokes: Poke[], commonPokes: Poke[]): Poke[];
  * @returns
  */
 export declare function getBestPokesPresentation(handPokes: Poke[][], commonPokes: Poke[]): string;
+export declare function getMaxPresentationAndPokes(handPokes: Poke[][], commonPokes: Poke[]): {
+    presentation: string;
+    pokes: ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
+};
 /**
  * @description 格式化展示牌信息
  * @param input

package/types/Deck/index.d.ts

@@ -22,5 +22,10 @@ declare class Deck {
     };
     getCards(): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[];
     getMaxPresentation(): handPokeType;
+    getMaxPokeCombinations(): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
+    getMaxPresentationAndPokes(): {
+        presentation: string;
+        pokes: ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
+    };
 }
 export default Deck;

package/types/Player/index.d.ts

@@ -54,6 +54,10 @@ export declare class Player implements GameComponent {
     set balance(value: number);
     get currentStageTotalAmount(): number;
     set currentStageTotalAmount(value: number);
+    get totalBetAmount(): number;
+    set totalBetAmount(value: number);
+    get wager(): number;
+    set wager(value: number);
     get id(): number;
     get lowestBetAmount(): number;
     get thinkingTime(): number;

package/types/index.d.ts

@@ -10,4 +10,5 @@ import { texasErrorMap, TexasErrorCode } from './TexasError/constant';
 import { RoomStatus, default as Room, PlayerSeatStatus } from './Room';
 import { User, Role, Action, ActionType, OnlineStatus, default as Player } from './Player';
 export * from './Deck/constant';
+export { getBestPokesPresentation, comparePresentation } from './Deck/core';
 export { Player, User, ActionType, Role, Action, roleMap, actionMap, Stage, ControllerStatus, stageMap, Dealer, Deck, Room, RoomStatus, PlayerSeatStatus, formatterPoke, TexasError, TexasErrorCode, texasErrorMap, Texas, OnlineStatus };

package/types/utils/index.d.ts

@@ -1,4 +1,4 @@
 export declare const getRandomInt: (min: number, max: number) => number;
 export declare const sum: (a: number, b: number) => number;
 export declare const filterMap: <T, K>(callback: (value: K, key: T) => boolean, map: Map<T, K>) => Map<T, K>;
-export declare const everyMap: <T, K>(callback: (value: K, key: T) => boolean, map: Map<T, K>) => undefined;
+export declare const everyMap: <T, K>(callback: (value: K, key: T) => boolean, map: Map<T, K>) => boolean;