most-box 0.1.5 → 0.1.7

package/server/src/core/zhajinhua.js

@@ -179,7 +179,7 @@ export function canStartRound(players = []) {
   return eligible.length >= ZHJ_MIN_PLAYERS && eligible.length <= ZHJ_MAX_PLAYERS
 }
 
-export function startRound({ roomCode, players, hostAddress, roundId = createRoundId(), random = Math.random }) {
+export function startRound({ roomCode, players, hostAddress, previousSeq = 0, previousWinner = '', roundId = createRoundId(), random = Math.random }) {
   const participants = players
     .filter(player => Number(player.chips) >= ZHJ_ANTE)
     .slice(0, ZHJ_MAX_PLAYERS)
@@ -204,17 +204,24 @@ export function startRound({ roomCode, players, hostAddress, roundId = createRou
     }
   })
 
-  const hostIndex = Math.max(
-    0,
-    publicPlayers.findIndex(player => player.address === normalizeAddress(hostAddress))
-  )
-  const turnAddress = publicPlayers[(hostIndex + 1) % publicPlayers.length].address
+  let turnAddress
+  const winnerNorm = normalizeAddress(previousWinner)
+  const winnerIndex = winnerNorm
+    ? publicPlayers.findIndex(p => normalizeAddress(p.address) === winnerNorm)
+    : -1
+  if (winnerIndex >= 0) {
+    turnAddress = publicPlayers[winnerIndex].address
+  } else {
+    const randomIndex = Math.floor(random() * publicPlayers.length)
+    turnAddress = publicPlayers[randomIndex].address
+  }
+
   const round = {
     roomCode: normalizeRoomCode(roomCode),
     roundId,
     status: 'playing',
     host: normalizeAddress(hostAddress),
-    seq: 1,
+    seq: previousSeq + 1,
     startedAt: Date.now(),
     ante: ZHJ_ANTE,
     pot: ZHJ_ANTE * publicPlayers.length,
@@ -226,6 +233,8 @@ export function startRound({ roomCode, players, hostAddress, roundId = createRou
     showdown: null,
     appliedEventIds: [],
     hands,
+    actionCounts: {},
+    compareReveal: {},
   }
 
   return round
@@ -268,6 +277,10 @@ export function normalizePublicRoundState(input) {
     appliedEventIds: Array.isArray(input.appliedEventIds)
       ? input.appliedEventIds.map(String)
       : [],
+    actionCounts: input.actionCounts && typeof input.actionCounts === 'object' ? clone(input.actionCounts) : {},
+    compareReveal: input.compareReveal && typeof input.compareReveal === 'object' ? clone(input.compareReveal) : {},
+    lastCompare: input.lastCompare && typeof input.lastCompare === 'object' ? clone(input.lastCompare) : null,
+    finishedAt: input.finishedAt ? Number(input.finishedAt) : null,
   }
 }
 
@@ -290,8 +303,7 @@ export function validatePlayerAction(round, actionEvent, authorAddress) {
   }
 
   if (action === 'call') {
-    const need = Math.max(0, state.currentBet - player.bet)
-    return player.chips >= need ? { ok: true } : { ok: false, error: '筹码不足，不能跟注' }
+    return player.chips >= ZHJ_ANTE ? { ok: true } : { ok: false, error: '筹码不足，不能跟注' }
   }
 
   if (action === 'raise') {
@@ -309,6 +321,11 @@ export function validatePlayerAction(round, actionEvent, authorAddress) {
     if (!target || target === author || !targetPlayer || targetPlayer.status !== 'active') {
       return { ok: false, error: '请选择有效的比牌对象' }
     }
+    const activePlayers = state.players.filter(p => p.status === 'active')
+    const allActed = activePlayers.every(p => (state.actionCounts?.[p.address] || 0) >= 1)
+    if (!allActed) {
+      return { ok: false, error: '第一轮不能比牌，请先跟注或加注' }
+    }
     const need = Math.max(0, state.currentBet - player.bet)
     return player.chips >= need ? { ok: true } : { ok: false, error: '筹码不足，不能比牌' }
   }
@@ -341,12 +358,16 @@ export function applyPlayerAction(round, actionEvent, authorAddress) {
   if (actionEvent.action === 'fold') {
     player.status = 'folded'
     state.lastAction = `${player.name} 弃牌`
+    incrementActionCount(state, author)
     return maybeFinishOrAdvance(state, author)
   }
 
   if (actionEvent.action === 'call') {
-    payToCurrentBet(state, player)
+    player.chips -= ZHJ_ANTE
+    player.bet += ZHJ_ANTE
+    state.pot += ZHJ_ANTE
     state.lastAction = `${player.name} 跟注`
+    incrementActionCount(state, author)
     return maybeFinishOrAdvance(state, author)
   }
 
@@ -355,6 +376,7 @@ export function applyPlayerAction(round, actionEvent, authorAddress) {
     state.currentBet += amount
     payToCurrentBet(state, player)
     state.lastAction = `${player.name} 加注 ${amount}`
+    incrementActionCount(state, author)
     return maybeFinishOrAdvance(state, author)
   }
 
@@ -362,10 +384,38 @@ export function applyPlayerAction(round, actionEvent, authorAddress) {
     payToCurrentBet(state, player)
     const targetAddress = normalizeAddress(actionEvent.target)
     const targetPlayer = state.players.find(item => item.address === targetAddress)
+    const initiatorLooked = player.looked
+    const targetLookedBefore = targetPlayer.looked
     const diff = compareHands(state.hands?.[author] || [], state.hands?.[targetAddress] || [])
+    const winner = diff >= 0 ? player : targetPlayer
     const loser = diff >= 0 ? targetPlayer : player
     loser.status = 'folded'
+    loser.looked = true
+    if (!state.compareReveal) state.compareReveal = {}
+    const bothLooked = initiatorLooked && targetLookedBefore
+    const neitherLooked = !initiatorLooked && !targetLookedBefore
+    if (bothLooked) {
+      state.compareReveal[author] = state.hands?.[targetAddress] || []
+      state.compareReveal[targetAddress] = state.hands?.[author] || []
+    } else if (neitherLooked) {
+      state.compareReveal[loser.address] = state.hands?.[winner.address] || []
+    } else {
+      const lookedPlayer = initiatorLooked ? player : targetPlayer
+      const unlookedPlayer = initiatorLooked ? targetPlayer : player
+      state.compareReveal[lookedPlayer.address] = state.hands?.[unlookedPlayer.address] || []
+      state.compareReveal[loser.address] = state.hands?.[winner.address] || []
+    }
+    state.lastCompare = {
+      initiator: author,
+      target: targetAddress,
+      winner: winner.address,
+      loser: loser.address,
+      initiatorLooked,
+      targetLooked: targetLookedBefore,
+      timestamp: Date.now(),
+    }
     state.lastAction = `${player.name} 与 ${targetPlayer.name} 比牌，${loser.name} 出局`
+    incrementActionCount(state, author)
     return maybeFinishOrAdvance(state, author)
   }
 
@@ -387,7 +437,11 @@ export function getAllowedActions(round, address) {
   if (ZHJ_RAISE_STEPS.some(amount => validatePlayerAction(round, { action: 'raise', amount }, player.address).ok)) {
     actions.push('raise')
   }
-  if (getActiveRoundPlayers(round).length > 1) actions.push('compare')
+  if (getActiveRoundPlayers(round).length > 1) {
+    const activePlayers = round.players.filter(p => p.status === 'active')
+    const allActed = activePlayers.every(p => (round.actionCounts?.[p.address] || 0) >= 1)
+    if (allActed) actions.push('compare')
+  }
   actions.push('fold')
   return actions
 }
@@ -403,6 +457,12 @@ export function chooseBotAction(round, address, random = Math.random) {
     item => item.address !== botAddress
   )
 
+  function canCompare() {
+    if (!allowedActions.includes('compare') || activeOpponents.length === 0) return false
+    const target = activeOpponents[0].address
+    return validatePlayerAction(round, { action: 'compare', target }, botAddress).ok
+  }
+
   if (
     allowedActions.includes('look') &&
     !player?.looked &&
@@ -412,7 +472,7 @@ export function chooseBotAction(round, address, random = Math.random) {
   }
 
   if (
-    allowedActions.includes('compare') &&
+    canCompare() &&
     activeOpponents.length === 1 &&
     handStrength >= 0.54 &&
     random() < 0.58
@@ -426,7 +486,7 @@ export function chooseBotAction(round, address, random = Math.random) {
   }
 
   if (
-    allowedActions.includes('compare') &&
+    canCompare() &&
     activeOpponents.length > 0 &&
     handStrength >= 0.82 &&
     random() < 0.36
@@ -455,6 +515,11 @@ function payToCurrentBet(state, player) {
   state.pot += need
 }
 
+function incrementActionCount(state, address) {
+  if (!state.actionCounts) state.actionCounts = {}
+  state.actionCounts[address] = (state.actionCounts[address] || 0) + 1
+}
+
 function maybeFinishOrAdvance(state, fromAddress) {
   const active = getActiveRoundPlayers(state)
   if (active.length === 1) {
@@ -466,15 +531,18 @@ function maybeFinishOrAdvance(state, fromAddress) {
 
 function finishRound(state, winnerAddress) {
   const winner = state.players.find(player => player.address === winnerAddress)
+  const winAmount = state.pot
   if (winner) {
     winner.chips += state.pot
   }
   state.status = 'finished'
   state.winner = winnerAddress
+  state.winAmount = winAmount
   state.turnAddress = ''
   state.showdown = state.hands ? clone(state.hands) : null
-  state.lastAction = winner ? `${winner.name} 赢得 ${state.pot} 筹码` : '本局结束'
+  state.lastAction = winner ? `${winner.name} 赢得 ${winAmount} 筹码` : '本局结束'
   state.pot = 0
+  state.finishedAt = Date.now()
   return advanceSeq(state)
 }
 

package/server/src/games/gandengyan.js

@@ -3,7 +3,7 @@ const RANKS = ['3', '4', '5', '6', '7', '8', '9', '10', 'J', 'Q', 'K', 'A', '2']
 const STRAIGHT_RANKS = RANKS.filter(rank => rank !== '2')
 const RANK_VALUE = new Map(RANKS.map((rank, index) => [rank, index + 3]))
 const INITIAL_HAND_SIZE = 5
-const SEALED_PENALTY = 15
+const SEALED_PENALTY = 20
 const INITIAL_SCORE = 1000
 
 export function createGanDengYanRoom({
@@ -128,6 +128,7 @@ export function playGanDengYanCards(room, address, cardIds) {
     return { ok: false, error: '出的牌压不过上一手', state: publicGanDengYanRoom(state) }
   }
 
+  cards.sort(compareCards)
   player.hand = player.hand.filter(card => !cardIds.includes(card.id))
   player.handCount = player.hand.length
   player.playedCards += cards.length
@@ -181,6 +182,45 @@ export function passGanDengYanTurn(room, address) {
   return { ok: true, state: publicGanDengYanRoom(state) }
 }
 
+export function removeGanDengYanPlayer(room, address) {
+  const state = hydrateGanDengYanRoom(room)
+  if (!state) return null
+  const normalizedAddress = normalizeAddress(address)
+  const index = state.players.findIndex(p => p.address === normalizedAddress)
+  if (index === -1) return publicGanDengYanRoom(state)
+  const leaving = state.players[index]
+  const wasCurrentTurn = state.currentSeat === leaving.seat
+  const wasLastWinner = state.lastWinnerSeat === leaving.seat
+  state.players.splice(index, 1)
+  state.passSeats = state.passSeats.filter(seat => seat !== leaving.seat)
+  state.log.unshift(`${leaving.name} 已退出房间`)
+  const remaining = orderedPlayers(state)
+  if (state.status === 'playing') {
+    if (remaining.length <= 1) {
+      if (remaining.length === 1) {
+        finishGame(state, remaining[0])
+      } else {
+        state.status = 'finished'
+        state.log.unshift('玩家不足，本局结束')
+      }
+    } else {
+      if (wasCurrentTurn) {
+        const active = activePlayers(state)
+        if (active.length > 0) {
+          const nextIndex = active.findIndex(p => p.seat > leaving.seat)
+          state.currentSeat = active[nextIndex >= 0 ? nextIndex : 0].seat
+        }
+      }
+      if (wasLastWinner && state.table) {
+        state.table = null
+        state.passSeats = []
+      }
+    }
+  }
+  state.seq += 1
+  return publicGanDengYanRoom(state)
+}
+
 export function publicGanDengYanRoom(room) {
   if (!room) return null
   return {
@@ -188,7 +228,9 @@ export function publicGanDengYanRoom(room) {
     ownerAddress: room.ownerAddress,
     status: room.status,
     seq: Number(room.seq || 1),
+    deck: Array.isArray(room.deck) ? room.deck.map(publicCard) : [],
     deckCount: room.deck?.length || Number(room.deckCount || 0),
+    discard: Array.isArray(room.discard) ? room.discard.map(publicCard) : [],
     discardCount: room.discard?.length || Number(room.discardCount || 0),
     currentSeat: Number(room.currentSeat || 0),
     lastWinnerSeat:
@@ -237,7 +279,7 @@ export function hydrateGanDengYanRoom(input) {
     players: Array.isArray(input.players)
       ? input.players.map(normalizeRoundPlayer).filter(Boolean)
       : [],
-    deck: Array.isArray(input.deck) ? input.deck.map(normalizeCard).filter(Boolean) : [],
+    deck: Array.isArray(input.deck) ? input.deck.map(expandCompactCard).filter(Boolean) : [],
     discard: Array.isArray(input.discard)
       ? input.discard.map(normalizeCard).filter(Boolean)
       : [],
@@ -274,6 +316,7 @@ export function hydrateGanDengYanRoom(input) {
 
 export function analyzeCards(cards) {
   if (!cards?.length) return null
+  cards = [...cards].sort(compareCards)
   const jokerCount = cards.filter(isJoker).length
   const normals = cards.filter(card => !isJoker(card))
   if (normals.length === 0) return null
@@ -303,15 +346,22 @@ function analyzeBomb(cards, normals, jokerCount) {
 
 function analyzeStraight(cards) {
   if (cards.length < 3) return null
+  const jokerCount = cards.filter(isJoker).length
+  const normals = cards.filter(card => !isJoker(card))
   for (let start = 0; start <= STRAIGHT_RANKS.length - cards.length; start += 1) {
     const values = STRAIGHT_RANKS.slice(start, start + cards.length).map(rank =>
       RANK_VALUE.get(rank)
     )
-    if (
-      cards.every(
-        (card, index) => isJoker(card) || cardValue(card) === values[index]
-      )
-    ) {
+    const remaining = [...values]
+    let matched = 0
+    for (const card of normals) {
+      const idx = remaining.indexOf(cardValue(card))
+      if (idx !== -1) {
+        remaining.splice(idx, 1)
+        matched += 1
+      }
+    }
+    if (matched + jokerCount === cards.length && remaining.length === jokerCount) {
       return makeCombo('straight', values.at(-1), cards.length, values)
     }
   }
@@ -321,16 +371,23 @@ function analyzeStraight(cards) {
 function analyzePairStraight(cards) {
   if (cards.length < 4 || cards.length % 2 !== 0) return null
   const pairCount = cards.length / 2
+  const jokerCount = cards.filter(isJoker).length
+  const normals = cards.filter(card => !isJoker(card))
   for (let start = 0; start <= STRAIGHT_RANKS.length - pairCount; start += 1) {
     const pairValues = STRAIGHT_RANKS.slice(start, start + pairCount).map(rank =>
       RANK_VALUE.get(rank)
     )
-    const values = pairValues.flatMap(value => [value, value])
-    if (
-      cards.every(
-        (card, index) => isJoker(card) || cardValue(card) === values[index]
-      )
-    ) {
+    const remaining = pairValues.flatMap(value => [value, value])
+    let matched = 0
+    for (const card of normals) {
+      const idx = remaining.indexOf(cardValue(card))
+      if (idx !== -1) {
+        remaining.splice(idx, 1)
+        matched += 1
+      }
+    }
+    if (matched + jokerCount === cards.length && remaining.length === jokerCount) {
+      const values = pairValues.flatMap(value => [value, value])
       return makeCombo('pairStraight', pairValues.at(-1), cards.length, values)
     }
   }
@@ -448,7 +505,7 @@ function finishGame(room, winner) {
   for (const player of orderedPlayers(room)) {
     if (player.seat === winner.seat) continue
     const sealed = player.playedCards === 0
-    const loss = sealed ? SEALED_PENALTY : player.hand.length * room.baseScore
+    const loss = sealed ? SEALED_PENALTY : player.hand.length * room.baseScore * 0.5
     player.score -= loss
     winnerGain += loss
     losers.push({
@@ -553,6 +610,14 @@ function suitValue(suit) {
   return { D: 0, C: 1, H: 2, S: 3, Joker: 4 }[suit] || 0
 }
 
+function expandCompactCard(input) {
+  if (typeof input === 'string') {
+    const [suit, rank] = input.split('-')
+    return normalizeCard({ id: input, suit, rank })
+  }
+  return normalizeCard(input)
+}
+
 function publicCard(card) {
   return {
     id: card.id,

package/server/src/http/app.js

@@ -697,8 +697,11 @@ export function createApp(engine, options = {}) {
     }
 
     try {
+      const timeout =
+        body.timeout === undefined ? undefined : Number(body.timeout)
       const result = await engine.checkDownloadAvailability(body.link, {
         ownerAddress: c.get('userAddress'),
+        timeout: Number.isFinite(timeout) && timeout > 0 ? timeout : undefined,
       })
       return c.json({ success: true, ...result })
     } catch (err) {
@@ -952,7 +955,11 @@ export function createApp(engine, options = {}) {
       const result = await engine.createChannel(
         body.name.trim(),
         body.type || 'personal',
-        { ownerAddress: c.get('userAddress') }
+        {
+          ownerAddress: c.get('userAddress'),
+          displayName: body.displayName,
+          avatar: body.avatar,
+        }
       )
       return c.json({ success: true, ...result })
     } catch (err) {
@@ -998,6 +1005,18 @@ export function createApp(engine, options = {}) {
     }
   })
 
+  app.get('/api/channels/:name/members', c => {
+    try {
+      return c.json(
+        engine.getChannelMembers(c.req.param('name'), {
+          ownerAddress: c.get('userAddress'),
+        })
+      )
+    } catch (err) {
+      return badRequestOrAppError(c, err)
+    }
+  })
+
   app.post('/api/channels/:name/messages', async c => {
     const name = c.req.param('name')
     const body = await c.req.json()
@@ -1022,7 +1041,11 @@ export function createApp(engine, options = {}) {
         body.content,
         body.author,
         body.authorName,
-        { ownerAddress: c.get('userAddress'), attachment: body.attachment }
+        {
+          ownerAddress: c.get('userAddress'),
+          attachment: body.attachment,
+          avatar: body.avatar,
+        }
       )
       return c.json({ success: true, message })
     } catch (err) {

package/server/src/http/nodeStatus.js

@@ -137,6 +137,43 @@ export function buildOpenApiSpec(appPort) {
           responses: { 200: { description: 'Pull task result' } },
         },
       },
+      '/api/files': {
+        get: {
+          summary: 'List published files for the authenticated local user',
+          responses: { 200: { description: 'Published file list' } },
+        },
+      },
+      '/api/publish': {
+        post: {
+          summary: 'Publish a file and start seeding by CID',
+          responses: { 200: { description: 'Published CID and most:// link' } },
+        },
+      },
+      '/api/download/check': {
+        post: {
+          summary:
+            'Check whether a most:// link is locally available or discoverable',
+          responses: { 200: { description: 'Download availability result' } },
+        },
+      },
+      '/api/download': {
+        post: {
+          summary: 'Start downloading a most:// link',
+          responses: { 200: { description: 'Download task result' } },
+        },
+      },
+      '/api/download/cancel': {
+        post: {
+          summary: 'Cancel an active download task',
+          responses: { 200: { description: 'Cancellation result' } },
+        },
+      },
+      '/api/files/{cid}/download': {
+        get: {
+          summary: 'Read a locally held file by CID',
+          responses: { 200: { description: 'File bytes' } },
+        },
+      },
     },
   }
 }