修复:短大盲全下行动与河牌弃牌底牌隐私

This commit is contained in:
pptg 2026-09-12 06:54:49 +08:00
parent a3fce77317
commit a0737d41f0
4 changed files with 115 additions and 3 deletions

View File

@ -86,3 +86,16 @@ cloudflared tunnel --url http://127.0.0.1:18439 --no-autoupdate
本轮本地构建与公网 JavaScript 内容逐字一致,但 CSS 和 HTML 文件哈希不同;本地构建及公网资源摘要分别保留,不声称整个构建逐字一致。真实模型与规则证据复用限于相同运行源码,页面验收以本轮浏览器检查及后续独立 QA 为准。
已知邀请交互:在同一页面仅切换 `#join=` fragment 时,`joined` 是页面级布尔值,按钮可能继续显示前一玩家“已加入”。服务端仍按当前邀请凭据鉴权,不能凭显示状态读取其他玩家底牌;三个独立新页邀请可正常完成。影响是同页连续接入时可能误以为新玩家已加入,导致开始被全员加入门禁拒绝。开发建议后续按邀请身份重置显示状态;本 Issue 明确将是否修复交给产品决定,因此本次保留并报告,不将其隐去或自作最终产品验收结论。当前使用方式是每份邀请独立新页打开。
## Issue 88 规则与隐私返工
本次 [Issue #88](https://gitea.d-robotics.cc/peng01.guo/ppanel/issues/88) 根据 [独立 CR #78](https://gitea.d-robotics.cc/peng01.guo/ppanel/issues/78) 修正两项问题,需求版本仍为 `1`:
- 只剩一位可行动玩家时,跟注目标使用仍未弃牌玩家的实际投注。短大盲全下且小盲已覆盖时直接补齐公共牌并摊牌;仍欠筹码时可弃牌或跟注,不能向无人响应的边池加注。仍有多人可下注时保留名义大盲 `20`。
- 结束后至少两位未弃牌玩家且公共牌完整才公开摊牌底牌。河牌弃牌获胜仍隐藏赢家底牌;赢家通过自己的邀请可看自己的牌。使用现有牌局状态推导,无新增持久化字段,旧快照加载后同样应用隐私规则。
新增规则回归覆盖短盲注、无人响应加注、多人转为全下对局、河牌弃牌公共/玩家投影、快照重载及正常多人摊牌;`api-check.mjs` 通过真实 HTTP 动作执行河牌弃牌结束,检查公共接口与每位玩家的观察。测试动作不是模型对局。
本次修改了 `game.mjs`,已有部署及真实模型记录不能证明修复后的代码已部署或通过验收。根据 [根任务环境更新](https://gitea.d-robotics.cc/peng01.guo/ppanel/issues/72#issuecomment-19196),公网此前已更新至 `a3fce77317c99cc68fb05fa0c1934fd62999cd3f`,源站 Node PID `59783`(2026-09-12 06:19:00 启动),替代上文历史 PID `43920`。本轮未操作该源站、隧道或控制面;最终部署需由授权部署者从新候选更新并重新核验,不能只凭历史 PID 操作服务。
本轮新增模型调用 `0`。旧真实对局仅作为可追溯历史事实;模型适配、邀请接口和 UI 源码保持不变,但规则文件有上述修正,不能宣称与旧运行源码逐字一致。最终独立 CR、QA、部署核验及合入后 QA 必须绑定新 SHA。同页切换邀请 fragment 的已知显示问题仍按原任务交产品决定,当前每份邀请独立新页打开。

View File

@ -68,5 +68,31 @@ const results = await Promise.all(
),
);
assert.deepEqual(results.map((r) => r.status).sort(), [200, 400]);
// 通过真实 HTTP 动作走到河牌,再弃牌结束;不调用模型。
let state = (await request(path + "observation", null, tokens[0])).data;
while (state.stage !== "river") {
const acting = (await request(path + "observation", null, tokens[state.actor])).data;
const result = await request(path + "action", {
action: acting.legal.actions.includes("check") ? "check" : "call",
version: acting.version,
}, tokens[state.actor]);
assert.equal(result.status, 200);
state = result.data;
}
while (state.stage !== "complete") {
const result = await request(path + "action", {
action: "fold", version: state.version,
}, tokens[state.actor]);
assert.equal(result.status, 200);
state = result.data;
}
const winner = state.players.find((p) => !p.folded).id;
const publicFinished = (await request("tables")).data.tables.find((t) => t.id === id);
assert.deepEqual(publicFinished.players.map((p) => p.cards), [[], [], []]);
for (let i = 0; i < tokens.length; i++) {
const observation = (await request(path + "observation", null, tokens[i])).data;
assert.equal(observation.players[winner].cards.length, i === winner ? 2 : 0);
}
assert.equal(publicFinished.history.at(-1).total, 3000);
await request(path + "control", { action: "pause" }, admin);
console.log("HTTP 鉴权、隐私、非当前玩家与并发重复动作检查通过");
console.log("HTTP 鉴权、隐私、非当前玩家、并发重复动作与河牌弃牌获胜隐私检查通过");

View File

@ -172,7 +172,8 @@ export class Game {
if (i !== this.actor || !p || p.folded || !p.stack) return null;
const call = Math.max(0, this.current - p.bet),
canRaise =
p.actedAt === null || this.current - p.actedAt >= this.minRaise;
(p.actedAt === null || this.current - p.actedAt >= this.minRaise) &&
this.players.some((other) => other !== p && !other.folded && other.stack > 0);
const max = p.bet + p.stack,
min = this.current + this.minRaise;
return {
@ -230,6 +231,8 @@ export class Game {
const alive = this.players.filter((p) => !p.folded),
active = alive.filter((p) => p.stack > 0);
if (alive.length === 1) return this.finish();
// 无人能响应加注时,只需覆盖仍在牌局中的实际投注(短盲注可能不足 20)。
if (active.length <= 1) this.current = Math.max(...alive.map((p) => p.bet));
if (active.length <= 1 && active.every((p) => p.bet >= this.current)) {
while (this.board.length < 5) this.board.push(this.deck.pop());
return this.finish();
@ -283,7 +286,8 @@ export class Game {
folded: p.folded,
cards:
p.id === id ||
(this.stage === "complete" && this.board.length === 5 && !p.folded)
(this.stage === "complete" && this.board.length === 5 &&
this.players.filter((player) => !player.folded).length > 1 && !p.folded)
? p.cards
: [],
})),

View File

@ -93,3 +93,72 @@ test("连续 50 手合法行动筹码守恒", () => {
assert.equal(g.history.at(-1).total, 3000);
}
});
test("短大盲全下且小盲已覆盖时直接摊牌,不再允许弃牌", () => {
for (const stacks of [[100, 5], [100, 10], [10, 5]]) {
const g = new Game(["甲", "乙"], stacks);
g.start();
assert.equal(g.stage, "complete");
assert.equal(g.actor, null);
assert.equal(g.board.length, 5);
assert.equal(g.history[0].total, stacks[0] + stacks[1]);
const before = JSON.stringify(g);
assert.throws(() => g.act(0, "fold", 0, g.version));
assert.equal(JSON.stringify(g), before);
}
});
test("唯一可行动者只需跟齐实际全下额,不能向无人响应的边池加注", () => {
const g = new Game(["甲", "乙"], [100, 15]);
g.start();
assert.equal(g.actor, 0);
assert.equal(g.legal(0).call, 5);
assert.deepEqual(g.legal(0).actions, ["fold", "call"]);
const before = JSON.stringify(g);
assert.throws(() => g.act(0, "raise", 40, g.version));
assert.throws(() => g.act(0, "all-in", 0, g.version));
assert.equal(JSON.stringify(g), before);
g.act(0, "call", 0, g.version);
assert.equal(g.stage, "complete");
assert.deepEqual(g.players.map((p) => p.total), [15, 15]);
assert.equal(g.history[0].total, 115);
});
test("多人短大盲保留名义大盲;其他玩家弃牌后按实际投注自动摊牌", () => {
const g = new Game(["甲", "乙", "丙"], [100, 100, 5]);
g.start();
assert.equal(g.legal(0).call, 20);
g.act(0, "fold", 0, g.version);
assert.equal(g.stage, "complete");
assert.equal(g.board.length, 5);
assert.equal(g.history[0].total, 205);
});
test("河牌弃牌获胜后公开和其他玩家投影隐藏赢家底牌,重载仍隐藏", () => {
const g = new Game(["甲", "乙", "丙"]);
g.start();
while (g.stage !== "river") {
g.act(g.actor, g.legal(g.actor).actions.includes("check") ? "check" : "call", 0, g.version);
}
g.act(g.actor, "fold", 0, g.version);
g.act(g.actor, "fold", 0, g.version);
assert.equal(g.stage, "complete");
const winner = g.players.find((p) => !p.folded).id;
const restored = Object.assign(new Game(["恢复", "状态"]), JSON.parse(JSON.stringify(g)));
for (const game of [g, restored]) {
assert.deepEqual(game.view().players.map((p) => p.cards), [[], [], []]);
for (const p of game.players) {
assert.equal(game.view(p.id).players[winner].cards.length, p.id === winner ? 2 : 0);
}
}
});
test("真实多人摊牌仍公开未弃牌者底牌", () => {
const g = new Game(["甲", "乙", "丙"]);
g.start();
g.act(g.actor, "fold", 0, g.version);
while (g.stage !== "complete") {
g.act(g.actor, g.legal(g.actor).actions.includes("check") ? "check" : "call", 0, g.version);
}
assert.deepEqual(g.view().players.map((p) => p.cards.length), [0, 2, 2]);
});