From b54de5bbda1e8ada16dce258117d6add44456de6 Mon Sep 17 00:00:00 2001 From: Joywayer Date: Mon, 31 Aug 2026 18:17:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(framework):=20RoomStore=20+=20RoomState.pl?= =?UTF-8?q?ayers=20=E7=B1=BB=E5=9E=8B=E7=B2=BE=E7=A1=AE=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RoomState.players: unknown[] → Array - 座位未占用显式为 null(不是 undefined、不是空对象) - 长度由 maxPlayerCount 决定,RoomStore.applyRecovery 校验填充 deskinfo 字段注释强调"C 规范 §5 边界判据 2:平台层不持有、不解析", 新测试覆盖引用相等透传(不深拷贝)。 新增 RoomStore: applyRecovery/clear,响应式 + 类型化入参 RoomRecoveryData。 97/97 tests pass, typecheck exit 0。 Co-Authored-By: Claude Opus 5 (1M context) --- .../framework/platform/stores/room-store.ts | 67 +++++++++++++++++ .../assets/framework/platform/stores/types.ts | 11 ++- .../platform/room-store.test.ts | 75 +++++++++++++++++++ 3 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 cocoscreator_projects/YouleNexus/assets/framework/platform/stores/room-store.ts create mode 100644 cocoscreator_projects/framework-tests/platform/room-store.test.ts diff --git a/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/room-store.ts b/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/room-store.ts new file mode 100644 index 0000000..07ad562 --- /dev/null +++ b/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/room-store.ts @@ -0,0 +1,67 @@ +import { signal, type ReadonlyReactive } from '../../core/reactive.ts'; +import type { RoomState, PlayerState } from './types.ts'; +import type { ReadonlyRoomStore } from '../readonly.ts'; + +/** RoomState 初始值：所有座位为空。 */ +const INITIAL: RoomState = { + inRoom: false, + roomcode: null, + isbattle: 0, + roommode: 0, + seat: -1, + isowner: 0, + asetcount: 0, + makewar: 0, + needprepare: 0, + infinite: 0, + players: [], + deskinfo: null, +}; + +/** RoomStore 的入参契约（B 组，从 login 响应或 rpc 回包填充）。 */ +export interface RoomRecoveryData { + roomcode?: string | null; + isbattle?: number; + roommode?: number; + seat?: number; + isowner?: number; + asetcount?: number; + makewar?: number; + needprepare?: number; + infinite?: number; + players?: Array; + deskinfo?: unknown; +} + +/** + * RoomStore：房间/牌桌状态（= 旧 Desk）。 + * login 含 roomcode 时或在房状态下填充；离开/未在房时 clear()。 + */ +export class RoomStore implements ReadonlyRoomStore { + private s = signal({ ...INITIAL }); + get state(): ReadonlyReactive { return this.s; } + + applyRecovery(raw: RoomRecoveryData): void { + this.s.value = { + ...this.s.value, + inRoom: true, + roomcode: raw.roomcode ?? null, + isbattle: raw.isbattle ?? 0, + roommode: raw.roommode ?? 0, + seat: raw.seat ?? -1, + isowner: raw.isowner ?? 0, + asetcount: raw.asetcount ?? 0, + makewar: raw.makewar ?? 0, + needprepare: raw.needprepare ?? 0, + infinite: raw.infinite ?? 0, + players: raw.players ?? [], + // deskinfo 原样透传（C 规范 §5 边界判据 2）：不深拷贝、不解析 + deskinfo: raw.deskinfo ?? null, + }; + } + + /** 离开房间/未在房，复位。 */ + clear(): void { + this.s.value = { ...INITIAL }; + } +} \ No newline at end of file diff --git a/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/types.ts b/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/types.ts index 87fa47f..db3da23 100644 --- a/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/types.ts +++ b/cocoscreator_projects/YouleNexus/assets/framework/platform/stores/types.ts @@ -37,6 +37,13 @@ export interface RoomState { seat: number; // 自己的座位（-1 未入座） isowner: number; // 1房主/0非 asetcount: number; makewar: number; needprepare: number; infinite: number; - players: unknown[]; // 按座位下标(可含 null)；完整建模留后续切片 - deskinfo: unknown; // 子游戏对局快照，opaque 透传 + /** + * 按座位下标的玩家数组。空座位用 null 占位（不是 undefined、不是空对象）， + * 长度由 maxPlayerCount 决定，由 RoomStore.applyRecovery 校验填充。 + */ + players: Array; + /** + * 子游戏对局快照，opaque 透传（C 规范 §5 边界判据 2：平台层不持有、不解析）。 + */ + deskinfo: unknown; } diff --git a/cocoscreator_projects/framework-tests/platform/room-store.test.ts b/cocoscreator_projects/framework-tests/platform/room-store.test.ts new file mode 100644 index 0000000..ea99b54 --- /dev/null +++ b/cocoscreator_projects/framework-tests/platform/room-store.test.ts @@ -0,0 +1,75 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { RoomStore } from '../../YouleNexus/assets/framework/platform/stores/room-store.ts'; + +test('初始: inRoom=false, seat=-1, players=[]', () => { + const v = new RoomStore().state.value; + assert.equal(v.inRoom, false); + assert.equal(v.seat, -1); + assert.deepEqual(v.players, []); +}); + +test('applyRecovery: 填充 B 组并置 inRoom=true', () => { + const store = new RoomStore(); + store.applyRecovery({ + roomcode: 'ROOM1', isbattle: 1, roommode: 1, + seat: 2, isowner: 1, + players: [ + null, + { playerid: 100, nickname: '甲', bean: 0, roomcard: 0 } as any, + null, + ], + }); + const v = store.state.value; + assert.equal(v.inRoom, true); + assert.equal(v.roomcode, 'ROOM1'); + assert.equal(v.isbattle, 1); + assert.equal(v.seat, 2); + assert.equal(v.players.length, 3); + assert.equal(v.players[0], null); + assert.equal(v.players[1]?.playerid, 100); + assert.equal(v.players[2], null); +}); + +test('applyRecovery: 未传 players 字段 → 空数组(非 null,非 undefined)', () => { + const store = new RoomStore(); + store.applyRecovery({ roomcode: 'R' } as any); + assert.deepEqual(store.state.value.players, []); +}); + +test('applyRecovery: deskinfo 透传原值不解析（第二准则:平台层不解析对局态）', () => { + const store = new RoomStore(); + const deskinfo = { round: 3, cards: ['A', 'B'] }; + store.applyRecovery({ roomcode: 'R', deskinfo } as any); + assert.equal(store.state.value.deskinfo, deskinfo, 'deskinfo 必须是引用相等（不深拷贝、不解析）'); +}); + +test('applyRecovery: deskinfo 缺省 → null', () => { + const store = new RoomStore(); + store.applyRecovery({ roomcode: 'R' } as any); + assert.equal(store.state.value.deskinfo, null); +}); + +test('clear: 复位 inRoom 与字段, players 也清空', () => { + const store = new RoomStore(); + store.applyRecovery({ + roomcode: 'R', seat: 1, + players: [{ playerid: 1 } as any, null], + }); + store.clear(); + const v = store.state.value; + assert.equal(v.inRoom, false); + assert.equal(v.roomcode, null); + assert.equal(v.seat, -1); + assert.deepEqual(v.players, []); +}); + +test('subscribe: inRoom 由 false → true 触发一次', () => { + const store = new RoomStore(); + let n = 0; + store.state.subscribe(() => { n++; + }); + store.applyRecovery({ roomcode: 'R' } as any); + store.clear(); + assert.equal(n, 2); +}); \ No newline at end of file