maid-poker-cli 1.0.0 → 1.0.1

package/dist/server.js

@@ -6,19 +6,28 @@ const socket_io_1 = require("socket.io");
 const http_1 = require("http");
 const PORT = 3000;
 class GameServer {
-    constructor() {
+    constructor(gameMode = 'three_player') {
         this.players = [];
         this.state = {
             phase: 'waiting',
+            gameMode: 'three_player',
             deck: [],
             currentTurnIndex: 0,
             landlordIndex: -1,
             lastPlayedCards: [],
-            lastPlayedIndex: -1
+            lastPlayedIndex: -1,
+            requiredPlayers: 3
         };
+        this.state.gameMode = gameMode;
+        this.state.requiredPlayers = gameMode === 'three_player' ? 3 : 4;
         const httpServer = (0, http_1.createServer)();
         this.io = new socket_io_1.Server(httpServer);
         this.io.on('connection', (socket) => {
+            // 发送当前游戏模式给客户端
+            socket.emit('game_mode', {
+                mode: this.state.gameMode,
+                requiredPlayers: this.state.requiredPlayers
+            });
             socket.on('join_game', (name) => this.handleJoin(socket, name));
             socket.on('disconnect', () => this.handleDisconnect(socket));
             socket.on('player_ready', () => this.handleReady(socket));
@@ -28,15 +37,15 @@ class GameServer {
             socket.on('pass', () => this.handlePass(socket));
         });
         httpServer.listen(PORT, '0.0.0.0', () => {
-            // Logs handled in index.ts usually, but good to have here
+            const modeText = gameMode === 'three_player' ? '三人斗地主' : '四人斗地主(2副牌)';
+            console.log(`游戏模式: ${modeText}`);
         });
     }
     handleJoin(socket, name) {
-        if (this.players.length >= 3) {
+        if (this.players.length >= this.state.requiredPlayers) {
             socket.emit('error_msg', '房间已满');
             return;
         }
-        // Allow joining if in waiting phase
         if (this.state.phase !== 'waiting' && this.state.phase !== 'ended') {
             socket.emit('error_msg', '游戏进行中');
             return;
@@ -50,18 +59,11 @@ class GameServer {
             isReady: false
         };
         this.players.push(newPlayer);
-        console.log(`${name} 加入了游戏. (${this.players.length}/3)`);
-        // Broadcast updated player list
+        const modeText = this.state.gameMode === 'three_player' ? '三人斗地主' : '四人斗地主';
+        console.log(`${name} 加入了游戏. (${this.players.length}/${this.state.requiredPlayers}) [${modeText}]`);
         this.broadcastPlayerList();
-        // If 3 players, ask them to get ready (or auto-ready for first game?)
-        // For UX consistency, let's treat "Join" as implicitly ready for the first game if we want instant start,
-        // BUT for "Restart" feature, explicit ready is better.
-        // Let's make the first game auto-start when 3 join for simplicity, 
-        // and subsequent games require explicit ready.
-        if (this.players.length === 3) {
+        if (this.players.length === this.state.requiredPlayers) {
             console.log('房间已满，准备开始...');
-            // Mark all valid players as ready for the first game? 
-            // Or just start immediately.
             this.startGame();
         }
     }
@@ -71,9 +73,7 @@ class GameServer {
             return;
         player.isReady = true;
         console.log(`${player.name} 已准备.`);
-        // Notify others?
-        // Check if all 3 are ready
-        if (this.players.length === 3 && this.players.every(p => p.isReady)) {
+        if (this.players.length === this.state.requiredPlayers && this.players.every(p => p.isReady)) {
             this.startGame();
         }
     }
@@ -84,7 +84,6 @@ class GameServer {
             console.log(`客户端断开连接: ${player.name} (${socket.id})`);
         }
         this.broadcastPlayerList();
-        // Reset game if someone leaves during play
         if (this.state.phase !== 'waiting' && this.state.phase !== 'ended') {
             this.io.emit('error_msg', '玩家断开连接，游戏重置。');
             this.resetGame();
@@ -92,33 +91,49 @@ class GameServer {
     }
     broadcastPlayerList() {
         const names = this.players.map(p => p.name);
-        this.io.emit('player_list_update', names);
+        this.io.emit('player_list_update', {
+            names,
+            required: this.state.requiredPlayers,
+            gameMode: this.state.gameMode
+        });
     }
     startGame() {
-        console.log('所有玩家准备就绪，游戏开始!');
+        const modeText = this.state.gameMode === 'three_player' ? '三人斗地主' : '四人斗地主';
+        console.log(`所有玩家准备就绪，${modeText}开始!`);
         this.state.phase = 'bidding';
         this.state.lastPlayedCards = [];
         this.state.lastPlayedIndex = -1;
         this.state.landlordIndex = -1;
         this.state.deck = [];
-        // Reset ready status for next time? No, do it at end.
         this.players.forEach(p => {
             p.isReady = false;
             p.role = 'peasant';
             p.hand = [];
         });
-        // 1. Shuffle and Deal
-        const fullDeck = (0, poker_1.shuffleDeck)((0, poker_1.createDeck)());
-        this.state.deck = fullDeck.splice(0, 3); // 3 hidden cards
-        // Deal 17 cards to each
-        this.players[0].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 17));
-        this.players[1].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 17));
-        this.players[2].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 17));
+        if (this.state.gameMode === 'three_player') {
+            // 三人斗地主：1副牌54张，每人17张，底牌3张
+            const fullDeck = (0, poker_1.shuffleDeck)((0, poker_1.createDeck)());
+            this.state.deck = fullDeck.splice(0, 3);
+            this.players[0].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 17));
+            this.players[1].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 17));
+            this.players[2].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 17));
+        }
+        else {
+            // 四人斗地主：2副牌108张，每人25张，底牌8张
+            const fullDeck = (0, poker_1.shuffleDeck)((0, poker_1.createDoubleDeck)());
+            this.state.deck = fullDeck.splice(0, 8);
+            this.players[0].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 25));
+            this.players[1].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 25));
+            this.players[2].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 25));
+            this.players[3].hand = (0, poker_1.sortHand)(fullDeck.splice(0, 25));
+        }
         this.players.forEach(p => {
-            p.socket.emit('game_start', { hand: p.hand });
+            p.socket.emit('game_start', {
+                hand: p.hand,
+                gameMode: this.state.gameMode
+            });
         });
-        // 2. Start Bidding (Simple random start for now)
-        this.state.currentTurnIndex = Math.floor(Math.random() * 3);
+        this.state.currentTurnIndex = Math.floor(Math.random() * this.state.requiredPlayers);
         this.notifyTurn('bid');
     }
     notifyTurn(action) {
@@ -126,17 +141,16 @@ class GameServer {
         this.io.emit('turn_update', {
             playerIndex: this.state.currentTurnIndex,
             playerName: player.name,
-            action
+            action,
+            gameMode: this.state.gameMode
         });
-        player.socket.emit('your_turn', { action });
+        player.socket.emit('your_turn', { action, gameMode: this.state.gameMode });
     }
-    // Placeholder handlers
     handleBid(socket, bid) {
         const playerIndex = this.players.findIndex(p => p.id === socket.id);
         if (playerIndex !== this.state.currentTurnIndex)
             return;
         if (bid > 0) {
-            // Claimed!
             this.state.landlordIndex = playerIndex;
             this.players[playerIndex].role = 'landlord';
             this.players[playerIndex].hand.push(...this.state.deck);
@@ -144,17 +158,14 @@ class GameServer {
             this.state.phase = 'playing';
             this.io.emit('landlord_chosen', {
                 landlordName: this.players[playerIndex].name,
-                hiddenCards: this.state.deck
+                hiddenCards: this.state.deck,
+                gameMode: this.state.gameMode
             });
-            // Sync new hand
             this.players[playerIndex].socket.emit('hand_update', this.players[playerIndex].hand);
-            // Landlord plays first
             this.notifyTurn('play');
         }
         else {
-            // Pass bid
-            this.state.currentTurnIndex = (this.state.currentTurnIndex + 1) % 3;
-            // MVP: Infinite loop until someone takes it
+            this.state.currentTurnIndex = (this.state.currentTurnIndex + 1) % this.state.requiredPlayers;
             this.notifyTurn('bid');
         }
     }
@@ -162,32 +173,31 @@ class GameServer {
         const playerIndex = this.players.findIndex(p => p.id === socket.id);
         if (playerIndex !== this.state.currentTurnIndex)
             return;
-        // Validate Play
         const { canBeat, analyzeHand } = require('./game/logic');
-        // If this is a new round (lastPlayedCards is empty), just check validity of the hand itself
         if (this.state.lastPlayedCards.length === 0) {
-            const analysis = analyzeHand(cards);
+            const analysis = analyzeHand(cards, this.state.gameMode);
             if (analysis.type === 'invalid') {
                 socket.emit('error_msg', '无效的牌型!');
-                this.players[playerIndex].socket.emit('your_turn', { action: 'play' });
+                this.players[playerIndex].socket.emit('your_turn', { action: 'play', gameMode: this.state.gameMode });
                 return;
             }
         }
         else {
-            // Check if it beats the last played cards
-            const valid = canBeat(this.state.lastPlayedCards, cards);
+            const valid = canBeat(this.state.lastPlayedCards, cards, this.state.gameMode);
             if (!valid) {
                 socket.emit('error_msg', '出牌无效: 你的牌必须大过上家!');
-                this.players[playerIndex].socket.emit('your_turn', { action: 'play' });
+                this.players[playerIndex].socket.emit('your_turn', { action: 'play', gameMode: this.state.gameMode });
                 return;
             }
         }
         this.state.lastPlayedCards = cards;
         this.state.lastPlayedIndex = playerIndex;
-        // Remove cards from hand
         const p = this.players[playerIndex];
+        // 四人模式需要考虑两副牌中同值同花的牌，使用 deckIndex 区分
         cards.forEach(c => {
-            const idx = p.hand.findIndex(h => h.suit === c.suit && h.rank === c.rank);
+            const idx = p.hand.findIndex(h => h.suit === c.suit &&
+                h.rank === c.rank &&
+                (this.state.gameMode === 'three_player' || h.deckIndex === c.deckIndex));
             if (idx !== -1)
                 p.hand.splice(idx, 1);
         });
@@ -195,15 +205,15 @@ class GameServer {
         this.io.emit('player_played', {
             playerName: p.name,
             cards: cards,
-            remainingCount: p.hand.length
+            remainingCount: p.hand.length,
+            gameMode: this.state.gameMode
         });
         if (p.hand.length === 0) {
             this.state.phase = 'ended';
-            this.io.emit('game_over', { winner: p.name, role: p.role });
-            // Don't kill server, wait for ready
+            this.io.emit('game_over', { winner: p.name, role: p.role, gameMode: this.state.gameMode });
         }
         else {
-            this.state.currentTurnIndex = (this.state.currentTurnIndex + 1) % 3;
+            this.state.currentTurnIndex = (this.state.currentTurnIndex + 1) % this.state.requiredPlayers;
             this.notifyTurn('play');
         }
     }
@@ -212,16 +222,14 @@ class GameServer {
         if (playerIndex !== this.state.currentTurnIndex)
             return;
         if (this.state.lastPlayedIndex === playerIndex || this.state.lastPlayedIndex === -1) {
-            // Cannot pass if you started the round
             socket.emit('error_msg', '这是新回合，必须出牌');
-            this.players[playerIndex].socket.emit('your_turn', { action: 'play' });
-            return; // Ask them to play again
+            this.players[playerIndex].socket.emit('your_turn', { action: 'play', gameMode: this.state.gameMode });
+            return;
         }
         this.io.emit('player_passed', { playerName: this.players[playerIndex].name });
-        this.state.currentTurnIndex = (this.state.currentTurnIndex + 1) % 3;
-        // If next player is the one who played last, they win the round and start new
+        this.state.currentTurnIndex = (this.state.currentTurnIndex + 1) % this.state.requiredPlayers;
         if (this.state.currentTurnIndex === this.state.lastPlayedIndex) {
-            this.state.lastPlayedCards = []; // Clear
+            this.state.lastPlayedCards = [];
             this.io.emit('new_round', { playerName: this.players[this.state.currentTurnIndex].name });
         }
         this.notifyTurn('play');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maid-poker-cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "女仆扑克牌 (Maid Poker) - A Command Line Dou Dizhu Game",
   "main": "dist/index.js",
   "bin": {
@@ -12,6 +12,9 @@
   "scripts": {
     "start": "ts-node src/index.ts",
     "build": "tsc",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -34,5 +37,10 @@
     "socket.io-client": "^4.8.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.4.6"
   }
 }