texas-poker-core 1.1.21 → 1.1.24

package/README.md

@@ -183,4 +183,10 @@ api change
 ## 1.1.20
 调整api
 ## 1.1.21
-增加一些事件监听方法
+增加一些事件监听方法
+## 1.1.22
+change api
+## 1.1.23
+change api
+## 1.1.24
+修复onAction的回调参数

package/dist/Player/index.js

@@ -81,6 +81,7 @@ var _lowestBetAmount = /*#__PURE__*/new WeakMap();
 var _currentStageTotalAmount = /*#__PURE__*/new WeakMap();
 var _lastPlayer = /*#__PURE__*/new WeakMap();
 var _nextPlayer = /*#__PURE__*/new WeakMap();
+var _shouldTakeDefaultAction = /*#__PURE__*/new WeakMap();
 var _timer = /*#__PURE__*/new WeakMap();
 var _dealer = /*#__PURE__*/new WeakMap();
 var _pool = /*#__PURE__*/new WeakMap();
@@ -106,7 +107,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
       pool = _ref.pool,
       isOwner = _ref.isOwner,
       _ref$thinkingTime = _ref.thinkingTime,
-      thinkingTime = _ref$thinkingTime === void 0 ? 30 : _ref$thinkingTime;
+      thinkingTime = _ref$thinkingTime === void 0 ? _config.defaultThinkingTime : _ref$thinkingTime,
+      _ref$shouldTakeDefaul = _ref.shouldTakeDefaultAction,
+      shouldTakeDefaultAction = _ref$shouldTakeDefaul === void 0 ? true : _ref$shouldTakeDefaul;
     _classCallCheck(this, Player);
     _classPrivateMethodInitSpec(this, _Player_brand);
     /**
@@ -140,6 +143,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
      */
     _classPrivateFieldInitSpec(this, _lastPlayer, null);
     _classPrivateFieldInitSpec(this, _nextPlayer, null);
+    _classPrivateFieldInitSpec(this, _shouldTakeDefaultAction, void 0);
     _classPrivateFieldInitSpec(this, _timer, null);
     _classPrivateFieldInitSpec(this, _dealer, void 0);
     _classPrivateFieldInitSpec(this, _pool, void 0);
@@ -165,6 +169,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
     _classPrivateFieldSet(_dealer, this, dealer);
     _classPrivateFieldSet(_isOwner, this, isOwner);
     _classPrivateFieldSet(_thinkingTime, this, thinkingTime);
+    _classPrivateFieldSet(_shouldTakeDefaultAction, this, shouldTakeDefaultAction);
     _classPrivateFieldSet(_controller, this, controller);
     _classPrivateFieldSet(_pool, this, pool || new _Pool.default());
   }
@@ -260,8 +265,8 @@ var Player = exports.Player = /*#__PURE__*/function () {
       _classPrivateFieldSet(_action, this, {
         type: 'check'
       });
-      (_classPrivateFieldGet2 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet2 === void 0 || _classPrivateFieldGet2.call(this, _classPrivateFieldGet(_action, this));
       _classPrivateFieldGet(_dealer, this).addAction(this);
+      (_classPrivateFieldGet2 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet2 === void 0 || _classPrivateFieldGet2.call(this, this);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '过牌');
       this.transferControl();
     }
@@ -273,9 +278,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
       _classPrivateFieldSet(_action, this, {
         type: 'fold'
       });
-      (_classPrivateFieldGet3 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet3 === void 0 || _classPrivateFieldGet3.call(this, _classPrivateFieldGet(_action, this));
       _classPrivateFieldSet(_status, this, 'out');
       _classPrivateFieldGet(_dealer, this).addAction(this);
+      (_classPrivateFieldGet3 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet3 === void 0 || _classPrivateFieldGet3.call(this, this);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '弃牌');
       this.transferControl();
     }
@@ -299,10 +304,11 @@ var Player = exports.Player = /*#__PURE__*/function () {
           value: money
         }
       });
-      (_classPrivateFieldGet4 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet4 === void 0 || _classPrivateFieldGet4.call(this, _classPrivateFieldGet(_action, this));
       _classPrivateFieldSet(_balance, this, _classPrivateFieldGet(_balance, this) - money);
       _classPrivateFieldSet(_currentStageTotalAmount, this, _classPrivateFieldGet(_currentStageTotalAmount, this) + money);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '下注金额:', money, '剩余筹码:', _classPrivateFieldGet(_balance, this));
+      // 默认下注行为不触发
+      if (!preFlopDefaultAction) (_classPrivateFieldGet4 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet4 === void 0 || _classPrivateFieldGet4.call(this, this);
       _classPrivateFieldGet(_pool, this).add(this, money, _classPrivateFieldGet(_controller, this).stage);
       if (!preFlopDefaultAction) this.transferControl();
       return money;
@@ -334,9 +340,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
           value: money
         }
       });
-      (_classPrivateFieldGet5 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet5 === void 0 || _classPrivateFieldGet5.call(this, _classPrivateFieldGet(_action, this));
       _classPrivateFieldSet(_balance, this, _classPrivateFieldGet(_balance, this) - money);
       _classPrivateFieldSet(_currentStageTotalAmount, this, _classPrivateFieldGet(_currentStageTotalAmount, this) + money);
+      (_classPrivateFieldGet5 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet5 === void 0 || _classPrivateFieldGet5.call(this, this);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '加注', money);
       _classPrivateFieldGet(_pool, this).add(this, money, _classPrivateFieldGet(_controller, this).stage);
       this.transferControl();
@@ -362,9 +368,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
           value: moneyShouldPay
         }
       });
-      (_classPrivateFieldGet6 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet6 === void 0 || _classPrivateFieldGet6.call(this, _classPrivateFieldGet(_action, this));
       _classPrivateFieldSet(_balance, this, _classPrivateFieldGet(_balance, this) - moneyShouldPay);
       _classPrivateFieldSet(_currentStageTotalAmount, this, _classPrivateFieldGet(_currentStageTotalAmount, this) + moneyShouldPay);
+      (_classPrivateFieldGet6 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet6 === void 0 || _classPrivateFieldGet6.call(this, this);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '跟注:', moneyShouldPay);
       _classPrivateFieldGet(_pool, this).add(this, moneyShouldPay, _classPrivateFieldGet(_controller, this).stage);
       this.transferControl();
@@ -393,10 +399,10 @@ var Player = exports.Player = /*#__PURE__*/function () {
           value: moneyShouldPay
         }
       });
-      (_classPrivateFieldGet7 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet7 === void 0 || _classPrivateFieldGet7.call(this, _classPrivateFieldGet(_action, this));
       _classPrivateFieldSet(_currentStageTotalAmount, this, _classPrivateFieldGet(_currentStageTotalAmount, this) + moneyShouldPay);
       _classPrivateFieldSet(_balance, this, _classPrivateFieldGet(_balance, this) - moneyShouldPay);
       _classPrivateFieldSet(_status, this, 'allIn');
+      (_classPrivateFieldGet7 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet7 === void 0 || _classPrivateFieldGet7.call(this, this);
       console.log(_classPrivateFieldGet(_userInfo, this).name, '全押:', moneyShouldPay, '剩余筹码: ', _classPrivateFieldGet(_balance, this));
       _classPrivateFieldGet(_pool, this).add(this, moneyShouldPay, _classPrivateFieldGet(_controller, this).stage);
       this.transferControl();
@@ -635,7 +641,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
         this.takeDefaultAction();
         return;
       }
-      if (_config.shouldTakeDefaultAction) {
+      if (_classPrivateFieldGet(_shouldTakeDefaultAction, this)) {
         _classPrivateFieldSet(_timer, this, setInterval(function () {
           var _this$countDownTime, _this$countDownTime2;
           if (_classPrivateFieldGet(_countDownTime, _this4) === 0 && _classPrivateFieldGet(_timer, _this4)) {
@@ -707,10 +713,10 @@ function _getAllowedActions() {
 
     // 上个玩家弃牌了, 需要知道最近采取行动的玩家
     if (((_classPrivateFieldGet9 = _classPrivateFieldGet(_action, lastPlayer)) === null || _classPrivateFieldGet9 === void 0 ? void 0 : _classPrivateFieldGet9.type) === 'fold') {
-      var player = _toConsumableArray(_classPrivateFieldGet(_dealer, _this5).actionHistory).reverse().find(function (player) {
+      var _player = _toConsumableArray(_classPrivateFieldGet(_dealer, _this5).actionHistory).reverse().find(function (player) {
         return player.getStatus() !== 'out';
       });
-      return _helper(player);
+      return _helper(_player);
     }
     if (_classPrivateFieldGet(_action, lastPlayer).type === 'check') return ['allIn', 'bet', 'check', 'fold'];
 

package/dist/config/index.js

@@ -3,9 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldTakeDefaultAction = exports.defaultThinkingTime = void 0;
+exports.defaultThinkingTime = void 0;
 // 默认思考事件
-var defaultThinkingTime = exports.defaultThinkingTime = 30;
-
-// 超时后服务器是否采取默认的行为
-var shouldTakeDefaultAction = exports.shouldTakeDefaultAction = false;
+var defaultThinkingTime = exports.defaultThinkingTime = 30;

package/dist/index.js

@@ -23,6 +23,8 @@ var _exportNames = {
   ActionType: true,
   Role: true,
   Action: true,
+  ActionWithPayload: true,
+  ActionWithOutPayload: true,
   roleMap: true,
   actionMap: true,
   Stage: true,
@@ -45,6 +47,18 @@ Object.defineProperty(exports, "ActionType", {
     return _Player.ActionType;
   }
 });
+Object.defineProperty(exports, "ActionWithOutPayload", {
+  enumerable: true,
+  get: function get() {
+    return _Player.ActionWithOutPayload;
+  }
+});
+Object.defineProperty(exports, "ActionWithPayload", {
+  enumerable: true,
+  get: function get() {
+    return _Player.ActionWithPayload;
+  }
+});
 Object.defineProperty(exports, "ControllerStatus", {
   enumerable: true,
   get: function get() {

package/dist/main.js

@@ -33,10 +33,12 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 // 是否允许观战
 
 var initialGame = exports.initialGame = function initialGame(_ref) {
-  var lowestBetAmount = _ref.lowestBetAmount,
-    maximumCountOfPlayers = _ref.maximumCountOfPlayers,
+  var user = _ref.user,
+    thinkingTime = _ref.thinkingTime,
+    lowestBetAmount = _ref.lowestBetAmount,
     allowPlayersToWatch = _ref.allowPlayersToWatch,
-    user = _ref.user;
+    maximumCountOfPlayers = _ref.maximumCountOfPlayers,
+    shouldTakeDefaultAction = _ref.shouldTakeDefaultAction;
   var dealer = new _Dealer.default(lowestBetAmount);
   var controller = new _Controller.default(dealer);
   var pool = new _Pool.default();
@@ -45,10 +47,11 @@ var initialGame = exports.initialGame = function initialGame(_ref) {
     lowestBetAmount: lowestBetAmount,
     controller: controller,
     dealer: dealer,
-    pool: pool
+    pool: pool,
+    shouldTakeDefaultAction: shouldTakeDefaultAction,
+    thinkingTime: thinkingTime
   });
   var room = new _Room.default(dealer, owner, controller, allowPlayersToWatch, maximumCountOfPlayers);
-  var callbackOfEnd;
   return {
     room: room,
     pool: pool,
@@ -83,7 +86,7 @@ var initialGame = exports.initialGame = function initialGame(_ref) {
       });
     },
     onGameEnd: function onGameEnd(callback) {
-      callbackOfEnd = callback;
+      this.controller.onGameEnd(callback);
     },
     onNextStage: function onNextStage(callback) {
       controller.onNextStage(callback);

package/package.json

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

package/types/Player/index.d.ts

@@ -5,10 +5,10 @@ import Controller from '../Controller';
 import { Poke } from '../Deck/constant';
 type PlayerStatus = 'allIn' | 'active' | 'waiting' | 'out';
 type OnlineStatus = 'online' | 'offline' | 'quit';
-interface ActionWithOutPayload {
+export interface ActionWithOutPayload {
     type: Extract<ActionType, 'check' | 'fold'>;
 }
-interface ActionWithPayload {
+export interface ActionWithPayload {
     type: Exclude<ActionType, 'check' | 'fold'>;
     payload: {
         value: number;
@@ -32,14 +32,14 @@ export interface User {
      */
     avatar?: string;
 }
-export type CallbackOfAction = (action: Action) => void;
+export type CallbackOfAction = (player: Player) => void;
 export type Role = 'button' | 'small-blind' | 'big-blind' | `under-the-gun${number | ''}` | `middle-position${number | ''}` | 'hi-jack' | 'cut-off';
 /**
  * 玩家
  */
 export declare class Player {
     #private;
-    constructor({ lowestBetAmount, user, lastPlayer, nextPlayer, controller, dealer, pool, isOwner, thinkingTime }: {
+    constructor({ lowestBetAmount, user, lastPlayer, nextPlayer, controller, dealer, pool, isOwner, thinkingTime, shouldTakeDefaultAction }: {
         lowestBetAmount: number;
         role?: Role;
         user: User;
@@ -51,6 +51,7 @@ export declare class Player {
         pool?: Pool;
         isOwner?: boolean;
         thinkingTime?: number;
+        shouldTakeDefaultAction?: boolean;
     });
     setNextPlayer(player: Player | null): void;
     setPresentation(presentation: string): void;

package/types/config/index.d.ts

@@ -1,2 +1 @@
 export declare const defaultThinkingTime = 30;
-export declare const shouldTakeDefaultAction = false;

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import { initialGame } from './main';
 export { initialGame };
-export { default as Player, User, ActionType, Role, Action } from './Player';
+export { default as Player, User, ActionType, Role, Action, ActionWithPayload, ActionWithOutPayload } from './Player';
 export { roleMap, actionMap } from './Player/constant';
 export { Stage, ControllerStatus } from './Controller';
 export { default as Dealer } from './Dealer';

package/types/main.d.ts

@@ -9,6 +9,11 @@ interface CreateRoomInputArgs {
     maximumCountOfPlayers: number;
     allowPlayersToWatch: boolean;
     user: User;
+    /**
+     * 是否需要在超时 采取默认行动
+     */
+    shouldTakeDefaultAction?: boolean;
+    thinkingTime?: number;
 }
 export interface PreAction {
     userId: number;
@@ -18,7 +23,7 @@ export interface PreAction {
         max: number;
     };
 }
-declare const initialGame: ({ lowestBetAmount, maximumCountOfPlayers, allowPlayersToWatch, user }: CreateRoomInputArgs) => {
+declare const initialGame: ({ user, thinkingTime, lowestBetAmount, allowPlayersToWatch, maximumCountOfPlayers, shouldTakeDefaultAction }: CreateRoomInputArgs) => {
     room: Room;
     pool: Pool;
     dealer: Dealer;