diff --git a/.hermes/shared-memory/decision-log.md b/.hermes/shared-memory/decision-log.md index 93ddf685..7c286ae6 100644 --- a/.hermes/shared-memory/decision-log.md +++ b/.hermes/shared-memory/decision-log.md @@ -16,6 +16,24 @@ --- +## 2026-06-03 拼消消收敛为单关 6x6 与 4-sheet 素材策略 + +- 背景：最初 4 关 / 135 次消除 / 单张大 atlas 方案生图数量和空间一致性成本过高，真实 image2 结果容易被布局提示词诱导成带文字、边框或编号的说明图，不适合运行态 1x1 切片。 +- 决策：拼消消运行态收敛为单关 `6x6 / 35 次消除 / 600 秒`，直接解锁 `1x2`、`1x3`、`2x2`、`2x3`；素材生成改为 4 张 `1024x1536` 竖版 sheet，每张按 `4x6`、每格 `256x256` 切片，再由服务端合成 `10x10 / 2560x2560` 最终 atlas。形状配比固定为 `1x2=23`、`1x3=5`、`2x2=4`、`2x3=3`，总计 35 个复合图案组和 95 个 1x1 卡牌切片。 +- 影响范围：`module-puzzle-clear` 关卡与图案组规划、api-server 拼消消素材生成编排、前端草稿试玩本地 runtime、结果页 atlas 预览、拼消消 PRD / 技术方案 / 平台链路文档。 +- 验证方式：`cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml`、`cargo test -p api-server puzzle_clear --manifest-path server-rs/Cargo.toml -- --nocapture`、`npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts`、`npm run test -- src/components/puzzle-clear-result/PuzzleClearResultView.test.tsx src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`。 +- 关联文档：`docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md`、`docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md`、`docs/【玩法创作】平台入口与玩法链路-2026-05-15.md`、`docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md`。 + +## 2026-05-30 拼消消按独立玩法公开闭环接入 + +- 背景：拼消消以拼图交换手感为基础，但核心规则从“拼完整单图过关”变为“拼成多个复合图案组后逐个消除”，同时需要顶部补牌、防死局、半锁定局部拼接组和正式统计，不能继续复用拼图运行态规则本体。 +- 决策：`puzzle-clear` 作为独立玩法域接入，公开作品码前缀固定为 `PC-`；创作链路采用表单 / 图片输入工作台 -> 独立生成页 -> 结果页 -> 试玩 -> 发布 -> 统一作品详情 -> 正式 runtime。领域规则落在 `module-puzzle-clear`，SpacetimeDB 新增 `puzzle_clear_*` 表 / procedure / view，并接入统一 `public_work_gallery_entry` / `public_work_detail_entry`；前端只表现后端 snapshot/action 结果，不把胜负、补牌或消除裁决做成前端事实源。 +- 补充约束：草稿编译和发布都必须拒绝缺失或 `placeholder` atlas / card assets，不允许后端 facade 或 SpacetimeDB 合成临时素材；当前单关正式 runtime 终态事件使用 `run-finished`、`level-failed`，并写入包含 `status`、`level`、`clears`、`clearDelta`、`elapsedMs` 的结果 JSON。 +- 补充约束：拼消消结果页草稿试玩使用前端本地 `runtimeMode=draft` snapshot，不调用 `/api/runtime/puzzle-clear/runs`，不写正式 run 统计；公开详情和推荐流正式运行继续走后端 `/api/runtime/puzzle-clear/*`，客户端需要区分创作详情 `/api/creation/puzzle-clear/works/{profileId}` 与公开运行态详情 `/api/runtime/puzzle-clear/works/{profileId}`。 +- 影响范围：`CONTEXT.md`、拼消消 PRD / 技术方案、平台玩法链路文档、`shared-contracts` / `packages/shared`、`api-server`、`spacetime-module`、`spacetime-client`、作品架 / 广场 / 统一作品详情 / runtime 前端分流。 +- 验证方式：PRD 和技术方案必须覆盖资产槽位、素材工作表风险、切片验证、恢复语义、API 命名空间和验证命令；实现侧至少运行 `npm run spacetime:generate`、`npm run check:spacetime-schema`、`npm run check:spacetime-runtime-access`、`npm run check:server-rs-ddd`、`npm run typecheck`、`npm run check:encoding`、相关前端测试和 `cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml`。 +- 关联文档：`docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md`、`docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md`、`docs/【玩法创作】平台入口与玩法链路-2026-05-15.md`、`docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md`。 + ## 2026-05-27 生成页总进度圆弧锁定固定画布 - 背景：多轮圆环角度微调后，`GenerationProgressHero` 的 SVG 圆弧仍会出现底部开口偏斜的问题，且圆环还会随着容器宽度伸缩，导致 UI 看起来时大时小、位置漂移。 @@ -1110,3 +1128,11 @@ - 影响范围：`server-rs/crates/api-server/src/state.rs`、`server-rs/crates/module-auth/src/lib.rs`、`server-rs/crates/spacetime-module/src/auth/procedures.rs`、`server-rs/crates/spacetime-client/src/auth.rs`、对应生成 bindings。 - 验证方式：`cargo check -p module-auth --manifest-path server-rs/Cargo.toml`、`cargo check -p api-server --manifest-path server-rs/Cargo.toml`、`cargo test -p module-auth password --manifest-path server-rs/Cargo.toml -- --nocapture`、`npm run check:spacetime-schema`、`npm run check:encoding`、`cargo test -p api-server spacetime_unavailable_router_returns_service_unavailable_for_requests --manifest-path server-rs/Cargo.toml -- --nocapture`。 - 关联文档：`docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md`、`docs/【开发运维】本地开发验证与生产运维-2026-05-15.md`。 + +## 2026-05-31 拼消消底图 prompt 与 atlas 切片提示词收口 + +- 背景：拼消消生成资产检查时，用户需要区分主题词、场地底图主题词和复合图 atlas prompt 的职责；若小图案显式画出切分线或边框，运行态 1x1 切片会显得像错误素材。 +- 决策：`boardBackgroundPrompt` 成为中央场地底图的优先 prompt 来源，只有该字段为空时才回退读取 `themePrompt`；用户上传底图时只执行平台资产持久化和换签，不用主题词重写上传资产。复合图 atlas prompt 只描述“可被服务端按等大 1x1 方格切分”，禁止模型在图案上绘制切分线、边框、网格线或裁切参考线。 +- 影响范围：拼消消工作台 payload、`shared-contracts` / `packages/shared` 契约、api-server 生成编排、SpacetimeDB session/work snapshot、文档与生成进度展示。 +- 验证方式：`npm run spacetime:generate`、`npm run check:encoding`、`npm run check:server-rs-ddd`、`cargo test -p module-puzzle-clear`、`cargo test -p spacetime-client puzzle_clear -- --nocapture`、`npm run test -- src/components/puzzle-clear-creation/PuzzleClearWorkspace.test.tsx src/services/miniGameDraftGenerationProgress.test.ts src/routing/appPageRoutes.test.ts src/services/publicWorkCode.test.ts`。 +- 关联文档：`docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md`、`docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md`、`docs/【玩法创作】平台入口与玩法链路-2026-05-15.md`。 diff --git a/.hermes/shared-memory/pitfalls.md b/.hermes/shared-memory/pitfalls.md index 3dea8cd4..57c92f78 100644 --- a/.hermes/shared-memory/pitfalls.md +++ b/.hermes/shared-memory/pitfalls.md @@ -1,4 +1,4 @@ -# 踩坑与排障记录 +# 踩坑与排障记录 > 用途：记录已验证、未来很可能再次遇到的问题。每条都应包含现象、原因、处理方式和验证方式。 @@ -87,6 +87,22 @@ - 验证：`npm test -- src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx -t \"puzzle draft generation auto starts trial and runtime back opens draft result\"`，确认 `window.location.pathname === '/runtime/puzzle'` 且 `window.location.search` 同时包含 `runtimeProfileId` 和 `runtimeSessionId`。 - 关联：`src/components/platform-entry/PlatformEntryFlowShellImpl.tsx`、`src/services/puzzleRuntimeUrlState.ts`、`src/routing/appPageRoutes.ts`、`docs/【玩法创作】平台入口与玩法链路-2026-05-15.md`。 +## 拼消消草稿试玩不能只测 swap 回调 + +- 现象：拼消消结果页和 runtime shell 的单测都能通过，但真实页面里卡片只是交换，完全不会消除，顶部准备区还会因为已知的卡背占位路径显示坏图。 +- 原因：草稿试玩走的是前端本地 runtime，早期测试只覆盖了 `onSwapCards` 回调和局部状态，没有验证完整的消除、重力补牌、关卡完成和资源兜底链路；同时顶部卡背对 `puzzle-clear-card-back.webp` 这类已知缺失资源没有前置回退。 +- 处理：草稿试玩的回归测试必须覆盖“交换 -> 完整图案消除 -> 补牌 -> 关卡完成”闭环，并在组件测试里验证真实点击/拖拽序列；顶部准备区卡背遇到已知占位路径时直接回退到 `puzzle.webp` 这类可用参考图，不等图片加载失败后再兜底。 +- 验证：`npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx` 通过，浏览器 smoke 页实测可完成一次消除并弹出“本关完成”。 +- 关联：`src/services/puzzle-clear/puzzleClearLocalRuntime.ts`、`src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`。 + +## 拼消消消除过渡不能隐藏已有卡片的最终下沉格 + +- 现象：消除补牌过程中偶尔看起来下方有空位，但同列上方卡片没有落下来。 +- 原因：后端和本地 runtime 的重力补牌已经把已有卡片压到底；真正的问题在前端过渡层。消除动画曾按旧消除坐标隐藏棋盘格，掉落动画也曾隐藏所有 drop 目标格。当某个旧卡下沉到刚被消除的格子时，最终 snapshot 里的真实卡片会被隐藏，视觉上像补牌没有落下。 +- 处理：消除 / 掉落覆盖层只负责动画表现，不再隐藏已有场上卡片的最终格；只有从顶部准备区新补入、前一帧棋盘不存在的卡片，才允许临时隐藏底层目标格来配合下落动画。 +- 验证：`npm run test -- src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx -t "已有卡片因重力下沉时目标格不被过渡状态隐藏成空位"`，并保留领域侧 `cargo test -p module-puzzle-clear refill --manifest-path server-rs/Cargo.toml`。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`server-rs/crates/module-puzzle-clear/src/application.rs`、`docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md`。 + ## 首页推荐分流参数不能条件性调用 hook - 现象：桌面首页或移动首页在 HMR、断点切换或重新渲染后直接报 React hook 顺序错误，页面停在“正在加载内容”。 @@ -955,6 +971,14 @@ - 验证：`cargo test -p api-server phone_auth_sms_provider_errors_keep_upstream_http_semantics --manifest-path server-rs/Cargo.toml`，真实 provider 频控时接口不再返回 `500`。 - 关联：`server-rs/crates/module-auth/src/errors.rs`、`server-rs/crates/api-server/src/phone_auth.rs`、`docs/technical/PHONE_SMS_PROVIDER_ERROR_HTTP_MAPPING_FIX_2026-05-08.md`。 + +## 本地短信 smoke 先确认 SMS provider + +- 现象：浏览器里短信验证码发送成功，但提交 `123456` 仍然报验证码错误，或者短信登录后又回到未登录态。 +- 原因：当前运行中的 `api-server` 如果读取到 `.env.local` 里的 `SMS_AUTH_PROVIDER=aliyun`，就会走真实短信 provider 口径；这时 mock 验证码 `123456` 不会被接受。之前本地调试时常见的误判是把 `.env.local` 改成 mock 了，但没有重启 `npm run dev`，或者旧的 `scripts/dev.mjs` 进程还在沿用旧环境。 +- 处理：本地只做 UI / 账号链路 smoke 时，把 `.env.local` 显式设为 `SMS_AUTH_PROVIDER=mock` 且配置 `SMS_AUTH_MOCK_VERIFY_CODE=123456`，然后重启 `npm run dev` 或 `npm run dev:api-server`。要做真实短信联调时，再切回 `SMS_AUTH_PROVIDER=aliyun` 并重启。 +- 验证：`POST /api/auth/phone/send-code` 应返回 `providerRequestId=mock-request-id`；`POST /api/auth/phone/login` 用 `123456` 应返回 `200` 且 `user.loginMethod=phone`。浏览器侧短信登录成功后，会先进入邀请码弹窗或我的页面，不应再提示“验证码错误”。 +- 关联：`scripts/dev-utils.mjs`、`scripts/dev-utils.test.ts`、`scripts/dev.mjs`、`server-rs/crates/api-server/src/config.rs`。 ## 手机验证码登录成功后又瞬间回到未登录 - 现象：手机号验证码登录先成功，随后 UI 又闪回“未登录”，登录弹窗可能重新出现。 @@ -1665,3 +1689,110 @@ - 处理：推荐页拖拽只校验当前是否有作品、多作品可切换以及是否正在提交动画，不再要求登录；登录态相关操作仍由点赞、改造等按钮自身权限控制。 - 验证：`npx vitest run src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx` 覆盖访客态纵向滑动不弹登录且触发下一条推荐。 - 关联：`src/components/rpg-entry/RpgEntryHomeView.tsx`、`src/components/rpg-entry/RpgEntryHomeView.recharge.test.tsx`。 + +## Windows junction worktree 下 Vitest 定向路径失败先切真实路径 + +- 现象：在 `C:\Users\...\ .codex\worktrees\...` 这类 junction 工作区运行 `npm run test -- src/...` 时，Vitest 可能报 `Failed to load url C:/Users/... (resolved id: F:/DevWorktrees/...)`，同一测试文件明明存在却被判定找不到。 +- 原因：Vite / Vitest 在 Windows 下会把测试入口 realpath 到真实 worktree 路径；如果命令从 junction 路径传入相对文件参数，入口路径和 resolved id 可能跨盘符不一致。 +- 处理：前端定向测试优先从 `Get-Item | Format-List Target` 显示的真实路径运行，例如 `F:\DevWorktrees\codex\worktrees\f584\Genarrative`；不要把这类文件加载失败误判成组件或路由断言失败。 +- 验证：同一命令从真实路径执行应正常收集并运行测试，例如 `npm run test -- src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`。 +- 关联：`src/components/puzzle-clear-creation/PuzzleClearWorkspace.test.tsx`、`src/components/puzzle-clear-result/PuzzleClearResultView.test.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`src/routing/appPageRoutes.test.ts`。 + +## 拼消消草稿试玩要和正式 runtime 分流 + +- 现象：拼消消结果页点击“试玩”后如果仍然调用 `/api/runtime/puzzle-clear/runs`，草稿试玩会被正式 run 规则和统计约束卡住，公开作品又可能和草稿恢复串台。 +- 原因：拼消消既有草稿生成 / 结果页 / 发布闭环，也有正式公开 runtime；如果把结果页试玩和公开运行态复用同一个后端 startRun 入口，`work detail` 读取路径和统计口径都会混在一起。 +- 处理：结果页试玩改走前端本地 `runtimeMode=draft` snapshot，只用于草稿试玩和关卡切换，不写正式 run；公开详情和推荐流进入正式 runtime 时才走后端 `/api/runtime/puzzle-clear/*`。客户端读取作品详情时也要区分创作详情 `/api/creation/puzzle-clear/works/{profileId}` 与公开运行态详情 `/api/runtime/puzzle-clear/works/{profileId}`。 +- 验证：点击拼消消结果页的试玩按钮，不应再请求 `/api/runtime/puzzle-clear/runs`；公开详情入口仍应能读取后端运行态详情。 +- 关联：`src/components/platform-entry/PlatformEntryFlowShellImpl.tsx`、`src/services/puzzle-clear/puzzleClearClient.ts`、`src/services/puzzle-clear/puzzleClearLocalRuntime.ts`、`docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md`。 + +## 拼消消 runtime 必须继承拼图模板的原生交互基线 + +- 现象：拼消消卡片在浏览器里会出现原生图片拖拽 / 下载手柄，或窗口拉伸后棋盘和卡片被拉成矩形。 +- 原因：拼消消 runtime 早期只继承了“交换 / 消除”的业务逻辑，没有完整继承拼图模板在基础交互上的防护：`touch-none`、`select-none`、`aspect-square`、`draggable={false}`、`onDragStart(event.preventDefault())`、`-webkit-user-drag: none`。 +- 处理：棋盘容器必须保持正方形约束，卡片按钮和内层 `` 都要显式禁用浏览器原生拖拽，样式层也要补 `user-select: none` 与 `-webkit-user-drag: none`，不能只靠业务指针逻辑。 +- 验证：浏览器中检查棋盘 `getBoundingClientRect().width === height`，卡片图片 `draggable="false"` 且 `-webkit-user-drag` 为 `none`；真实拖拽只应进入交换逻辑，不应触发原生图片拖拽。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/index.css`、`src/components/puzzle-runtime/PuzzleRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`。 + +## 拼消消拖拽浮层要挂到页面级 portal + +- 现象：拼消消拖拽时图片看起来没有贴在鼠标或手指上，尤其是平台壳层本身带有 transform 时更明显。 +- 原因：拖拽 ghost 用了 `position: fixed`，但如果还挂在会被 transform 的局部容器里，浏览器会把 fixed 当成相对该祖先定位；`clientX/clientY` 读到的是视口坐标，两个坐标系一混就会出现肉眼可见的偏移。 +- 处理：拖拽浮层必须通过 portal 挂到 `document.body` 这一层，再继续使用 `clientX/clientY - pointerOffset` 计算 left/top；不要把 ghost 留在平台壳或任何会参与 transform 的容器里。 +- 验证：`npm run test -- src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx` 应断言拖拽浮层父节点是 `document.body`，且 left/top 与按下点偏移一致。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`。 + +## 拼消消要继承拼图模板的动作语言，不只是规则 + +- 现象：拼消消如果只实现“交换后裁决”，但没有开局翻牌、按下留空位、被替换卡快速飞回、以及局部拼接块整体拖动，玩家会直觉上觉得比原拼图更笨重。 +- 原因：早期实现容易把“规则独立”误读成“动作语言也要重写”，结果只保留了交换逻辑，没有沿用拼图模板里已经验证过的拖拽反馈、空位让位和合并块连续感。 +- 处理：拼消消运行态要继承拼图模板的基础手感：只在开局保留入场翻牌，拖起时源位立即呈空，放下时被替换卡要有明确飞向空位的位移感，连通块要作为整体拖动和整体呈现。 +- 验证：浏览器拖拽时能看到跟手 ghost、源位空槽、落点飞入和整组拼接层；`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx` 应覆盖这些行为。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`src/index.css`。 + +## 拼消消空格位必须允许落位，不能当成不可交互死格 + +- 现象：运行到某一关后，棋盘里出现空格位，用户能看见空洞但拖不进去，也点不动。 +- 原因：空格位被前端交互或后端裁决误当成“无效目标”，只保留了交换逻辑，没有把“源卡落入空位、源位清空”当成合法移动。 +- 处理：空格位必须保留 button 交互态和落点命中逻辑；前端拖拽 / 点击落到空格时直接提交移动，后端和本地 runtime 都要把源卡移动到目标格并清空源格，不再走失败交换。 +- 验证：`npm run test -- src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts`、`cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml player_move_can_drop_card_into_empty_target_cell -- --nocapture`。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/services/puzzle-clear/puzzleClearLocalRuntime.ts`、`server-rs/crates/module-puzzle-clear/src/application.rs`。 + +## 拼消消空位落卡后必须立即补位，不能把空洞留成真空格 + +- 现象：卡牌成功落进空格后，源位仍然留空，玩家会误以为那个格子坏掉了。 +- 原因：移动逻辑只处理了“落到空位”，没有在未消除时同步走一遍重力补位，所以源列会短暂或永久留下空洞。 +- 处理：只要移动后棋盘存在空位，就立即走补位和可解性修复；这样源位会从顶部准备区补卡，不会留下不可交互空洞。 +- 验证：`npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts`、`cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml player_move_can_drop_card_into_empty_target_cell -- --nocapture`。 +- 关联：`src/services/puzzle-clear/puzzleClearLocalRuntime.ts`、`server-rs/crates/module-puzzle-clear/src/application.rs`。 +## 拼消消锁定组覆盖层必须锚定在棋盘本身 + +- 现象：消除或补牌过程中，局部完成的组图偶尔会看起来从格子里“飘出去”，并且大小会随着窗口和外层面板变化而异常拉伸。 +- 原因：锁定组视觉层用了 `absolute inset-0`，但棋盘容器本身不是 `position: relative`，于是覆盖层实际锚到了更外层的运行态面板，`gridColumn` / `gridRow` 只能在错误坐标系里排版。 +- 处理：棋盘容器必须显式 `relative`，让锁定组覆盖层、拖拽鬼影和格子坐标都在同一正方形棋盘坐标系内排版；不要把这类覆盖层锚到外层 `section` 或整页容器。 +- 验证：浏览器里棋盘 `getBoundingClientRect()` 和锁定组覆盖层应共享同一块正方形区域，窗口缩放后组图不应再出现越界或被拉伸的现象；`PuzzleClearRuntimeShell.test.tsx` 需要断言棋盘 class 包含 `relative`。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`。 + +## 拼消消中央场地底图必须挂在棋盘内部 + +- 现象：创作阶段选择了中央场地底图，但运行态消除卡片后只看到浅色格子或空点，看不到底图。 +- 原因：底图被渲染成整页氛围背景，并被页面渐变、棋盘面板和格子 `bg-white/78` 遮住；棋盘内部没有静态底图层，空格仍保留不透明卡片底色。 +- 处理：`boardBackgroundAsset.imageSrc` 必须作为 `puzzle-clear-board` 内部的 `absolute inset-0` 静态底图渲染；空格、消除空位和拖拽源位必须透明或近透明，不能继续使用实体卡片白底。 +- 验证：`PuzzleClearRuntimeShell.test.tsx` 断言 `puzzle-clear-board-background` 在棋盘内，`/board-bg.png` 只出现一次，空格 class 包含 `bg-transparent` 且不包含 `bg-white/78`。 +- 关联：`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`docs/【玩法创作】平台入口与玩法链路-2026-05-15.md`。 + +## 创作入口突然消失先查前后端是否串到不同 worktree + +- 现象：`http://127.0.0.1:3000/` 可访问，但创作 Tab 里新增玩法入口消失；例如 `puzzle-clear` 已在代码默认种子中存在，浏览器仍看不到“拼消消”。 +- 原因：Vite 可能来自当前 worktree，但代理目标的 `api-server` 仍是另一个 worktree 的旧进程，或者 `api-server` 连到旧 SpacetimeDB 模块；此时 `/api/creation-entry/config` 会返回旧入口配置。 +- 处理：先用 `Get-NetTCPConnection -State Listen -LocalPort 3000,8083,3103` 结合 `Get-CimInstance Win32_Process` 确认端口进程路径；停止串线的旧 `api-server`，再用当前 worktree 的 `npm run dev:spacetime -- --spacetime-port --database ` 和 `npm run dev:api-server -- --api-port --spacetime-port --database ` 拉起同一套服务。 +- 验证：`GET /api/creation-entry/config` 应包含目标入口，且监听端口的命令行都指向同一个 worktree；浏览器创作 Tab 对应分类应显示入口卡。 +- 关联：`scripts/dev.mjs`、`.hermes/skills/genarrative-dev-stack-port-routing/SKILL.md`、`docs/【玩法创作】平台入口与玩法链路-2026-05-15.md`。 + +## Windows junction 工作区下 dev.mjs 直接执行入口要用 realpath 判断 + +- 现象：在 `C:\Users\...\ .codex\worktrees\...` 这类 junction 路径里运行 `npm run dev:web`，进程会秒退，`3000` 不监听，但同一脚本从真实 worktree 路径能正常启动。 +- 原因：`scripts/dev.mjs` 的入口判断只比对 `process.argv[1]` 和 `import.meta.url` 的字面路径；junction 路径和 realpath 路径不一致时会误判成“不是直接执行”，于是主流程根本不进入。 +- 处理：入口判断改成基于 `realpathSync(...)` 的 `isDirectModuleExecution(...)`，让 junction 路径和真实 worktree 路径指向同一个模块；同时补回归测试覆盖该场景。 +- 验证：`npm run test -- scripts/dev.test.ts scripts/dev-stack-port-utils.test.ts` 通过后，`npm run dev:web -- --web-port 3000 --api-port 8083 --no-interactive` 应能稳定把 `0.0.0.0:3000` 监听起来。 +- 关联：`scripts/dev.mjs`、`scripts/dev.test.ts`。 + +## Vitest 定向测试在 Windows junction 工作区要切真实路径 + +- 现象：在 `C:\Users\...\ .codex\worktrees\...` 这类 junction 路径里跑 `npm run test -- src/...` 时，Vitest 会报 `Failed to load url ... (resolved id: F:/DevWorktrees/...)`，看起来像文件不存在。 +- 原因：Vite / Vitest 会把入口 realpath 到真实 worktree 路径；如果命令从 junction 路径传入相对文件参数，入口路径和 resolved id 可能跨盘符不一致。 +- 处理：前端定向测试优先从真实路径 `F:\DevWorktrees\codex\worktrees\f584\Genarrative` 运行，不要把这类文件加载失败误判成组件或路由断言失败。 +- 验证：同一命令从真实路径执行应正常收集并运行测试。 +- 关联：`src/components/puzzle-clear-creation/PuzzleClearWorkspace.test.tsx`、`src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`src/routing/appPageRoutes.test.ts`。 +- 现象：新增或扩展 `*-generating` 页面后，生成卡只渲染首帧，`已耗时` / `预计等待` 停在进入页那一刻不动。 +- 原因：平台壳层的共享 `miniGameGenerationProgressNowMs` 时钟没有把新生成阶段纳入 tick 条件，或者该阶段的 `buildMiniGameDraftGenerationProgress(..., nowMs)` 没有接入同一时钟。 +- 处理：任何共享生成页都要通过平台壳层统一的时钟判断和 `nowMs` 传递刷新，新增生成阶段时要同时补 `selectionStage` 判定、`useEffect` 依赖和进度调用点。 +- 验证：浏览器里进入对应生成页后，`已耗时` / `预计等待` 应持续变化，不应停在首帧。 + +## 拼消消要用真实可消除判断，不要把“已相邻”当成可解 + +- 现象：拼消消开局或补牌后会直接出现已完成的图案组，或者 `1x2` 被当成半锁定局部留在场上。 +- 原因：早期把可解性写成“场上已经有同组相邻卡”或“只要有一对相邻同组卡就算可解”，这会把已完成盘面误当成合法盘面；同时半锁定规则没有排除 `1x2`。 +- 处理：开局和补牌后的重排必须先排除现成消除，再用真实交换 / 落位模拟判断是否会产生新消除；`1x2` 永远不进入半锁定组，半锁定只允许 `1x3`、`2x2`、`2x3`。 +- 验证：`npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx` 与 `cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml -- --nocapture` 通过后，开局盘面不应直接出现 completed group。 +- 关联：`src/services/puzzle-clear/puzzleClearLocalRuntime.ts`、`server-rs/crates/module-puzzle-clear/src/application.rs`。 diff --git a/.hermes/shared-memory/project-overview.md b/.hermes/shared-memory/project-overview.md index 45ffc1e4..e761ae43 100644 --- a/.hermes/shared-memory/project-overview.md +++ b/.hermes/shared-memory/project-overview.md @@ -1,6 +1,6 @@ # Genarrative 项目共享概览 -更新时间：`2026-05-15` +更新时间：`2026-05-30` ## 一句话定位 @@ -10,6 +10,7 @@ Genarrative / 陶泥儿是一个 AI 原生互动内容与小游戏平台，把 A - RPG / 自定义世界创作与运行时。 - 拼图玩法创作、草稿、发布、运行态和排行榜。 +- 拼消消玩法创作、素材图集生成、结果页、发布、统一作品详情、正式运行态和基础统计。 - 敲木鱼玩法创作、草稿、发布、运行态、公开详情和分享码。 - 抓大鹅 Match3D 创作、2D 多视角素材生成、发布和运行态。 - 大鱼吃小鱼、方洞挑战、视觉小说、汪汪声浪和儿童向寓教于乐玩法。 diff --git a/CONTEXT.md b/CONTEXT.md index 160d1edd..233cde60 100644 --- a/CONTEXT.md +++ b/CONTEXT.md @@ -18,6 +18,32 @@ _Avoid_: 为每个玩法单独发明素材流水线、把系列素材建模成 ## Language +### Puzzle Clear + +**拼消消**: +基于拼图交换 / 拖拽手感的新玩法模板，玩家移动 1x1 卡牌碎片，把同一复合图案组拼成完整矩形后消除，并由顶部对应纵列补牌继续游玩。 +_Avoid_: 拼图整图过关、三消槽位玩法、前端本地裁决 + +**复合图案组**: +拼消消中可被消除的一幅小图，由 `1x2`、`1x3`、`2x2` 或 `2x3` 的 1x1 卡牌碎片组成；只有组内碎片按正确相对位置拼成完整矩形后才消除。 +_Avoid_: 单张卡牌、整关大图、任意相邻同色块 + +**1x1 卡牌碎片**: +复合图案组被服务端切成的最小可移动单位，带有所属组、形状、组内坐标和图片资产。 +_Avoid_: 前端临时裁图、无所属图案的普通方块 + +**半锁定拼接组**: +非 2 格复合图案组中已经局部完成的拼接状态，可作为整体拖动；玩家用外部单格撞入组内某格时只交换该格，其余部分保留并退回半完成状态。 +_Avoid_: 永久锁死、补牌打散、完整消除 + +**顶部卡牌准备区**: +拼消消棋盘上方按纵列排列的背面卡牌队列；某列产生空位时，准备区对应列的卡牌从顶部下落补齐。 +_Avoid_: 全局随机发牌槽、底部三消槽 + +**防死局发牌**: +拼消消开局和每次补牌后由后端保证至少存在一步可拼接；补牌时至少有一张新掉落卡能与场上剩余某张卡对应。 +_Avoid_: 前端提示代替可解性、完全随机补牌 + ### Wooden Fish **敲木鱼**: diff --git a/docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md b/docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md new file mode 100644 index 00000000..6adfb9a7 --- /dev/null +++ b/docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md @@ -0,0 +1,77 @@ +# 拼消消玩法模板 PRD + +日期：`2026-05-30` + +## 目标 + +新增玩法模板 **拼消消**，工程域与 `playId` 均为 `puzzle-clear`，公开作品码前缀为 `PC-`。拼消消以拼图的交换 / 拖拽手感为原型，但运行态规则独立：玩家移动 1x1 卡牌碎片，把同一复合图案组拼成完整矩形后消除；消除产生空位后，由顶部对应纵列的卡牌准备区下落补位。 + +首版必须完成公开闭环： + +```text +创作入口 -> 轻表单工作台 -> 独立生成页 -> 结果页 -> 试玩 -> 发布 -> 统一作品详情 -> 正式 runtime -> 基础统计 / 作品架 / 广场 +``` + +## 创作工具平台接入声明 + +- 工作台模式：表单 / 图片输入创作工作台。 +- 创作链路：入口 -> 工作台 -> 生成页 -> 结果页 -> 试玩 -> 发布 -> 运行态。 +- 单图资产槽位： + - `board-background` / `ui-background` / `中央场地底图` / `boardBackgroundPrompt` 优先、空值时回退 `themePrompt`，并支持用户上传图 / 写回 `draft.boardBackgroundAsset`、`draft.boardBackgroundPrompt`、`work.boardBackgroundAsset` 与 `work.boardBackgroundPrompt` / 允许历史图 / 允许 AI 重绘。 + - 中央场地底图的字段名沿用平台表面口径，实际作用是玩家逐步消除清空中央棋盘后慢慢看到的主题目标图；AI 生成尺寸必须与中央棋盘一致，使用 1:1 正方形画面。prompt 必须强绑定主题、画面精致、强表现力并一眼体现主题，带来探索、揭开全貌和追求目标完成的感受；不得继续要求“画面干净”或“适合作为卡牌棋盘底图”。 +- 系列素材槽位： + - `batchId=puzzle-clear-pattern-atlas-v1`。 + - `sheetSpec`：4 张素材工作表，每张 `1024x1536` 竖版，后台按 `4 列 x 6 行` 裁切，每个 1x1 单元为 `256x256`；服务端再把切片合成一张 `10x10 / 2560x2560` 最终 atlas。复合图案组总数为 `35`，形状配比 `1x2=23`、`1x3=5`、`2x2=4`、`2x3=3`，总计 `95` 个 1x1 卡牌切片。 + - `slotSpecs`：每个复合图案组一个 `patternGroup`，服务端预排 `groupId`、`shape`、atlas 坐标和 1x1 切片坐标。 + - 切图规则：生图 prompt 只要求复合图案组能按 4x6 素材工作表均等切成 1x1 方形小份，不允许模型在图上绘制切分线、边框、网格线或裁切参考线；服务端按 sheet 布局直接裁出 1x1 卡牌碎片，校验每个编号占格数与领域图案组面积一致，再合成最终 atlas，写入 `patternGroups[]` 与 `cardAssets[]`。 + - 透明化规则：首版保留完整方形卡面，不强制透明化；若 provider 输出带边框、切分线、网格、裁切参考线或文字，生成任务失败并回写审计。 + - 失败回写：生成页写回 `generationStatus=failed` 与失败阶段；结果页保留重试入口。 + - 局部重生成：v1 允许整批 4 张素材工作表重试，不做单组局部重生。 +- API 命名空间：`/api/creation/puzzle-clear/...` 与 `/api/runtime/puzzle-clear/...`。 +- 业务真相：草稿、发布、runtime snapshot、胜负、补牌、防死局、统计均由后端裁决；前端只做动画和交互表现。 +- 创作工具模式例外：无。 +- 验证命令：`npm run check:encoding`、`npm run typecheck`、`npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts`、`npm run test -- src/components/puzzle-clear-result/PuzzleClearResultView.test.tsx src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx`、`cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml`、`cargo test -p api-server puzzle_clear --manifest-path server-rs/Cargo.toml -- --nocapture`；涉及 SpacetimeDB schema 后运行 `npm run spacetime:generate`、`npm run check:spacetime-runtime-access`、`npm run check:spacetime-schema`、`npm run check:server-rs-ddd`。 + +## 工作台字段 + +| 字段 | 契约字段 | 默认值 | 校验 | 落库 | +| --- | --- | --- | --- | --- | +| 作品标题 | `workTitle` | 空 | 必填，1-30 字 | session draft / work profile | +| 简介 | `workDescription` | 空 | 0-120 字 | session draft / work profile | +| 主题词 | `themePrompt` | 空 | 必填，1-80 字 | 生成 prompt 与草稿 | +| 场地底图主题词 | `boardBackgroundPrompt` | 空 | 0-80 字；为空时底图生成回退 `themePrompt` | session draft / work profile / 主题目标图生成 prompt | +| 中央场地底图 | `boardBackgroundAsset` | 空 | 上传或 AI 生成至少一种 | 单图资产槽位 | +| AI 生成底图 | `generateBoardBackground` | `true` | boolean | 生成编排参数 | + +规则参数不开放创作者编辑：棋盘尺寸、倒计时、消除次数、形状解锁、防死局发牌和半锁定规则固定。 + +## 运行规则 + +| 关卡 | 棋盘 | 目标消除 | 倒计时 | 解锁形状 | +| --- | --- | --- | --- | --- | +| 1 | 6x6 | 35 | 10 分钟 | 1x2、1x3、2x2、2x3 | + +- 开局每个小格子从背面翻向正面。 +- 可消除图由横向或纵向复合图案组组成，最小消除单位为两张图拼接。 +- 完成一个复合图案组后，该组所有 1x1 卡牌碎片消除。 +- 消除后空位按列由顶部卡牌准备区下落补齐。 +- 每次补牌至少保证掉落卡中有一张可以与场上剩余某张卡拼接，防止死局。 +- 非 2 格消除时，若场上已有局部完成的半锁定拼接组，补牌不得破坏它。 +- 半锁定拼接组可整体拖动；玩家用外部单格撞入组内某格时，只交换该格，组其余部分保留，组状态退回半完成。 +- 超时只判当前关失败，可重试当前关；完成 35 次目标并清空当前棋盘后整局完成。 + +## 结果页 + +结果页展示：素材 atlas、中央场地底图、发布状态、试玩入口和失败重试。结果页不写功能说明类文案，不开放规则编辑器，不新增排行榜配置。 + +## 统计 + +首版只记录正式 `published` run： + +- 开局。 +- 全局完成。 +- 当前关失败。 +- 耗时。 +- 消除统计。 + +草稿试玩不写正式统计，不进入排行榜；v1 不做排行榜。 diff --git a/docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md b/docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md new file mode 100644 index 00000000..ab968550 --- /dev/null +++ b/docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md @@ -0,0 +1,115 @@ +# 拼消消玩法模板技术方案 + +日期：`2026-05-30` + +## 总体边界 + +拼消消使用独立工程域 `puzzle-clear`，不复用拼图运行态规则本体。实现按 DDD 分层： + +- `module-puzzle-clear`：纯领域规则，覆盖图案组规划、棋盘、交换、半锁定、消除、补牌、防死局、关卡状态。 +- `shared-contracts` / `packages/shared`：工作台输入、生成素材、结果页、作品摘要、runtime snapshot 与 action DTO。 +- `spacetime-module`：session、work profile、runtime run、事件 / 统计、公开 source view。 +- `spacetime-client`：typed facade 与 row mapper。 +- `api-server`：Axum 路由、鉴权、入口熔断、生成编排、资产持久化、BFF。 +- `platform-image` / OSS / asset object：图片生成、切图、上传、换签和失败审计。 +- 前端：轻表单、生成页、结果页与 runtime 动画，不承接正式业务真相。 + +## 资产生成方案 + +素材目标从“单张超大 atlas 生图”收敛为 4 张素材工作表，再由服务端合成最终 atlas： + +- image2 调用：4 次，每次生成 1 张 `1024x1536` 竖版素材工作表。 +- sheet 裁切：每张按 `4 列 x 6 行` 裁切，每个 1x1 单元为 `256x256`。 +- 最终 atlas：服务端把 95 个切片按领域坐标合成 `10x10 / 2560x2560` PNG，空单元保留浅色背景。 +- 运行态素材：最终写回 `35` 个复合图案组和 `95` 个 1x1 卡牌切片。 + +服务端固定布局如下： + +| 形状 | 数量 | 单组单元数 | 解锁 | +| --- | ---: | ---: | --- | +| 1x2 | 23 | 2 | 第 1 关 | +| 1x3 | 5 | 3 | 第 1 关 | +| 2x2 | 4 | 4 | 第 1 关 | +| 2x3 | 3 | 6 | 第 1 关 | + +流程： + +```text +主题词 / 场地底图主题词 / 用户底图 -> 4 张 sheet 坐标规划 -> gpt-image-2 生成素材工作表 -> 按 4x6 裁切 1x1 -> 合成最终 atlas -> atlas 与卡牌切片持久化 -> OSS / asset_object / bind -> session draft 回写 +``` + +中央场地底图的 prompt 来源固定为：若用户填写 `boardBackgroundPrompt`，AI 生成底图只读取该字段；若该字段为空，才回退读取 `themePrompt`。用户直接上传底图资产时不再用主题词重写该资产，只执行平台资产持久化与换签。中央场地底图在运行态不是普通棋盘衬底，而是玩家逐渐消除卡牌后露出的主题目标图；生成请求使用与中央棋盘一致的 1:1 正方形尺寸，prompt 必须强调探索、揭开全貌、追求完成目标、精致主题主视觉和强主题表现，不写“画面干净”或“适合作为卡牌棋盘底图”。 + +### 素材工作表风险与切片验证 + +风险：4x6 工作表 prompt 仍需要告诉 provider 编号布局；如果模型把布局理解成 UI 海报、说明图或卡牌模板，可能画出文字、编号、边框、切分线、贴纸外框或重复主体。若 provider 无法严格按布局输出，切片后可能出现跨格、主体贴边、重复图案、文字或图案错位。 + +验证策略： + +- 生图 prompt 明确禁止文字、水印、UI、边框标签、切分线、网格线、裁切参考线和跨格主体。 +- 复合图案组本身不画任何可见分割辅助线，但 prompt 必须说明每个 `1x2`、`1x3`、`2x2`、`2x3` 图案都能被服务端按等大的 1x1 方形单元切分；纵向 `1x2` 按横向切线分成两个 1x1，小图案内不显示切线；横向 `1x2` 按纵向切线分成两个 1x1，小图案内不显示切线；其他形状同理。 +- 服务端保留 `PuzzleClearPatternGroup` 坐标清单，切片前校验每个 sheet 编号出现次数等于领域图案组 `width * height`，并要求同编号区域是完整连续矩形；切片后还应对尺寸、非空像素比例和重复 hash 做校验。 +- 首版若当前 provider 无法稳定产出可切 atlas，生成任务进入 `failed`，错误写入审计；不得退回前端假素材或绕过平台资产底座。 +- 草稿编译和作品发布都必须拒绝缺失 atlas、缺失卡牌切片、空 `assetObjectId` / `imageObjectKey` 或 `placeholder` 占位资产；`spacetime-client` 不再为编译请求合成默认 atlas / card assets。 +- 技术回退需要用户确认后才能改成更多 sheet、降低切片规格或改为逐图生成；当前需求固定为 4 张 `1024x1536` sheet 与最终 `2560x2560` atlas。 + +## 领域规则 + +`module-puzzle-clear` 已固定以下规则： + +- 关卡配置：单关 `6x6/35`，600 秒。 +- 图案组配比：`1x2=23`、`1x3=5`、`2x2=4`、`2x3=3`。 +- 开局随机铺满并保证至少一步可解。 +- 补牌按列重力下落；补牌后仍保证至少一步可解。 +- 完整图案组消除并清空对应格。 +- 半锁定拼接组只由玩家主动交换 / 撞入打散，补牌不破坏。 +- 超时失败只作用于当前单关，可重试；完成 35 次消除目标并清空棋盘后整局完成。 + +## API 命名空间 + +- `POST /api/creation/puzzle-clear/sessions` +- `GET /api/creation/puzzle-clear/sessions/{sessionId}` +- `POST /api/creation/puzzle-clear/sessions/{sessionId}/actions` +- `GET /api/creation/puzzle-clear/works` +- `GET /api/creation/puzzle-clear/works/{profileId}` +- `POST /api/creation/puzzle-clear/works/{profileId}/publish` +- `GET /api/runtime/puzzle-clear/works/{profileId}` +- `POST /api/runtime/puzzle-clear/runs` +- `POST /api/runtime/puzzle-clear/runs/{runId}/swap` +- `POST /api/runtime/puzzle-clear/runs/{runId}/retry-level` +- `POST /api/runtime/puzzle-clear/runs/{runId}/next-level` +- `POST /api/runtime/puzzle-clear/runs/{runId}/time-up` + +api-server 路由熔断使用 SpacetimeDB 创作入口配置 `puzzle-clear`，不得新增前端硬编码事实源。 + +## Runtime 事件与统计载荷 + +正式 `published` run 记录开局、全局完成、当前关失败、耗时和消除统计。runtime action 返回的终态事件包括： + +- `run-finished`：第 1 关完成并结束整局，结果 JSON 至少包含 `status`、`level`、`clears`、`clearDelta`、`elapsedMs`。 +- `level-failed`：当前关超时失败，结果 JSON 至少包含 `status`、`level`、`clears`、`clearDelta`、`elapsedMs`。 + +草稿试玩只消费同一份 snapshot/action 结果做表现，不写正式统计。 + +## 前端阶段 + +新增阶段： + +- `puzzle-clear-workspace` -> `/creation/puzzle-clear` +- `puzzle-clear-generating` -> `/creation/puzzle-clear/generating` +- `puzzle-clear-result` -> `/creation/puzzle-clear/result` +- `puzzle-clear-runtime` -> `/runtime/puzzle-clear` + +runtime 移动端优先，首屏结构为顶部倒计时 / 单关铭牌、顶部列准备区、棋盘、失败 / 完成弹层。棋盘主网格、半锁定组覆盖层和消除 / 掉落覆盖层统一使用 3px 格间距。动画包括开场翻转、列补牌下落和消除表现，不再有下一关切换。消除和补牌动画只能作为当前后端 snapshot 的表现层覆盖；已有场上卡片因重力下沉后的最终格不得被旧消除坐标或掉落覆盖层隐藏，避免出现“下方空位但上方卡片未下落”的视觉假象。 + +## 验证计划 + +- `cargo test -p module-puzzle-clear --manifest-path server-rs/Cargo.toml` +- `cargo test -p api-server puzzle_clear --manifest-path server-rs/Cargo.toml -- --nocapture` +- `cargo test -p spacetime-client --manifest-path server-rs/Cargo.toml puzzle_clear_compile_requires_real_atlas_assets_from_api_server` +- `npm run test -- src/services/puzzle-clear/puzzleClearLocalRuntime.test.ts` +- `npm run test -- src/components/puzzle-clear-result/PuzzleClearResultView.test.tsx src/components/puzzle-clear-runtime/PuzzleClearRuntimeShell.test.tsx` +- `npm run test -- src/routing/appPageRoutes.test.ts src/services/publicWorkCode.test.ts` +- `npm run check:encoding` +- `npm run typecheck` +- 接入 SpacetimeDB schema 后：`npm run spacetime:generate`、`npm run check:spacetime-runtime-access`、`npm run check:spacetime-schema`、`npm run check:server-rs-ddd` diff --git a/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md b/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md index 12609ae9..5e725d78 100644 --- a/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md +++ b/docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md @@ -619,6 +619,45 @@ npm run check:server-rs-ddd - Rust 结构体：`PuzzleWorkProfileRow` - 源码：`server-rs/crates/spacetime-module/src/puzzle.rs` +### `puzzle_clear_agent_session` + +- Rust 结构体：`PuzzleClearAgentSessionRow` +- 源码：`server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs` +- 说明：拼消消创作会话表，保存轻表单草稿、生成状态、已发布 profile 关联和更新时间；只由拼消消 procedure 读写。 + +### `puzzle_clear_work_profile` + +- Rust 结构体：`PuzzleClearWorkProfileRow` +- 源码：`server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs` +- 说明：拼消消作品 profile 表，保存中央底图资产、4 张素材工作表切片后合成的最终 atlas、35 个复合图案组、95 个 1x1 卡牌切片、卡背占位图、发布状态、可见性和基础 play count；公开列表 / 详情只通过 read model 消费，不让前端直接订阅源表。 +- 字段变更：`visible` 控制是否进入公开列表 / 详情，默认 `true`；旧迁移数据由 `migration.rs` 补默认值。 + +### `puzzle_clear_runtime_run` + +- Rust 结构体：`PuzzleClearRuntimeRunRow` +- 源码：`server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs` +- 说明：拼消消正式 runtime run 表，保存当前关卡、已消除次数、棋盘 snapshot、开始 / 完成时间和 run 状态；正式胜负、重试、完成、超时和交换结果以后端 procedure 裁决为准。 + +### `puzzle_clear_event` + +- Rust 结构体：`PuzzleClearEventRow` +- 源码：`server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs` +- 说明：拼消消基础 runtime 事件表，记录 published run 的开局、关卡完成、全局完成、失败、超时和消除统计来源；首版不做排行榜。 + +### SpacetimeDB view：`puzzle_clear_gallery_view` + +- Rust view：`puzzle_clear_gallery_view` +- 返回类型：`Vec` +- 源码：`server-rs/crates/spacetime-module/src/puzzle_clear.rs` +- 说明：拼消消公开详情 source 投影，只暴露 `publication_status = published` 且 `visible = true` 的作品，包含 atlas、底图、图案组和卡牌切片等详情级字段；统一公开详情主路径通过 `public_work_detail_entry` 消费该 view，只保留平台详情页展示摘要。 + +### SpacetimeDB view：`puzzle_clear_gallery_card_view` + +- Rust view：`puzzle_clear_gallery_card_view` +- 返回类型：`Vec` +- 源码：`server-rs/crates/spacetime-module/src/puzzle_clear.rs` +- 说明：拼消消公开列表 source 投影，只暴露平台卡片需要的公开字段；统一公开列表主路径通过 `public_work_gallery_entry` 消费该 view，`/api/runtime/puzzle-clear/gallery` 保留玩法专属 HTTP shape。 + ### SpacetimeDB view：`puzzle_gallery_view` - Rust view：`puzzle_gallery_view` @@ -648,6 +687,7 @@ npm run check:server-rs-ddd - `SELECT * FROM public_work_detail_entry` - `SELECT * FROM bark_battle_gallery_view` - `SELECT * FROM puzzle_gallery_card_view` +- `SELECT * FROM puzzle_clear_gallery_card_view` - `SELECT * FROM jump_hop_gallery_card_view` - `SELECT * FROM wooden_fish_gallery_card_view` - `SELECT * FROM custom_world_gallery_entry` @@ -664,6 +704,7 @@ npm run check:server-rs-ddd - `SELECT * FROM public_work_play_daily_stat WHERE source_type = 'visual-novel'` - `SELECT * FROM public_work_play_daily_stat WHERE source_type = 'big-fish'` - `SELECT * FROM public_work_play_daily_stat WHERE source_type = 'bark-battle'` +- `SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle-clear'` - `SELECT * FROM creation_entry_config` - `SELECT * FROM creation_entry_type_config` - `SELECT * FROM asset_object` diff --git a/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md b/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md index befe256c..0c6dad9f 100644 --- a/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md +++ b/docs/【开发运维】本地开发验证与生产运维-2026-05-15.md @@ -1,4 +1,4 @@ -# 本地开发验证与生产运维 +# 本地开发验证与生产运维 更新时间：`2026-05-15` @@ -47,6 +47,8 @@ npm run dev:api-server 开发态 `npm run dev` 与 `npm run dev:api-server` 会默认注入 `GENARRATIVE_DEV_PASSWORD_ENTRY_AUTO_REGISTER_ENABLED=true`，因此密码登录在本地开发环境可直接注册未知手机号账号；生产环境仍按 `api-server` 配置默认关闭该开关。 +本地只做账号/UI smoke 且需要短信登录时，`SMS_AUTH_PROVIDER` 应显式设为 `mock`，并把 `SMS_AUTH_MOCK_VERIFY_CODE` 设为固定值（当前常用 `123456`），再重启 `npm run dev` 或 `npm run dev:api-server`。如果 `.env.local` 还保留 `SMS_AUTH_PROVIDER=aliyun`，`POST /api/auth/phone/login` 用 mock 验证码会稳定报“验证码错误”，不是前端表单问题。真实短信联调再切回 `aliyun` 并重启。 + 如果本地 `GET /api/creation-entry/config` 返回 `No such procedure`，或 `api-server` 日志出现 `no such table: puzzle_gallery_card_view` / `no such table: wooden_fish_gallery_card_view` 这类公开 view 缺失，通常是 `.env.local` 指向的 SpacetimeDB 库还没有发布当前 `spacetime-module`，或当前 CLI 身份无权发布该库。debug 构建的 `api-server` 会临时使用后端默认入口配置兜底，避免创作作品架整块消失；正式修复仍应切换到拥有目标库权限的 SpacetimeDB 身份后重新运行 `npm run dev` 完成发布，或用 gitignored 的 `spacetime.local.json` 指向可发布的本地库。 本地排查 schema 漂移时，先用当前 dev server 显式查询目标库，例如： diff --git a/docs/【玩法创作】平台入口与玩法链路-2026-05-15.md b/docs/【玩法创作】平台入口与玩法链路-2026-05-15.md index d5207f03..f73e7049 100644 --- a/docs/【玩法创作】平台入口与玩法链路-2026-05-15.md +++ b/docs/【玩法创作】平台入口与玩法链路-2026-05-15.md @@ -171,6 +171,34 @@ RPG / 拼图等运行态存档仍以 `/api/profile/save-archives` 的后端列 平台首页推荐、精选、最新、公开详情、搜索、已玩作品和公开试玩统一按 `sourceType='wooden-fish'` 与 `WF-*` 公开作品号识别敲木鱼作品；公开列表应走 `wooden_fish_gallery_card_view` 订阅缓存，公开详情或运行态启动时卡片摘要不足则补读完整 work profile。 +## 拼消消 + +对外名称：拼消消。工程域与 `playId`：`puzzle-clear`。公开作品码前缀：`PC-`。当前按新增玩法 SOP 接入完整公开闭环，不复用拼图运行态规则本体。 + +链路为： + +```text +创作入口 -> 轻表单工作台 -> 生成过程页 -> 结果页 -> 试玩 -> 发布 -> 统一作品详情 -> 正式运行态 +``` + +工作台字段固定为作品标题、简介、主题词、场地底图主题词 `boardBackgroundPrompt`、中央场地底图槽位、是否 AI 生成底图。中央场地底图必须复用 `CreativeImageInputPanel`，支持上传、历史图和 AI 重绘；若用户填写 `boardBackgroundPrompt`，AI 生成底图只读取该字段，字段为空时才回退读取 `themePrompt`；用户上传底图时不再用主题词重写该资产。中央场地底图的字段名保留平台口径，但实际语义是玩家逐步消除清空棋盘后露出的主题目标图，生成尺寸必须与中央棋盘一致，按 1:1 正方形出图；prompt 必须强绑定主题、画面精致、强表现力并一眼体现主题，不再要求“画面干净”或“适合作为卡牌棋盘底图”。运行态必须把中央场地底图作为棋盘内部静态底图使用，不能降级成整页氛围背景；卡牌消除后产生的空位和拖拽源位应露出该棋盘底图。卡面背面背景 v1 使用默认占位图，不作为创作者配置项。规则参数不开放编辑：单关 `6x6`、每局 10 分钟、35 次目标消除、形状解锁、防死局发牌和半锁定规则均由后端规则集固定。 + +素材生成使用拼消消专用编排，但必须复用 `platform-image`、VectorEngine `gpt-image-2`、OSS、`asset_object`、换签和失败审计。素材目标是 4 张 `1024x1536` 竖版工作表，每张后台按 `4 列 x 6 行` 裁切，每格 `256x256`；服务端从工作表切出总计 95 个 1x1 卡牌碎片，再合成一张 `10x10 / 2560x2560` 最终 atlas。复合图案组总数固定为 35，形状配比固定为 `1x2=23`、`1x3=5`、`2x2=4`、`2x3=3`。服务端先预排每个复合图案组的 sheet 布局、最终 atlas 坐标和形状，再按坐标切成 1x1 卡牌碎片作为运行态素材；sheet 生图 prompt 只能要求复合图案组可按后台 4x6 均等切成 1x1 方形小份，不能让模型在小图案上绘制切分线、边框、网格线、编号或裁切参考线。当前只有单关，同关内复合图案不重复。草稿编译和发布都必须使用 api-server 已持久化的真实 atlas / card assets，拒绝缺失、空对象键或 `placeholder` 占位素材，不允许 `spacetime-client` 或 SpacetimeDB 侧合成临时素材绕过平台图片底座。 + +运行态规则： + +1. 单关固定为 `6x6 / 35次消除`。 +2. 每局固定 10 分钟；超时只判当前关失败，可重试当前关。 +3. 当前关直接出现 `1x2`、`1x3`、`2x2` 和 `2x3`。 +4. 开局棋盘随机铺满并保证至少一步可解；补牌后也必须由后端保证至少一步可解。 +5. 顶部卡牌准备区按纵列补位，某列有空格时该列卡牌从顶部下落。 +6. 非 2 格消除时，补牌不得破坏已完成局部；只有玩家主动交换或撞入才允许打散半锁定拼接组。 +7. 正式 runtime 只消费后端 snapshot 与 action 结果；前端负责开局翻转、拖拽、掉落、消除和弹层动画。 + 拖拽手感必须对齐拼图模板：开局小卡片只翻转一次，交换落位不得重新翻牌；按住后可见卡片立即跟随鼠标或手指，源位置即时留出空槽；放下时被替换卡片要快速飞向对应空位；已完成局部拼接组要以连续整体呈现并可作为整组拖起。拖拽浮层必须挂到页面级 `document.body` portal，避免平台壳层 transform 让 `position: fixed` 和 `clientX/clientY` 坐标系错位。 +8. 正式 `published` run 的终态事件使用 `run-finished` 和 `level-failed`，事件结果 JSON 至少包含 `status`、`level`、`clears`、`clearDelta` 和 `elapsedMs`，供基础统计与排障回读。 + +新增阶段为 `puzzle-clear-workspace`、`puzzle-clear-generating`、`puzzle-clear-result` 和 `puzzle-clear-runtime`；路由为 `/creation/puzzle-clear`、`/creation/puzzle-clear/generating`、`/creation/puzzle-clear/result` 与 `/runtime/puzzle-clear`。API 命名空间为 `/api/creation/puzzle-clear/*` 与 `/api/runtime/puzzle-clear/*`。验证命令见 `docs/prd/【玩法创作】拼消消玩法模板PRD-2026-05-30.md` 与 `docs/technical/【玩法创作】拼消消玩法模板技术方案-2026-05-30.md`。 + ## 抓大鹅 Match3D 对外名称：`抓大鹅`。工程域：`match3d`。 diff --git a/package-lock.json b/package-lock.json index 3756b11e..97252bec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -73,7 +73,6 @@ "version": "7.29.0", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -1575,6 +1574,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -1587,6 +1587,7 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, + "peer": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -1600,7 +1601,8 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true + "dev": true, + "peer": true }, "node_modules/@testing-library/react": { "version": "16.3.2", @@ -1663,7 +1665,8 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", - "dev": true + "dev": true, + "peer": true }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -1706,8 +1709,7 @@ "version": "4.3.20", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz", "integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@types/chai-subset": { "version": "1.3.6", @@ -1753,7 +1755,6 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz", "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", "dev": true, - "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -1763,7 +1764,6 @@ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, - "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -1855,7 +1855,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", "dev": true, - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "6.21.0", "@typescript-eslint/types": "6.21.0", @@ -2186,7 +2185,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2277,6 +2275,7 @@ "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "dequal": "^2.0.3" } @@ -2460,7 +2459,6 @@ "url": "https://github.com/sponsors/ai" } ], - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -2824,6 +2822,7 @@ "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=6" } @@ -2879,7 +2878,8 @@ "version": "0.5.16", "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", - "dev": true + "dev": true, + "peer": true }, "node_modules/domexception": { "version": "4.0.0", @@ -3077,7 +3077,6 @@ "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -3994,7 +3993,6 @@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", "dev": true, - "peer": true, "dependencies": { "abab": "^2.0.6", "cssstyle": "^3.0.0", @@ -4401,6 +4399,7 @@ "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, + "peer": true, "bin": { "lz-string": "bin/bin.js" } @@ -4866,7 +4865,6 @@ "url": "https://github.com/sponsors/ai" } ], - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -5069,7 +5067,6 @@ "version": "19.2.4", "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz", "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -5078,7 +5075,6 @@ "version": "19.2.4", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz", "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -5673,7 +5669,6 @@ "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz", "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==", "devOptional": true, - "peer": true, "dependencies": { "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" @@ -5740,7 +5735,6 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5830,7 +5824,6 @@ "version": "6.4.1", "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -7666,7 +7659,6 @@ "version": "7.29.0", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", - "peer": true, "requires": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -8516,13 +8508,15 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true + "dev": true, + "peer": true }, "pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, + "peer": true, "requires": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -8533,7 +8527,8 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true + "dev": true, + "peer": true } } }, @@ -8569,7 +8564,8 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", - "dev": true + "dev": true, + "peer": true }, "@types/babel__core": { "version": "7.20.5", @@ -8612,8 +8608,7 @@ "version": "4.3.20", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz", "integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==", - "dev": true, - "peer": true + "dev": true }, "@types/chai-subset": { "version": "1.3.6", @@ -8656,7 +8651,6 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz", "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", "dev": true, - "peer": true, "requires": { "csstype": "^3.2.2" } @@ -8666,7 +8660,6 @@ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, - "peer": true, "requires": {} }, "@types/semver": { @@ -8733,7 +8726,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", "dev": true, - "peer": true, "requires": { "@typescript-eslint/scope-manager": "6.21.0", "@typescript-eslint/types": "6.21.0", @@ -8944,8 +8936,7 @@ "version": "8.16.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", - "dev": true, - "peer": true + "dev": true }, "acorn-jsx": { "version": "5.3.2", @@ -9008,6 +8999,7 @@ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, + "peer": true, "requires": { "dequal": "^2.0.3" } @@ -9117,7 +9109,6 @@ "version": "4.28.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", - "peer": true, "requires": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -9368,7 +9359,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true + "dev": true, + "peer": true }, "detect-libc": { "version": "2.1.2", @@ -9408,7 +9400,8 @@ "version": "0.5.16", "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", - "dev": true + "dev": true, + "peer": true }, "domexception": { "version": "4.0.0", @@ -9553,7 +9546,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dev": true, - "peer": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -10198,7 +10190,6 @@ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", "dev": true, - "peer": true, "requires": { "abab": "^2.0.6", "cssstyle": "^3.0.0", @@ -10411,7 +10402,8 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", - "dev": true + "dev": true, + "peer": true }, "magic-string": { "version": "0.30.21", @@ -10740,7 +10732,6 @@ "version": "8.5.8", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz", "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==", - "peer": true, "requires": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -10878,14 +10869,12 @@ "react": { "version": "19.2.4", "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz", - "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==", - "peer": true + "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==" }, "react-dom": { "version": "19.2.4", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz", "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==", - "peer": true, "requires": { "scheduler": "^0.27.0" } @@ -11300,7 +11289,6 @@ "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz", "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==", "devOptional": true, - "peer": true, "requires": { "esbuild": "~0.27.0", "fsevents": "~2.3.3", @@ -11342,8 +11330,7 @@ "version": "5.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", - "dev": true, - "peer": true + "dev": true }, "ufo": { "version": "1.6.3", @@ -11402,7 +11389,6 @@ "version": "6.4.1", "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", - "peer": true, "requires": { "esbuild": "^0.25.0", "fdir": "^6.4.4", diff --git a/packages/shared/src/contracts/index.ts b/packages/shared/src/contracts/index.ts index c6484f20..5ba8e295 100644 --- a/packages/shared/src/contracts/index.ts +++ b/packages/shared/src/contracts/index.ts @@ -3,6 +3,7 @@ export type * from './creationAudio'; export type * from './hyper3d'; export type * from './jumpHop'; export type * from './puzzleCreativeTemplate'; +export type * from './puzzleClear'; export type * from './publicWork'; export type * from './visualNovel'; export type * from './barkBattle'; diff --git a/packages/shared/src/contracts/puzzleClear.ts b/packages/shared/src/contracts/puzzleClear.ts new file mode 100644 index 00000000..728c93f9 --- /dev/null +++ b/packages/shared/src/contracts/puzzleClear.ts @@ -0,0 +1,226 @@ +export type PuzzleClearGenerationStatus = 'draft' | 'generating' | 'ready' | 'failed'; + +export type PuzzleClearShapeKind = '1x2' | '1x3' | '2x2' | '2x3'; + +export type PuzzleClearOrientation = 'horizontal' | 'vertical'; + +export type PuzzleClearRunStatus = + | 'playing' + | 'level_failed' + | 'level_cleared' + | 'finished'; + +export type PuzzleClearActionType = + | 'compile-draft' + | 'regenerate-atlas' + | 'update-work-meta' + | 'update-board-background'; + +export interface PuzzleClearImageAsset { + assetId: string; + imageSrc: string; + imageObjectKey: string; + assetObjectId: string; + generationProvider: string; + prompt: string; + width: number; + height: number; +} + +export interface PuzzleClearPatternGroup { + groupId: string; + shape: PuzzleClearShapeKind; + width: number; + height: number; + atlasX: number; + atlasY: number; + atlasWidth: number; + atlasHeight: number; +} + +export interface PuzzleClearCardAsset { + cardId: string; + groupId: string; + shape: PuzzleClearShapeKind; + orientation: PuzzleClearOrientation; + partX: number; + partY: number; + imageSrc: string; + imageObjectKey: string; + assetObjectId: string; + sourceAtlasCell: string; +} + +export interface PuzzleClearWorkspaceCreateRequest { + templateId: 'puzzle-clear' | string; + workTitle: string; + workDescription: string; + themePrompt: string; + boardBackgroundPrompt: string; + generateBoardBackground: boolean; + boardBackgroundAsset?: PuzzleClearImageAsset | null; +} + +export interface PuzzleClearActionRequest { + actionType: PuzzleClearActionType; + profileId?: string | null; + workTitle?: string | null; + workDescription?: string | null; + themePrompt?: string | null; + boardBackgroundPrompt?: string | null; + generateBoardBackground?: boolean | null; + boardBackgroundAsset?: PuzzleClearImageAsset | null; + atlasAsset?: PuzzleClearImageAsset | null; + patternGroups?: PuzzleClearPatternGroup[] | null; + cardAssets?: PuzzleClearCardAsset[] | null; +} + +export interface PuzzleClearDraftResponse { + templateId: string; + templateName: string; + profileId: string | null; + workTitle: string; + workDescription: string; + themePrompt: string; + boardBackgroundPrompt: string; + generateBoardBackground: boolean; + boardBackgroundAsset: PuzzleClearImageAsset | null; + cardBackImageSrc: string | null; + atlasAsset: PuzzleClearImageAsset | null; + patternGroups: PuzzleClearPatternGroup[]; + cardAssets: PuzzleClearCardAsset[]; + generationStatus: PuzzleClearGenerationStatus; +} + +export interface PuzzleClearSessionSnapshotResponse { + sessionId: string; + ownerUserId: string; + status: PuzzleClearGenerationStatus; + draft: PuzzleClearDraftResponse | null; + createdAt: string; + updatedAt: string; +} + +export interface PuzzleClearSessionResponse { + session: PuzzleClearSessionSnapshotResponse; +} + +export interface PuzzleClearActionResponse { + actionType: PuzzleClearActionType; + session: PuzzleClearSessionSnapshotResponse; + work: PuzzleClearWorkProfileResponse | null; +} + +export interface PuzzleClearWorkSummaryResponse { + runtimeKind: 'puzzle-clear'; + workId: string; + profileId: string; + ownerUserId: string; + sourceSessionId: string | null; + workTitle: string; + workDescription: string; + themePrompt: string; + coverImageSrc: string | null; + publicationStatus: string; + playCount: number; + updatedAt: string; + publishedAt: string | null; + publishReady: boolean; + generationStatus: PuzzleClearGenerationStatus; +} + +export interface PuzzleClearWorkProfileResponse { + summary: PuzzleClearWorkSummaryResponse; + draft: PuzzleClearDraftResponse; + boardBackgroundAsset: PuzzleClearImageAsset | null; + atlasAsset: PuzzleClearImageAsset; + patternGroups: PuzzleClearPatternGroup[]; + cardAssets: PuzzleClearCardAsset[]; +} + +export interface PuzzleClearWorksResponse { + items: PuzzleClearWorkSummaryResponse[]; +} + +export interface PuzzleClearWorkDetailResponse { + item: PuzzleClearWorkProfileResponse; +} + +export interface PuzzleClearWorkMutationResponse { + item: PuzzleClearWorkProfileResponse; +} + +export interface PuzzleClearGalleryCardResponse + extends PuzzleClearWorkSummaryResponse { + publicWorkCode?: string; + authorDisplayName?: string; + recentPlayCount7d?: number; +} + +export interface PuzzleClearGalleryResponse { + items: PuzzleClearGalleryCardResponse[]; + hasMore: boolean; + nextCursor: string | null; +} + +export interface PuzzleClearGalleryDetailResponse { + item: PuzzleClearWorkProfileResponse; +} + +export interface PuzzleClearBoardCell { + row: number; + col: number; + card: PuzzleClearCardAsset | null; + lockedGroupId: string | null; +} + +export interface PuzzleClearBoardSnapshot { + rows: number; + cols: number; + cells: PuzzleClearBoardCell[]; +} + +export interface PuzzleClearRuntimeSnapshotResponse { + runId: string; + profileId: string; + ownerUserId: string; + runtimeMode?: 'draft' | 'published'; + status: PuzzleClearRunStatus; + levelIndex: number; + clearsDone: number; + targetClears: number; + levelDurationSeconds: number; + levelStartedAtMs: number; + board: PuzzleClearBoardSnapshot; + readyColumns: PuzzleClearCardAsset[][]; + startedAtMs: number; + finishedAtMs: number | null; +} + +export interface PuzzleClearRunResponse { + run: PuzzleClearRuntimeSnapshotResponse; +} + +export interface PuzzleClearStartRunRequest { + profileId: string; +} + +export interface PuzzleClearSwapRequest { + fromRow: number; + fromCol: number; + toRow: number; + toCol: number; + clientActionId: string; +} + +export interface PuzzleClearRetryLevelRequest { + clientActionId: string; +} + +export interface PuzzleClearNextLevelRequest { + clientActionId: string; +} + +export interface PuzzleClearTimeUpRequest { + clientActionId: string; +} diff --git a/scripts/check-spacetime-schema-guard.mjs b/scripts/check-spacetime-schema-guard.mjs index 6f72ac8d..a935012a 100644 --- a/scripts/check-spacetime-schema-guard.mjs +++ b/scripts/check-spacetime-schema-guard.mjs @@ -477,8 +477,14 @@ function getChangedFiles(baseRef) { const diffOutput = tryGit(['diff', '--name-only', '-z', baseRef, '--']) ?? ''; const untrackedOutput = tryGit(['ls-files', '--others', '--exclude-standard', '-z', moduleSrcRoot]) ?? ''; + const untrackedBindingsOutput = + tryGit(['ls-files', '--others', '--exclude-standard', '-z', bindingsRoot]) ?? ''; return new Set( - [...diffOutput.split(/\u0000/u), ...untrackedOutput.split(/\u0000/u)] + [ + ...diffOutput.split(/\u0000/u), + ...untrackedOutput.split(/\u0000/u), + ...untrackedBindingsOutput.split(/\u0000/u), + ] .map(normalizePath) .filter(Boolean), ); diff --git a/scripts/dev-utils.test.ts b/scripts/dev-utils.test.ts index aeabfcee..b027b525 100644 --- a/scripts/dev-utils.test.ts +++ b/scripts/dev-utils.test.ts @@ -88,6 +88,29 @@ describe('dev utils env merge', () => { ); }); + test('本地短信 smoke 可以用 mock 验证码覆盖真实短信 provider 口径', () => { + withTempEnvFiles( + { + '.env.local': [ + 'SMS_AUTH_ENABLED=true', + 'SMS_AUTH_PROVIDER=mock', + 'SMS_AUTH_MOCK_VERIFY_CODE=123456', + ].join('\n'), + }, + (_env, tempDir) => { + const env = mergeApiServerEnv(tempDir, { + SMS_AUTH_ENABLED: 'true', + SMS_AUTH_PROVIDER: 'aliyun', + SMS_AUTH_MOCK_VERIFY_CODE: '654321', + }); + + expect(env.SMS_AUTH_ENABLED).toBe('true'); + expect(env.SMS_AUTH_PROVIDER).toBe('mock'); + expect(env.SMS_AUTH_MOCK_VERIFY_CODE).toBe('123456'); + }, + ); + }); + test('空外层 shell 变量不会遮蔽本地私密配置', () => { withTempEnvFiles( { diff --git a/scripts/dev.mjs b/scripts/dev.mjs index 13cbb831..e9823459 100644 --- a/scripts/dev.mjs +++ b/scripts/dev.mjs @@ -5,6 +5,7 @@ import { existsSync, readdirSync, readFileSync, + realpathSync, statSync, watch, writeFileSync, @@ -1684,6 +1685,26 @@ function normalizePath(path) { return path.replace(/\\/gu, '/'); } +function safeRealpath(pathValue) { + try { + return realpathSync(pathValue); + } catch { + return resolve(pathValue); + } +} + +function isDirectModuleExecution(argv1, moduleUrl, resolvePath = safeRealpath) { + if (!argv1) { + return false; + } + + try { + return resolvePath(argv1) === resolvePath(fileURLToPath(moduleUrl)); + } catch { + return resolve(argv1) === fileURLToPath(moduleUrl); + } +} + function buildSpacetimePublishArgs({database, server, preserveDatabase}) { const args = [ 'publish', @@ -1735,6 +1756,7 @@ export { createDevServerSpawnOptions, createWatchConfigs, isSpacetimePublishPermissionError, + isDirectModuleExecution, parseSpacetimeToolVersion, parseArgs, shouldAcceptWatchEvent, @@ -1765,6 +1787,6 @@ async function main() { } } -if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) { +if (isDirectModuleExecution(process.argv[1], import.meta.url)) { void main(); } diff --git a/scripts/dev.test.ts b/scripts/dev.test.ts index 341cde80..0a1b65ef 100644 --- a/scripts/dev.test.ts +++ b/scripts/dev.test.ts @@ -12,6 +12,7 @@ import { buildSpacetimePublishArgs, createDevServerSpawnOptions, createWatchConfigs, + isDirectModuleExecution, isSpacetimePublishPermissionError, parseSpacetimeToolVersion, parseArgs, @@ -35,6 +36,19 @@ function workspaceSpacetimeVersionForTest() { } describe('dev scheduler argument routing', () => { + test('Windows junction 路径下的直接执行入口也能识别为当前模块', () => { + const moduleUrl = + 'file:///F:/DevWorktrees/codex/worktrees/f584/Genarrative/scripts/dev.mjs'; + const argv1 = + 'C:\\Users\\wuxiangwanzi\\.codex\\worktrees\\f584\\Genarrative\\scripts\\dev.mjs'; + const resolvePath = (value) => + value.startsWith('C:\\Users\\') + ? 'F:\\DevWorktrees\\codex\\worktrees\\f584\\Genarrative\\scripts\\dev.mjs' + : value; + + expect(isDirectModuleExecution(argv1, moduleUrl, resolvePath)).toBe(true); + }); + test('完整 dev 栈覆盖前端代理到本次解析出的 api-server 地址', () => { const {command, explicitOptions, options} = parseArgs([], { GENARRATIVE_API_PORT: '8090', diff --git a/server-rs/Cargo.lock b/server-rs/Cargo.lock index becd7daa..6282d5a3 100644 --- a/server-rs/Cargo.lock +++ b/server-rs/Cargo.lock @@ -99,6 +99,7 @@ dependencies = [ "module-match3d", "module-npc", "module-puzzle", + "module-puzzle-clear", "module-runtime", "module-runtime-item", "module-runtime-story", @@ -1876,6 +1877,15 @@ dependencies = [ "spacetimedb", ] +[[package]] +name = "module-puzzle-clear" +version = "0.1.0" +dependencies = [ + "serde", + "shared-kernel", + "spacetimedb", +] + [[package]] name = "module-quest" version = "0.1.0" @@ -3319,6 +3329,7 @@ dependencies = [ "module-match3d", "module-npc", "module-puzzle", + "module-puzzle-clear", "module-runtime", "module-runtime-item", "module-runtime-story", @@ -3354,6 +3365,7 @@ dependencies = [ "module-npc", "module-progression", "module-puzzle", + "module-puzzle-clear", "module-quest", "module-runtime", "module-runtime-item", diff --git a/server-rs/Cargo.toml b/server-rs/Cargo.toml index 84e0da98..7350f6d2 100644 --- a/server-rs/Cargo.toml +++ b/server-rs/Cargo.toml @@ -22,6 +22,7 @@ members = [ "crates/module-match3d", "crates/module-npc", "crates/module-puzzle", + "crates/module-puzzle-clear", "crates/module-progression", "crates/module-quest", "crates/module-runtime", @@ -68,6 +69,7 @@ module-match3d = { path = "crates/module-match3d", default-features = false } module-npc = { path = "crates/module-npc", default-features = false } module-progression = { path = "crates/module-progression", default-features = false } module-puzzle = { path = "crates/module-puzzle", default-features = false } +module-puzzle-clear = { path = "crates/module-puzzle-clear", default-features = false } module-quest = { path = "crates/module-quest", default-features = false } module-runtime = { path = "crates/module-runtime", default-features = false } module-runtime-item = { path = "crates/module-runtime-item", default-features = false } diff --git a/server-rs/crates/api-server/Cargo.toml b/server-rs/crates/api-server/Cargo.toml index 06aaaa61..c781bee5 100644 --- a/server-rs/crates/api-server/Cargo.toml +++ b/server-rs/crates/api-server/Cargo.toml @@ -26,6 +26,7 @@ module-inventory = { workspace = true } module-match3d = { workspace = true } module-npc = { workspace = true } module-puzzle = { workspace = true } +module-puzzle-clear = { workspace = true } module-runtime = { workspace = true } module-runtime-story = { workspace = true } module-runtime-item = { workspace = true } diff --git a/server-rs/crates/api-server/src/app.rs b/server-rs/crates/api-server/src/app.rs index 142d4725..39c6a2f4 100644 --- a/server-rs/crates/api-server/src/app.rs +++ b/server-rs/crates/api-server/src/app.rs @@ -64,6 +64,7 @@ pub fn build_router(state: AppState) -> Router { .merge(modules::jump_hop::router(state.clone())) .merge(modules::wooden_fish::router(state.clone())) .merge(modules::public_work::router(state.clone())) + .merge(modules::puzzle_clear::router(state.clone())) .merge(modules::puzzle::router(state.clone())) .merge(visual_novel_router(state.clone())) .route( diff --git a/server-rs/crates/api-server/src/character_visual_assets.rs b/server-rs/crates/api-server/src/character_visual_assets.rs index 5aa1028d..08adcaa2 100644 --- a/server-rs/crates/api-server/src/character_visual_assets.rs +++ b/server-rs/crates/api-server/src/character_visual_assets.rs @@ -94,13 +94,11 @@ pub async fn generate_character_visual( .map_err(|error| character_visual_error_response(&request_context, error))?; let result = async { - let settings = require_openai_image_settings(&state)? - .with_external_api_audit_context( - &request_context, - Some(owner_user_id.clone()), - Some(character_id.clone()), - ) - ; + let settings = require_openai_image_settings(&state)?.with_external_api_audit_context( + &request_context, + Some(owner_user_id.clone()), + Some(character_id.clone()), + ); let http_client = build_openai_image_http_client(&settings)?; state @@ -324,10 +322,8 @@ pub(crate) async fn generate_character_primary_visual_for_profile( &model, &prompt, )?; - let settings = require_openai_image_settings(state)?.with_external_api_audit_actor( - Some(owner_user_id.to_string()), - Some(character_id.clone()), - ); + let settings = require_openai_image_settings(state)? + .with_external_api_audit_actor(Some(owner_user_id.to_string()), Some(character_id.clone())); let http_client = build_openai_image_http_client(&settings)?; state .ai_task_service() diff --git a/server-rs/crates/api-server/src/creation_entry_config.rs b/server-rs/crates/api-server/src/creation_entry_config.rs index ab0e06fc..c1843585 100644 --- a/server-rs/crates/api-server/src/creation_entry_config.rs +++ b/server-rs/crates/api-server/src/creation_entry_config.rs @@ -72,6 +72,12 @@ pub async fn require_creation_entry_route_enabled( pub fn resolve_creation_entry_route_id(path: &str) -> Option<&'static str> { let normalized = path.trim_end_matches('/'); + if normalized.starts_with("/api/runtime/puzzle-clear") { + return Some("puzzle-clear"); + } + if normalized.starts_with("/api/creation/puzzle-clear") { + return Some("puzzle-clear"); + } if normalized.starts_with("/api/runtime/puzzle") { return Some("puzzle"); } @@ -173,6 +179,14 @@ mod tests { resolve_creation_entry_route_id("/api/runtime/puzzle/works"), Some("puzzle"), ); + assert_eq!( + resolve_creation_entry_route_id("/api/creation/puzzle-clear/sessions"), + Some("puzzle-clear"), + ); + assert_eq!( + resolve_creation_entry_route_id("/api/runtime/puzzle-clear/runs/run-1"), + Some("puzzle-clear"), + ); assert_eq!( resolve_creation_entry_route_id("/api/runtime/match3d/runs/run-1"), Some("match3d"), diff --git a/server-rs/crates/api-server/src/custom_world_ai.rs b/server-rs/crates/api-server/src/custom_world_ai.rs index 0aa81311..932f5099 100644 --- a/server-rs/crates/api-server/src/custom_world_ai.rs +++ b/server-rs/crates/api-server/src/custom_world_ai.rs @@ -553,12 +553,11 @@ pub async fn generate_custom_world_scene_image( "scene_image", asset_id.as_str(), async { - let settings = require_openai_image_settings(&state)? - .with_external_api_audit_context( - &request_context, - Some(owner_user_id.to_string()), - normalized.profile_id.clone(), - ); + let settings = require_openai_image_settings(&state)?.with_external_api_audit_context( + &request_context, + Some(owner_user_id.to_string()), + normalized.profile_id.clone(), + ); let http_client = build_openai_image_http_client(&settings)?; let reference_image = if let Some(reference_image_src) = normalized.reference_image_src.as_deref() { diff --git a/server-rs/crates/api-server/src/edutainment_baby_object.rs b/server-rs/crates/api-server/src/edutainment_baby_object.rs index dda85bf5..abfb5349 100644 --- a/server-rs/crates/api-server/src/edutainment_baby_object.rs +++ b/server-rs/crates/api-server/src/edutainment_baby_object.rs @@ -1052,6 +1052,7 @@ mod tests { external_api_audit_state: None, external_api_audit_user_id: None, external_api_audit_profile_id: None, + external_api_audit_request_id: None, }); assert_eq!( diff --git a/server-rs/crates/api-server/src/jump_hop.rs b/server-rs/crates/api-server/src/jump_hop.rs index 910c18f2..9dd69508 100644 --- a/server-rs/crates/api-server/src/jump_hop.rs +++ b/server-rs/crates/api-server/src/jump_hop.rs @@ -414,12 +414,11 @@ async fn maybe_generate_jump_hop_assets( let settings = require_openai_image_settings(state) .map(|settings| { - settings - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(profile_id.clone()), - ) + settings.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.clone()), + ) }) .map_err(|error| { jump_hop_error_response(request_context, JUMP_HOP_CREATION_PROVIDER, error) diff --git a/server-rs/crates/api-server/src/main.rs b/server-rs/crates/api-server/src/main.rs index 0c511311..c7400bf0 100644 --- a/server-rs/crates/api-server/src/main.rs +++ b/server-rs/crates/api-server/src/main.rs @@ -64,6 +64,7 @@ mod prompt; mod public_work; mod puzzle; mod puzzle_agent_turn; +mod puzzle_clear; mod puzzle_gallery_cache; mod refresh_session; mod registration_reward; diff --git a/server-rs/crates/api-server/src/match3d/item_assets.rs b/server-rs/crates/api-server/src/match3d/item_assets.rs index 726f0c7e..f21ecbbf 100644 --- a/server-rs/crates/api-server/src/match3d/item_assets.rs +++ b/server-rs/crates/api-server/src/match3d/item_assets.rs @@ -755,12 +755,11 @@ async fn generate_match3d_material_sheet_from_level_scene( config: &Match3DConfigJson, background_asset: Option<&Match3DGeneratedBackgroundAsset>, ) -> Result { - let settings = require_openai_image_settings(state)? - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(profile_id.to_string()), - ); + let settings = require_openai_image_settings(state)?.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + ); let http_client = build_openai_image_http_client(&settings)?; let prompt = build_match3d_item_spritesheet_prompt(); let reference = load_match3d_level_scene_reference_image(state, background_asset).await?; diff --git a/server-rs/crates/api-server/src/match3d/works.rs b/server-rs/crates/api-server/src/match3d/works.rs index 99d4ef06..bcdea311 100644 --- a/server-rs/crates/api-server/src/match3d/works.rs +++ b/server-rs/crates/api-server/src/match3d/works.rs @@ -304,12 +304,11 @@ pub(super) async fn generate_match3d_cover_image_asset( reference_image_srcs: Vec, ) -> Result { require_match3d_oss_client(state)?; - let settings = require_openai_image_settings(state)? - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(profile_id.to_string()), - ); + let settings = require_openai_image_settings(state)?.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + ); let http_client = build_openai_image_http_client(&settings)?; let cover_prompt = build_match3d_cover_generation_prompt(config, prompt); let generated = if let Some(uploaded_image) = resolve_match3d_reference_image_for_edit( @@ -459,12 +458,11 @@ pub(super) async fn generate_match3d_level_asset_bundle( prompt: &str, ) -> Result { require_match3d_oss_client(state)?; - let settings = require_openai_image_settings(state)? - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(profile_id.to_string()), - ); + let settings = require_openai_image_settings(state)?.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + ); let http_client = build_openai_image_http_client(&settings)?; let level_scene_prompt = build_match3d_level_scene_generation_prompt(config); @@ -607,12 +605,11 @@ pub(super) async fn generate_match3d_container_image( prompt: &str, ) -> Result { require_match3d_oss_client(state)?; - let settings = require_openai_image_settings(state)? - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(profile_id.to_string()), - ); + let settings = require_openai_image_settings(state)?.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + ); let http_client = build_openai_image_http_client(&settings)?; let reference_image = load_match3d_container_reference_image()?; let container_prompt = build_match3d_container_generation_prompt(config, prompt); diff --git a/server-rs/crates/api-server/src/modules.rs b/server-rs/crates/api-server/src/modules.rs index 9d643493..1cac08d9 100644 --- a/server-rs/crates/api-server/src/modules.rs +++ b/server-rs/crates/api-server/src/modules.rs @@ -13,6 +13,7 @@ pub mod platform; pub mod profile; pub mod public_work; pub mod puzzle; +pub mod puzzle_clear; pub mod square_hole; pub mod story; pub mod wooden_fish; diff --git a/server-rs/crates/api-server/src/modules/puzzle_clear.rs b/server-rs/crates/api-server/src/modules/puzzle_clear.rs new file mode 100644 index 00000000..3eaabde6 --- /dev/null +++ b/server-rs/crates/api-server/src/modules/puzzle_clear.rs @@ -0,0 +1,116 @@ +use axum::{ + Router, middleware, + routing::{get, post}, +}; + +use crate::{ + auth::{require_bearer_auth, require_runtime_principal_auth}, + puzzle_clear::{ + advance_puzzle_clear_next_level, create_puzzle_clear_session, execute_puzzle_clear_action, + get_puzzle_clear_gallery_detail, get_puzzle_clear_run, get_puzzle_clear_runtime_work, + get_puzzle_clear_session, get_puzzle_clear_work, list_puzzle_clear_gallery, + list_puzzle_clear_works, mark_puzzle_clear_level_time_up, publish_puzzle_clear_work, + retry_puzzle_clear_level, start_puzzle_clear_run, swap_puzzle_clear_cards, + }, + state::AppState, +}; + +pub fn router(state: AppState) -> Router { + Router::new() + .route( + "/api/creation/puzzle-clear/sessions", + post(create_puzzle_clear_session).route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )), + ) + .route( + "/api/creation/puzzle-clear/sessions/{session_id}", + get(get_puzzle_clear_session).route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )), + ) + .route( + "/api/creation/puzzle-clear/sessions/{session_id}/actions", + post(execute_puzzle_clear_action).route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )), + ) + .route( + "/api/creation/puzzle-clear/works", + get(list_puzzle_clear_works).route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )), + ) + .route( + "/api/creation/puzzle-clear/works/{profile_id}", + get(get_puzzle_clear_work).route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )), + ) + .route( + "/api/creation/puzzle-clear/works/{profile_id}/publish", + post(publish_puzzle_clear_work).route_layer(middleware::from_fn_with_state( + state.clone(), + require_bearer_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/works/{profile_id}", + get(get_puzzle_clear_runtime_work), + ) + .route( + "/api/runtime/puzzle-clear/runs", + post(start_puzzle_clear_run).route_layer(middleware::from_fn_with_state( + state.clone(), + require_runtime_principal_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/runs/{run_id}", + get(get_puzzle_clear_run).route_layer(middleware::from_fn_with_state( + state.clone(), + require_runtime_principal_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/runs/{run_id}/swap", + post(swap_puzzle_clear_cards).route_layer(middleware::from_fn_with_state( + state.clone(), + require_runtime_principal_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/runs/{run_id}/retry-level", + post(retry_puzzle_clear_level).route_layer(middleware::from_fn_with_state( + state.clone(), + require_runtime_principal_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/runs/{run_id}/next-level", + post(advance_puzzle_clear_next_level).route_layer(middleware::from_fn_with_state( + state.clone(), + require_runtime_principal_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/runs/{run_id}/time-up", + post(mark_puzzle_clear_level_time_up).route_layer(middleware::from_fn_with_state( + state.clone(), + require_runtime_principal_auth, + )), + ) + .route( + "/api/runtime/puzzle-clear/gallery", + get(list_puzzle_clear_gallery), + ) + .route( + "/api/runtime/puzzle-clear/gallery/{public_work_code}", + get(get_puzzle_clear_gallery_detail), + ) +} diff --git a/server-rs/crates/api-server/src/puzzle/generation.rs b/server-rs/crates/api-server/src/puzzle/generation.rs index a17766f7..c03ad4bf 100644 --- a/server-rs/crates/api-server/src/puzzle/generation.rs +++ b/server-rs/crates/api-server/src/puzzle/generation.rs @@ -310,12 +310,11 @@ pub(crate) async fn generate_puzzle_level_asset_bundle( level_name: &str, puzzle_image: &PuzzleDownloadedImage, ) -> Result { - let settings = require_puzzle_vector_engine_settings(state)? - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(session_id.to_string()), - ); + let settings = require_puzzle_vector_engine_settings(state)?.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(session_id.to_string()), + ); let http_client = build_puzzle_image_http_client(state, PuzzleImageModel::GptImage2)?; let puzzle_reference = build_puzzle_downloaded_image_reference(puzzle_image); let scene_generated = create_puzzle_vector_engine_image_generation( diff --git a/server-rs/crates/api-server/src/puzzle/vector_engine.rs b/server-rs/crates/api-server/src/puzzle/vector_engine.rs index 4c6f9b2f..4338966b 100644 --- a/server-rs/crates/api-server/src/puzzle/vector_engine.rs +++ b/server-rs/crates/api-server/src/puzzle/vector_engine.rs @@ -117,11 +117,9 @@ impl PuzzleVectorEngineSettings { ) -> Self { self.external_api_audit_user_id = user_id; self.external_api_audit_profile_id = profile_id; - self.external_api_audit_request_id = - Some(request_context.request_id().to_string()); + self.external_api_audit_request_id = Some(request_context.request_id().to_string()); self } - } pub(crate) struct ParsedPuzzleImageDataUrl { diff --git a/server-rs/crates/api-server/src/puzzle_clear.rs b/server-rs/crates/api-server/src/puzzle_clear.rs new file mode 100644 index 00000000..1ed5605f --- /dev/null +++ b/server-rs/crates/api-server/src/puzzle_clear.rs @@ -0,0 +1,1729 @@ +use axum::{ + Json, + body::{Body, to_bytes}, + extract::{Extension, Path, State, rejection::JsonRejection}, + http::{HeaderName, StatusCode, header}, + response::Response, +}; +use module_assets::{ + AssetObjectAccessPolicy, build_asset_entity_binding_input, build_asset_object_upsert_input, + generate_asset_binding_id, generate_asset_object_id, +}; +use platform_oss::{LegacyAssetPrefix, OssHeadObjectRequest, OssObjectAccess}; +use serde_json::{Value, json}; +use shared_contracts::puzzle_clear::{ + PuzzleClearActionRequest, PuzzleClearActionType, PuzzleClearCardAsset, + PuzzleClearDraftResponse, PuzzleClearGenerationStatus, PuzzleClearImageAsset, + PuzzleClearNextLevelRequest, PuzzleClearPatternGroup, PuzzleClearRetryLevelRequest, + PuzzleClearRunResponse, PuzzleClearSessionResponse, PuzzleClearSessionSnapshotResponse, + PuzzleClearStartRunRequest, PuzzleClearSwapRequest, PuzzleClearTimeUpRequest, + PuzzleClearWorkDetailResponse, PuzzleClearWorkMutationResponse, PuzzleClearWorksResponse, + PuzzleClearWorkspaceCreateRequest, +}; +use shared_kernel::{build_prefixed_uuid_id, format_timestamp_micros}; +use spacetime_client::SpacetimeClientError; +use std::{ + collections::BTreeMap, + time::{SystemTime, UNIX_EPOCH}, +}; + +use crate::{ + api_response::json_success_body, + auth::{AuthenticatedAccessToken, RuntimePrincipal}, + generated_image_assets::{ + GeneratedImageAssetAdapter, GeneratedImageAssetDataUrl, + adapter::{GeneratedImageAssetAdapterMetadata, GeneratedImageAssetPersistInput}, + decode_generated_image_asset_data_url, normalize_generated_image_asset_mime, + }, + http_error::AppError, + openai_image_generation::{ + DownloadedOpenAiImage, build_openai_image_http_client, create_openai_image_generation, + require_openai_image_settings, + }, + request_context::RequestContext, + state::AppState, + work_play_tracking::{WorkPlayTrackingDraft, record_work_play_start_after_success}, +}; + +const PUZZLE_CLEAR_PROVIDER: &str = "puzzle-clear"; +const PUZZLE_CLEAR_CREATION_PROVIDER: &str = "puzzle-clear-creation"; +const PUZZLE_CLEAR_RUNTIME_PROVIDER: &str = "puzzle-clear-runtime"; +const PUZZLE_CLEAR_TEMPLATE_ID: &str = "puzzle-clear"; +const PUZZLE_CLEAR_TEMPLATE_NAME: &str = "拼消消"; +const PUZZLE_CLEAR_RUNTIME_RUNS_ROUTE: &str = "/api/runtime/puzzle-clear/runs"; +const PUZZLE_CLEAR_ATLAS_CELL_SIZE: u32 = 256; +const PUZZLE_CLEAR_SHEET_COLUMNS: u32 = 4; +const PUZZLE_CLEAR_SHEET_ROWS: u32 = 6; +const PUZZLE_CLEAR_SHEET_COLUMNS_USIZE: usize = 4; +const PUZZLE_CLEAR_SHEET_ROWS_USIZE: usize = 6; +const PUZZLE_CLEAR_FINAL_ATLAS_COLUMNS: u32 = 10; +const PUZZLE_CLEAR_FINAL_ATLAS_ROWS: u32 = 10; +const PUZZLE_CLEAR_ATLAS_GENERATION_SIZE: &str = "1024x1536"; +const PUZZLE_CLEAR_BOARD_BACKGROUND_GENERATION_SIZE: &str = "1024x1024"; +const PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC: &str = "/creation-type-references/puzzle.webp"; + +pub async fn create_puzzle_clear_session( + State(state): State, + Extension(request_context): Extension, + Extension(authenticated): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_CREATION_PROVIDER)?; + validate_workspace_request(&request_context, &payload)?; + + let owner_user_id = authenticated.claims().user_id().to_string(); + let session_id = build_prefixed_uuid_id(module_puzzle_clear::PUZZLE_CLEAR_SESSION_ID_PREFIX); + let now = current_utc_micros(); + let draft = build_puzzle_clear_draft(&payload); + let session = PuzzleClearSessionSnapshotResponse { + session_id, + owner_user_id, + status: PuzzleClearGenerationStatus::Draft, + draft: Some(draft), + created_at: format_timestamp_micros(now), + updated_at: format_timestamp_micros(now), + }; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearSessionResponse { + session: state + .spacetime_client() + .create_puzzle_clear_session(session) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?, + }, + )) +} + +pub async fn get_puzzle_clear_session( + State(state): State, + Path(session_id): Path, + Extension(request_context): Extension, + Extension(authenticated): Extension, +) -> Result, Response> { + ensure_non_empty(&request_context, &session_id, "sessionId")?; + let session = state + .spacetime_client() + .get_puzzle_clear_session(session_id, authenticated.claims().user_id().to_string()) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearSessionResponse { session }, + )) +} + +pub async fn execute_puzzle_clear_action( + State(state): State, + Path(session_id): Path, + Extension(request_context): Extension, + Extension(authenticated): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + ensure_non_empty(&request_context, &session_id, "sessionId")?; + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_CREATION_PROVIDER)?; + let owner_user_id = authenticated.claims().user_id().to_string(); + let author_display_name = authenticated + .claims() + .display_name + .as_deref() + .unwrap_or("拼消消玩家") + .to_string(); + let mut payload = payload; + if let Err(response) = maybe_prepare_puzzle_clear_assets_inner( + &state, + &request_context, + session_id.as_str(), + owner_user_id.as_str(), + &mut payload, + ) + .await + { + let (error_message, response) = extract_puzzle_clear_response_error_message(response).await; + tracing::warn!( + provider = PUZZLE_CLEAR_CREATION_PROVIDER, + session_id, + error = %error_message, + "拼消消素材生成失败，准备回写 failed 状态" + ); + if let Err(writeback_error) = state + .spacetime_client() + .mark_puzzle_clear_generation_failed( + session_id.clone(), + owner_user_id.clone(), + author_display_name.clone(), + payload.clone(), + ) + .await + { + tracing::warn!( + provider = PUZZLE_CLEAR_CREATION_PROVIDER, + session_id, + error = %writeback_error, + "拼消消素材生成失败状态回写失败" + ); + } + return Err(response); + } + let response = state + .spacetime_client() + .execute_puzzle_clear_action(session_id, owner_user_id, author_display_name, payload) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body(Some(&request_context), response)) +} + +pub async fn list_puzzle_clear_works( + State(state): State, + Extension(request_context): Extension, + Extension(authenticated): Extension, +) -> Result, Response> { + let works = state + .spacetime_client() + .list_puzzle_clear_works(authenticated.claims().user_id().to_string()) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearWorksResponse { + items: works.into_iter().map(|work| work.summary).collect(), + }, + )) +} + +pub async fn get_puzzle_clear_work( + State(state): State, + Path(profile_id): Path, + Extension(request_context): Extension, + Extension(authenticated): Extension, +) -> Result, Response> { + ensure_non_empty(&request_context, &profile_id, "profileId")?; + let item = state + .spacetime_client() + .get_puzzle_clear_work_profile(profile_id, authenticated.claims().user_id().to_string()) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearWorkDetailResponse { item }, + )) +} + +pub async fn publish_puzzle_clear_work( + State(state): State, + Path(profile_id): Path, + Extension(request_context): Extension, + Extension(authenticated): Extension, +) -> Result, Response> { + ensure_non_empty(&request_context, &profile_id, "profileId")?; + let item = state + .spacetime_client() + .publish_puzzle_clear_work(profile_id, authenticated.claims().user_id().to_string()) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearWorkMutationResponse { item }, + )) +} + +pub async fn get_puzzle_clear_runtime_work( + State(state): State, + Path(profile_id): Path, + Extension(request_context): Extension, +) -> Result, Response> { + ensure_non_empty(&request_context, &profile_id, "profileId")?; + let item = state + .spacetime_client() + .get_puzzle_clear_runtime_work(profile_id) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearWorkDetailResponse { item }, + )) +} + +pub async fn start_puzzle_clear_run( + State(state): State, + Extension(request_context): Extension, + Extension(principal): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_RUNTIME_PROVIDER)?; + ensure_non_empty(&request_context, &payload.profile_id, "profileId")?; + let owner_user_id = principal.subject().to_string(); + let principal_kind = principal.kind().as_str(); + let run = state + .spacetime_client() + .start_puzzle_clear_run(payload, owner_user_id) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + record_work_play_start_after_success( + &state, + &request_context, + build_puzzle_clear_work_play_tracking_draft( + &principal, + run.profile_id.clone(), + PUZZLE_CLEAR_RUNTIME_RUNS_ROUTE, + ) + .owner_user_id(run.owner_user_id.clone()) + .run_id(run.run_id.clone()) + .profile_id(run.profile_id.clone()) + .extra(json!({ + "runStatus": run.status, + "principalKind": principal_kind, + "levelIndex": run.level_index, + })), + ) + .await; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearRunResponse { run }, + )) +} + +pub async fn get_puzzle_clear_run( + State(state): State, + Path(run_id): Path, + Extension(request_context): Extension, + Extension(principal): Extension, +) -> Result, Response> { + ensure_non_empty(&request_context, &run_id, "runId")?; + let run = state + .spacetime_client() + .get_puzzle_clear_run(run_id, principal.subject().to_string()) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearRunResponse { run }, + )) +} + +pub async fn swap_puzzle_clear_cards( + State(state): State, + Path(run_id): Path, + Extension(request_context): Extension, + Extension(principal): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + ensure_non_empty(&request_context, &run_id, "runId")?; + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_RUNTIME_PROVIDER)?; + let run = state + .spacetime_client() + .swap_puzzle_clear_cards(run_id, principal.subject().to_string(), payload) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearRunResponse { run }, + )) +} + +pub async fn retry_puzzle_clear_level( + State(state): State, + Path(run_id): Path, + Extension(request_context): Extension, + Extension(principal): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + ensure_non_empty(&request_context, &run_id, "runId")?; + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_RUNTIME_PROVIDER)?; + let run = state + .spacetime_client() + .retry_puzzle_clear_level(run_id, principal.subject().to_string(), payload) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearRunResponse { run }, + )) +} + +pub async fn advance_puzzle_clear_next_level( + State(state): State, + Path(run_id): Path, + Extension(request_context): Extension, + Extension(principal): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + ensure_non_empty(&request_context, &run_id, "runId")?; + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_RUNTIME_PROVIDER)?; + let run = state + .spacetime_client() + .advance_puzzle_clear_next_level(run_id, principal.subject().to_string(), payload) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearRunResponse { run }, + )) +} + +pub async fn mark_puzzle_clear_level_time_up( + State(state): State, + Path(run_id): Path, + Extension(request_context): Extension, + Extension(principal): Extension, + payload: Result, JsonRejection>, +) -> Result, Response> { + ensure_non_empty(&request_context, &run_id, "runId")?; + let Json(payload) = + puzzle_clear_json(payload, &request_context, PUZZLE_CLEAR_RUNTIME_PROVIDER)?; + let run = state + .spacetime_client() + .mark_puzzle_clear_level_time_up(run_id, principal.subject().to_string(), payload) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearRunResponse { run }, + )) +} + +pub async fn list_puzzle_clear_gallery( + State(state): State, + Extension(request_context): Extension, +) -> Result, Response> { + let items = state + .spacetime_client() + .list_puzzle_clear_gallery() + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + json!({ + "items": items, + "hasMore": false, + "nextCursor": null, + }), + )) +} + +pub async fn get_puzzle_clear_gallery_detail( + State(state): State, + Path(public_work_code): Path, + Extension(request_context): Extension, +) -> Result, Response> { + ensure_non_empty(&request_context, &public_work_code, "publicWorkCode")?; + let normalized_code = normalize_public_work_code(public_work_code.as_str()); + let items = state + .spacetime_client() + .list_puzzle_clear_gallery() + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + let profile_id = items + .into_iter() + .find(|item| { + normalize_public_work_code( + build_puzzle_clear_public_work_code(&item.profile_id).as_str(), + ) == normalized_code + || normalize_public_work_code(item.profile_id.as_str()) == normalized_code + }) + .map(|item| item.profile_id) + .ok_or_else(|| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + AppError::from_status(StatusCode::NOT_FOUND).with_details(json!({ + "provider": PUZZLE_CLEAR_PROVIDER, + "message": "拼消消公开作品不存在", + })), + ) + })?; + let item = state + .spacetime_client() + .get_puzzle_clear_work_profile(profile_id, String::new()) + .await + .map_err(|error| { + puzzle_clear_error_response( + &request_context, + PUZZLE_CLEAR_RUNTIME_PROVIDER, + map_puzzle_clear_client_error(error), + ) + })?; + + Ok(json_success_body( + Some(&request_context), + PuzzleClearWorkDetailResponse { item }, + )) +} + +#[derive(Clone, Debug, PartialEq, Eq)] +struct PuzzleClearAtlasCardSlice { + group: PuzzleClearPatternGroup, + task_id: Option, + part_x: u32, + part_y: u32, + bytes: Vec, +} + +#[derive(Clone, Copy, Debug)] +struct PuzzleClearAtlasSheetSpec { + sheet_id: &'static str, + layout: [[&'static str; PUZZLE_CLEAR_SHEET_COLUMNS_USIZE]; PUZZLE_CLEAR_SHEET_ROWS_USIZE], + layout_prompt: &'static str, +} + +#[derive(Clone, Debug)] +struct PuzzleClearGeneratedSheet { + spec: PuzzleClearAtlasSheetSpec, + prompt: String, + task_id: String, + image: DownloadedOpenAiImage, +} + +async fn maybe_prepare_puzzle_clear_assets_inner( + state: &AppState, + request_context: &RequestContext, + session_id: &str, + owner_user_id: &str, + payload: &mut PuzzleClearActionRequest, +) -> Result<(), Response> { + if !matches!( + payload.action_type, + PuzzleClearActionType::CompileDraft | PuzzleClearActionType::RegenerateAtlas + ) { + return Ok(()); + } + if payload.atlas_asset.is_some() + && payload + .pattern_groups + .as_ref() + .is_some_and(|groups| !groups.is_empty()) + && payload + .card_assets + .as_ref() + .is_some_and(|cards| !cards.is_empty()) + { + return Ok(()); + } + + let profile_id = payload + .profile_id + .as_ref() + .map(|value| value.trim()) + .filter(|value| !value.is_empty()) + .map(ToString::to_string) + .unwrap_or_else(|| { + build_prefixed_uuid_id(module_puzzle_clear::PUZZLE_CLEAR_PROFILE_ID_PREFIX) + }); + payload.profile_id = Some(profile_id.clone()); + + if payload.generate_board_background.unwrap_or(false) + && payload + .board_background_asset + .as_ref() + .is_none_or(|asset| asset.image_src.trim().is_empty()) + { + let board_background_prompt = payload + .board_background_prompt + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()); + let theme_prompt = payload.theme_prompt.as_deref().unwrap_or_default(); + let background_asset = generate_and_persist_puzzle_clear_board_background( + state, + request_context, + owner_user_id, + profile_id.as_str(), + board_background_prompt.unwrap_or(theme_prompt), + ) + .await?; + payload.board_background_asset = Some(background_asset); + } else if let Some(asset) = payload.board_background_asset.clone() { + if asset.image_src.trim_start().starts_with("data:image/") { + payload.board_background_asset = Some( + persist_puzzle_clear_data_url_asset( + state, + request_context, + owner_user_id, + profile_id.as_str(), + "board-background-upload", + asset.prompt.as_str(), + asset.image_src.as_str(), + 1024, + 1536, + ) + .await?, + ); + } + } + + let groups = planned_puzzle_clear_pattern_groups(); + let groups_by_id = groups + .iter() + .cloned() + .map(|group| (group.group_id.clone(), group)) + .collect::>(); + let sheet_specs = puzzle_clear_atlas_sheet_specs(); + let settings = require_openai_image_settings(state) + .map(|settings| { + settings.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.clone()), + ) + }) + .map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?; + let http_client = build_openai_image_http_client(&settings).map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?; + let mut generated_sheets = Vec::with_capacity(sheet_specs.len()); + for sheet_spec in sheet_specs { + let sheet_prompt = build_puzzle_clear_atlas_prompt( + payload.theme_prompt.as_deref().unwrap_or_default(), + &sheet_spec, + ); + let failure_context = format!("拼消消素材 {} 生成失败", sheet_spec.sheet_id); + let generated = create_openai_image_generation( + &http_client, + &settings, + sheet_prompt.as_str(), + Some("文字、Logo、水印、按钮、UI 字、网格线、编号、标签、边框、外轮廓框、白色描边、白色贴纸边、圆角框、阴影框、分隔线、裁切参考线、低清晰度、主体跨格、主体贴边、重复同款小图"), + PUZZLE_CLEAR_ATLAS_GENERATION_SIZE, + 1, + &[], + failure_context.as_str(), + ) + .await?; + let task_id = generated.task_id; + let image = generated.images.into_iter().next().ok_or_else(|| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": "vector-engine", + "message": format!("拼消消素材 {} 生成成功但未返回图片。", sheet_spec.sheet_id), + })), + ) + })?; + generated_sheets.push(PuzzleClearGeneratedSheet { + spec: sheet_spec, + prompt: sheet_prompt, + task_id, + image, + }); + } + + let mut slices = Vec::new(); + for generated_sheet in &generated_sheets { + slices.extend( + slice_puzzle_clear_sheet( + &generated_sheet.image, + &generated_sheet.spec, + &groups_by_id, + generated_sheet.task_id.as_str(), + ) + .map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?, + ); + } + let atlas_image = + compose_puzzle_clear_final_atlas(&slices, &groups_by_id).map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?; + let atlas_prompt = generated_sheets + .iter() + .map(|sheet| format!("{}:\n{}", sheet.spec.sheet_id, sheet.prompt)) + .collect::>() + .join("\n\n---\n\n"); + let atlas_task_ids = generated_sheets + .iter() + .map(|sheet| sheet.task_id.as_str()) + .collect::>() + .join(","); + let atlas_asset = persist_puzzle_clear_generated_image_asset( + state, + owner_user_id, + profile_id.as_str(), + "atlas", + atlas_prompt.as_str(), + Some(atlas_task_ids.as_str()), + atlas_image, + PUZZLE_CLEAR_ATLAS_CELL_SIZE * PUZZLE_CLEAR_FINAL_ATLAS_COLUMNS, + PUZZLE_CLEAR_ATLAS_CELL_SIZE * PUZZLE_CLEAR_FINAL_ATLAS_ROWS, + request_context, + ) + .await?; + + let mut card_assets = Vec::with_capacity(slices.len()); + for slice in slices { + let task_id = slice.task_id.clone(); + card_assets.push( + persist_puzzle_clear_card_slice( + state, + owner_user_id, + profile_id.as_str(), + task_id.as_deref(), + slice, + request_context, + ) + .await?, + ); + } + + payload.atlas_asset = Some(atlas_asset); + payload.pattern_groups = Some(groups); + payload.card_assets = Some(card_assets); + tracing::info!( + provider = PUZZLE_CLEAR_CREATION_PROVIDER, + session_id, + profile_id, + group_count = payload.pattern_groups.as_ref().map_or(0, Vec::len), + card_count = payload.card_assets.as_ref().map_or(0, Vec::len), + "拼消消素材 atlas 已生成、切片并写入资产索引" + ); + Ok(()) +} + +async fn extract_puzzle_clear_response_error_message(response: Response) -> (String, Response) { + let status = response.status(); + let (parts, body) = response.into_parts(); + let body_bytes = match to_bytes(body, 64 * 1024).await { + Ok(bytes) => bytes, + Err(_) => { + let rebuilt = Response::from_parts(parts, Body::empty()); + return (format!("拼消消素材生成失败：{status}"), rebuilt); + } + }; + let body_text = String::from_utf8_lossy(&body_bytes).trim().to_string(); + let message = if body_text.is_empty() { + format!("拼消消素材生成失败：{status}") + } else if let Ok(body_json) = serde_json::from_str::(&body_text) { + body_json + .get("error") + .and_then(|error| error.get("message")) + .and_then(Value::as_str) + .map(str::trim) + .filter(|message| !message.is_empty()) + .unwrap_or(body_text.as_str()) + .to_string() + } else { + body_text + }; + let rebuilt = Response::from_parts(parts, Body::from(body_bytes)); + (message, rebuilt) +} + +fn planned_puzzle_clear_pattern_groups() -> Vec { + module_puzzle_clear::plan_puzzle_clear_pattern_groups(PUZZLE_CLEAR_ATLAS_CELL_SIZE) + .unwrap_or_default() + .into_iter() + .map(|group| PuzzleClearPatternGroup { + group_id: group.group_id, + shape: group.shape.as_str().to_string(), + width: group.width, + height: group.height, + atlas_x: group.atlas_x, + atlas_y: group.atlas_y, + atlas_width: group.atlas_width, + atlas_height: group.atlas_height, + }) + .collect() +} + +fn puzzle_clear_atlas_sheet_specs() -> Vec { + vec![ + PuzzleClearAtlasSheetSpec { + sheet_id: "sheet-01", + layout: [ + ["D01", "D01", "D01", "A02"], + ["D01", "D01", "D01", "A02"], + ["D02", "D02", "C01", "C01"], + ["D02", "D02", "C01", "C01"], + ["D02", "D02", "C02", "C02"], + ["A01", "A01", "C02", "C02"], + ], + layout_prompt: concat!( + "本张 sheet 的布局如下，编号只给后台理解，绝对不要画在图中：\n\n", + "第1行：D01 D01 D01 A02\n", + "第2行：D01 D01 D01 A02\n", + "第3行：D02 D02 C01 C01\n", + "第4行：D02 D02 C01 C01\n", + "第5行：D02 D02 C02 C02\n", + "第6行：A01 A01 C02 C02\n\n", + "A 表示 1x2 复合图案，C 表示 2x2 复合图案，D 表示 2x3 或 3x2 复合图案。请按相同编号连续区域生成一幅完整连续的小插画。" + ), + }, + PuzzleClearAtlasSheetSpec { + sheet_id: "sheet-02", + layout: [ + ["D03", "D03", "D03", "A04"], + ["D03", "D03", "D03", "A04"], + ["C03", "C03", "C04", "C04"], + ["C03", "C03", "C04", "C04"], + ["B01", "B01", "B01", "A06"], + ["B03", "B03", "B03", "A06"], + ], + layout_prompt: concat!( + "本张 sheet 的布局如下，编号只给后台理解，绝对不要画在图中：\n\n", + "第1行：D03 D03 D03 A04\n", + "第2行：D03 D03 D03 A04\n", + "第3行：C03 C03 C04 C04\n", + "第4行：C03 C03 C04 C04\n", + "第5行：B01 B01 B01 A06\n", + "第6行：B03 B03 B03 A06\n\n", + "A 表示 1x2 复合图案，B 表示 1x3 或 3x1 复合图案，C 表示 2x2 复合图案，D 表示 2x3 或 3x2 复合图案。请按相同编号连续区域生成一幅完整连续的小插画。" + ), + }, + PuzzleClearAtlasSheetSpec { + sheet_id: "sheet-03", + layout: [ + ["B02", "B04", "A03", "A03"], + ["B02", "B04", "A05", "A05"], + ["B02", "B04", "A07", "A07"], + ["B05", "B05", "B05", "A08"], + ["A09", "A09", "A10", "A08"], + ["A11", "A11", "A10", "."], + ], + layout_prompt: concat!( + "本张 sheet 的布局如下，编号只给后台理解，绝对不要画在图中：\n\n", + "第1行：B02 B04 A03 A03\n", + "第2行：B02 B04 A05 A05\n", + "第3行：B02 B04 A07 A07\n", + "第4行：B05 B05 B05 A08\n", + "第5行：A09 A09 A10 A08\n", + "第6行：A11 A11 A10 空白\n\n", + "A 表示 1x2 复合图案，B 表示 1x3 或 3x1 复合图案。空白格保持干净浅色背景，不要生成图案。请按相同编号连续区域生成一幅完整连续的小插画。" + ), + }, + PuzzleClearAtlasSheetSpec { + sheet_id: "sheet-04", + layout: [ + ["A12", "A13", "A13", "A14"], + ["A12", "A15", "A15", "A14"], + ["A16", "A17", "A17", "A18"], + ["A16", "A19", "A19", "A18"], + ["A20", "A21", "A21", "A22"], + ["A20", "A23", "A23", "A22"], + ], + layout_prompt: concat!( + "本张 sheet 的布局如下，编号只给后台理解，绝对不要画在图中：\n\n", + "第1行：A12 A13 A13 A14\n", + "第2行：A12 A15 A15 A14\n", + "第3行：A16 A17 A17 A18\n", + "第4行：A16 A19 A19 A18\n", + "第5行：A20 A21 A21 A22\n", + "第6行：A20 A23 A23 A22\n\n", + "A 表示 1x2 复合图案。请按相同编号连续区域生成一幅完整连续的小插画，横向 1x2 和纵向 1x2 都要自然可拼接。" + ), + }, + ] +} + +fn build_puzzle_clear_atlas_prompt( + theme_prompt: &str, + sheet_spec: &PuzzleClearAtlasSheetSpec, +) -> String { + let subject = normalize_non_empty_str(theme_prompt).unwrap_or_else(|| "梦幻物件".to_string()); + format!( + concat!( + "生成一张拼消消素材工作表，主题是「{subject}」，竖版 1024x1536。\n\n", + "这张图供程序后台按 4 列 x 6 行裁切，每个裁切单元为 256x256 的正方形。4x6 网格只用于后台理解，画面中绝对不要画出网格线、切分线、边框、编号或坐标。\n\n", + "相同编号连续占据的格子是一幅复合小插画，必须形成同一个完整主题物件或小场景；不同编号之间是不同图案，不要重复主体。复合图案可以横向或纵向跨格，但跨格处必须自然连续，切成 1x1 后每一格仍然有清晰可识别的局部图案。\n\n", + "图案不要做成卡牌、贴纸、图标格子或带框小卡片。每个图案外沿自然融入干净浅色背景，但不能有过多留白，外轮廓框、白色描边、圆角框、阴影框、分隔线、参考线或贴纸边。\n\n", + "画风为高清、清爽、适合休闲消除游戏的小插画；主体饱满，颜色鲜明，边缘干净，不能出现文字、Logo、水印、按钮、UI 或教程元素。\n\n", + "{layout_prompt}" + ), + subject = subject, + layout_prompt = sheet_spec.layout_prompt + ) +} + +fn build_puzzle_clear_board_background_prompt(theme_prompt: &str) -> String { + let subject = normalize_non_empty_str(theme_prompt).unwrap_or_else(|| "拼消消".to_string()); + format!( + concat!( + "生成拼消消中央背景底图，1:1 正方形，尺寸与中央棋盘一致，主题是「{subject}」。", + "这张图不是棋盘装饰，而是玩家逐渐消除卡片后慢慢看见的目标画面；", + "画面需要让玩家有探索、揭开底图全貌和追求目标完成的感受。", + "请以主题为核心设计精致完整的主题场景或主题主视觉，主体清晰、细节丰富、色彩和氛围强绑定主题，强表现力，必须一眼体现主题。", + "不要文字、水印、按钮、教程浮层或明显网格。" + ), + subject = subject + ) +} + +async fn generate_and_persist_puzzle_clear_board_background( + state: &AppState, + request_context: &RequestContext, + owner_user_id: &str, + profile_id: &str, + theme_prompt: &str, +) -> Result { + let prompt = build_puzzle_clear_board_background_prompt(theme_prompt); + let settings = require_openai_image_settings(state) + .map(|settings| { + settings.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + ) + }) + .map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?; + let http_client = build_openai_image_http_client(&settings).map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?; + let generated = create_openai_image_generation( + &http_client, + &settings, + prompt.as_str(), + Some("文字、水印、按钮、教程浮层、明显网格"), + PUZZLE_CLEAR_BOARD_BACKGROUND_GENERATION_SIZE, + 1, + &[], + "拼消消场地底图生成失败", + ) + .await + .map_err(|error| { + puzzle_clear_error_response(request_context, PUZZLE_CLEAR_CREATION_PROVIDER, error) + })?; + let task_id = generated.task_id; + let image = generated.images.into_iter().next().ok_or_else(|| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": "vector-engine", + "message": "拼消消场地底图生成成功但未返回图片。", + })), + ) + })?; + persist_puzzle_clear_generated_image_asset( + state, + owner_user_id, + profile_id, + "board-background", + prompt.as_str(), + Some(task_id.as_str()), + image, + 1024, + 1024, + request_context, + ) + .await +} + +async fn persist_puzzle_clear_data_url_asset( + state: &AppState, + request_context: &RequestContext, + owner_user_id: &str, + profile_id: &str, + slot: &str, + prompt: &str, + data_url: &str, + width: u32, + height: u32, +) -> Result { + let parsed = decode_generated_image_asset_data_url(data_url).map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({ + "provider": "generated-image-assets", + "message": format!("拼消消图片 Data URL 解析失败：{error:?}"), + })), + ) + })?; + let image = DownloadedOpenAiImage { + extension: parsed.format.extension, + mime_type: parsed.format.mime_type, + bytes: parsed.bytes, + }; + persist_puzzle_clear_generated_image_asset( + state, + owner_user_id, + profile_id, + slot, + prompt, + None, + image, + width, + height, + request_context, + ) + .await +} + +fn slice_puzzle_clear_sheet( + image: &DownloadedOpenAiImage, + sheet_spec: &PuzzleClearAtlasSheetSpec, + groups_by_id: &BTreeMap, + task_id: &str, +) -> Result, AppError> { + let source = image::load_from_memory(image.bytes.as_slice()).map_err(|error| { + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消素材 {} 解码失败：{error}", sheet_spec.sheet_id), + })) + })?; + let source_width = source.width(); + let source_height = source.height(); + if source_width < 16 || source_height < 16 { + return Err( + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消素材 {} 尺寸过小，无法切割。", sheet_spec.sheet_id), + })), + ); + } + let mut slices = Vec::new(); + let mut cells_by_group: BTreeMap<&str, Vec<(u32, u32)>> = BTreeMap::new(); + for (row, cells) in sheet_spec.layout.iter().enumerate() { + for (col, group_id) in cells.iter().enumerate() { + if *group_id == "." { + continue; + } + cells_by_group + .entry(*group_id) + .or_default() + .push((row as u32, col as u32)); + } + } + + for (group_id, cells) in cells_by_group { + let group = groups_by_id.get(group_id).ok_or_else(|| { + AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消素材布局引用了未知图案组：{group_id}"), + })) + })?; + let min_row = cells.iter().map(|(row, _)| *row).min().unwrap_or(0); + let min_col = cells.iter().map(|(_, col)| *col).min().unwrap_or(0); + let expected_cell_count = (group.width * group.height) as usize; + if cells.len() != expected_cell_count { + return Err( + AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!( + "拼消消素材 {} 的布局 {} 格数不匹配，期望 {} 格，实际 {} 格。", + sheet_spec.sheet_id, + group_id, + expected_cell_count, + cells.len(), + ), + })), + ); + } + for part_y in 0..group.height { + for part_x in 0..group.width { + let expected_cell = (min_row + part_y, min_col + part_x); + if !cells.contains(&expected_cell) { + return Err(AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR) + .with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!( + "拼消消素材 {} 的布局 {} 不是完整连续矩形，缺少第 {} 行第 {} 列。", + sheet_spec.sheet_id, + group_id, + expected_cell.0 + 1, + expected_cell.1 + 1, + ), + }))); + } + } + } + for (row, col) in cells { + let part_x = col.saturating_sub(min_col); + let part_y = row.saturating_sub(min_row); + let x0 = scale_sheet_coord(col, source_width, PUZZLE_CLEAR_SHEET_COLUMNS); + let y0 = scale_sheet_coord(row, source_height, PUZZLE_CLEAR_SHEET_ROWS); + let x1 = scale_sheet_coord(col + 1, source_width, PUZZLE_CLEAR_SHEET_COLUMNS) + .max(x0 + 1) + .min(source_width); + let y1 = scale_sheet_coord(row + 1, source_height, PUZZLE_CLEAR_SHEET_ROWS) + .max(y0 + 1) + .min(source_height); + let cropped = source.crop_imm(x0, y0, x1 - x0, y1 - y0).resize_exact( + PUZZLE_CLEAR_ATLAS_CELL_SIZE, + PUZZLE_CLEAR_ATLAS_CELL_SIZE, + image::imageops::FilterType::Lanczos3, + ); + let mut cursor = std::io::Cursor::new(Vec::new()); + cropped + .write_to(&mut cursor, image::ImageFormat::Png) + .map_err(|error| { + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消素材 {} 切片失败：{error}", sheet_spec.sheet_id), + })) + })?; + slices.push(PuzzleClearAtlasCardSlice { + group: group.clone(), + task_id: Some(task_id.to_string()), + part_x, + part_y, + bytes: cursor.into_inner(), + }); + } + } + Ok(slices) +} + +fn compose_puzzle_clear_final_atlas( + slices: &[PuzzleClearAtlasCardSlice], + groups_by_id: &BTreeMap, +) -> Result { + let width = PUZZLE_CLEAR_ATLAS_CELL_SIZE * PUZZLE_CLEAR_FINAL_ATLAS_COLUMNS; + let height = PUZZLE_CLEAR_ATLAS_CELL_SIZE * PUZZLE_CLEAR_FINAL_ATLAS_ROWS; + let mut atlas = image::RgbaImage::from_pixel(width, height, image::Rgba([255, 248, 234, 255])); + for slice in slices { + let group = groups_by_id.get(&slice.group.group_id).ok_or_else(|| { + AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消最终 atlas 缺少图案组：{}", slice.group.group_id), + })) + })?; + let piece = image::load_from_memory(slice.bytes.as_slice()) + .map_err(|error| { + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消最终 atlas 切片解码失败：{error}"), + })) + })? + .to_rgba8(); + image::imageops::overlay( + &mut atlas, + &piece, + i64::from(group.atlas_x + slice.part_x * PUZZLE_CLEAR_ATLAS_CELL_SIZE), + i64::from(group.atlas_y + slice.part_y * PUZZLE_CLEAR_ATLAS_CELL_SIZE), + ); + } + let mut cursor = std::io::Cursor::new(Vec::new()); + image::DynamicImage::ImageRgba8(atlas) + .write_to(&mut cursor, image::ImageFormat::Png) + .map_err(|error| { + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": PUZZLE_CLEAR_CREATION_PROVIDER, + "message": format!("拼消消最终 atlas 合成失败：{error}"), + })) + })?; + Ok(DownloadedOpenAiImage { + extension: "png".to_string(), + mime_type: "image/png".to_string(), + bytes: cursor.into_inner(), + }) +} + +fn scale_sheet_coord(value: u32, actual: u32, sheet_cells: u32) -> u32 { + ((u64::from(value) * u64::from(actual)) / u64::from(sheet_cells)) as u32 +} + +fn normalize_non_empty_str(value: &str) -> Option { + let value = value.trim(); + if value.is_empty() { + None + } else { + Some(value.to_string()) + } +} + +async fn persist_puzzle_clear_card_slice( + state: &AppState, + owner_user_id: &str, + profile_id: &str, + task_id: Option<&str>, + slice: PuzzleClearAtlasCardSlice, + request_context: &RequestContext, +) -> Result { + let card_id = format!( + "{}-part-{}-{}", + slice.group.group_id, slice.part_x, slice.part_y + ); + let prompt = format!( + "拼消消素材切片 {} {}:{}", + slice.group.group_id, slice.part_x, slice.part_y + ); + let image = DownloadedOpenAiImage { + extension: "png".to_string(), + mime_type: "image/png".to_string(), + bytes: slice.bytes, + }; + let persisted = persist_puzzle_clear_generated_image_asset( + state, + owner_user_id, + profile_id, + format!("cards/{card_id}").as_str(), + prompt.as_str(), + task_id, + image, + PUZZLE_CLEAR_ATLAS_CELL_SIZE, + PUZZLE_CLEAR_ATLAS_CELL_SIZE, + request_context, + ) + .await?; + + Ok(PuzzleClearCardAsset { + card_id, + group_id: slice.group.group_id, + shape: slice.group.shape, + orientation: if slice.group.width >= slice.group.height { + "horizontal".to_string() + } else { + "vertical".to_string() + }, + part_x: slice.part_x, + part_y: slice.part_y, + image_src: persisted.image_src, + image_object_key: persisted.image_object_key, + asset_object_id: persisted.asset_object_id, + source_atlas_cell: format!("{}:{}:{}", persisted.asset_id, slice.part_x, slice.part_y), + }) +} + +#[allow(clippy::too_many_arguments)] +async fn persist_puzzle_clear_generated_image_asset( + state: &AppState, + owner_user_id: &str, + profile_id: &str, + slot: &str, + prompt: &str, + task_id: Option<&str>, + image: DownloadedOpenAiImage, + width: u32, + height: u32, + request_context: &RequestContext, +) -> Result { + let image_format = normalize_generated_image_asset_mime(image.mime_type.as_str()); + let prepared = + GeneratedImageAssetAdapter::prepare_put_object(GeneratedImageAssetPersistInput { + prefix: LegacyAssetPrefix::PuzzleClearAssets, + path_segments: vec![profile_id.to_string(), slot.to_string()], + file_stem: "image".to_string(), + image: GeneratedImageAssetDataUrl { + format: image_format, + bytes: image.bytes, + }, + access: OssObjectAccess::Private, + metadata: GeneratedImageAssetAdapterMetadata { + asset_kind: Some(format!("puzzle-clear-{slot}")), + owner_user_id: Some(owner_user_id.to_string()), + entity_kind: Some("puzzle_clear_work".to_string()), + entity_id: Some(profile_id.to_string()), + slot: Some(slot.to_string()), + provider: Some("vector-engine".to_string()), + task_id: task_id.map(ToString::to_string), + }, + extra_metadata: BTreeMap::new(), + }) + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::INTERNAL_SERVER_ERROR).with_details(json!({ + "provider": "generated-image-assets", + "message": format!("准备拼消消图片资产上传请求失败：{error:?}"), + })), + ) + })?; + let persisted_mime_type = prepared.format.mime_type.clone(); + let oss_client = state.oss_client().ok_or_else(|| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::SERVICE_UNAVAILABLE).with_details(json!({ + "provider": "aliyun-oss", + "reason": "OSS 未完成环境变量配置", + })), + ) + })?; + let http_client = reqwest::Client::new(); + let put_result = oss_client + .put_object(&http_client, prepared.request) + .await + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": "aliyun-oss", + "message": error.to_string(), + })), + ) + })?; + let head = oss_client + .head_object( + &http_client, + OssHeadObjectRequest { + object_key: put_result.object_key.clone(), + }, + ) + .await + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": "aliyun-oss", + "message": error.to_string(), + })), + ) + })?; + let now_micros = current_utc_micros(); + let asset_object_input = build_asset_object_upsert_input( + generate_asset_object_id(now_micros), + head.bucket, + head.object_key.clone(), + AssetObjectAccessPolicy::Private, + head.content_type.or(Some(persisted_mime_type)), + head.content_length, + head.etag, + format!("puzzle-clear-{slot}"), + task_id.map(ToString::to_string), + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + Some(profile_id.to_string()), + now_micros, + ) + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({ + "provider": "asset-object", + "message": error.to_string(), + })), + ) + })?; + let asset_object = state + .spacetime_client() + .confirm_asset_object(asset_object_input) + .await + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": "spacetimedb", + "message": error.to_string(), + })), + ) + })?; + let binding_input = build_asset_entity_binding_input( + generate_asset_binding_id(now_micros), + asset_object.asset_object_id.clone(), + "puzzle_clear_work".to_string(), + profile_id.to_string(), + slot.to_string(), + format!("puzzle-clear-{slot}"), + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + now_micros, + ) + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({ + "provider": "asset-entity-binding", + "message": error.to_string(), + })), + ) + })?; + state + .spacetime_client() + .bind_asset_object_to_entity(binding_input) + .await + .map_err(|error| { + puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({ + "provider": "spacetimedb", + "message": error.to_string(), + })), + ) + })?; + + Ok(PuzzleClearImageAsset { + asset_id: format!("{profile_id}-{}-{now_micros}", slot.replace('/', "-")), + image_src: put_result.legacy_public_path, + image_object_key: head.object_key, + asset_object_id: asset_object.asset_object_id, + generation_provider: "vector-engine".to_string(), + prompt: prompt.to_string(), + width, + height, + }) +} + +fn build_puzzle_clear_draft( + payload: &PuzzleClearWorkspaceCreateRequest, +) -> PuzzleClearDraftResponse { + PuzzleClearDraftResponse { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: None, + work_title: payload.work_title.trim().to_string(), + work_description: payload.work_description.trim().to_string(), + theme_prompt: payload.theme_prompt.trim().to_string(), + board_background_prompt: payload.board_background_prompt.trim().to_string(), + generate_board_background: payload.generate_board_background, + board_background_asset: payload.board_background_asset.clone(), + card_back_image_src: Some(PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC.to_string()), + atlas_asset: None, + pattern_groups: Vec::new(), + card_assets: Vec::new(), + generation_status: PuzzleClearGenerationStatus::Draft, + } +} + +fn validate_workspace_request( + request_context: &RequestContext, + payload: &PuzzleClearWorkspaceCreateRequest, +) -> Result<(), Response> { + if payload.template_id.trim() != PUZZLE_CLEAR_TEMPLATE_ID { + return Err(puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_CREATION_PROVIDER, + AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({ + "provider": PUZZLE_CLEAR_PROVIDER, + "message": "templateId 必须为 puzzle-clear", + })), + )); + } + ensure_non_empty(request_context, &payload.work_title, "workTitle")?; + ensure_non_empty(request_context, &payload.theme_prompt, "themePrompt")?; + Ok(()) +} + +fn ensure_non_empty( + request_context: &RequestContext, + value: &str, + field: &str, +) -> Result<(), Response> { + if value.trim().is_empty() { + return Err(puzzle_clear_error_response( + request_context, + PUZZLE_CLEAR_PROVIDER, + AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({ + "provider": PUZZLE_CLEAR_PROVIDER, + "field": field, + "message": format!("{field} 不能为空"), + })), + )); + } + Ok(()) +} + +fn puzzle_clear_json( + payload: Result, JsonRejection>, + request_context: &RequestContext, + provider: &str, +) -> Result, Response> { + payload.map_err(|error| { + puzzle_clear_error_response( + request_context, + provider, + AppError::from_status(StatusCode::BAD_REQUEST).with_details(json!({ + "provider": provider, + "message": error.to_string(), + })), + ) + }) +} + +fn map_puzzle_clear_client_error(error: SpacetimeClientError) -> AppError { + let message = error.to_string(); + let status = match &error { + SpacetimeClientError::Runtime(_) => StatusCode::BAD_REQUEST, + SpacetimeClientError::Procedure(value) + if value.contains("不存在") + || value.contains("not found") + || value.contains("does not exist") => + { + StatusCode::NOT_FOUND + } + SpacetimeClientError::Procedure(value) + if value.contains("发布需要") + || value.contains("不能为空") + || value.contains("必须") + || value.contains("无权") => + { + StatusCode::BAD_REQUEST + } + _ => StatusCode::BAD_GATEWAY, + }; + + AppError::from_status(status).with_details(json!({ + "provider": "spacetimedb", + "message": message, + })) +} + +fn puzzle_clear_error_response( + request_context: &RequestContext, + provider: &str, + error: AppError, +) -> Response { + let mut response = error.into_response_with_context(Some(request_context)); + response.headers_mut().insert( + HeaderName::from_static("x-genarrative-provider"), + header::HeaderValue::from_str(provider) + .unwrap_or_else(|_| header::HeaderValue::from_static(PUZZLE_CLEAR_PROVIDER)), + ); + response +} + +fn build_puzzle_clear_work_play_tracking_draft( + principal: &RuntimePrincipal, + work_id: impl Into, + source_route: &'static str, +) -> WorkPlayTrackingDraft { + WorkPlayTrackingDraft::runtime_principal("puzzle-clear", work_id, principal, source_route) +} + +fn normalize_public_work_code(value: &str) -> String { + value + .chars() + .filter(|character| character.is_ascii_alphanumeric()) + .map(|character| character.to_ascii_uppercase()) + .collect() +} + +fn build_puzzle_clear_public_work_code(profile_id: &str) -> String { + let normalized = normalize_public_work_code(profile_id); + let fallback = if normalized.is_empty() { + "00000000".to_string() + } else { + normalized + }; + let suffix = if fallback.len() >= 8 { + fallback[fallback.len() - 8..].to_string() + } else { + format!("{fallback:0>8}") + }; + format!("PC-{suffix}") +} + +#[cfg(test)] +mod tests { + use super::{ + PUZZLE_CLEAR_ATLAS_CELL_SIZE, PUZZLE_CLEAR_BOARD_BACKGROUND_GENERATION_SIZE, + build_puzzle_clear_atlas_prompt, build_puzzle_clear_board_background_prompt, + build_puzzle_clear_draft, planned_puzzle_clear_pattern_groups, + puzzle_clear_atlas_sheet_specs, + }; + use shared_contracts::puzzle_clear::PuzzleClearWorkspaceCreateRequest; + + #[test] + fn puzzle_clear_atlas_prompt_uses_sheet_cells_and_subject() { + let sheet = puzzle_clear_atlas_sheet_specs() + .into_iter() + .next() + .expect("sheet exists"); + let prompt = build_puzzle_clear_atlas_prompt("水果", &sheet); + assert!(prompt.contains("主题是「水果」")); + assert!(prompt.contains("竖版 1024x1536")); + assert!(prompt.contains("4 列 x 6 行裁切")); + assert!(prompt.contains("256x256 的正方形")); + assert!(prompt.contains("切成 1x1 后每一格")); + assert!(prompt.contains("图案不要做成卡牌、贴纸、图标格子或带框小卡片")); + assert!(prompt.contains("外轮廓框")); + assert!(prompt.contains("贴纸边")); + assert!(prompt.contains("圆角框")); + assert!(prompt.contains("阴影框")); + assert!(!prompt.contains("135 幅")); + assert!(!prompt.contains("24 列 x 38 行")); + assert!(!prompt.contains("卡牌小格")); + assert!(!prompt.contains("卡牌排版图")); + assert!(!prompt.contains("贴纸表")); + } + + #[test] + fn puzzle_clear_sheet_plan_matches_reduced_asset_strategy() { + let sheets = puzzle_clear_atlas_sheet_specs(); + let groups = planned_puzzle_clear_pattern_groups(); + let sheet_cells = sheets + .iter() + .flat_map(|sheet| sheet.layout.iter().flatten()) + .filter(|group_id| **group_id != ".") + .count(); + let mut sheet_cells_by_group = std::collections::BTreeMap::<&str, u32>::new(); + for group_id in sheets + .iter() + .flat_map(|sheet| sheet.layout.iter().flatten()) + .filter(|group_id| **group_id != ".") + { + *sheet_cells_by_group.entry(*group_id).or_default() += 1; + } + let group_cells = groups + .iter() + .map(|group| group.width * group.height) + .sum::(); + + assert_eq!(sheets.len(), 4); + assert_eq!(groups.len(), 35); + assert_eq!(sheet_cells, 95); + assert_eq!(group_cells, 95); + assert_eq!(PUZZLE_CLEAR_ATLAS_CELL_SIZE, 256); + assert_eq!(sheet_cells_by_group.len(), groups.len()); + for group in &groups { + assert_eq!( + sheet_cells_by_group.get(group.group_id.as_str()).copied(), + Some(group.width * group.height), + ); + } + } + + #[test] + fn puzzle_clear_board_background_prompt_reveals_theme_goal() { + let prompt = build_puzzle_clear_board_background_prompt("星港花园"); + + assert!(prompt.contains("星港花园")); + assert!(prompt.contains("逐渐消除")); + assert!(prompt.contains("底图全貌")); + assert!(prompt.contains("探索")); + assert!(prompt.contains("追求目标")); + assert!(prompt.contains("尺寸与中央棋盘一致")); + assert!(prompt.contains("精致")); + assert!(prompt.contains("强表现力")); + assert_eq!(PUZZLE_CLEAR_BOARD_BACKGROUND_GENERATION_SIZE, "1024x1024"); + assert!(!prompt.contains("画面干净")); + assert!(!prompt.contains("适合作为卡牌棋盘底图")); + assert!(!prompt.contains("9:16")); + } + + #[test] + fn puzzle_clear_draft_uses_existing_card_back_placeholder() { + let draft = build_puzzle_clear_draft(&PuzzleClearWorkspaceCreateRequest { + template_id: "puzzle-clear".to_string(), + work_title: "星港拼消消".to_string(), + work_description: String::new(), + theme_prompt: "星港".to_string(), + board_background_prompt: String::new(), + generate_board_background: true, + board_background_asset: None, + }); + + assert_eq!( + draft.card_back_image_src.as_deref(), + Some("/creation-type-references/puzzle.webp"), + ); + } +} + +fn current_utc_micros() -> i64 { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|duration| duration.as_micros().min(i64::MAX as u128) as i64) + .unwrap_or(0) +} diff --git a/server-rs/crates/api-server/src/square_hole/visual_assets.rs b/server-rs/crates/api-server/src/square_hole/visual_assets.rs index 75ad863e..3379f2a4 100644 --- a/server-rs/crates/api-server/src/square_hole/visual_assets.rs +++ b/server-rs/crates/api-server/src/square_hole/visual_assets.rs @@ -398,12 +398,11 @@ async fn generate_square_hole_image_data_url( size: &str, failure_context: &str, ) -> Result { - let settings = require_openai_image_settings(state)? - .with_external_api_audit_context( - request_context, - Some(owner_user_id.to_string()), - Some(profile_id.to_string()), - ); + let settings = require_openai_image_settings(state)?.with_external_api_audit_context( + request_context, + Some(owner_user_id.to_string()), + Some(profile_id.to_string()), + ); let http_client = build_openai_image_http_client(&settings)?; let generated = create_openai_image_generation( &http_client, diff --git a/server-rs/crates/api-server/src/wooden_fish.rs b/server-rs/crates/api-server/src/wooden_fish.rs index a181489e..3be3360f 100644 --- a/server-rs/crates/api-server/src/wooden_fish.rs +++ b/server-rs/crates/api-server/src/wooden_fish.rs @@ -1292,6 +1292,7 @@ fn current_utc_micros() -> i64 { #[cfg(test)] mod tests { use super::*; + use crate::AppConfig; use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64_STANDARD}; #[test] @@ -1461,8 +1462,9 @@ mod tests { assert_eq!(asset.prompt.as_deref(), Some("默认木鱼音")); } - #[test] - fn wooden_fish_draft_uses_default_hit_sound_asset_and_ignores_prompt() { + #[tokio::test] + async fn wooden_fish_draft_uses_default_hit_sound_asset_and_ignores_prompt() { + let state = AppState::new(AppConfig::default()).expect("state should build"); let payload = WoodenFishWorkspaceCreateRequest { template_id: WOODEN_FISH_TEMPLATE_ID.to_string(), work_title: "今日敲木鱼".to_string(), @@ -1475,7 +1477,9 @@ mod tests { floating_words: vec![], }; - let draft = build_wooden_fish_draft(&payload); + let draft = build_wooden_fish_draft(&payload, &state) + .await + .expect("draft should build"); assert!(draft.hit_sound_prompt.is_none()); let asset = draft diff --git a/server-rs/crates/module-auth/src/lib.rs b/server-rs/crates/module-auth/src/lib.rs index fa4bb11c..64c1108e 100644 --- a/server-rs/crates/module-auth/src/lib.rs +++ b/server-rs/crates/module-auth/src/lib.rs @@ -992,6 +992,36 @@ impl InMemoryAuthStore { .map_err(RefreshSessionError::Store) } + fn resolve_phone_user_locked( + state: &mut InMemoryAuthStoreState, + phone_number: &str, + ) -> Option { + if let Some(user_id) = state.phone_to_user_id.get(phone_number).cloned() { + if let Some(stored_user) = state + .users_by_username + .values() + .find(|stored_user| stored_user.user.id == user_id) + .cloned() + { + return Some(stored_user); + } + state.phone_to_user_id.remove(phone_number); + } + + let Some(stored_user) = state + .users_by_username + .values() + .find(|stored_user| stored_user.phone_number.as_deref() == Some(phone_number)) + .cloned() + else { + return None; + }; + state + .phone_to_user_id + .insert(phone_number.to_string(), stored_user.user.id.clone()); + Some(stored_user) + } + fn find_by_user_id( &self, user_id: &str, @@ -1086,36 +1116,22 @@ impl InMemoryAuthStore { &self, phone_number: &str, ) -> Result, PhoneAuthError> { - let state = self + let mut state = self .inner .lock() .map_err(|_| PhoneAuthError::Store("用户仓储锁已中毒".to_string()))?; - let Some(user_id) = state.phone_to_user_id.get(phone_number) else { - return Ok(None); - }; - Ok(state - .users_by_username - .values() - .find(|stored_user| stored_user.user.id == *user_id) - .cloned()) + Ok(Self::resolve_phone_user_locked(&mut state, phone_number)) } fn find_by_phone_number_for_password( &self, phone_number: &str, ) -> Result, PasswordEntryError> { - let state = self + let mut state = self .inner .lock() .map_err(|_| PasswordEntryError::Store("用户仓储锁已中毒".to_string()))?; - let Some(user_id) = state.phone_to_user_id.get(phone_number) else { - return Ok(None); - }; - Ok(state - .users_by_username - .values() - .find(|stored_user| stored_user.user.id == *user_id) - .cloned()) + Ok(Self::resolve_phone_user_locked(&mut state, phone_number)) } fn update_user_profile( @@ -1158,7 +1174,7 @@ impl InMemoryAuthStore { .inner .lock() .map_err(|_| PhoneAuthError::Store("用户仓储锁已中毒".to_string()))?; - if state.phone_to_user_id.contains_key(&phone_number.e164) { + if Self::resolve_phone_user_locked(&mut state, &phone_number.e164).is_some() { return Err(PhoneAuthError::Store( "手机号已存在，无法重复创建账号".to_string(), )); @@ -1212,7 +1228,7 @@ impl InMemoryAuthStore { .inner .lock() .map_err(|_| PasswordEntryError::Store("用户仓储锁已中毒".to_string()))?; - if state.phone_to_user_id.contains_key(&phone_number.e164) { + if Self::resolve_phone_user_locked(&mut state, &phone_number.e164).is_some() { return Err(PasswordEntryError::InvalidCredentials); } @@ -1662,7 +1678,9 @@ impl InMemoryAuthStore { .lock() .map_err(|_| PhoneAuthError::Store("用户仓储锁已中毒".to_string()))?; - let existing_phone_user_id = state.phone_to_user_id.get(&phone_number.e164).cloned(); + let existing_phone_user_id = + Self::resolve_phone_user_locked(&mut state, &phone_number.e164) + .map(|stored_user| stored_user.user.id); if let Some(target_user_id) = existing_phone_user_id && target_user_id != pending_user_id { @@ -2048,10 +2066,8 @@ impl InMemoryAuthStore { .inner .lock() .map_err(|_| PhoneAuthError::Store("用户仓储锁已中毒".to_string()))?; - let user_id = state - .phone_to_user_id - .get(phone_number) - .cloned() + let user_id = Self::resolve_phone_user_locked(&mut state, phone_number) + .map(|stored_user| stored_user.user.id) .ok_or(PhoneAuthError::UserNotFound)?; for stored_user in state.users_by_username.values_mut() { @@ -2572,6 +2588,90 @@ mod tests { assert_eq!(error, PhoneAuthError::UserNotFound); } + #[tokio::test] + async fn dev_password_registration_ignores_orphan_phone_index() { + let snapshot = PersistentAuthStoreSnapshot { + next_user_id: 7, + users_by_username: HashMap::new(), + phone_to_user_id: HashMap::from([( + "+8613800138004".to_string(), + "user_deleted".to_string(), + )]), + sessions_by_id: HashMap::new(), + session_id_by_refresh_token_hash: HashMap::new(), + wechat_identity_by_provider_uid: HashMap::new(), + user_id_by_provider_union_id: HashMap::new(), + }; + let snapshot_json = + serde_json::to_string(&snapshot).expect("snapshot json should serialize"); + let service = build_password_service( + InMemoryAuthStore::from_snapshot_json(&snapshot_json).expect("snapshot should restore"), + ); + + let created = service + .execute_with_dev_registration(PasswordEntryInput { + phone_number: "13800138004".to_string(), + password: "secret123".to_string(), + }) + .await + .expect("orphan phone index should not block dev registration"); + + assert!(created.created); + assert_eq!( + created.user.phone_number_masked.as_deref(), + Some("138****8004") + ); + } + + #[tokio::test] + async fn phone_login_ignores_orphan_phone_index_after_code_verification() { + let snapshot = PersistentAuthStoreSnapshot { + next_user_id: 8, + users_by_username: HashMap::new(), + phone_to_user_id: HashMap::from([( + "+8613800138005".to_string(), + "user_deleted".to_string(), + )]), + sessions_by_id: HashMap::new(), + session_id_by_refresh_token_hash: HashMap::new(), + wechat_identity_by_provider_uid: HashMap::new(), + user_id_by_provider_union_id: HashMap::new(), + }; + let snapshot_json = + serde_json::to_string(&snapshot).expect("snapshot json should serialize"); + let phone_service = build_phone_service( + InMemoryAuthStore::from_snapshot_json(&snapshot_json).expect("snapshot should restore"), + ); + let now = OffsetDateTime::now_utc(); + phone_service + .send_code( + SendPhoneCodeInput { + phone_number: "13800138005".to_string(), + scene: PhoneAuthScene::Login, + }, + now, + ) + .await + .expect("phone code should send"); + + let created = phone_service + .login( + PhoneLoginInput { + phone_number: "13800138005".to_string(), + verify_code: "123456".to_string(), + }, + now + Duration::seconds(1), + ) + .await + .expect("orphan phone index should not turn login into duplicate create"); + + assert!(created.created); + assert_eq!( + created.user.phone_number_masked.as_deref(), + Some("138****8005") + ); + } + #[tokio::test] async fn snapshot_json_restores_user_and_refresh_session_after_roundtrip() { let store = InMemoryAuthStore::default(); diff --git a/server-rs/crates/module-puzzle-clear/Cargo.toml b/server-rs/crates/module-puzzle-clear/Cargo.toml new file mode 100644 index 00000000..9fb82b3f --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "module-puzzle-clear" +edition.workspace = true +version.workspace = true +license.workspace = true + +[features] +default = [] +spacetime-types = ["dep:spacetimedb"] + +[dependencies] +serde = { workspace = true } +shared-kernel = { workspace = true } +spacetimedb = { workspace = true, optional = true } diff --git a/server-rs/crates/module-puzzle-clear/src/application.rs b/server-rs/crates/module-puzzle-clear/src/application.rs new file mode 100644 index 00000000..29c7e312 --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/src/application.rs @@ -0,0 +1,1837 @@ +use std::collections::{BTreeSet, HashMap, VecDeque}; + +use shared_kernel::normalize_required_string; + +use crate::{ + PUZZLE_CLEAR_LEVEL_DURATION_SECONDS, PuzzleClearBoard, PuzzleClearCard, PuzzleClearCell, + PuzzleClearDeck, PuzzleClearElimination, PuzzleClearError, PuzzleClearLevelConfig, + PuzzleClearMove, PuzzleClearOrientation, PuzzleClearPatternGroup, PuzzleClearRunSnapshot, + PuzzleClearRunStatus, PuzzleClearShapeKind, PuzzleClearShapeQuota, +}; + +pub fn puzzle_clear_level_configs() -> Vec { + vec![PuzzleClearLevelConfig { + level_index: 1, + board_size: 6, + target_clears: 35, + duration_seconds: PUZZLE_CLEAR_LEVEL_DURATION_SECONDS, + unlocked_shapes: vec![ + PuzzleClearShapeKind::OneByTwo, + PuzzleClearShapeKind::OneByThree, + PuzzleClearShapeKind::TwoByTwo, + PuzzleClearShapeKind::TwoByThree, + ], + }] +} + +pub fn puzzle_clear_shape_quotas() -> Vec { + vec![ + PuzzleClearShapeQuota { + shape: PuzzleClearShapeKind::OneByTwo, + count: 23, + }, + PuzzleClearShapeQuota { + shape: PuzzleClearShapeKind::OneByThree, + count: 5, + }, + PuzzleClearShapeQuota { + shape: PuzzleClearShapeKind::TwoByTwo, + count: 4, + }, + PuzzleClearShapeQuota { + shape: PuzzleClearShapeKind::TwoByThree, + count: 3, + }, + ] +} + +pub fn plan_puzzle_clear_pattern_groups( + cell_size: u32, +) -> Result, PuzzleClearError> { + if cell_size == 0 { + return Err(PuzzleClearError::InvalidBoard); + } + Ok(puzzle_clear_pattern_group_specs() + .into_iter() + .map(|spec| PuzzleClearPatternGroup { + group_id: spec.group_id.to_string(), + shape: spec.shape, + width: spec.width, + height: spec.height, + atlas_x: spec.atlas_col * cell_size, + atlas_y: spec.atlas_row * cell_size, + atlas_width: spec.width * cell_size, + atlas_height: spec.height * cell_size, + }) + .collect()) +} + +pub fn build_cards_from_groups( + groups: &[PuzzleClearPatternGroup], + image_prefix: &str, +) -> Vec { + let mut cards = Vec::new(); + for group in groups { + let orientation = if group.width >= group.height { + PuzzleClearOrientation::Horizontal + } else { + PuzzleClearOrientation::Vertical + }; + for y in 0..group.height { + for x in 0..group.width { + cards.push(PuzzleClearCard { + card_id: format!("{}-part-{x}-{y}", group.group_id), + group_id: group.group_id.clone(), + shape: group.shape, + orientation, + part_x: x, + part_y: y, + image_src: format!( + "{}/{}-part-{x}-{y}.png", + image_prefix.trim_end_matches('/'), + group.group_id + ), + image_object_key: format!( + "{}/{}-part-{x}-{y}.png", + image_prefix.trim_start_matches('/').trim_end_matches('/'), + group.group_id + ), + asset_object_id: format!("{}-part-{x}-{y}-object", group.group_id), + source_atlas_cell: format!("{}:{x}:{y}", group.group_id), + }); + } + } + } + cards +} + +pub fn create_puzzle_clear_board( + level: &PuzzleClearLevelConfig, + seed: &str, + cards: Vec, +) -> Result { + if level.board_size == 0 { + return Err(PuzzleClearError::InvalidLevel); + } + let total = (level.board_size * level.board_size) as usize; + if cards.len() < total { + return Err(PuzzleClearError::EmptyDeck); + } + let mut rng = DeterministicRng::new(seed, &format!("level-{}", level.level_index)); + let mut selected = cards.into_iter().take(total).collect::>(); + shuffle(&mut selected, &mut rng); + + let mut cells = Vec::with_capacity(total); + for row in 0..level.board_size { + for col in 0..level.board_size { + let index = (row * level.board_size + col) as usize; + cells.push(PuzzleClearCell { + row, + col, + card: selected.get(index).cloned(), + locked_group_id: None, + }); + } + } + let mut board = PuzzleClearBoard { + rows: level.board_size, + cols: level.board_size, + cells, + }; + ensure_board_has_playable_move(&mut board)?; + Ok(board) +} + +pub fn start_puzzle_clear_run( + run_id: String, + owner_user_id: String, + profile_id: String, + board: PuzzleClearBoard, + deck: PuzzleClearDeck, + started_at_ms: u64, +) -> Result { + let run_id = normalize_required_string(run_id).ok_or(PuzzleClearError::MissingRunId)?; + let owner_user_id = + normalize_required_string(owner_user_id).ok_or(PuzzleClearError::MissingOwnerUserId)?; + let profile_id = + normalize_required_string(profile_id).ok_or(PuzzleClearError::MissingProfileId)?; + validate_board(&board)?; + if !has_playable_move(&board) { + return Err(PuzzleClearError::NoPlayableMove); + } + + Ok(PuzzleClearRunSnapshot { + run_id, + owner_user_id, + profile_id, + status: PuzzleClearRunStatus::Playing, + level_index: 1, + clears_done: 0, + board, + deck, + started_at_ms, + level_started_at_ms: started_at_ms, + finished_at_ms: None, + }) +} + +pub fn apply_puzzle_clear_swap( + run: &PuzzleClearRunSnapshot, + player_move: PuzzleClearMove, + now_ms: u64, +) -> Result { + ensure_run_playing(run)?; + ensure_not_expired(run, now_ms)?; + + let mut next = run.clone(); + swap_cells(&mut next.board, &player_move)?; + let mut resolved_clears = resolve_eliminations_and_refill(&mut next.board, &mut next.deck)?; + next.clears_done = next.clears_done.saturating_add(resolved_clears); + if resolved_clears == 0 { + if has_empty_cell(&next.board) { + apply_gravity_and_refill(&mut next.board, &mut next.deck)?; + resolved_clears = resolve_eliminations_and_refill(&mut next.board, &mut next.deck)?; + next.clears_done = next.clears_done.saturating_add(resolved_clears); + } + } + mark_completed_local_groups(&mut next.board); + if has_remaining_cards(&next.board) { + ensure_board_has_playable_move(&mut next.board)?; + } + let level = puzzle_clear_level_configs() + .into_iter() + .find(|config| config.level_index == next.level_index) + .ok_or(PuzzleClearError::InvalidLevel)?; + if next.clears_done >= level.target_clears && !has_remaining_cards(&next.board) { + next.status = if next.level_index >= max_puzzle_clear_level_index() { + PuzzleClearRunStatus::Finished + } else { + PuzzleClearRunStatus::LevelCleared + }; + next.finished_at_ms = Some(now_ms); + } + Ok(next) +} + +pub fn fail_puzzle_clear_level_on_timeout( + run: &PuzzleClearRunSnapshot, + now_ms: u64, +) -> Result { + ensure_run_playing(run)?; + let mut next = run.clone(); + if is_level_expired(run, now_ms) { + next.status = PuzzleClearRunStatus::LevelFailed; + next.finished_at_ms = Some(now_ms); + } + Ok(next) +} + +pub fn retry_puzzle_clear_level( + run: &PuzzleClearRunSnapshot, + board: PuzzleClearBoard, + deck: PuzzleClearDeck, + restarted_at_ms: u64, +) -> Result { + validate_board(&board)?; + if !has_playable_move(&board) { + return Err(PuzzleClearError::NoPlayableMove); + } + Ok(PuzzleClearRunSnapshot { + status: PuzzleClearRunStatus::Playing, + board, + deck, + level_started_at_ms: restarted_at_ms, + finished_at_ms: None, + ..run.clone() + }) +} + +pub fn advance_puzzle_clear_level( + run: &PuzzleClearRunSnapshot, + board: PuzzleClearBoard, + deck: PuzzleClearDeck, + started_at_ms: u64, +) -> Result { + if run.status != PuzzleClearRunStatus::LevelCleared { + return Err(PuzzleClearError::RunNotPlaying); + } + validate_board(&board)?; + if !has_playable_move(&board) { + return Err(PuzzleClearError::NoPlayableMove); + } + Ok(PuzzleClearRunSnapshot { + status: PuzzleClearRunStatus::Playing, + level_index: run.level_index.saturating_add(1), + clears_done: 0, + board, + deck, + level_started_at_ms: started_at_ms, + finished_at_ms: None, + ..run.clone() + }) +} + +pub fn has_playable_move(board: &PuzzleClearBoard) -> bool { + let Ok(()) = validate_board(board) else { + return false; + }; + if !find_eliminations(board).is_empty() { + return false; + } + for row in 0..board.rows { + for col in 0..board.cols { + if card_at(board, row, col).is_none() { + continue; + }; + for next_row in 0..board.rows { + for next_col in 0..board.cols { + if row == next_row && col == next_col { + continue; + } + let mut candidate = board.clone(); + if swap_cells( + &mut candidate, + &PuzzleClearMove { + from_row: row, + from_col: col, + to_row: next_row, + to_col: next_col, + }, + ) + .is_err() + { + continue; + } + if !find_eliminations(&candidate).is_empty() { + return true; + } + } + } + } + } + false +} + +pub fn find_eliminations(board: &PuzzleClearBoard) -> Vec { + let mut by_group: HashMap> = HashMap::new(); + for cell in &board.cells { + if let Some(card) = &cell.card { + by_group.entry(card.group_id.clone()).or_default().push(( + cell.row, + cell.col, + card.clone(), + )); + } + } + + let mut eliminations = Vec::new(); + for (group_id, entries) in by_group { + let Some(first) = entries.first().map(|(_, _, card)| card.clone()) else { + continue; + }; + let (width, height) = first.shape.dimensions(first.orientation); + if entries.len() != (width * height) as usize { + continue; + } + let min_row = entries.iter().map(|(row, _, _)| *row).min().unwrap_or(0); + let min_col = entries.iter().map(|(_, col, _)| *col).min().unwrap_or(0); + let mut expected = BTreeSet::new(); + for y in 0..height { + for x in 0..width { + expected.insert((min_row + y, min_col + x, x, y)); + } + } + let actual = entries + .iter() + .map(|(row, col, card)| (*row, *col, card.part_x, card.part_y)) + .collect::>(); + if actual == expected { + eliminations.push(PuzzleClearElimination { + group_id, + positions: entries + .into_iter() + .map(|(row, col, _)| (row, col)) + .collect(), + }); + } + } + eliminations +} + +pub fn apply_gravity_and_refill( + board: &mut PuzzleClearBoard, + deck: &mut PuzzleClearDeck, +) -> Result<(), PuzzleClearError> { + validate_board(board)?; + if deck.ready_columns.len() < board.cols as usize { + return Err(PuzzleClearError::EmptyDeck); + } + for col in 0..board.cols { + let mut segment_start = 0; + while segment_start < board.rows { + while segment_start < board.rows && is_locked_cell(board, segment_start, col) { + segment_start += 1; + } + let start = segment_start; + while segment_start < board.rows && !is_locked_cell(board, segment_start, col) { + segment_start += 1; + } + if start < segment_start { + refill_unlocked_column_segment(board, deck, col, start, segment_start)?; + } + } + } + Ok(()) +} + +fn ensure_run_playing(run: &PuzzleClearRunSnapshot) -> Result<(), PuzzleClearError> { + if run.status == PuzzleClearRunStatus::Playing { + Ok(()) + } else { + Err(PuzzleClearError::RunNotPlaying) + } +} + +fn ensure_not_expired(run: &PuzzleClearRunSnapshot, now_ms: u64) -> Result<(), PuzzleClearError> { + if is_level_expired(run, now_ms) { + Err(PuzzleClearError::LevelExpired) + } else { + Ok(()) + } +} + +fn is_level_expired(run: &PuzzleClearRunSnapshot, now_ms: u64) -> bool { + now_ms.saturating_sub(run.level_started_at_ms) + > u64::from(PUZZLE_CLEAR_LEVEL_DURATION_SECONDS) * 1000 +} + +fn validate_board(board: &PuzzleClearBoard) -> Result<(), PuzzleClearError> { + if board.rows == 0 || board.cols == 0 || board.cells.len() != (board.rows * board.cols) as usize + { + return Err(PuzzleClearError::InvalidBoard); + } + Ok(()) +} + +fn has_empty_cell(board: &PuzzleClearBoard) -> bool { + board.cells.iter().any(|cell| cell.card.is_none()) +} + +fn has_remaining_cards(board: &PuzzleClearBoard) -> bool { + board.cells.iter().any(|cell| cell.card.is_some()) +} + +fn ensure_board_has_playable_move(board: &mut PuzzleClearBoard) -> Result<(), PuzzleClearError> { + if find_eliminations(board).is_empty() && has_playable_move(board) { + return Ok(()); + } + let snapshot = board.clone(); + for from_row in 0..board.rows { + for from_col in 0..board.cols { + if cell(&snapshot, from_row, from_col) + .and_then(|cell| cell.locked_group_id.as_ref()) + .is_some() + { + continue; + } + for to_row in 0..board.rows { + for to_col in 0..board.cols { + if from_row == to_row && from_col == to_col { + continue; + } + if cell(&snapshot, to_row, to_col) + .and_then(|cell| cell.locked_group_id.as_ref()) + .is_some() + { + continue; + } + let mut candidate = snapshot.clone(); + if swap_positions(&mut candidate, from_row, from_col, to_row, to_col).is_err() { + continue; + } + if find_eliminations(&candidate).is_empty() && has_playable_move(&candidate) { + *board = candidate; + return Ok(()); + } + } + } + } + } + Err(PuzzleClearError::NoPlayableMove) +} + +fn mark_completed_local_groups(board: &mut PuzzleClearBoard) { + for elimination in find_local_completed_groups(board) { + for (row, col) in elimination.positions { + if let Some(cell) = cell_mut(board, row, col) { + cell.locked_group_id = Some(elimination.group_id.clone()); + } + } + } +} + +fn find_local_completed_groups(board: &PuzzleClearBoard) -> Vec { + let mut by_group: HashMap> = HashMap::new(); + for cell in &board.cells { + if let Some(card) = &cell.card { + by_group.entry(card.group_id.clone()).or_default().push(( + cell.row, + cell.col, + card.clone(), + )); + } + } + by_group + .into_iter() + .filter_map(|(group_id, entries)| { + let Some(first) = entries.first().map(|(_, _, card)| card.clone()) else { + return None; + }; + if entries.len() < 2 || first.shape == PuzzleClearShapeKind::OneByTwo { + return None; + } + let mut ordered = entries.clone(); + ordered.sort_by_key(|(_, _, card)| (card.part_y, card.part_x)); + let adjacent = ordered.windows(2).all(|pair| { + let a = &pair[0].2; + let b = &pair[1].2; + manhattan_part_distance(a, b) == 1 + && are_neighbors(pair[0].0, pair[0].1, pair[1].0, pair[1].1) + }); + adjacent.then(|| PuzzleClearElimination { + group_id, + positions: entries + .into_iter() + .map(|(row, col, _)| (row, col)) + .collect(), + }) + }) + .collect() +} + +fn clear_locked_group(board: &mut PuzzleClearBoard, group_id: &str) { + for cell in &mut board.cells { + if cell.locked_group_id.as_deref() == Some(group_id) { + cell.locked_group_id = None; + } + } +} + +fn clear_elimination(board: &mut PuzzleClearBoard, elimination: &PuzzleClearElimination) { + for (row, col) in &elimination.positions { + if let Some(cell) = cell_mut(board, *row, *col) { + cell.card = None; + cell.locked_group_id = None; + } + } +} + +fn resolve_eliminations_and_refill( + board: &mut PuzzleClearBoard, + deck: &mut PuzzleClearDeck, +) -> Result { + let mut resolved_clears: u32 = 0; + let max_passes = board.rows.saturating_mul(board.cols); + for _ in 0..max_passes { + let eliminations = find_eliminations(board); + if eliminations.is_empty() { + break; + } + for elimination in eliminations { + clear_elimination(board, &elimination); + resolved_clears = resolved_clears.saturating_add(1); + } + apply_gravity_and_refill(board, deck)?; + } + Ok(resolved_clears) +} + +fn swap_cells( + board: &mut PuzzleClearBoard, + player_move: &PuzzleClearMove, +) -> Result<(), PuzzleClearError> { + let Some(from_cell) = cell(board, player_move.from_row, player_move.from_col) else { + return Err(PuzzleClearError::InvalidPosition); + }; + let Some(_to_cell) = cell(board, player_move.to_row, player_move.to_col) else { + return Err(PuzzleClearError::InvalidPosition); + }; + if let Some(group_id) = cell(board, player_move.from_row, player_move.from_col) + .and_then(|cell| cell.locked_group_id.clone()) + { + return move_locked_group(board, group_id.as_str(), player_move); + } + let target_locked_group = cell(board, player_move.to_row, player_move.to_col) + .and_then(|cell| cell.locked_group_id.clone()); + let source_card = from_cell.card.clone(); + if source_card.is_none() { + return Err(PuzzleClearError::MissingCard); + } + let target_card = + cell(board, player_move.to_row, player_move.to_col).and_then(|cell| cell.card.clone()); + if target_card.is_none() { + set_card(board, player_move.to_row, player_move.to_col, source_card)?; + set_card(board, player_move.from_row, player_move.from_col, None)?; + if let Some(group_id) = target_locked_group { + clear_locked_group(board, group_id.as_str()); + } + return Ok(()); + } + swap_positions( + board, + player_move.from_row, + player_move.from_col, + player_move.to_row, + player_move.to_col, + )?; + if let Some(group_id) = target_locked_group { + clear_locked_group(board, group_id.as_str()); + } + Ok(()) +} + +fn move_locked_group( + board: &mut PuzzleClearBoard, + group_id: &str, + player_move: &PuzzleClearMove, +) -> Result<(), PuzzleClearError> { + let delta_row = i64::from(player_move.to_row) - i64::from(player_move.from_row); + let delta_col = i64::from(player_move.to_col) - i64::from(player_move.from_col); + if delta_row == 0 && delta_col == 0 { + return Ok(()); + } + + let mut old_positions = board + .cells + .iter() + .filter(|cell| cell.locked_group_id.as_deref() == Some(group_id)) + .map(|cell| (cell.row, cell.col)) + .collect::>(); + if old_positions.is_empty() { + return Err(PuzzleClearError::InvalidPosition); + } + old_positions.sort_unstable(); + + let mut new_positions = Vec::with_capacity(old_positions.len()); + for (row, col) in &old_positions { + let next_row = i64::from(*row) + delta_row; + let next_col = i64::from(*col) + delta_col; + if next_row < 0 + || next_col < 0 + || next_row >= i64::from(board.rows) + || next_col >= i64::from(board.cols) + { + return Err(PuzzleClearError::InvalidPosition); + } + new_positions.push((next_row as u32, next_col as u32)); + } + + let old_set = old_positions.iter().copied().collect::>(); + let new_set = new_positions.iter().copied().collect::>(); + if old_set == new_set { + return Ok(()); + } + + let old_only = old_set.difference(&new_set).copied().collect::>(); + let new_only = new_set.difference(&old_set).copied().collect::>(); + if old_only.len() != new_only.len() { + return Err(PuzzleClearError::InvalidPosition); + } + + let snapshot = board + .cells + .iter() + .map(|cell| ((cell.row, cell.col), cell.clone())) + .collect::>(); + let mut next_by_position = snapshot.clone(); + let mut displaced_locked_groups = BTreeSet::new(); + + for (old_position, new_position) in old_positions.iter().zip(new_positions.iter()) { + let mut moving = snapshot + .get(old_position) + .cloned() + .ok_or(PuzzleClearError::InvalidPosition)?; + moving.row = new_position.0; + moving.col = new_position.1; + moving.locked_group_id = Some(group_id.to_string()); + next_by_position.insert(*new_position, moving); + } + + for (vacated_position, displaced_position) in old_only.iter().zip(new_only.iter()) { + let mut displaced = snapshot + .get(displaced_position) + .cloned() + .ok_or(PuzzleClearError::InvalidPosition)?; + if let Some(displaced_group_id) = displaced.locked_group_id.clone() { + if displaced_group_id != group_id { + displaced_locked_groups.insert(displaced_group_id); + } + } + displaced.row = vacated_position.0; + displaced.col = vacated_position.1; + next_by_position.insert(*vacated_position, displaced); + } + + for cell in &mut board.cells { + let position = (cell.row, cell.col); + *cell = next_by_position + .get(&position) + .cloned() + .ok_or(PuzzleClearError::InvalidPosition)?; + } + for displaced_group_id in displaced_locked_groups { + clear_locked_group(board, displaced_group_id.as_str()); + } + Ok(()) +} + +fn swap_positions( + board: &mut PuzzleClearBoard, + a_row: u32, + a_col: u32, + b_row: u32, + b_col: u32, +) -> Result<(), PuzzleClearError> { + let a_index = cell_index(board, a_row, a_col).ok_or(PuzzleClearError::InvalidPosition)?; + let b_index = cell_index(board, b_row, b_col).ok_or(PuzzleClearError::InvalidPosition)?; + board.cells.swap(a_index, b_index); + board.cells[a_index].row = a_row; + board.cells[a_index].col = a_col; + board.cells[b_index].row = b_row; + board.cells[b_index].col = b_col; + Ok(()) +} + +fn take_card( + board: &mut PuzzleClearBoard, + row: u32, + col: u32, +) -> Result, PuzzleClearError> { + let cell = cell_mut(board, row, col).ok_or(PuzzleClearError::InvalidPosition)?; + cell.locked_group_id = None; + Ok(cell.card.take()) +} + +fn set_card( + board: &mut PuzzleClearBoard, + row: u32, + col: u32, + card: Option, +) -> Result<(), PuzzleClearError> { + let cell = cell_mut(board, row, col).ok_or(PuzzleClearError::InvalidPosition)?; + cell.card = card; + cell.locked_group_id = None; + Ok(()) +} + +fn refill_unlocked_column_segment( + board: &mut PuzzleClearBoard, + deck: &mut PuzzleClearDeck, + col: u32, + start_row: u32, + end_row: u32, +) -> Result<(), PuzzleClearError> { + let mut existing = VecDeque::new(); + for row in (start_row..end_row).rev() { + if let Some(card) = take_card(board, row, col)? { + existing.push_back(card); + } + } + for row in (start_row..end_row).rev() { + let next_card = if let Some(card) = existing.pop_front() { + Some(card) + } else { + pop_matching_refill_card(&mut deck.ready_columns, col as usize, board) + }; + set_card(board, row, col, next_card)?; + } + Ok(()) +} + +fn pop_matching_refill_card( + ready_columns: &mut [Vec], + preferred_col: usize, + board: &PuzzleClearBoard, +) -> Option { + fn matching_refill_index( + column: &[PuzzleClearCard], + board: &PuzzleClearBoard, + ) -> Option { + column + .iter() + .position(|candidate| can_match_remaining_field_card(candidate, board)) + } + + if preferred_col >= ready_columns.len() { + return None; + } + if let Some(index) = matching_refill_index(&ready_columns[preferred_col], board) { + return Some(ready_columns[preferred_col].remove(index)); + } + + for index in 0..ready_columns.len() { + if index == preferred_col { + continue; + } + if let Some(matching_index) = matching_refill_index(&ready_columns[index], board) { + return Some(ready_columns[index].remove(matching_index)); + } + } + + if let Some(card) = ready_columns[preferred_col].pop() { + return Some(card); + } + + for index in 0..ready_columns.len() { + if index == preferred_col { + continue; + } + if let Some(card) = ready_columns[index].pop() { + return Some(card); + } + } + None +} + +fn can_match_remaining_field_card(candidate: &PuzzleClearCard, board: &PuzzleClearBoard) -> bool { + board.cells.iter().any(|cell| { + cell.card.as_ref().is_some_and(|card| { + card.group_id == candidate.group_id && manhattan_part_distance(card, candidate) == 1 + }) + }) +} + +fn is_locked_cell(board: &PuzzleClearBoard, row: u32, col: u32) -> bool { + cell(board, row, col) + .and_then(|cell| cell.locked_group_id.as_ref()) + .is_some() +} + +fn card_at(board: &PuzzleClearBoard, row: u32, col: u32) -> Option<&PuzzleClearCard> { + cell(board, row, col)?.card.as_ref() +} + +fn cell(board: &PuzzleClearBoard, row: u32, col: u32) -> Option<&PuzzleClearCell> { + cell_index(board, row, col).and_then(|index| board.cells.get(index)) +} + +fn cell_mut(board: &mut PuzzleClearBoard, row: u32, col: u32) -> Option<&mut PuzzleClearCell> { + cell_index(board, row, col).and_then(|index| board.cells.get_mut(index)) +} + +fn cell_index(board: &PuzzleClearBoard, row: u32, col: u32) -> Option { + (row < board.rows && col < board.cols).then_some((row * board.cols + col) as usize) +} + +fn are_neighbors(a_row: u32, a_col: u32, b_row: u32, b_col: u32) -> bool { + a_row.abs_diff(b_row) + a_col.abs_diff(b_col) == 1 +} + +fn manhattan_part_distance(left: &PuzzleClearCard, right: &PuzzleClearCard) -> u32 { + left.part_x.abs_diff(right.part_x) + left.part_y.abs_diff(right.part_y) +} + +fn max_puzzle_clear_level_index() -> u32 { + puzzle_clear_level_configs() + .into_iter() + .map(|config| config.level_index) + .max() + .unwrap_or(1) +} + +struct PuzzleClearPatternGroupSpec { + group_id: &'static str, + shape: PuzzleClearShapeKind, + width: u32, + height: u32, + atlas_col: u32, + atlas_row: u32, +} + +fn puzzle_clear_pattern_group_specs() -> Vec { + use PuzzleClearShapeKind::{OneByThree, OneByTwo, TwoByThree, TwoByTwo}; + + vec![ + PuzzleClearPatternGroupSpec { + group_id: "D01", + shape: TwoByThree, + width: 3, + height: 2, + atlas_col: 0, + atlas_row: 0, + }, + PuzzleClearPatternGroupSpec { + group_id: "D02", + shape: TwoByThree, + width: 2, + height: 3, + atlas_col: 3, + atlas_row: 0, + }, + PuzzleClearPatternGroupSpec { + group_id: "D03", + shape: TwoByThree, + width: 3, + height: 2, + atlas_col: 5, + atlas_row: 0, + }, + PuzzleClearPatternGroupSpec { + group_id: "C01", + shape: TwoByTwo, + width: 2, + height: 2, + atlas_col: 8, + atlas_row: 0, + }, + PuzzleClearPatternGroupSpec { + group_id: "C02", + shape: TwoByTwo, + width: 2, + height: 2, + atlas_col: 0, + atlas_row: 2, + }, + PuzzleClearPatternGroupSpec { + group_id: "B02", + shape: OneByThree, + width: 1, + height: 3, + atlas_col: 2, + atlas_row: 2, + }, + PuzzleClearPatternGroupSpec { + group_id: "C03", + shape: TwoByTwo, + width: 2, + height: 2, + atlas_col: 5, + atlas_row: 2, + }, + PuzzleClearPatternGroupSpec { + group_id: "C04", + shape: TwoByTwo, + width: 2, + height: 2, + atlas_col: 7, + atlas_row: 2, + }, + PuzzleClearPatternGroupSpec { + group_id: "B04", + shape: OneByThree, + width: 1, + height: 3, + atlas_col: 9, + atlas_row: 2, + }, + PuzzleClearPatternGroupSpec { + group_id: "A02", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 3, + atlas_row: 3, + }, + PuzzleClearPatternGroupSpec { + group_id: "A04", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 4, + atlas_row: 3, + }, + PuzzleClearPatternGroupSpec { + group_id: "A01", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 0, + atlas_row: 4, + }, + PuzzleClearPatternGroupSpec { + group_id: "B01", + shape: OneByThree, + width: 3, + height: 1, + atlas_col: 5, + atlas_row: 4, + }, + PuzzleClearPatternGroupSpec { + group_id: "A06", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 8, + atlas_row: 4, + }, + PuzzleClearPatternGroupSpec { + group_id: "B03", + shape: OneByThree, + width: 3, + height: 1, + atlas_col: 0, + atlas_row: 5, + }, + PuzzleClearPatternGroupSpec { + group_id: "B05", + shape: OneByThree, + width: 3, + height: 1, + atlas_col: 3, + atlas_row: 5, + }, + PuzzleClearPatternGroupSpec { + group_id: "A03", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 6, + atlas_row: 5, + }, + PuzzleClearPatternGroupSpec { + group_id: "A08", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 9, + atlas_row: 5, + }, + PuzzleClearPatternGroupSpec { + group_id: "A05", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 0, + atlas_row: 6, + }, + PuzzleClearPatternGroupSpec { + group_id: "A07", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 2, + atlas_row: 6, + }, + PuzzleClearPatternGroupSpec { + group_id: "A09", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 4, + atlas_row: 6, + }, + PuzzleClearPatternGroupSpec { + group_id: "A10", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 6, + atlas_row: 6, + }, + PuzzleClearPatternGroupSpec { + group_id: "A11", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 7, + atlas_row: 6, + }, + PuzzleClearPatternGroupSpec { + group_id: "A12", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 0, + atlas_row: 7, + }, + PuzzleClearPatternGroupSpec { + group_id: "A13", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 1, + atlas_row: 7, + }, + PuzzleClearPatternGroupSpec { + group_id: "A14", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 3, + atlas_row: 7, + }, + PuzzleClearPatternGroupSpec { + group_id: "A15", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 4, + atlas_row: 7, + }, + PuzzleClearPatternGroupSpec { + group_id: "A16", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 7, + atlas_row: 7, + }, + PuzzleClearPatternGroupSpec { + group_id: "A17", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 8, + atlas_row: 7, + }, + PuzzleClearPatternGroupSpec { + group_id: "A19", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 1, + atlas_row: 8, + }, + PuzzleClearPatternGroupSpec { + group_id: "A18", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 4, + atlas_row: 8, + }, + PuzzleClearPatternGroupSpec { + group_id: "A20", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 5, + atlas_row: 8, + }, + PuzzleClearPatternGroupSpec { + group_id: "A22", + shape: OneByTwo, + width: 1, + height: 2, + atlas_col: 6, + atlas_row: 8, + }, + PuzzleClearPatternGroupSpec { + group_id: "A21", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 8, + atlas_row: 8, + }, + PuzzleClearPatternGroupSpec { + group_id: "A23", + shape: OneByTwo, + width: 2, + height: 1, + atlas_col: 0, + atlas_row: 9, + }, + ] +} + +fn shuffle(items: &mut [T], rng: &mut DeterministicRng) { + for index in (1..items.len()).rev() { + let swap_index = rng.range_usize(0, index); + items.swap(index, swap_index); + } +} + +struct DeterministicRng { + state: u64, +} + +impl DeterministicRng { + fn new(seed: &str, salt: &str) -> Self { + let mut state = 0xcbf2_9ce4_8422_2325u64; + for byte in seed.bytes().chain(salt.bytes()) { + state ^= u64::from(byte); + state = state.wrapping_mul(0x1000_0000_01b3); + } + Self { state } + } + + fn next_u32(&mut self) -> u32 { + self.state = self + .state + .wrapping_mul(6_364_136_223_846_793_005) + .wrapping_add(1); + (self.state >> 32) as u32 + } + + fn range_usize(&mut self, min: usize, max: usize) -> usize { + if max <= min { + return min; + } + min + self.next_u32() as usize % (max - min + 1) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn fixed_level_config_uses_single_six_by_six_level() { + let configs = puzzle_clear_level_configs(); + + assert_eq!(configs.len(), 1); + assert_eq!(configs[0].board_size, 6); + assert_eq!(configs[0].target_clears, 35); + assert_eq!( + configs[0].unlocked_shapes, + vec![ + PuzzleClearShapeKind::OneByTwo, + PuzzleClearShapeKind::OneByThree, + PuzzleClearShapeKind::TwoByTwo, + PuzzleClearShapeKind::TwoByThree, + ] + ); + assert!(configs.iter().all(|config| config.duration_seconds == 600)); + } + + #[test] + fn atlas_plan_contains_exact_shape_quotas() { + let groups = plan_puzzle_clear_pattern_groups(256).expect("atlas should plan"); + let mut counts = HashMap::new(); + for group in groups { + *counts.entry(group.shape.as_str()).or_insert(0u32) += 1; + assert_eq!(group.atlas_width, group.width * 256); + assert_eq!(group.atlas_height, group.height * 256); + assert!(group.atlas_x + group.atlas_width <= 2560); + assert!(group.atlas_y + group.atlas_height <= 2560); + } + + assert_eq!(counts.get("1x2"), Some(&23)); + assert_eq!(counts.get("1x3"), Some(&5)); + assert_eq!(counts.get("2x2"), Some(&4)); + assert_eq!(counts.get("2x3"), Some(&3)); + } + + #[test] + fn atlas_plan_includes_vertical_groups_for_rotatable_shapes() { + let groups = plan_puzzle_clear_pattern_groups(256).expect("atlas should plan"); + let vertical_groups = groups + .iter() + .filter(|group| { + matches!( + group.shape, + PuzzleClearShapeKind::OneByTwo + | PuzzleClearShapeKind::OneByThree + | PuzzleClearShapeKind::TwoByThree + ) && group.height > group.width + }) + .count(); + let cards = build_cards_from_groups(&groups, "/generated-puzzle-clear"); + + assert!(vertical_groups > 0); + assert!( + cards + .iter() + .any(|card| card.orientation == PuzzleClearOrientation::Vertical) + ); + } + + #[test] + fn board_creation_guarantees_a_playable_move() { + let groups = plan_puzzle_clear_pattern_groups(64).expect("atlas should plan"); + let cards = build_cards_from_groups(&groups, "/generated-puzzle-clear"); + let board = create_puzzle_clear_board(&puzzle_clear_level_configs()[0], "seed-a", cards) + .expect("board should create"); + + assert_eq!(board.rows, 6); + assert_eq!(board.cols, 6); + assert!(find_eliminations(&board).is_empty()); + assert!(has_playable_move(&board)); + } + + #[test] + fn one_by_two_neighbors_are_not_half_locked() { + let board = board_from_cards( + 3, + vec![ + Some(card("pair", 0, 0)), + Some(card("noise-a", 0, 0)), + Some(card("noise-b", 0, 0)), + Some(card("noise-c", 0, 0)), + Some(card("pair", 1, 0)), + Some(card("noise-d", 0, 0)), + Some(card("noise-e", 0, 0)), + Some(card("noise-f", 0, 0)), + Some(card("noise-g", 0, 0)), + ], + ); + let run = start_puzzle_clear_run( + "run-one-by-two-lock".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board, + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 100, + ) + .expect("run should start"); + + let next = apply_puzzle_clear_swap( + &run, + PuzzleClearMove { + from_row: 1, + from_col: 1, + to_row: 1, + to_col: 0, + }, + 200, + ) + .expect("swap should resolve"); + + assert!( + next.board + .cells + .iter() + .all(|cell| cell.locked_group_id.is_none()) + ); + assert_eq!(next.clears_done, 0); + } + + #[test] + fn completing_two_piece_group_eliminates_and_refills() { + let board = board_from_cards( + 3, + vec![ + Some(card("other", 0, 0)), + Some(card("noise", 0, 0)), + Some(card("other", 1, 0)), + Some(card("noise-a", 0, 0)), + Some(card("play", 0, 0)), + Some(card("noise-b", 0, 0)), + Some(card("noise-c", 0, 0)), + Some(card("play", 1, 0)), + Some(card("noise-d", 0, 0)), + ], + ); + let deck = PuzzleClearDeck { + ready_columns: vec![ + vec![], + vec![card("fill-0", 0, 0)], + vec![card("fill-1", 0, 0)], + ], + }; + let run = start_puzzle_clear_run( + "run-1".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board, + deck, + 100, + ) + .expect("run should start"); + + let next = apply_puzzle_clear_swap( + &run, + PuzzleClearMove { + from_row: 2, + from_col: 1, + to_row: 1, + to_col: 2, + }, + 200, + ) + .expect("swap should resolve"); + + assert_eq!(next.clears_done, 1); + assert!(next.board.cells.iter().all(|cell| cell.card.is_some())); + assert!(has_playable_move(&next.board)); + } + + #[test] + fn reaching_target_clears_without_empty_board_keeps_playing() { + let board = board_from_cards( + 3, + vec![ + Some(card("other", 0, 0)), + Some(card("noise", 0, 0)), + Some(card("other", 1, 0)), + Some(card("noise-a", 0, 0)), + Some(card("play", 0, 0)), + Some(card("noise-b", 0, 0)), + Some(card("noise-c", 0, 0)), + Some(card("play", 1, 0)), + Some(card("keep", 0, 0)), + ], + ); + let mut run = start_puzzle_clear_run( + "run-target".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board, + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 100, + ) + .expect("run should start"); + run.clears_done = 4; + let next = apply_puzzle_clear_swap( + &run, + PuzzleClearMove { + from_row: 2, + from_col: 1, + to_row: 1, + to_col: 2, + }, + 200, + ) + .expect("swap should resolve"); + + assert_eq!(next.clears_done, 5); + assert_eq!(next.status, PuzzleClearRunStatus::Playing); + assert!(next.board.cells.iter().any(|cell| cell.card.is_some())); + } + + #[test] + fn refill_keeps_locked_partial_group_in_place() { + let mut board = board_from_cards( + 3, + vec![ + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 0, 0)), + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 1, 0)), + Some(card("a", 0, 0)), + None, + Some(card("b", 0, 0)), + Some(card("c", 0, 0)), + Some(card("d", 0, 0)), + Some(card("e", 0, 0)), + Some(card("f", 0, 0)), + ], + ); + lock_cells(&mut board, "tri", &[(0, 0), (0, 1)]); + let mut deck = PuzzleClearDeck { + ready_columns: vec![vec![card("x", 0, 0)], vec![card("y", 0, 0)], vec![]], + }; + + apply_gravity_and_refill(&mut board, &mut deck).expect("refill should keep partial group"); + + assert_eq!( + card_at(&board, 0, 0).map(|card| card.group_id.as_str()), + Some("tri") + ); + assert_eq!( + card_at(&board, 0, 1).map(|card| card.group_id.as_str()), + Some("tri") + ); + assert_eq!( + cell(&board, 0, 0).and_then(|cell| cell.locked_group_id.as_deref()), + Some("tri") + ); + assert_eq!( + cell(&board, 0, 1).and_then(|cell| cell.locked_group_id.as_deref()), + Some("tri") + ); + } + + #[test] + fn refill_compacts_existing_cards_down_before_drawing_new_cards() { + let mut board = board_from_cards( + 3, + vec![ + Some(card("top", 0, 0)), + Some(card("a", 0, 0)), + Some(card("b", 0, 0)), + None, + Some(card("c", 0, 0)), + Some(card("d", 0, 0)), + None, + Some(card("e", 0, 0)), + Some(card("f", 0, 0)), + ], + ); + let mut deck = PuzzleClearDeck { + ready_columns: vec![ + vec![card("fill-top", 0, 0), card("fill-middle", 0, 0)], + vec![], + vec![], + ], + }; + + apply_gravity_and_refill(&mut board, &mut deck) + .expect("gravity should compact before refill"); + + assert_eq!( + card_at(&board, 2, 0).map(|card| card.group_id.as_str()), + Some("top") + ); + assert_eq!( + card_at(&board, 0, 0).map(|card| card.group_id.as_str()), + Some("fill-top") + ); + assert_eq!( + card_at(&board, 1, 0).map(|card| card.group_id.as_str()), + Some("fill-middle") + ); + } + + #[test] + fn dragging_locked_partial_group_moves_as_unit() { + let mut board = board_from_cards( + 3, + vec![ + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 0, 0)), + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 1, 0)), + Some(card("a", 0, 0)), + Some(card("x", 0, 0)), + Some(card("y", 0, 0)), + Some(card("play", 0, 0)), + Some(card("c", 0, 0)), + Some(card("d", 0, 0)), + Some(card("play", 1, 0)), + ], + ); + lock_cells(&mut board, "tri", &[(0, 0), (0, 1)]); + let run = start_puzzle_clear_run( + "run-1".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board, + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 100, + ) + .expect("run should start"); + + let next = apply_puzzle_clear_swap( + &run, + PuzzleClearMove { + from_row: 0, + from_col: 0, + to_row: 1, + to_col: 0, + }, + 200, + ) + .expect("group drag should resolve"); + + assert_eq!( + card_at(&next.board, 1, 0).map(|card| card.group_id.as_str()), + Some("tri") + ); + assert_eq!( + card_at(&next.board, 1, 1).map(|card| card.group_id.as_str()), + Some("tri") + ); + assert_eq!( + cell(&next.board, 1, 0).and_then(|cell| cell.locked_group_id.as_deref()), + Some("tri") + ); + assert_eq!( + cell(&next.board, 1, 1).and_then(|cell| cell.locked_group_id.as_deref()), + Some("tri") + ); + assert_eq!( + card_at(&next.board, 0, 0).map(|card| card.group_id.as_str()), + Some("x") + ); + assert_eq!( + card_at(&next.board, 0, 1).map(|card| card.group_id.as_str()), + Some("y") + ); + } + + #[test] + fn refill_promotes_new_card_matching_remaining_field_card() { + let mut board = board_from_cards( + 3, + vec![ + Some(card("a", 0, 0)), + None, + Some(card("b", 0, 0)), + Some(card("c", 0, 0)), + Some(card("d", 0, 0)), + Some(card("e", 0, 0)), + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 0, 0)), + Some(card("f", 0, 0)), + Some(card("g", 0, 0)), + ], + ); + let mut deck = PuzzleClearDeck { + ready_columns: vec![ + vec![], + vec![ + card_shape("tri", PuzzleClearShapeKind::OneByThree, 1, 0), + card("noise", 0, 0), + ], + vec![], + ], + }; + + apply_gravity_and_refill(&mut board, &mut deck) + .expect("refill should choose a matching new card"); + + assert_eq!( + card_at(&board, 0, 1).map(|card| card.group_id.as_str()), + Some("tri") + ); + } + + #[test] + fn refill_can_borrow_from_other_ready_columns_when_preferred_column_empty() { + let mut board = board_from_cards( + 3, + vec![ + Some(card("a", 0, 0)), + None, + Some(card("b", 0, 0)), + Some(card("c", 0, 0)), + Some(card("d", 0, 0)), + Some(card("e", 0, 0)), + Some(card("f", 0, 0)), + Some(card("g", 0, 0)), + Some(card("h", 0, 0)), + ], + ); + let mut deck = PuzzleClearDeck { + ready_columns: vec![ + vec![], + vec![], + vec![card("borrow", 0, 0), card("noise", 0, 0)], + ], + }; + + apply_gravity_and_refill(&mut board, &mut deck) + .expect("refill should borrow from another ready column"); + + assert!(board.cells.iter().all(|cell| cell.card.is_some())); + } + + #[test] + fn player_move_can_drop_card_into_empty_target_cell() { + let board = board_from_cards( + 3, + vec![ + Some(card("source", 0, 0)), + Some(card("noise-a", 0, 0)), + Some(card("noise-b", 0, 0)), + Some(card("noise-c", 0, 0)), + Some(card_shape("pair", PuzzleClearShapeKind::OneByThree, 0, 0)), + Some(card_shape("pair", PuzzleClearShapeKind::OneByThree, 1, 0)), + Some(card("play", 0, 0)), + Some(card("noise-e", 0, 0)), + Some(card("play", 1, 0)), + ], + ); + let run = start_puzzle_clear_run( + "run-empty-target".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board, + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 100, + ) + .expect("run should start"); + let mut run = run.clone(); + if let Some(cell) = cell_mut(&mut run.board, 0, 1) { + cell.card = None; + } + run.deck.ready_columns[0].push(card("refill-source", 0, 0)); + + let next = apply_puzzle_clear_swap( + &run, + PuzzleClearMove { + from_row: 0, + from_col: 0, + to_row: 0, + to_col: 1, + }, + 200, + ) + .expect("empty target should be allowed"); + + assert_eq!( + card_at(&next.board, 0, 0).map(|card| card.group_id.as_str()), + Some("refill-source") + ); + assert_eq!( + card_at(&next.board, 0, 1).map(|card| card.group_id.as_str()), + Some("source") + ); + } + + #[test] + fn non_two_piece_partial_group_can_be_locked_and_downgraded_by_player_swap() { + let board = board_from_cards( + 3, + vec![ + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 0, 0)), + Some(card_shape("tri", PuzzleClearShapeKind::OneByThree, 1, 0)), + Some(card("x", 0, 0)), + Some(card("play", 0, 0)), + Some(card("z", 0, 0)), + Some(card("w", 0, 0)), + Some(card("m", 0, 0)), + Some(card("n", 0, 0)), + Some(card("play", 1, 0)), + ], + ); + let run = start_puzzle_clear_run( + "run-1".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board, + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 100, + ) + .expect("run should start"); + let locked = apply_puzzle_clear_swap( + &run, + PuzzleClearMove { + from_row: 2, + from_col: 2, + to_row: 1, + to_col: 2, + }, + 200, + ) + .expect("non-clear swap should mark partials"); + + assert_eq!( + locked.board.cells[0].locked_group_id.as_deref(), + Some("tri") + ); + assert_eq!( + locked.board.cells[1].locked_group_id.as_deref(), + Some("tri") + ); + + let downgraded = apply_puzzle_clear_swap( + &locked, + PuzzleClearMove { + from_row: 1, + from_col: 0, + to_row: 0, + to_col: 0, + }, + 250, + ) + .expect("player swap into group should downgrade lock"); + + assert!( + downgraded + .board + .cells + .iter() + .filter(|cell| cell + .card + .as_ref() + .is_some_and(|card| card.group_id == "tri")) + .all(|cell| cell.locked_group_id.is_none()) + ); + } + + #[test] + fn timeout_fails_only_current_level_and_retry_restarts_it() { + let board = board_from_cards( + 3, + vec![ + Some(card("a", 0, 0)), + Some(card("b", 0, 0)), + Some(card("b", 0, 0)), + Some(card("c", 0, 0)), + Some(card("a", 1, 0)), + Some(card("e", 0, 0)), + Some(card("f", 0, 0)), + Some(card("g", 0, 0)), + Some(card("h", 0, 0)), + ], + ); + let run = start_puzzle_clear_run( + "run-1".to_string(), + "user-1".to_string(), + "profile-1".to_string(), + board.clone(), + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 0, + ) + .expect("run should start"); + + let failed = fail_puzzle_clear_level_on_timeout(&run, 601_000).expect("timeout applies"); + assert_eq!(failed.status, PuzzleClearRunStatus::LevelFailed); + assert_eq!(failed.level_index, 1); + + let retried = retry_puzzle_clear_level( + &failed, + board, + PuzzleClearDeck { + ready_columns: vec![vec![], vec![], vec![]], + }, + 700_000, + ) + .expect("retry should restart"); + assert_eq!(retried.status, PuzzleClearRunStatus::Playing); + assert_eq!(retried.level_index, 1); + assert_eq!(retried.clears_done, 0); + } + + fn board_from_cards(size: u32, cards: Vec>) -> PuzzleClearBoard { + let mut cells = Vec::new(); + for row in 0..size { + for col in 0..size { + let index = (row * size + col) as usize; + cells.push(PuzzleClearCell { + row, + col, + card: cards.get(index).cloned().flatten(), + locked_group_id: None, + }); + } + } + PuzzleClearBoard { + rows: size, + cols: size, + cells, + } + } + + fn lock_cells(board: &mut PuzzleClearBoard, group_id: &str, positions: &[(u32, u32)]) { + for (row, col) in positions { + if let Some(cell) = cell_mut(board, *row, *col) { + cell.locked_group_id = Some(group_id.to_string()); + } + } + } + + fn card(group_id: &str, part_x: u32, part_y: u32) -> PuzzleClearCard { + card_shape(group_id, PuzzleClearShapeKind::OneByTwo, part_x, part_y) + } + + fn card_shape( + group_id: &str, + shape: PuzzleClearShapeKind, + part_x: u32, + part_y: u32, + ) -> PuzzleClearCard { + PuzzleClearCard { + card_id: format!("{group_id}-{part_x}-{part_y}"), + group_id: group_id.to_string(), + shape, + orientation: PuzzleClearOrientation::Horizontal, + part_x, + part_y, + image_src: format!("/{group_id}-{part_x}-{part_y}.png"), + image_object_key: format!("{group_id}-{part_x}-{part_y}.png"), + asset_object_id: format!("{group_id}-{part_x}-{part_y}-object"), + source_atlas_cell: format!("{group_id}:{part_x}:{part_y}"), + } + } +} diff --git a/server-rs/crates/module-puzzle-clear/src/commands.rs b/server-rs/crates/module-puzzle-clear/src/commands.rs new file mode 100644 index 00000000..66980ed7 --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/src/commands.rs @@ -0,0 +1,25 @@ +use shared_kernel::normalize_required_string; + +use crate::{PuzzleClearOrientation, PuzzleClearShapeKind}; + +pub fn parse_puzzle_clear_shape_kind(value: &str) -> PuzzleClearShapeKind { + match value.trim().to_ascii_lowercase().as_str() { + "1x3" | "one-by-three" => PuzzleClearShapeKind::OneByThree, + "2x2" | "two-by-two" => PuzzleClearShapeKind::TwoByTwo, + "2x3" | "two-by-three" => PuzzleClearShapeKind::TwoByThree, + _ => PuzzleClearShapeKind::OneByTwo, + } +} + +pub fn parse_puzzle_clear_orientation(value: &str) -> PuzzleClearOrientation { + match value.trim().to_ascii_lowercase().as_str() { + "vertical" | "纵向" => PuzzleClearOrientation::Vertical, + _ => PuzzleClearOrientation::Horizontal, + } +} + +pub fn normalize_puzzle_clear_seed(seed: &str, fallback: &str) -> String { + normalize_required_string(seed) + .or_else(|| normalize_required_string(fallback)) + .unwrap_or_else(|| "puzzle-clear".to_string()) +} diff --git a/server-rs/crates/module-puzzle-clear/src/domain.rs b/server-rs/crates/module-puzzle-clear/src/domain.rs new file mode 100644 index 00000000..4306d3a7 --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/src/domain.rs @@ -0,0 +1,191 @@ +use serde::{Deserialize, Serialize}; +#[cfg(feature = "spacetime-types")] +use spacetimedb::SpacetimeType; + +pub const PUZZLE_CLEAR_PLAY_ID: &str = "puzzle-clear"; +pub const PUZZLE_CLEAR_PUBLIC_WORK_CODE_PREFIX: &str = "PC-"; +pub const PUZZLE_CLEAR_SESSION_ID_PREFIX: &str = "puzzle-clear-session-"; +pub const PUZZLE_CLEAR_PROFILE_ID_PREFIX: &str = "puzzle-clear-profile-"; +pub const PUZZLE_CLEAR_WORK_ID_PREFIX: &str = "puzzle-clear-work-"; +pub const PUZZLE_CLEAR_RUN_ID_PREFIX: &str = "puzzle-clear-run-"; +pub const PUZZLE_CLEAR_LEVEL_DURATION_SECONDS: u32 = 600; + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub enum PuzzleClearShapeKind { + OneByTwo, + OneByThree, + TwoByTwo, + TwoByThree, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub enum PuzzleClearOrientation { + Horizontal, + Vertical, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub enum PuzzleClearRunStatus { + Playing, + LevelFailed, + LevelCleared, + Finished, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearLevelConfig { + pub level_index: u32, + pub board_size: u32, + pub target_clears: u32, + pub duration_seconds: u32, + pub unlocked_shapes: Vec, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearShapeQuota { + pub shape: PuzzleClearShapeKind, + pub count: u32, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearPatternGroup { + pub group_id: String, + pub shape: PuzzleClearShapeKind, + pub width: u32, + pub height: u32, + pub atlas_x: u32, + pub atlas_y: u32, + pub atlas_width: u32, + pub atlas_height: u32, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearCard { + pub card_id: String, + pub group_id: String, + pub shape: PuzzleClearShapeKind, + pub orientation: PuzzleClearOrientation, + pub part_x: u32, + pub part_y: u32, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub source_atlas_cell: String, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearCell { + pub row: u32, + pub col: u32, + pub card: Option, + pub locked_group_id: Option, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearBoard { + pub rows: u32, + pub cols: u32, + pub cells: Vec, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearDeck { + pub ready_columns: Vec>, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearMove { + pub from_row: u32, + pub from_col: u32, + pub to_row: u32, + pub to_col: u32, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearElimination { + pub group_id: String, + pub positions: Vec<(u32, u32)>, +} + +#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))] +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct PuzzleClearRunSnapshot { + pub run_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub status: PuzzleClearRunStatus, + pub level_index: u32, + pub clears_done: u32, + pub board: PuzzleClearBoard, + pub deck: PuzzleClearDeck, + pub started_at_ms: u64, + pub level_started_at_ms: u64, + pub finished_at_ms: Option, +} + +impl PuzzleClearShapeKind { + pub fn as_str(self) -> &'static str { + match self { + Self::OneByTwo => "1x2", + Self::OneByThree => "1x3", + Self::TwoByTwo => "2x2", + Self::TwoByThree => "2x3", + } + } + + pub fn base_dimensions(self) -> (u32, u32) { + match self { + Self::OneByTwo => (2, 1), + Self::OneByThree => (3, 1), + Self::TwoByTwo => (2, 2), + Self::TwoByThree => (3, 2), + } + } + + pub fn dimensions(self, orientation: PuzzleClearOrientation) -> (u32, u32) { + let (width, height) = self.base_dimensions(); + if matches!(orientation, PuzzleClearOrientation::Vertical) + && matches!( + self, + PuzzleClearShapeKind::OneByTwo + | PuzzleClearShapeKind::OneByThree + | PuzzleClearShapeKind::TwoByThree + ) + { + (height, width) + } else { + (width, height) + } + } +} + +impl PuzzleClearOrientation { + pub fn as_str(self) -> &'static str { + match self { + Self::Horizontal => "horizontal", + Self::Vertical => "vertical", + } + } +} + +impl PuzzleClearRunStatus { + pub fn as_str(self) -> &'static str { + match self { + Self::Playing => "playing", + Self::LevelFailed => "level_failed", + Self::LevelCleared => "level_cleared", + Self::Finished => "finished", + } + } +} diff --git a/server-rs/crates/module-puzzle-clear/src/errors.rs b/server-rs/crates/module-puzzle-clear/src/errors.rs new file mode 100644 index 00000000..7b6fc69d --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/src/errors.rs @@ -0,0 +1,37 @@ +use std::fmt; + +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum PuzzleClearError { + MissingRunId, + MissingOwnerUserId, + MissingProfileId, + InvalidLevel, + InvalidBoard, + InvalidPosition, + EmptyDeck, + NoPlayableMove, + RunNotPlaying, + LevelExpired, + MissingCard, +} + +impl fmt::Display for PuzzleClearError { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let message = match self { + Self::MissingRunId => "puzzle-clear run_id 不能为空", + Self::MissingOwnerUserId => "puzzle-clear owner_user_id 不能为空", + Self::MissingProfileId => "puzzle-clear profile_id 不能为空", + Self::InvalidLevel => "puzzle-clear 关卡配置无效", + Self::InvalidBoard => "puzzle-clear 棋盘状态无效", + Self::InvalidPosition => "puzzle-clear 坐标无效", + Self::EmptyDeck => "puzzle-clear 发牌池为空", + Self::NoPlayableMove => "puzzle-clear 棋盘没有可解拼接", + Self::RunNotPlaying => "puzzle-clear 当前 run 不在 playing 状态", + Self::LevelExpired => "puzzle-clear 当前关卡已经超时", + Self::MissingCard => "puzzle-clear 目标格子没有卡牌", + }; + f.write_str(message) + } +} + +impl std::error::Error for PuzzleClearError {} diff --git a/server-rs/crates/module-puzzle-clear/src/events.rs b/server-rs/crates/module-puzzle-clear/src/events.rs new file mode 100644 index 00000000..1e60ddbb --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/src/events.rs @@ -0,0 +1,31 @@ +//! 拼消消领域事件。 +//! +//! 事件只表达已经发生的领域事实，持久化、统计投影和前端通知由 +//! SpacetimeDB adapter 与 BFF 编排层决定。 + +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum PuzzleClearDomainEvent { + DraftCompiled { + profile_id: String, + owner_user_id: String, + occurred_at_micros: i64, + }, + WorkPublished { + profile_id: String, + owner_user_id: String, + occurred_at_micros: i64, + }, + LevelCleared { + run_id: String, + owner_user_id: String, + level_index: u32, + clears_done: u32, + occurred_at_micros: i64, + }, + RunSettled { + run_id: String, + owner_user_id: String, + status: String, + occurred_at_micros: i64, + }, +} diff --git a/server-rs/crates/module-puzzle-clear/src/lib.rs b/server-rs/crates/module-puzzle-clear/src/lib.rs new file mode 100644 index 00000000..6acdc7c7 --- /dev/null +++ b/server-rs/crates/module-puzzle-clear/src/lib.rs @@ -0,0 +1,11 @@ +mod application; +mod commands; +mod domain; +mod errors; +mod events; + +pub use application::*; +pub use commands::*; +pub use domain::*; +pub use errors::*; +pub use events::*; diff --git a/server-rs/crates/module-runtime/src/application.rs b/server-rs/crates/module-runtime/src/application.rs index 2d997da6..376fc954 100644 --- a/server-rs/crates/module-runtime/src/application.rs +++ b/server-rs/crates/module-runtime/src/application.rs @@ -131,6 +131,20 @@ pub fn default_creation_entry_type_snapshots( 20, updated_at_micros, ), + build_default_creation_entry_type_snapshot( + "puzzle-clear", + "拼消消", + "拼接消除玩法", + "可创建", + "/creation-type-references/puzzle.webp", + true, + true, + 46, + "recommended", + "热门推荐", + 20, + updated_at_micros, + ), build_default_creation_entry_type_snapshot( "wooden-fish", "敲木鱼", diff --git a/server-rs/crates/module-runtime/src/lib.rs b/server-rs/crates/module-runtime/src/lib.rs index 054ab40e..43abccc6 100644 --- a/server-rs/crates/module-runtime/src/lib.rs +++ b/server-rs/crates/module-runtime/src/lib.rs @@ -293,6 +293,22 @@ mod tests { assert_eq!(wooden_fish.image_src, "/wooden-fish/default-hit-object.png"); } + #[test] + fn default_creation_entry_types_include_puzzle_clear() { + let configs = default_creation_entry_type_snapshots(1); + let puzzle_clear = configs + .iter() + .find(|item| item.id == "puzzle-clear") + .expect("puzzle-clear creation entry should be seeded"); + + assert_eq!(puzzle_clear.title, "拼消消"); + assert!(puzzle_clear.visible); + assert!(puzzle_clear.open); + assert_eq!(puzzle_clear.badge, "可创建"); + assert_eq!(puzzle_clear.sort_order, 46); + assert_eq!(puzzle_clear.category_id, "recommended"); + } + #[test] fn normalized_clamps_music_volume_into_valid_range() { let low = RuntimeSettings::normalized(-1.0, RuntimePlatformTheme::Light); diff --git a/server-rs/crates/platform-oss/src/lib.rs b/server-rs/crates/platform-oss/src/lib.rs index a9b3935e..c801af3b 100644 --- a/server-rs/crates/platform-oss/src/lib.rs +++ b/server-rs/crates/platform-oss/src/lib.rs @@ -20,7 +20,7 @@ const OSS_V4_REQUEST: &str = "aliyun_v4_request"; const OSS_V4_SERVICE: &str = "oss"; const OSS_UNSIGNED_PAYLOAD: &str = "UNSIGNED-PAYLOAD"; -pub const LEGACY_PUBLIC_PREFIXES: [&str; 13] = [ +pub const LEGACY_PUBLIC_PREFIXES: [&str; 14] = [ "generated-character-drafts", "generated-characters", "generated-animations", @@ -29,6 +29,7 @@ pub const LEGACY_PUBLIC_PREFIXES: [&str; 13] = [ "generated-wooden-fish-assets", "generated-match3d-assets", "generated-puzzle-assets", + "generated-puzzle-clear-assets", "generated-jump-hop-assets", "generated-custom-world-scenes", "generated-custom-world-covers", @@ -53,6 +54,7 @@ pub enum LegacyAssetPrefix { WoodenFishAssets, Match3DAssets, PuzzleAssets, + PuzzleClearAssets, JumpHopAssets, CustomWorldScenes, CustomWorldCovers, @@ -243,6 +245,7 @@ impl LegacyAssetPrefix { "generated-wooden-fish-assets" => Some(Self::WoodenFishAssets), "generated-match3d-assets" => Some(Self::Match3DAssets), "generated-puzzle-assets" => Some(Self::PuzzleAssets), + "generated-puzzle-clear-assets" => Some(Self::PuzzleClearAssets), "generated-jump-hop-assets" => Some(Self::JumpHopAssets), "generated-custom-world-scenes" => Some(Self::CustomWorldScenes), "generated-custom-world-covers" => Some(Self::CustomWorldCovers), @@ -262,6 +265,7 @@ impl LegacyAssetPrefix { Self::WoodenFishAssets => "generated-wooden-fish-assets", Self::Match3DAssets => "generated-match3d-assets", Self::PuzzleAssets => "generated-puzzle-assets", + Self::PuzzleClearAssets => "generated-puzzle-clear-assets", Self::JumpHopAssets => "generated-jump-hop-assets", Self::CustomWorldScenes => "generated-custom-world-scenes", Self::CustomWorldCovers => "generated-custom-world-covers", diff --git a/server-rs/crates/shared-contracts/src/lib.rs b/server-rs/crates/shared-contracts/src/lib.rs index 2f13b4be..4faea2da 100644 --- a/server-rs/crates/shared-contracts/src/lib.rs +++ b/server-rs/crates/shared-contracts/src/lib.rs @@ -19,6 +19,7 @@ pub mod match3d_runtime; pub mod match3d_works; pub mod public_work; pub mod puzzle_agent; +pub mod puzzle_clear; pub mod puzzle_creative_template; pub mod puzzle_gallery; pub mod puzzle_runtime; diff --git a/server-rs/crates/shared-contracts/src/puzzle_clear.rs b/server-rs/crates/shared-contracts/src/puzzle_clear.rs new file mode 100644 index 00000000..9d2af4f2 --- /dev/null +++ b/server-rs/crates/shared-contracts/src/puzzle_clear.rs @@ -0,0 +1,313 @@ +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum PuzzleClearGenerationStatus { + Draft, + Generating, + Ready, + Failed, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum PuzzleClearActionType { + CompileDraft, + RegenerateAtlas, + UpdateWorkMeta, + UpdateBoardBackground, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum PuzzleClearRunStatus { + Playing, + LevelFailed, + LevelCleared, + Finished, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearImageAsset { + pub asset_id: String, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub generation_provider: String, + pub prompt: String, + pub width: u32, + pub height: u32, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearPatternGroup { + pub group_id: String, + pub shape: String, + pub width: u32, + pub height: u32, + pub atlas_x: u32, + pub atlas_y: u32, + pub atlas_width: u32, + pub atlas_height: u32, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearCardAsset { + pub card_id: String, + pub group_id: String, + pub shape: String, + pub orientation: String, + pub part_x: u32, + pub part_y: u32, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub source_atlas_cell: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorkspaceCreateRequest { + pub template_id: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + #[serde(default)] + pub board_background_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearActionRequest { + pub action_type: PuzzleClearActionType, + pub profile_id: Option, + pub work_title: Option, + pub work_description: Option, + pub theme_prompt: Option, + #[serde(default)] + pub board_background_prompt: Option, + pub generate_board_background: Option, + pub board_background_asset: Option, + pub atlas_asset: Option, + pub pattern_groups: Option>, + pub card_assets: Option>, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearDraftResponse { + pub template_id: String, + pub template_name: String, + pub profile_id: Option, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + #[serde(default)] + pub board_background_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + pub card_back_image_src: Option, + pub atlas_asset: Option, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub generation_status: PuzzleClearGenerationStatus, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearSessionSnapshotResponse { + pub session_id: String, + pub owner_user_id: String, + pub status: PuzzleClearGenerationStatus, + pub draft: Option, + pub created_at: String, + pub updated_at: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearSessionResponse { + pub session: PuzzleClearSessionSnapshotResponse, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearActionResponse { + pub action_type: PuzzleClearActionType, + pub session: PuzzleClearSessionSnapshotResponse, + pub work: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorkSummaryResponse { + pub runtime_kind: String, + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub source_session_id: Option, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub cover_image_src: Option, + pub publication_status: String, + pub play_count: u32, + pub updated_at: String, + pub published_at: Option, + pub publish_ready: bool, + pub generation_status: PuzzleClearGenerationStatus, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorkProfileResponse { + pub summary: PuzzleClearWorkSummaryResponse, + pub draft: PuzzleClearDraftResponse, + pub board_background_asset: Option, + pub atlas_asset: PuzzleClearImageAsset, + pub pattern_groups: Vec, + pub card_assets: Vec, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorksResponse { + pub items: Vec, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorkDetailResponse { + pub item: PuzzleClearWorkProfileResponse, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorkMutationResponse { + pub item: PuzzleClearWorkProfileResponse, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearBoardCell { + pub row: u32, + pub col: u32, + pub card: Option, + pub locked_group_id: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearBoardSnapshot { + pub rows: u32, + pub cols: u32, + pub cells: Vec, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearRuntimeSnapshotResponse { + pub run_id: String, + pub profile_id: String, + pub owner_user_id: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub runtime_mode: Option, + pub status: PuzzleClearRunStatus, + pub level_index: u32, + pub clears_done: u32, + pub target_clears: u32, + pub level_duration_seconds: u32, + pub level_started_at_ms: u64, + pub board: PuzzleClearBoardSnapshot, + pub ready_columns: Vec>, + pub started_at_ms: u64, + pub finished_at_ms: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearRunResponse { + pub run: PuzzleClearRuntimeSnapshotResponse, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearStartRunRequest { + pub profile_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearSwapRequest { + pub from_row: u32, + pub from_col: u32, + pub to_row: u32, + pub to_col: u32, + pub client_action_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearRetryLevelRequest { + pub client_action_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearNextLevelRequest { + pub client_action_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearTimeUpRequest { + pub client_action_id: String, +} + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + #[test] + fn workspace_create_request_uses_camel_case() { + let payload = PuzzleClearWorkspaceCreateRequest { + template_id: "puzzle-clear".to_string(), + work_title: "花园拼消消".to_string(), + work_description: "轻松消除".to_string(), + theme_prompt: "春日花园".to_string(), + board_background_prompt: "樱花庭院".to_string(), + generate_board_background: true, + board_background_asset: None, + }; + + let value = serde_json::to_value(payload).expect("request should serialize"); + + assert_eq!(value["templateId"], json!("puzzle-clear")); + assert_eq!(value["themePrompt"], json!("春日花园")); + assert_eq!(value["boardBackgroundPrompt"], json!("樱花庭院")); + assert_eq!(value["generateBoardBackground"], json!(true)); + } + + #[test] + fn runtime_swap_request_uses_camel_case() { + let payload = PuzzleClearSwapRequest { + from_row: 1, + from_col: 2, + to_row: 1, + to_col: 3, + client_action_id: "swap-1".to_string(), + }; + + let value = serde_json::to_value(payload).expect("request should serialize"); + + assert_eq!(value["fromRow"], json!(1)); + assert_eq!(value["toCol"], json!(3)); + assert_eq!(value["clientActionId"], json!("swap-1")); + } +} diff --git a/server-rs/crates/spacetime-client/Cargo.toml b/server-rs/crates/spacetime-client/Cargo.toml index fcb0c9ce..00017607 100644 --- a/server-rs/crates/spacetime-client/Cargo.toml +++ b/server-rs/crates/spacetime-client/Cargo.toml @@ -16,6 +16,7 @@ module-wooden-fish = { workspace = true } module-match3d = { workspace = true } module-npc = { workspace = true } module-puzzle = { workspace = true } +module-puzzle-clear = { workspace = true } module-runtime = { workspace = true } module-runtime-story = { workspace = true } module-runtime-item = { workspace = true } diff --git a/server-rs/crates/spacetime-client/src/jump_hop.rs b/server-rs/crates/spacetime-client/src/jump_hop.rs index 28a5ed25..5b8124fd 100644 --- a/server-rs/crates/spacetime-client/src/jump_hop.rs +++ b/server-rs/crates/spacetime-client/src/jump_hop.rs @@ -1157,6 +1157,7 @@ mod tests { fn action(action_type: JumpHopActionType) -> JumpHopActionRequest { JumpHopActionRequest { action_type, + profile_id: None, work_title: None, work_description: None, theme_tags: None, @@ -1165,6 +1166,10 @@ mod tests { character_prompt: None, tile_prompt: None, end_mood_prompt: None, + character_asset: None, + tile_atlas_asset: None, + tile_assets: None, + cover_composite: None, } } diff --git a/server-rs/crates/spacetime-client/src/lib.rs b/server-rs/crates/spacetime-client/src/lib.rs index 73e0b55f..59659f51 100644 --- a/server-rs/crates/spacetime-client/src/lib.rs +++ b/server-rs/crates/spacetime-client/src/lib.rs @@ -52,16 +52,24 @@ pub use mapper::{ PuzzleAgentMessageSubmitRecordInput, PuzzleAgentSessionCreateRecordInput, PuzzleAgentSessionRecord, PuzzleAgentSuggestedActionRecord, PuzzleAnchorItemRecord, PuzzleAnchorPackRecord, PuzzleAudioAssetRecord, PuzzleBoardRecord, PuzzleCellPositionRecord, - PuzzleCreatorIntentRecord, PuzzleDraftCompileFailureRecordInput, PuzzleDraftLevelRecord, - PuzzleFormDraftRecord, PuzzleFormDraftSaveRecordInput, PuzzleGalleryCardRecord, - PuzzleGeneratedImageCandidateRecord, PuzzleGeneratedImagesSaveRecordInput, - PuzzleLeaderboardEntryRecord, PuzzleLeaderboardSubmitRecordInput, PuzzleMergedGroupRecord, - PuzzlePieceStateRecord, PuzzlePublishRecordInput, PuzzleRecommendedNextWorkRecord, - PuzzleResultDraftRecord, PuzzleResultPreviewBlockerRecord, PuzzleResultPreviewFindingRecord, - PuzzleResultPreviewRecord, PuzzleRunDragRecordInput, PuzzleRunNextLevelRecordInput, - PuzzleRunPauseRecordInput, PuzzleRunPropRecordInput, PuzzleRunRecord, - PuzzleRunStartRecordInput, PuzzleRunSwapRecordInput, PuzzleRuntimeLevelRecord, - PuzzleSelectCoverImageRecordInput, PuzzleUiBackgroundSaveRecordInput, + PuzzleClearActionRequest, PuzzleClearActionResponse, PuzzleClearActionType, + PuzzleClearBoardCell, PuzzleClearBoardSnapshot, PuzzleClearCardAsset, PuzzleClearDraftResponse, + PuzzleClearGenerationStatus, PuzzleClearImageAsset, PuzzleClearNextLevelRequest, + PuzzleClearPatternGroup, PuzzleClearRetryLevelRequest, PuzzleClearRunResponse, + PuzzleClearRunStatus, PuzzleClearRuntimeSnapshotResponse, PuzzleClearSessionResponse, + PuzzleClearSessionSnapshotResponse, PuzzleClearStartRunRequest, PuzzleClearSwapRequest, + PuzzleClearTimeUpRequest, PuzzleClearWorkDetailResponse, PuzzleClearWorkMutationResponse, + PuzzleClearWorkProfileResponse, PuzzleClearWorkSummaryResponse, PuzzleClearWorksResponse, + PuzzleClearWorkspaceCreateRequest, PuzzleCreatorIntentRecord, + PuzzleDraftCompileFailureRecordInput, PuzzleDraftLevelRecord, PuzzleFormDraftRecord, + PuzzleFormDraftSaveRecordInput, PuzzleGalleryCardRecord, PuzzleGeneratedImageCandidateRecord, + PuzzleGeneratedImagesSaveRecordInput, PuzzleLeaderboardEntryRecord, + PuzzleLeaderboardSubmitRecordInput, PuzzleMergedGroupRecord, PuzzlePieceStateRecord, + PuzzlePublishRecordInput, PuzzleRecommendedNextWorkRecord, PuzzleResultDraftRecord, + PuzzleResultPreviewBlockerRecord, PuzzleResultPreviewFindingRecord, PuzzleResultPreviewRecord, + PuzzleRunDragRecordInput, PuzzleRunNextLevelRecordInput, PuzzleRunPauseRecordInput, + PuzzleRunPropRecordInput, PuzzleRunRecord, PuzzleRunStartRecordInput, PuzzleRunSwapRecordInput, + PuzzleRuntimeLevelRecord, PuzzleSelectCoverImageRecordInput, PuzzleUiBackgroundSaveRecordInput, PuzzleWorkLikeReportRecordInput, PuzzleWorkPointIncentiveClaimRecordInput, PuzzleWorkProfileRecord, PuzzleWorkRemixRecordInput, PuzzleWorkUpsertRecordInput, ResolveCombatActionRecord, ResolveNpcBattleInteractionInput, @@ -109,6 +117,7 @@ pub mod match3d; pub mod npc; pub mod public_work; pub mod puzzle; +pub mod puzzle_clear; pub mod runtime; pub mod square_hole; pub mod story; @@ -575,6 +584,7 @@ impl SpacetimeClient { "SELECT * FROM public_work_detail_entry", "SELECT * FROM bark_battle_gallery_view", "SELECT * FROM puzzle_gallery_card_view", + "SELECT * FROM puzzle_clear_gallery_card_view", "SELECT * FROM jump_hop_gallery_card_view", "SELECT * FROM wooden_fish_gallery_card_view", "SELECT * FROM custom_world_gallery_entry", @@ -591,6 +601,7 @@ impl SpacetimeClient { for query in [ "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle'", + "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'puzzle-clear'", "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'jump-hop'", "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'wooden-fish'", "SELECT * FROM public_work_play_daily_stat WHERE source_type = 'custom-world'", diff --git a/server-rs/crates/spacetime-client/src/mapper.rs b/server-rs/crates/spacetime-client/src/mapper.rs index fa080b9d..3c836ff3 100644 --- a/server-rs/crates/spacetime-client/src/mapper.rs +++ b/server-rs/crates/spacetime-client/src/mapper.rs @@ -14,6 +14,7 @@ mod match3d; mod npc; mod public_work; mod puzzle; +mod puzzle_clear; mod runtime; mod runtime_profile; mod square_hole; @@ -114,6 +115,17 @@ pub use self::puzzle::{ PuzzleWorkLikeReportRecordInput, PuzzleWorkPointIncentiveClaimRecordInput, PuzzleWorkProfileRecord, PuzzleWorkRemixRecordInput, PuzzleWorkUpsertRecordInput, }; +pub use self::puzzle_clear::{ + PuzzleClearActionRequest, PuzzleClearActionResponse, PuzzleClearActionType, + PuzzleClearBoardCell, PuzzleClearBoardSnapshot, PuzzleClearCardAsset, PuzzleClearDraftResponse, + PuzzleClearGenerationStatus, PuzzleClearImageAsset, PuzzleClearNextLevelRequest, + PuzzleClearPatternGroup, PuzzleClearRetryLevelRequest, PuzzleClearRunResponse, + PuzzleClearRunStatus, PuzzleClearRuntimeSnapshotResponse, PuzzleClearSessionResponse, + PuzzleClearSessionSnapshotResponse, PuzzleClearStartRunRequest, PuzzleClearSwapRequest, + PuzzleClearTimeUpRequest, PuzzleClearWorkDetailResponse, PuzzleClearWorkMutationResponse, + PuzzleClearWorkProfileResponse, PuzzleClearWorkSummaryResponse, PuzzleClearWorksResponse, + PuzzleClearWorkspaceCreateRequest, +}; pub use self::runtime::{ AdminWorkVisibilityRecord, BigFishGameDraftRecord, BigFishRuntimeEntityRecord, BigFishRuntimeParamsRecord, BigFishRuntimeRunRecord, CreationEntryConfigRecord, @@ -192,6 +204,11 @@ pub(crate) use self::puzzle::{ map_puzzle_works_procedure_result, map_runtime_profile_wallet_ledger_source_type_back, parse_puzzle_agent_stage_record, }; +pub(crate) use self::puzzle_clear::{ + map_puzzle_clear_agent_session_procedure_result, map_puzzle_clear_gallery_card_view_row, + map_puzzle_clear_run_procedure_result, map_puzzle_clear_work_procedure_result, + map_puzzle_clear_works_procedure_result, +}; pub(crate) use self::runtime::{ build_admin_work_visibility_list_input, build_admin_work_visibility_update_input, build_creation_entry_config_record_from_rows, map_admin_work_visibility_list_procedure_result, diff --git a/server-rs/crates/spacetime-client/src/mapper/bark_battle.rs b/server-rs/crates/spacetime-client/src/mapper/bark_battle.rs index ae4c3253..19f51490 100644 --- a/server-rs/crates/spacetime-client/src/mapper/bark_battle.rs +++ b/server-rs/crates/spacetime-client/src/mapper/bark_battle.rs @@ -163,6 +163,7 @@ mod tests { let row = BarkBattleGalleryViewRow { work_id: "BB-33333333".to_string(), owner_user_id: "user-3".to_string(), + author_display_name: "声浪玩家".to_string(), source_draft_id: Some("bark-battle-draft-3".to_string()), config_version: 1, ruleset_version: "bark-battle-ruleset-v1".to_string(), diff --git a/server-rs/crates/spacetime-client/src/mapper/puzzle_clear.rs b/server-rs/crates/spacetime-client/src/mapper/puzzle_clear.rs new file mode 100644 index 00000000..d67a96a1 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/mapper/puzzle_clear.rs @@ -0,0 +1,289 @@ +use super::*; +pub use shared_contracts::puzzle_clear::{ + PuzzleClearActionRequest, PuzzleClearActionResponse, PuzzleClearActionType, + PuzzleClearBoardCell, PuzzleClearBoardSnapshot, PuzzleClearCardAsset, PuzzleClearDraftResponse, + PuzzleClearGenerationStatus, PuzzleClearImageAsset, PuzzleClearNextLevelRequest, + PuzzleClearPatternGroup, PuzzleClearRetryLevelRequest, PuzzleClearRunResponse, + PuzzleClearRunStatus, PuzzleClearRuntimeSnapshotResponse, PuzzleClearSessionResponse, + PuzzleClearSessionSnapshotResponse, PuzzleClearStartRunRequest, PuzzleClearSwapRequest, + PuzzleClearTimeUpRequest, PuzzleClearWorkDetailResponse, PuzzleClearWorkMutationResponse, + PuzzleClearWorkProfileResponse, PuzzleClearWorkSummaryResponse, PuzzleClearWorksResponse, + PuzzleClearWorkspaceCreateRequest, +}; + +pub(crate) fn map_puzzle_clear_agent_session_procedure_result( + result: PuzzleClearAgentSessionProcedureResult, +) -> Result { + if !result.ok { + return Err(SpacetimeClientError::procedure_failed(result.error_message)); + } + let session = result + .session + .ok_or_else(|| SpacetimeClientError::missing_snapshot("puzzle clear agent session 快照"))?; + Ok(map_puzzle_clear_session_snapshot(session)) +} + +pub(crate) fn map_puzzle_clear_work_procedure_result( + result: PuzzleClearWorkProcedureResult, +) -> Result { + if !result.ok { + return Err(SpacetimeClientError::procedure_failed(result.error_message)); + } + let work = result + .work + .ok_or_else(|| SpacetimeClientError::missing_snapshot("puzzle clear work 快照"))?; + Ok(map_puzzle_clear_work_snapshot(work)) +} + +pub(crate) fn map_puzzle_clear_works_procedure_result( + result: PuzzleClearWorksProcedureResult, +) -> Result, SpacetimeClientError> { + if !result.ok { + return Err(SpacetimeClientError::procedure_failed(result.error_message)); + } + Ok(result + .items + .into_iter() + .map(map_puzzle_clear_work_snapshot) + .collect()) +} + +pub(crate) fn map_puzzle_clear_run_procedure_result( + result: PuzzleClearRunProcedureResult, +) -> Result { + if !result.ok { + return Err(SpacetimeClientError::procedure_failed(result.error_message)); + } + let run = result + .run + .ok_or_else(|| SpacetimeClientError::missing_snapshot("puzzle clear run 快照"))?; + Ok(map_puzzle_clear_run_snapshot(run)) +} + +pub(crate) fn map_puzzle_clear_gallery_card_view_row( + row: PuzzleClearGalleryCardViewRow, +) -> PuzzleClearWorkSummaryResponse { + PuzzleClearWorkSummaryResponse { + runtime_kind: "puzzle-clear".to_string(), + work_id: row.work_id, + profile_id: row.profile_id, + owner_user_id: row.owner_user_id, + source_session_id: None, + work_title: row.work_title, + work_description: row.work_description, + theme_prompt: row.theme_prompt, + cover_image_src: row.cover_image_src, + publication_status: normalize_publication_status(&row.publication_status).to_string(), + play_count: row.play_count, + updated_at: format_timestamp_micros(row.updated_at_micros), + published_at: row.published_at_micros.map(format_timestamp_micros), + publish_ready: true, + generation_status: parse_generation_status(&row.generation_status), + } +} + +fn map_puzzle_clear_session_snapshot( + snapshot: PuzzleClearAgentSessionSnapshot, +) -> PuzzleClearSessionSnapshotResponse { + PuzzleClearSessionSnapshotResponse { + session_id: snapshot.session_id, + owner_user_id: snapshot.owner_user_id, + status: parse_generation_status(&snapshot.status), + draft: snapshot.draft.map(map_puzzle_clear_draft_snapshot), + created_at: format_timestamp_micros(snapshot.created_at_micros), + updated_at: format_timestamp_micros(snapshot.updated_at_micros), + } +} + +fn map_puzzle_clear_work_snapshot( + snapshot: PuzzleClearWorkSnapshot, +) -> PuzzleClearWorkProfileResponse { + let atlas_asset = map_image_asset(snapshot.atlas_asset.clone()); + let pattern_groups = snapshot + .pattern_groups + .clone() + .into_iter() + .map(map_pattern_group) + .collect::>(); + let card_assets = snapshot + .card_assets + .clone() + .into_iter() + .map(map_card_asset) + .collect::>(); + let board_background_asset = snapshot.board_background_asset.clone().map(map_image_asset); + let draft = PuzzleClearDraftResponse { + template_id: "puzzle-clear".to_string(), + template_name: "拼消消".to_string(), + profile_id: Some(snapshot.profile_id.clone()), + work_title: snapshot.work_title.clone(), + work_description: snapshot.work_description.clone(), + theme_prompt: snapshot.theme_prompt.clone(), + board_background_prompt: snapshot.board_background_prompt.clone(), + generate_board_background: snapshot.generate_board_background, + board_background_asset: board_background_asset.clone(), + card_back_image_src: snapshot.card_back_image_src.clone(), + atlas_asset: Some(atlas_asset.clone()), + pattern_groups: pattern_groups.clone(), + card_assets: card_assets.clone(), + generation_status: parse_generation_status(&snapshot.generation_status), + }; + + PuzzleClearWorkProfileResponse { + summary: PuzzleClearWorkSummaryResponse { + runtime_kind: "puzzle-clear".to_string(), + work_id: snapshot.work_id, + profile_id: snapshot.profile_id, + owner_user_id: snapshot.owner_user_id, + source_session_id: empty_string_to_none(snapshot.source_session_id), + work_title: snapshot.work_title, + work_description: snapshot.work_description, + theme_prompt: snapshot.theme_prompt, + cover_image_src: snapshot.cover_image_src, + publication_status: normalize_publication_status(&snapshot.publication_status) + .to_string(), + play_count: snapshot.play_count, + updated_at: format_timestamp_micros(snapshot.updated_at_micros), + published_at: snapshot.published_at_micros.map(format_timestamp_micros), + publish_ready: snapshot.publish_ready, + generation_status: parse_generation_status(&snapshot.generation_status), + }, + draft, + board_background_asset, + atlas_asset, + pattern_groups, + card_assets, + } +} + +fn map_puzzle_clear_draft_snapshot(snapshot: PuzzleClearDraftSnapshot) -> PuzzleClearDraftResponse { + PuzzleClearDraftResponse { + template_id: snapshot.template_id, + template_name: snapshot.template_name, + profile_id: snapshot.profile_id, + work_title: snapshot.work_title, + work_description: snapshot.work_description, + theme_prompt: snapshot.theme_prompt, + board_background_prompt: snapshot.board_background_prompt, + generate_board_background: snapshot.generate_board_background, + board_background_asset: snapshot.board_background_asset.map(map_image_asset), + card_back_image_src: snapshot.card_back_image_src, + atlas_asset: snapshot.atlas_asset.map(map_image_asset), + pattern_groups: snapshot + .pattern_groups + .into_iter() + .map(map_pattern_group) + .collect(), + card_assets: snapshot + .card_assets + .into_iter() + .map(map_card_asset) + .collect(), + generation_status: parse_generation_status(&snapshot.generation_status), + } +} + +fn map_image_asset(snapshot: PuzzleClearImageAssetSnapshot) -> PuzzleClearImageAsset { + PuzzleClearImageAsset { + asset_id: snapshot.asset_id, + image_src: snapshot.image_src, + image_object_key: snapshot.image_object_key, + asset_object_id: snapshot.asset_object_id, + generation_provider: snapshot.generation_provider, + prompt: snapshot.prompt, + width: snapshot.width, + height: snapshot.height, + } +} + +fn map_pattern_group(snapshot: PuzzleClearPatternGroupSnapshot) -> PuzzleClearPatternGroup { + PuzzleClearPatternGroup { + group_id: snapshot.group_id, + shape: snapshot.shape, + width: snapshot.width, + height: snapshot.height, + atlas_x: snapshot.atlas_x, + atlas_y: snapshot.atlas_y, + atlas_width: snapshot.atlas_width, + atlas_height: snapshot.atlas_height, + } +} + +fn map_card_asset(snapshot: PuzzleClearCardAssetSnapshot) -> PuzzleClearCardAsset { + PuzzleClearCardAsset { + card_id: snapshot.card_id, + group_id: snapshot.group_id, + shape: snapshot.shape, + orientation: snapshot.orientation, + part_x: snapshot.part_x, + part_y: snapshot.part_y, + image_src: snapshot.image_src, + image_object_key: snapshot.image_object_key, + asset_object_id: snapshot.asset_object_id, + source_atlas_cell: snapshot.source_atlas_cell, + } +} + +fn map_puzzle_clear_run_snapshot( + snapshot: PuzzleClearRuntimeSnapshot, +) -> PuzzleClearRuntimeSnapshotResponse { + PuzzleClearRuntimeSnapshotResponse { + run_id: snapshot.run_id, + profile_id: snapshot.profile_id, + owner_user_id: snapshot.owner_user_id, + runtime_mode: None, + status: parse_run_status(&snapshot.status), + level_index: snapshot.level_index, + clears_done: snapshot.clears_done, + target_clears: snapshot.target_clears, + level_duration_seconds: snapshot.level_duration_seconds, + level_started_at_ms: snapshot.level_started_at_ms, + board: PuzzleClearBoardSnapshot { + rows: snapshot.board.rows, + cols: snapshot.board.cols, + cells: snapshot + .board + .cells + .into_iter() + .map(|cell| PuzzleClearBoardCell { + row: cell.row, + col: cell.col, + card: cell.card.map(map_card_asset), + locked_group_id: cell.locked_group_id, + }) + .collect(), + }, + ready_columns: snapshot + .ready_columns + .into_iter() + .map(|column| column.into_iter().map(map_card_asset).collect()) + .collect(), + started_at_ms: snapshot.started_at_ms, + finished_at_ms: snapshot.finished_at_ms, + } +} + +fn parse_generation_status(value: &str) -> PuzzleClearGenerationStatus { + match value { + "generating" => PuzzleClearGenerationStatus::Generating, + "ready" => PuzzleClearGenerationStatus::Ready, + "failed" => PuzzleClearGenerationStatus::Failed, + _ => PuzzleClearGenerationStatus::Draft, + } +} + +fn parse_run_status(value: &str) -> PuzzleClearRunStatus { + match value { + "level_failed" => PuzzleClearRunStatus::LevelFailed, + "level_cleared" => PuzzleClearRunStatus::LevelCleared, + "finished" => PuzzleClearRunStatus::Finished, + _ => PuzzleClearRunStatus::Playing, + } +} + +fn normalize_publication_status(value: &str) -> &str { + match value { + "Published" | "published" => "published", + _ => "draft", + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings.rs b/server-rs/crates/spacetime-client/src/module_bindings.rs index e153434f..3c817756 100644 --- a/server-rs/crates/spacetime-client/src/module_bindings.rs +++ b/server-rs/crates/spacetime-client/src/module_bindings.rs @@ -25,6 +25,7 @@ pub mod admin_work_visibility_list_procedure_result_type; pub mod admin_work_visibility_procedure_result_type; pub mod admin_work_visibility_snapshot_type; pub mod admin_work_visibility_update_input_type; +pub mod advance_puzzle_clear_next_level_procedure; pub mod advance_puzzle_next_level_procedure; pub mod ai_result_reference_input_type; pub mod ai_result_reference_kind_type; @@ -212,6 +213,7 @@ pub mod compile_custom_world_published_profile_procedure; pub mod compile_jump_hop_draft_procedure; pub mod compile_match_3_d_draft_procedure; pub mod compile_puzzle_agent_draft_procedure; +pub mod compile_puzzle_clear_draft_procedure; pub mod compile_square_hole_draft_procedure; pub mod compile_visual_novel_work_profile_procedure; pub mod compile_wooden_fish_draft_procedure; @@ -234,6 +236,7 @@ pub mod create_jump_hop_agent_session_procedure; pub mod create_match_3_d_agent_session_procedure; pub mod create_profile_recharge_order_and_return_procedure; pub mod create_puzzle_agent_session_procedure; +pub mod create_puzzle_clear_agent_session_procedure; pub mod create_square_hole_agent_session_procedure; pub mod create_visual_novel_agent_session_procedure; pub mod create_wooden_fish_agent_session_procedure; @@ -378,6 +381,9 @@ pub mod get_profile_recharge_order_and_return_procedure; pub mod get_profile_referral_invite_center_procedure; pub mod get_profile_task_center_procedure; pub mod get_puzzle_agent_session_procedure; +pub mod get_puzzle_clear_agent_session_procedure; +pub mod get_puzzle_clear_runtime_run_procedure; +pub mod get_puzzle_clear_work_profile_procedure; pub mod get_puzzle_gallery_detail_procedure; pub mod get_puzzle_run_procedure; pub mod get_puzzle_work_detail_procedure; @@ -466,6 +472,7 @@ pub mod list_match_3_d_works_procedure; pub mod list_platform_browse_history_procedure; pub mod list_profile_save_archives_procedure; pub mod list_profile_wallet_ledger_procedure; +pub mod list_puzzle_clear_works_procedure; pub mod list_puzzle_gallery_procedure; pub mod list_puzzle_works_procedure; pub mod list_square_hole_works_procedure; @@ -473,6 +480,7 @@ pub mod list_visual_novel_runtime_history_procedure; pub mod list_visual_novel_works_procedure; pub mod list_wooden_fish_works_procedure; pub mod mark_profile_recharge_order_paid_and_return_procedure; +pub mod mark_puzzle_clear_level_time_up_procedure; pub mod mark_puzzle_draft_generation_failed_procedure; pub mod match_3_d_agent_message_finalize_input_type; pub mod match_3_d_agent_message_row_type; @@ -580,6 +588,7 @@ pub mod publish_custom_world_profile_reducer; pub mod publish_custom_world_world_procedure; pub mod publish_jump_hop_work_procedure; pub mod publish_match_3_d_work_procedure; +pub mod publish_puzzle_clear_work_procedure; pub mod publish_puzzle_work_procedure; pub mod publish_square_hole_work_procedure; pub mod publish_visual_novel_work_procedure; @@ -606,6 +615,44 @@ pub mod puzzle_anchor_status_type; pub mod puzzle_audio_asset_type; pub mod puzzle_board_snapshot_type; pub mod puzzle_cell_position_type; +pub mod puzzle_clear_agent_session_create_input_type; +pub mod puzzle_clear_agent_session_get_input_type; +pub mod puzzle_clear_agent_session_procedure_result_type; +pub mod puzzle_clear_agent_session_row_type; +pub mod puzzle_clear_agent_session_snapshot_type; +pub mod puzzle_clear_agent_session_table; +pub mod puzzle_clear_board_cell_snapshot_type; +pub mod puzzle_clear_board_snapshot_type; +pub mod puzzle_clear_card_asset_snapshot_type; +pub mod puzzle_clear_draft_compile_input_type; +pub mod puzzle_clear_draft_snapshot_type; +pub mod puzzle_clear_event_row_type; +pub mod puzzle_clear_event_table; +pub mod puzzle_clear_gallery_card_view_row_type; +pub mod puzzle_clear_gallery_card_view_table; +pub mod puzzle_clear_gallery_view_row_type; +pub mod puzzle_clear_gallery_view_table; +pub mod puzzle_clear_image_asset_snapshot_type; +pub mod puzzle_clear_pattern_group_snapshot_type; +pub mod puzzle_clear_run_get_input_type; +pub mod puzzle_clear_run_next_level_input_type; +pub mod puzzle_clear_run_procedure_result_type; +pub mod puzzle_clear_run_retry_level_input_type; +pub mod puzzle_clear_run_start_input_type; +pub mod puzzle_clear_run_swap_input_type; +pub mod puzzle_clear_run_time_up_input_type; +pub mod puzzle_clear_runtime_run_row_type; +pub mod puzzle_clear_runtime_run_table; +pub mod puzzle_clear_runtime_snapshot_type; +pub mod puzzle_clear_work_get_input_type; +pub mod puzzle_clear_work_procedure_result_type; +pub mod puzzle_clear_work_profile_row_type; +pub mod puzzle_clear_work_profile_table; +pub mod puzzle_clear_work_publish_input_type; +pub mod puzzle_clear_work_snapshot_type; +pub mod puzzle_clear_work_update_input_type; +pub mod puzzle_clear_works_list_input_type; +pub mod puzzle_clear_works_procedure_result_type; pub mod puzzle_creator_intent_type; pub mod puzzle_draft_compile_failure_input_type; pub mod puzzle_draft_compile_input_type; @@ -726,6 +773,7 @@ pub mod restart_jump_hop_run_procedure; pub mod restart_match_3_d_run_procedure; pub mod restart_square_hole_run_procedure; pub mod resume_profile_save_archive_and_return_procedure; +pub mod retry_puzzle_clear_level_run_procedure; pub mod revoke_database_migration_operator_procedure; pub mod rpg_agent_draft_card_kind_type; pub mod rpg_agent_draft_card_status_type; @@ -896,6 +944,7 @@ pub mod start_bark_battle_run_procedure; pub mod start_big_fish_run_procedure; pub mod start_jump_hop_run_procedure; pub mod start_match_3_d_run_procedure; +pub mod start_puzzle_clear_runtime_run_procedure; pub mod start_puzzle_run_procedure; pub mod start_square_hole_run_procedure; pub mod start_visual_novel_run_procedure; @@ -924,6 +973,7 @@ pub mod submit_puzzle_agent_message_procedure; pub mod submit_puzzle_leaderboard_entry_procedure; pub mod submit_square_hole_agent_message_procedure; pub mod submit_visual_novel_agent_message_procedure; +pub mod swap_puzzle_clear_cards_procedure; pub mod swap_puzzle_pieces_procedure; pub mod tracking_daily_stat_table; pub mod tracking_daily_stat_type; @@ -942,6 +992,7 @@ pub mod unpublish_custom_world_profile_reducer; pub mod update_bark_battle_draft_config_procedure; pub mod update_jump_hop_work_procedure; pub mod update_match_3_d_work_procedure; +pub mod update_puzzle_clear_work_procedure; pub mod update_puzzle_run_pause_procedure; pub mod update_puzzle_work_procedure; pub mod update_square_hole_work_procedure; @@ -1064,6 +1115,7 @@ pub use admin_work_visibility_list_procedure_result_type::AdminWorkVisibilityLis pub use admin_work_visibility_procedure_result_type::AdminWorkVisibilityProcedureResult; pub use admin_work_visibility_snapshot_type::AdminWorkVisibilitySnapshot; pub use admin_work_visibility_update_input_type::AdminWorkVisibilityUpdateInput; +pub use advance_puzzle_clear_next_level_procedure::advance_puzzle_clear_next_level; pub use advance_puzzle_next_level_procedure::advance_puzzle_next_level; pub use ai_result_reference_input_type::AiResultReferenceInput; pub use ai_result_reference_kind_type::AiResultReferenceKind; @@ -1251,6 +1303,7 @@ pub use compile_custom_world_published_profile_procedure::compile_custom_world_p pub use compile_jump_hop_draft_procedure::compile_jump_hop_draft; pub use compile_match_3_d_draft_procedure::compile_match_3_d_draft; pub use compile_puzzle_agent_draft_procedure::compile_puzzle_agent_draft; +pub use compile_puzzle_clear_draft_procedure::compile_puzzle_clear_draft; pub use compile_square_hole_draft_procedure::compile_square_hole_draft; pub use compile_visual_novel_work_profile_procedure::compile_visual_novel_work_profile; pub use compile_wooden_fish_draft_procedure::compile_wooden_fish_draft; @@ -1273,6 +1326,7 @@ pub use create_jump_hop_agent_session_procedure::create_jump_hop_agent_session; pub use create_match_3_d_agent_session_procedure::create_match_3_d_agent_session; pub use create_profile_recharge_order_and_return_procedure::create_profile_recharge_order_and_return; pub use create_puzzle_agent_session_procedure::create_puzzle_agent_session; +pub use create_puzzle_clear_agent_session_procedure::create_puzzle_clear_agent_session; pub use create_square_hole_agent_session_procedure::create_square_hole_agent_session; pub use create_visual_novel_agent_session_procedure::create_visual_novel_agent_session; pub use create_wooden_fish_agent_session_procedure::create_wooden_fish_agent_session; @@ -1417,6 +1471,9 @@ pub use get_profile_recharge_order_and_return_procedure::get_profile_recharge_or pub use get_profile_referral_invite_center_procedure::get_profile_referral_invite_center; pub use get_profile_task_center_procedure::get_profile_task_center; pub use get_puzzle_agent_session_procedure::get_puzzle_agent_session; +pub use get_puzzle_clear_agent_session_procedure::get_puzzle_clear_agent_session; +pub use get_puzzle_clear_runtime_run_procedure::get_puzzle_clear_runtime_run; +pub use get_puzzle_clear_work_profile_procedure::get_puzzle_clear_work_profile; pub use get_puzzle_gallery_detail_procedure::get_puzzle_gallery_detail; pub use get_puzzle_run_procedure::get_puzzle_run; pub use get_puzzle_work_detail_procedure::get_puzzle_work_detail; @@ -1505,6 +1562,7 @@ pub use list_match_3_d_works_procedure::list_match_3_d_works; pub use list_platform_browse_history_procedure::list_platform_browse_history; pub use list_profile_save_archives_procedure::list_profile_save_archives; pub use list_profile_wallet_ledger_procedure::list_profile_wallet_ledger; +pub use list_puzzle_clear_works_procedure::list_puzzle_clear_works; pub use list_puzzle_gallery_procedure::list_puzzle_gallery; pub use list_puzzle_works_procedure::list_puzzle_works; pub use list_square_hole_works_procedure::list_square_hole_works; @@ -1512,6 +1570,7 @@ pub use list_visual_novel_runtime_history_procedure::list_visual_novel_runtime_h pub use list_visual_novel_works_procedure::list_visual_novel_works; pub use list_wooden_fish_works_procedure::list_wooden_fish_works; pub use mark_profile_recharge_order_paid_and_return_procedure::mark_profile_recharge_order_paid_and_return; +pub use mark_puzzle_clear_level_time_up_procedure::mark_puzzle_clear_level_time_up; pub use mark_puzzle_draft_generation_failed_procedure::mark_puzzle_draft_generation_failed; pub use match_3_d_agent_message_finalize_input_type::Match3DAgentMessageFinalizeInput; pub use match_3_d_agent_message_row_type::Match3DAgentMessageRow; @@ -1619,6 +1678,7 @@ pub use publish_custom_world_profile_reducer::publish_custom_world_profile; pub use publish_custom_world_world_procedure::publish_custom_world_world; pub use publish_jump_hop_work_procedure::publish_jump_hop_work; pub use publish_match_3_d_work_procedure::publish_match_3_d_work; +pub use publish_puzzle_clear_work_procedure::publish_puzzle_clear_work; pub use publish_puzzle_work_procedure::publish_puzzle_work; pub use publish_square_hole_work_procedure::publish_square_hole_work; pub use publish_visual_novel_work_procedure::publish_visual_novel_work; @@ -1645,6 +1705,44 @@ pub use puzzle_anchor_status_type::PuzzleAnchorStatus; pub use puzzle_audio_asset_type::PuzzleAudioAsset; pub use puzzle_board_snapshot_type::PuzzleBoardSnapshot; pub use puzzle_cell_position_type::PuzzleCellPosition; +pub use puzzle_clear_agent_session_create_input_type::PuzzleClearAgentSessionCreateInput; +pub use puzzle_clear_agent_session_get_input_type::PuzzleClearAgentSessionGetInput; +pub use puzzle_clear_agent_session_procedure_result_type::PuzzleClearAgentSessionProcedureResult; +pub use puzzle_clear_agent_session_row_type::PuzzleClearAgentSessionRow; +pub use puzzle_clear_agent_session_snapshot_type::PuzzleClearAgentSessionSnapshot; +pub use puzzle_clear_agent_session_table::*; +pub use puzzle_clear_board_cell_snapshot_type::PuzzleClearBoardCellSnapshot; +pub use puzzle_clear_board_snapshot_type::PuzzleClearBoardSnapshot; +pub use puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; +pub use puzzle_clear_draft_compile_input_type::PuzzleClearDraftCompileInput; +pub use puzzle_clear_draft_snapshot_type::PuzzleClearDraftSnapshot; +pub use puzzle_clear_event_row_type::PuzzleClearEventRow; +pub use puzzle_clear_event_table::*; +pub use puzzle_clear_gallery_card_view_row_type::PuzzleClearGalleryCardViewRow; +pub use puzzle_clear_gallery_card_view_table::*; +pub use puzzle_clear_gallery_view_row_type::PuzzleClearGalleryViewRow; +pub use puzzle_clear_gallery_view_table::*; +pub use puzzle_clear_image_asset_snapshot_type::PuzzleClearImageAssetSnapshot; +pub use puzzle_clear_pattern_group_snapshot_type::PuzzleClearPatternGroupSnapshot; +pub use puzzle_clear_run_get_input_type::PuzzleClearRunGetInput; +pub use puzzle_clear_run_next_level_input_type::PuzzleClearRunNextLevelInput; +pub use puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; +pub use puzzle_clear_run_retry_level_input_type::PuzzleClearRunRetryLevelInput; +pub use puzzle_clear_run_start_input_type::PuzzleClearRunStartInput; +pub use puzzle_clear_run_swap_input_type::PuzzleClearRunSwapInput; +pub use puzzle_clear_run_time_up_input_type::PuzzleClearRunTimeUpInput; +pub use puzzle_clear_runtime_run_row_type::PuzzleClearRuntimeRunRow; +pub use puzzle_clear_runtime_run_table::*; +pub use puzzle_clear_runtime_snapshot_type::PuzzleClearRuntimeSnapshot; +pub use puzzle_clear_work_get_input_type::PuzzleClearWorkGetInput; +pub use puzzle_clear_work_procedure_result_type::PuzzleClearWorkProcedureResult; +pub use puzzle_clear_work_profile_row_type::PuzzleClearWorkProfileRow; +pub use puzzle_clear_work_profile_table::*; +pub use puzzle_clear_work_publish_input_type::PuzzleClearWorkPublishInput; +pub use puzzle_clear_work_snapshot_type::PuzzleClearWorkSnapshot; +pub use puzzle_clear_work_update_input_type::PuzzleClearWorkUpdateInput; +pub use puzzle_clear_works_list_input_type::PuzzleClearWorksListInput; +pub use puzzle_clear_works_procedure_result_type::PuzzleClearWorksProcedureResult; pub use puzzle_creator_intent_type::PuzzleCreatorIntent; pub use puzzle_draft_compile_failure_input_type::PuzzleDraftCompileFailureInput; pub use puzzle_draft_compile_input_type::PuzzleDraftCompileInput; @@ -1765,6 +1863,7 @@ pub use restart_jump_hop_run_procedure::restart_jump_hop_run; pub use restart_match_3_d_run_procedure::restart_match_3_d_run; pub use restart_square_hole_run_procedure::restart_square_hole_run; pub use resume_profile_save_archive_and_return_procedure::resume_profile_save_archive_and_return; +pub use retry_puzzle_clear_level_run_procedure::retry_puzzle_clear_level_run; pub use revoke_database_migration_operator_procedure::revoke_database_migration_operator; pub use rpg_agent_draft_card_kind_type::RpgAgentDraftCardKind; pub use rpg_agent_draft_card_status_type::RpgAgentDraftCardStatus; @@ -1935,6 +2034,7 @@ pub use start_bark_battle_run_procedure::start_bark_battle_run; pub use start_big_fish_run_procedure::start_big_fish_run; pub use start_jump_hop_run_procedure::start_jump_hop_run; pub use start_match_3_d_run_procedure::start_match_3_d_run; +pub use start_puzzle_clear_runtime_run_procedure::start_puzzle_clear_runtime_run; pub use start_puzzle_run_procedure::start_puzzle_run; pub use start_square_hole_run_procedure::start_square_hole_run; pub use start_visual_novel_run_procedure::start_visual_novel_run; @@ -1963,6 +2063,7 @@ pub use submit_puzzle_agent_message_procedure::submit_puzzle_agent_message; pub use submit_puzzle_leaderboard_entry_procedure::submit_puzzle_leaderboard_entry; pub use submit_square_hole_agent_message_procedure::submit_square_hole_agent_message; pub use submit_visual_novel_agent_message_procedure::submit_visual_novel_agent_message; +pub use swap_puzzle_clear_cards_procedure::swap_puzzle_clear_cards; pub use swap_puzzle_pieces_procedure::swap_puzzle_pieces; pub use tracking_daily_stat_table::*; pub use tracking_daily_stat_type::TrackingDailyStat; @@ -1981,6 +2082,7 @@ pub use unpublish_custom_world_profile_reducer::unpublish_custom_world_profile; pub use update_bark_battle_draft_config_procedure::update_bark_battle_draft_config; pub use update_jump_hop_work_procedure::update_jump_hop_work; pub use update_match_3_d_work_procedure::update_match_3_d_work; +pub use update_puzzle_clear_work_procedure::update_puzzle_clear_work; pub use update_puzzle_run_pause_procedure::update_puzzle_run_pause; pub use update_puzzle_work_procedure::update_puzzle_work; pub use update_square_hole_work_procedure::update_square_hole_work; @@ -2430,6 +2532,12 @@ pub struct DbUpdate { public_work_play_daily_stat: __sdk::TableUpdate, puzzle_agent_message: __sdk::TableUpdate, puzzle_agent_session: __sdk::TableUpdate, + puzzle_clear_agent_session: __sdk::TableUpdate, + puzzle_clear_event: __sdk::TableUpdate, + puzzle_clear_gallery_card_view: __sdk::TableUpdate, + puzzle_clear_gallery_view: __sdk::TableUpdate, + puzzle_clear_runtime_run: __sdk::TableUpdate, + puzzle_clear_work_profile: __sdk::TableUpdate, puzzle_event: __sdk::TableUpdate, puzzle_gallery_card_view: __sdk::TableUpdate, puzzle_gallery_view: __sdk::TableUpdate, @@ -2706,6 +2814,26 @@ impl TryFrom<__ws::v2::TransactionUpdate> for DbUpdate { "puzzle_agent_session" => db_update.puzzle_agent_session.append( puzzle_agent_session_table::parse_table_update(table_update)?, ), + "puzzle_clear_agent_session" => db_update.puzzle_clear_agent_session.append( + puzzle_clear_agent_session_table::parse_table_update(table_update)?, + ), + "puzzle_clear_event" => db_update + .puzzle_clear_event + .append(puzzle_clear_event_table::parse_table_update(table_update)?), + "puzzle_clear_gallery_card_view" => { + db_update.puzzle_clear_gallery_card_view.append( + puzzle_clear_gallery_card_view_table::parse_table_update(table_update)?, + ) + } + "puzzle_clear_gallery_view" => db_update.puzzle_clear_gallery_view.append( + puzzle_clear_gallery_view_table::parse_table_update(table_update)?, + ), + "puzzle_clear_runtime_run" => db_update.puzzle_clear_runtime_run.append( + puzzle_clear_runtime_run_table::parse_table_update(table_update)?, + ), + "puzzle_clear_work_profile" => db_update.puzzle_clear_work_profile.append( + puzzle_clear_work_profile_table::parse_table_update(table_update)?, + ), "puzzle_event" => db_update .puzzle_event .append(puzzle_event_table::parse_table_update(table_update)?), @@ -3199,6 +3327,30 @@ impl __sdk::DbUpdate for DbUpdate { &self.puzzle_agent_session, ) .with_updates_by_pk(|row| &row.session_id); + diff.puzzle_clear_agent_session = cache + .apply_diff_to_table::( + "puzzle_clear_agent_session", + &self.puzzle_clear_agent_session, + ) + .with_updates_by_pk(|row| &row.session_id); + diff.puzzle_clear_event = cache + .apply_diff_to_table::( + "puzzle_clear_event", + &self.puzzle_clear_event, + ) + .with_updates_by_pk(|row| &row.event_id); + diff.puzzle_clear_runtime_run = cache + .apply_diff_to_table::( + "puzzle_clear_runtime_run", + &self.puzzle_clear_runtime_run, + ) + .with_updates_by_pk(|row| &row.run_id); + diff.puzzle_clear_work_profile = cache + .apply_diff_to_table::( + "puzzle_clear_work_profile", + &self.puzzle_clear_work_profile, + ) + .with_updates_by_pk(|row| &row.profile_id); diff.puzzle_event = self.puzzle_event.into_event_diff(); diff.puzzle_leaderboard_entry = cache .apply_diff_to_table::( @@ -3364,6 +3516,15 @@ impl __sdk::DbUpdate for DbUpdate { "public_work_gallery_entry", &self.public_work_gallery_entry, ); + diff.puzzle_clear_gallery_card_view = cache + .apply_diff_to_table::( + "puzzle_clear_gallery_card_view", + &self.puzzle_clear_gallery_card_view, + ); + diff.puzzle_clear_gallery_view = cache.apply_diff_to_table::( + "puzzle_clear_gallery_view", + &self.puzzle_clear_gallery_view, + ); diff.puzzle_gallery_card_view = cache.apply_diff_to_table::( "puzzle_gallery_card_view", &self.puzzle_gallery_card_view, @@ -3618,6 +3779,24 @@ impl __sdk::DbUpdate for DbUpdate { "puzzle_agent_session" => db_update .puzzle_agent_session .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), + "puzzle_clear_agent_session" => db_update + .puzzle_clear_agent_session + .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), + "puzzle_clear_event" => db_update + .puzzle_clear_event + .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), + "puzzle_clear_gallery_card_view" => db_update + .puzzle_clear_gallery_card_view + .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), + "puzzle_clear_gallery_view" => db_update + .puzzle_clear_gallery_view + .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), + "puzzle_clear_runtime_run" => db_update + .puzzle_clear_runtime_run + .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), + "puzzle_clear_work_profile" => db_update + .puzzle_clear_work_profile + .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), "puzzle_event" => db_update .puzzle_event .append(__sdk::parse_row_list_as_inserts(table_rows.rows)?), @@ -3961,6 +4140,24 @@ impl __sdk::DbUpdate for DbUpdate { "puzzle_agent_session" => db_update .puzzle_agent_session .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), + "puzzle_clear_agent_session" => db_update + .puzzle_clear_agent_session + .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), + "puzzle_clear_event" => db_update + .puzzle_clear_event + .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), + "puzzle_clear_gallery_card_view" => db_update + .puzzle_clear_gallery_card_view + .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), + "puzzle_clear_gallery_view" => db_update + .puzzle_clear_gallery_view + .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), + "puzzle_clear_runtime_run" => db_update + .puzzle_clear_runtime_run + .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), + "puzzle_clear_work_profile" => db_update + .puzzle_clear_work_profile + .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), "puzzle_event" => db_update .puzzle_event .append(__sdk::parse_row_list_as_deletes(table_rows.rows)?), @@ -4160,6 +4357,12 @@ pub struct AppliedDiff<'r> { public_work_play_daily_stat: __sdk::TableAppliedDiff<'r, PublicWorkPlayDailyStat>, puzzle_agent_message: __sdk::TableAppliedDiff<'r, PuzzleAgentMessageRow>, puzzle_agent_session: __sdk::TableAppliedDiff<'r, PuzzleAgentSessionRow>, + puzzle_clear_agent_session: __sdk::TableAppliedDiff<'r, PuzzleClearAgentSessionRow>, + puzzle_clear_event: __sdk::TableAppliedDiff<'r, PuzzleClearEventRow>, + puzzle_clear_gallery_card_view: __sdk::TableAppliedDiff<'r, PuzzleClearGalleryCardViewRow>, + puzzle_clear_gallery_view: __sdk::TableAppliedDiff<'r, PuzzleClearGalleryViewRow>, + puzzle_clear_runtime_run: __sdk::TableAppliedDiff<'r, PuzzleClearRuntimeRunRow>, + puzzle_clear_work_profile: __sdk::TableAppliedDiff<'r, PuzzleClearWorkProfileRow>, puzzle_event: __sdk::TableAppliedDiff<'r, PuzzleEvent>, puzzle_gallery_card_view: __sdk::TableAppliedDiff<'r, PuzzleGalleryCardViewRow>, puzzle_gallery_view: __sdk::TableAppliedDiff<'r, PuzzleWorkProfile>, @@ -4568,6 +4771,36 @@ impl<'r> __sdk::AppliedDiff<'r> for AppliedDiff<'r> { &self.puzzle_agent_session, event, ); + callbacks.invoke_table_row_callbacks::( + "puzzle_clear_agent_session", + &self.puzzle_clear_agent_session, + event, + ); + callbacks.invoke_table_row_callbacks::( + "puzzle_clear_event", + &self.puzzle_clear_event, + event, + ); + callbacks.invoke_table_row_callbacks::( + "puzzle_clear_gallery_card_view", + &self.puzzle_clear_gallery_card_view, + event, + ); + callbacks.invoke_table_row_callbacks::( + "puzzle_clear_gallery_view", + &self.puzzle_clear_gallery_view, + event, + ); + callbacks.invoke_table_row_callbacks::( + "puzzle_clear_runtime_run", + &self.puzzle_clear_runtime_run, + event, + ); + callbacks.invoke_table_row_callbacks::( + "puzzle_clear_work_profile", + &self.puzzle_clear_work_profile, + event, + ); callbacks.invoke_table_row_callbacks::( "puzzle_event", &self.puzzle_event, @@ -5474,6 +5707,12 @@ impl __sdk::SpacetimeModule for RemoteModule { public_work_play_daily_stat_table::register_table(client_cache); puzzle_agent_message_table::register_table(client_cache); puzzle_agent_session_table::register_table(client_cache); + puzzle_clear_agent_session_table::register_table(client_cache); + puzzle_clear_event_table::register_table(client_cache); + puzzle_clear_gallery_card_view_table::register_table(client_cache); + puzzle_clear_gallery_view_table::register_table(client_cache); + puzzle_clear_runtime_run_table::register_table(client_cache); + puzzle_clear_work_profile_table::register_table(client_cache); puzzle_event_table::register_table(client_cache); puzzle_gallery_card_view_table::register_table(client_cache); puzzle_gallery_view_table::register_table(client_cache); @@ -5586,6 +5825,12 @@ impl __sdk::SpacetimeModule for RemoteModule { "public_work_play_daily_stat", "puzzle_agent_message", "puzzle_agent_session", + "puzzle_clear_agent_session", + "puzzle_clear_event", + "puzzle_clear_gallery_card_view", + "puzzle_clear_gallery_view", + "puzzle_clear_runtime_run", + "puzzle_clear_work_profile", "puzzle_event", "puzzle_gallery_card_view", "puzzle_gallery_view", diff --git a/server-rs/crates/spacetime-client/src/module_bindings/advance_puzzle_clear_next_level_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/advance_puzzle_clear_next_level_procedure.rs new file mode 100644 index 00000000..a75b35e4 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/advance_puzzle_clear_next_level_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_run_next_level_input_type::PuzzleClearRunNextLevelInput; +use super::puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct AdvancePuzzleClearNextLevelArgs { + pub input: PuzzleClearRunNextLevelInput, +} + +impl __sdk::InModule for AdvancePuzzleClearNextLevelArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `advance_puzzle_clear_next_level`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait advance_puzzle_clear_next_level { + fn advance_puzzle_clear_next_level(&self, input: PuzzleClearRunNextLevelInput) { + self.advance_puzzle_clear_next_level_then(input, |_, _| {}); + } + + fn advance_puzzle_clear_next_level_then( + &self, + input: PuzzleClearRunNextLevelInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl advance_puzzle_clear_next_level for super::RemoteProcedures { + fn advance_puzzle_clear_next_level_then( + &self, + input: PuzzleClearRunNextLevelInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearRunProcedureResult>( + "advance_puzzle_clear_next_level", + AdvancePuzzleClearNextLevelArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/compile_puzzle_clear_draft_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/compile_puzzle_clear_draft_procedure.rs new file mode 100644 index 00000000..79726bb5 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/compile_puzzle_clear_draft_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_agent_session_procedure_result_type::PuzzleClearAgentSessionProcedureResult; +use super::puzzle_clear_draft_compile_input_type::PuzzleClearDraftCompileInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct CompilePuzzleClearDraftArgs { + pub input: PuzzleClearDraftCompileInput, +} + +impl __sdk::InModule for CompilePuzzleClearDraftArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `compile_puzzle_clear_draft`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait compile_puzzle_clear_draft { + fn compile_puzzle_clear_draft(&self, input: PuzzleClearDraftCompileInput) { + self.compile_puzzle_clear_draft_then(input, |_, _| {}); + } + + fn compile_puzzle_clear_draft_then( + &self, + input: PuzzleClearDraftCompileInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl compile_puzzle_clear_draft for super::RemoteProcedures { + fn compile_puzzle_clear_draft_then( + &self, + input: PuzzleClearDraftCompileInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearAgentSessionProcedureResult>( + "compile_puzzle_clear_draft", + CompilePuzzleClearDraftArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/create_puzzle_clear_agent_session_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/create_puzzle_clear_agent_session_procedure.rs new file mode 100644 index 00000000..1059b5c6 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/create_puzzle_clear_agent_session_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_agent_session_create_input_type::PuzzleClearAgentSessionCreateInput; +use super::puzzle_clear_agent_session_procedure_result_type::PuzzleClearAgentSessionProcedureResult; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct CreatePuzzleClearAgentSessionArgs { + pub input: PuzzleClearAgentSessionCreateInput, +} + +impl __sdk::InModule for CreatePuzzleClearAgentSessionArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `create_puzzle_clear_agent_session`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait create_puzzle_clear_agent_session { + fn create_puzzle_clear_agent_session(&self, input: PuzzleClearAgentSessionCreateInput) { + self.create_puzzle_clear_agent_session_then(input, |_, _| {}); + } + + fn create_puzzle_clear_agent_session_then( + &self, + input: PuzzleClearAgentSessionCreateInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl create_puzzle_clear_agent_session for super::RemoteProcedures { + fn create_puzzle_clear_agent_session_then( + &self, + input: PuzzleClearAgentSessionCreateInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearAgentSessionProcedureResult>( + "create_puzzle_clear_agent_session", + CreatePuzzleClearAgentSessionArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_agent_session_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_agent_session_procedure.rs new file mode 100644 index 00000000..34c2f8e3 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_agent_session_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_agent_session_get_input_type::PuzzleClearAgentSessionGetInput; +use super::puzzle_clear_agent_session_procedure_result_type::PuzzleClearAgentSessionProcedureResult; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct GetPuzzleClearAgentSessionArgs { + pub input: PuzzleClearAgentSessionGetInput, +} + +impl __sdk::InModule for GetPuzzleClearAgentSessionArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `get_puzzle_clear_agent_session`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait get_puzzle_clear_agent_session { + fn get_puzzle_clear_agent_session(&self, input: PuzzleClearAgentSessionGetInput) { + self.get_puzzle_clear_agent_session_then(input, |_, _| {}); + } + + fn get_puzzle_clear_agent_session_then( + &self, + input: PuzzleClearAgentSessionGetInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl get_puzzle_clear_agent_session for super::RemoteProcedures { + fn get_puzzle_clear_agent_session_then( + &self, + input: PuzzleClearAgentSessionGetInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearAgentSessionProcedureResult>( + "get_puzzle_clear_agent_session", + GetPuzzleClearAgentSessionArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_runtime_run_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_runtime_run_procedure.rs new file mode 100644 index 00000000..7a196e1a --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_runtime_run_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_run_get_input_type::PuzzleClearRunGetInput; +use super::puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct GetPuzzleClearRuntimeRunArgs { + pub input: PuzzleClearRunGetInput, +} + +impl __sdk::InModule for GetPuzzleClearRuntimeRunArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `get_puzzle_clear_runtime_run`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait get_puzzle_clear_runtime_run { + fn get_puzzle_clear_runtime_run(&self, input: PuzzleClearRunGetInput) { + self.get_puzzle_clear_runtime_run_then(input, |_, _| {}); + } + + fn get_puzzle_clear_runtime_run_then( + &self, + input: PuzzleClearRunGetInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl get_puzzle_clear_runtime_run for super::RemoteProcedures { + fn get_puzzle_clear_runtime_run_then( + &self, + input: PuzzleClearRunGetInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearRunProcedureResult>( + "get_puzzle_clear_runtime_run", + GetPuzzleClearRuntimeRunArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_work_profile_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_work_profile_procedure.rs new file mode 100644 index 00000000..a394e9e8 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/get_puzzle_clear_work_profile_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_work_get_input_type::PuzzleClearWorkGetInput; +use super::puzzle_clear_work_procedure_result_type::PuzzleClearWorkProcedureResult; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct GetPuzzleClearWorkProfileArgs { + pub input: PuzzleClearWorkGetInput, +} + +impl __sdk::InModule for GetPuzzleClearWorkProfileArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `get_puzzle_clear_work_profile`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait get_puzzle_clear_work_profile { + fn get_puzzle_clear_work_profile(&self, input: PuzzleClearWorkGetInput) { + self.get_puzzle_clear_work_profile_then(input, |_, _| {}); + } + + fn get_puzzle_clear_work_profile_then( + &self, + input: PuzzleClearWorkGetInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl get_puzzle_clear_work_profile for super::RemoteProcedures { + fn get_puzzle_clear_work_profile_then( + &self, + input: PuzzleClearWorkGetInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearWorkProcedureResult>( + "get_puzzle_clear_work_profile", + GetPuzzleClearWorkProfileArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/list_puzzle_clear_works_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/list_puzzle_clear_works_procedure.rs new file mode 100644 index 00000000..d440e9b8 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/list_puzzle_clear_works_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_works_list_input_type::PuzzleClearWorksListInput; +use super::puzzle_clear_works_procedure_result_type::PuzzleClearWorksProcedureResult; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct ListPuzzleClearWorksArgs { + pub input: PuzzleClearWorksListInput, +} + +impl __sdk::InModule for ListPuzzleClearWorksArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `list_puzzle_clear_works`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait list_puzzle_clear_works { + fn list_puzzle_clear_works(&self, input: PuzzleClearWorksListInput) { + self.list_puzzle_clear_works_then(input, |_, _| {}); + } + + fn list_puzzle_clear_works_then( + &self, + input: PuzzleClearWorksListInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl list_puzzle_clear_works for super::RemoteProcedures { + fn list_puzzle_clear_works_then( + &self, + input: PuzzleClearWorksListInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearWorksProcedureResult>( + "list_puzzle_clear_works", + ListPuzzleClearWorksArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/mark_puzzle_clear_level_time_up_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/mark_puzzle_clear_level_time_up_procedure.rs new file mode 100644 index 00000000..99280a6b --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/mark_puzzle_clear_level_time_up_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; +use super::puzzle_clear_run_time_up_input_type::PuzzleClearRunTimeUpInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct MarkPuzzleClearLevelTimeUpArgs { + pub input: PuzzleClearRunTimeUpInput, +} + +impl __sdk::InModule for MarkPuzzleClearLevelTimeUpArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `mark_puzzle_clear_level_time_up`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait mark_puzzle_clear_level_time_up { + fn mark_puzzle_clear_level_time_up(&self, input: PuzzleClearRunTimeUpInput) { + self.mark_puzzle_clear_level_time_up_then(input, |_, _| {}); + } + + fn mark_puzzle_clear_level_time_up_then( + &self, + input: PuzzleClearRunTimeUpInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl mark_puzzle_clear_level_time_up for super::RemoteProcedures { + fn mark_puzzle_clear_level_time_up_then( + &self, + input: PuzzleClearRunTimeUpInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearRunProcedureResult>( + "mark_puzzle_clear_level_time_up", + MarkPuzzleClearLevelTimeUpArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/publish_puzzle_clear_work_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/publish_puzzle_clear_work_procedure.rs new file mode 100644 index 00000000..55b2ca6d --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/publish_puzzle_clear_work_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_work_procedure_result_type::PuzzleClearWorkProcedureResult; +use super::puzzle_clear_work_publish_input_type::PuzzleClearWorkPublishInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct PublishPuzzleClearWorkArgs { + pub input: PuzzleClearWorkPublishInput, +} + +impl __sdk::InModule for PublishPuzzleClearWorkArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `publish_puzzle_clear_work`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait publish_puzzle_clear_work { + fn publish_puzzle_clear_work(&self, input: PuzzleClearWorkPublishInput) { + self.publish_puzzle_clear_work_then(input, |_, _| {}); + } + + fn publish_puzzle_clear_work_then( + &self, + input: PuzzleClearWorkPublishInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl publish_puzzle_clear_work for super::RemoteProcedures { + fn publish_puzzle_clear_work_then( + &self, + input: PuzzleClearWorkPublishInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearWorkProcedureResult>( + "publish_puzzle_clear_work", + PublishPuzzleClearWorkArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_create_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_create_input_type.rs new file mode 100644 index 00000000..9403c138 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_create_input_type.rs @@ -0,0 +1,23 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearAgentSessionCreateInput { + pub session_id: String, + pub owner_user_id: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: Option, + pub board_background_prompt: String, + pub created_at_micros: i64, +} + +impl __sdk::InModule for PuzzleClearAgentSessionCreateInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_get_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_get_input_type.rs new file mode 100644 index 00000000..3b88ac38 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_get_input_type.rs @@ -0,0 +1,16 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearAgentSessionGetInput { + pub session_id: String, + pub owner_user_id: String, +} + +impl __sdk::InModule for PuzzleClearAgentSessionGetInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_procedure_result_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_procedure_result_type.rs new file mode 100644 index 00000000..ac1a377f --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_procedure_result_type.rs @@ -0,0 +1,19 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_agent_session_snapshot_type::PuzzleClearAgentSessionSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearAgentSessionProcedureResult { + pub ok: bool, + pub session: Option, + pub error_message: Option, +} + +impl __sdk::InModule for PuzzleClearAgentSessionProcedureResult { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_row_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_row_type.rs new file mode 100644 index 00000000..697bb922 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_row_type.rs @@ -0,0 +1,72 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearAgentSessionRow { + pub session_id: String, + pub owner_user_id: String, + pub status: String, + pub draft_json: String, + pub published_profile_id: String, + pub created_at: __sdk::Timestamp, + pub updated_at: __sdk::Timestamp, +} + +impl __sdk::InModule for PuzzleClearAgentSessionRow { + type Module = super::RemoteModule; +} + +/// Column accessor struct for the table `PuzzleClearAgentSessionRow`. +/// +/// Provides typed access to columns for query building. +pub struct PuzzleClearAgentSessionRowCols { + pub session_id: __sdk::__query_builder::Col, + pub owner_user_id: __sdk::__query_builder::Col, + pub status: __sdk::__query_builder::Col, + pub draft_json: __sdk::__query_builder::Col, + pub published_profile_id: __sdk::__query_builder::Col, + pub created_at: __sdk::__query_builder::Col, + pub updated_at: __sdk::__query_builder::Col, +} + +impl __sdk::__query_builder::HasCols for PuzzleClearAgentSessionRow { + type Cols = PuzzleClearAgentSessionRowCols; + fn cols(table_name: &'static str) -> Self::Cols { + PuzzleClearAgentSessionRowCols { + session_id: __sdk::__query_builder::Col::new(table_name, "session_id"), + owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"), + status: __sdk::__query_builder::Col::new(table_name, "status"), + draft_json: __sdk::__query_builder::Col::new(table_name, "draft_json"), + published_profile_id: __sdk::__query_builder::Col::new( + table_name, + "published_profile_id", + ), + created_at: __sdk::__query_builder::Col::new(table_name, "created_at"), + updated_at: __sdk::__query_builder::Col::new(table_name, "updated_at"), + } + } +} + +/// Indexed column accessor struct for the table `PuzzleClearAgentSessionRow`. +/// +/// Provides typed access to indexed columns for query building. +pub struct PuzzleClearAgentSessionRowIxCols { + pub owner_user_id: __sdk::__query_builder::IxCol, + pub session_id: __sdk::__query_builder::IxCol, +} + +impl __sdk::__query_builder::HasIxCols for PuzzleClearAgentSessionRow { + type IxCols = PuzzleClearAgentSessionRowIxCols; + fn ix_cols(table_name: &'static str) -> Self::IxCols { + PuzzleClearAgentSessionRowIxCols { + owner_user_id: __sdk::__query_builder::IxCol::new(table_name, "owner_user_id"), + session_id: __sdk::__query_builder::IxCol::new(table_name, "session_id"), + } + } +} + +impl __sdk::__query_builder::CanBeLookupTable for PuzzleClearAgentSessionRow {} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_snapshot_type.rs new file mode 100644 index 00000000..4c31e374 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_snapshot_type.rs @@ -0,0 +1,23 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_draft_snapshot_type::PuzzleClearDraftSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearAgentSessionSnapshot { + pub session_id: String, + pub owner_user_id: String, + pub status: String, + pub draft: Option, + pub published_profile_id: Option, + pub created_at_micros: i64, + pub updated_at_micros: i64, +} + +impl __sdk::InModule for PuzzleClearAgentSessionSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_table.rs new file mode 100644 index 00000000..3b2ad913 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_agent_session_table.rs @@ -0,0 +1,166 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use super::puzzle_clear_agent_session_row_type::PuzzleClearAgentSessionRow; +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +/// Table handle for the table `puzzle_clear_agent_session`. +/// +/// Obtain a handle from the [`PuzzleClearAgentSessionTableAccess::puzzle_clear_agent_session`] method on [`super::RemoteTables`], +/// like `ctx.db.puzzle_clear_agent_session()`. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_agent_session().on_insert(...)`. +pub struct PuzzleClearAgentSessionTableHandle<'ctx> { + imp: __sdk::TableHandle, + ctx: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the table `puzzle_clear_agent_session`. +/// +/// Implemented for [`super::RemoteTables`]. +pub trait PuzzleClearAgentSessionTableAccess { + #[allow(non_snake_case)] + /// Obtain a [`PuzzleClearAgentSessionTableHandle`], which mediates access to the table `puzzle_clear_agent_session`. + fn puzzle_clear_agent_session(&self) -> PuzzleClearAgentSessionTableHandle<'_>; +} + +impl PuzzleClearAgentSessionTableAccess for super::RemoteTables { + fn puzzle_clear_agent_session(&self) -> PuzzleClearAgentSessionTableHandle<'_> { + PuzzleClearAgentSessionTableHandle { + imp: self + .imp + .get_table::("puzzle_clear_agent_session"), + ctx: std::marker::PhantomData, + } + } +} + +pub struct PuzzleClearAgentSessionInsertCallbackId(__sdk::CallbackId); +pub struct PuzzleClearAgentSessionDeleteCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::Table for PuzzleClearAgentSessionTableHandle<'ctx> { + type Row = PuzzleClearAgentSessionRow; + type EventContext = super::EventContext; + + fn count(&self) -> u64 { + self.imp.count() + } + fn iter(&self) -> impl Iterator + '_ { + self.imp.iter() + } + + type InsertCallbackId = PuzzleClearAgentSessionInsertCallbackId; + + fn on_insert( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearAgentSessionInsertCallbackId { + PuzzleClearAgentSessionInsertCallbackId(self.imp.on_insert(Box::new(callback))) + } + + fn remove_on_insert(&self, callback: PuzzleClearAgentSessionInsertCallbackId) { + self.imp.remove_on_insert(callback.0) + } + + type DeleteCallbackId = PuzzleClearAgentSessionDeleteCallbackId; + + fn on_delete( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearAgentSessionDeleteCallbackId { + PuzzleClearAgentSessionDeleteCallbackId(self.imp.on_delete(Box::new(callback))) + } + + fn remove_on_delete(&self, callback: PuzzleClearAgentSessionDeleteCallbackId) { + self.imp.remove_on_delete(callback.0) + } +} + +pub struct PuzzleClearAgentSessionUpdateCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::TableWithPrimaryKey for PuzzleClearAgentSessionTableHandle<'ctx> { + type UpdateCallbackId = PuzzleClearAgentSessionUpdateCallbackId; + + fn on_update( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row, &Self::Row) + Send + 'static, + ) -> PuzzleClearAgentSessionUpdateCallbackId { + PuzzleClearAgentSessionUpdateCallbackId(self.imp.on_update(Box::new(callback))) + } + + fn remove_on_update(&self, callback: PuzzleClearAgentSessionUpdateCallbackId) { + self.imp.remove_on_update(callback.0) + } +} + +/// Access to the `session_id` unique index on the table `puzzle_clear_agent_session`, +/// which allows point queries on the field of the same name +/// via the [`PuzzleClearAgentSessionSessionIdUnique::find`] method. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_agent_session().session_id().find(...)`. +pub struct PuzzleClearAgentSessionSessionIdUnique<'ctx> { + imp: __sdk::UniqueConstraintHandle, + phantom: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +impl<'ctx> PuzzleClearAgentSessionTableHandle<'ctx> { + /// Get a handle on the `session_id` unique index on the table `puzzle_clear_agent_session`. + pub fn session_id(&self) -> PuzzleClearAgentSessionSessionIdUnique<'ctx> { + PuzzleClearAgentSessionSessionIdUnique { + imp: self.imp.get_unique_constraint::("session_id"), + phantom: std::marker::PhantomData, + } + } +} + +impl<'ctx> PuzzleClearAgentSessionSessionIdUnique<'ctx> { + /// Find the subscribed row whose `session_id` column value is equal to `col_val`, + /// if such a row is present in the client cache. + pub fn find(&self, col_val: &String) -> Option { + self.imp.find(col_val) + } +} + +#[doc(hidden)] +pub(super) fn register_table(client_cache: &mut __sdk::ClientCache) { + let _table = + client_cache.get_or_make_table::("puzzle_clear_agent_session"); + _table.add_unique_constraint::("session_id", |row| &row.session_id); +} + +#[doc(hidden)] +pub(super) fn parse_table_update( + raw_updates: __ws::v2::TableUpdate, +) -> __sdk::Result<__sdk::TableUpdate> { + __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| { + __sdk::InternalError::failed_parse("TableUpdate", "TableUpdate") + .with_cause(e) + .into() + }) +} + +#[allow(non_camel_case_types)] +/// Extension trait for query builder access to the table `PuzzleClearAgentSessionRow`. +/// +/// Implemented for [`__sdk::QueryTableAccessor`]. +pub trait puzzle_clear_agent_sessionQueryTableAccess { + #[allow(non_snake_case)] + /// Get a query builder for the table `PuzzleClearAgentSessionRow`. + fn puzzle_clear_agent_session( + &self, + ) -> __sdk::__query_builder::Table; +} + +impl puzzle_clear_agent_sessionQueryTableAccess for __sdk::QueryTableAccessor { + fn puzzle_clear_agent_session( + &self, + ) -> __sdk::__query_builder::Table { + __sdk::__query_builder::Table::new("puzzle_clear_agent_session") + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_board_cell_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_board_cell_snapshot_type.rs new file mode 100644 index 00000000..6fe05368 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_board_cell_snapshot_type.rs @@ -0,0 +1,20 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearBoardCellSnapshot { + pub row: u32, + pub col: u32, + pub card: Option, + pub locked_group_id: Option, +} + +impl __sdk::InModule for PuzzleClearBoardCellSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_board_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_board_snapshot_type.rs new file mode 100644 index 00000000..fd1626e9 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_board_snapshot_type.rs @@ -0,0 +1,19 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_board_cell_snapshot_type::PuzzleClearBoardCellSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearBoardSnapshot { + pub rows: u32, + pub cols: u32, + pub cells: Vec, +} + +impl __sdk::InModule for PuzzleClearBoardSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_card_asset_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_card_asset_snapshot_type.rs new file mode 100644 index 00000000..8b40818e --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_card_asset_snapshot_type.rs @@ -0,0 +1,24 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearCardAssetSnapshot { + pub card_id: String, + pub group_id: String, + pub shape: String, + pub orientation: String, + pub part_x: u32, + pub part_y: u32, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub source_atlas_cell: String, +} + +impl __sdk::InModule for PuzzleClearCardAssetSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_draft_compile_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_draft_compile_input_type.rs new file mode 100644 index 00000000..c04959eb --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_draft_compile_input_type.rs @@ -0,0 +1,29 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearDraftCompileInput { + pub session_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: Option, + pub board_background_prompt: String, + pub atlas_asset_json: Option, + pub pattern_groups_json: Option, + pub card_assets_json: Option, + pub generation_status: Option, + pub compiled_at_micros: i64, +} + +impl __sdk::InModule for PuzzleClearDraftCompileInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_draft_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_draft_snapshot_type.rs new file mode 100644 index 00000000..75055777 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_draft_snapshot_type.rs @@ -0,0 +1,32 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; +use super::puzzle_clear_image_asset_snapshot_type::PuzzleClearImageAssetSnapshot; +use super::puzzle_clear_pattern_group_snapshot_type::PuzzleClearPatternGroupSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearDraftSnapshot { + pub template_id: String, + pub template_name: String, + pub profile_id: Option, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + pub board_background_prompt: String, + pub card_back_image_src: Option, + pub atlas_asset: Option, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub generation_status: String, +} + +impl __sdk::InModule for PuzzleClearDraftSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_event_row_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_event_row_type.rs new file mode 100644 index 00000000..00fcb66f --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_event_row_type.rs @@ -0,0 +1,71 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearEventRow { + pub event_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub run_id: String, + pub event_type: String, + pub result: String, + pub occurred_at: __sdk::Timestamp, +} + +impl __sdk::InModule for PuzzleClearEventRow { + type Module = super::RemoteModule; +} + +/// Column accessor struct for the table `PuzzleClearEventRow`. +/// +/// Provides typed access to columns for query building. +pub struct PuzzleClearEventRowCols { + pub event_id: __sdk::__query_builder::Col, + pub owner_user_id: __sdk::__query_builder::Col, + pub profile_id: __sdk::__query_builder::Col, + pub run_id: __sdk::__query_builder::Col, + pub event_type: __sdk::__query_builder::Col, + pub result: __sdk::__query_builder::Col, + pub occurred_at: __sdk::__query_builder::Col, +} + +impl __sdk::__query_builder::HasCols for PuzzleClearEventRow { + type Cols = PuzzleClearEventRowCols; + fn cols(table_name: &'static str) -> Self::Cols { + PuzzleClearEventRowCols { + event_id: __sdk::__query_builder::Col::new(table_name, "event_id"), + owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"), + profile_id: __sdk::__query_builder::Col::new(table_name, "profile_id"), + run_id: __sdk::__query_builder::Col::new(table_name, "run_id"), + event_type: __sdk::__query_builder::Col::new(table_name, "event_type"), + result: __sdk::__query_builder::Col::new(table_name, "result"), + occurred_at: __sdk::__query_builder::Col::new(table_name, "occurred_at"), + } + } +} + +/// Indexed column accessor struct for the table `PuzzleClearEventRow`. +/// +/// Provides typed access to indexed columns for query building. +pub struct PuzzleClearEventRowIxCols { + pub event_id: __sdk::__query_builder::IxCol, + pub profile_id: __sdk::__query_builder::IxCol, + pub run_id: __sdk::__query_builder::IxCol, +} + +impl __sdk::__query_builder::HasIxCols for PuzzleClearEventRow { + type IxCols = PuzzleClearEventRowIxCols; + fn ix_cols(table_name: &'static str) -> Self::IxCols { + PuzzleClearEventRowIxCols { + event_id: __sdk::__query_builder::IxCol::new(table_name, "event_id"), + profile_id: __sdk::__query_builder::IxCol::new(table_name, "profile_id"), + run_id: __sdk::__query_builder::IxCol::new(table_name, "run_id"), + } + } +} + +impl __sdk::__query_builder::CanBeLookupTable for PuzzleClearEventRow {} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_event_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_event_table.rs new file mode 100644 index 00000000..c1966f23 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_event_table.rs @@ -0,0 +1,161 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use super::puzzle_clear_event_row_type::PuzzleClearEventRow; +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +/// Table handle for the table `puzzle_clear_event`. +/// +/// Obtain a handle from the [`PuzzleClearEventTableAccess::puzzle_clear_event`] method on [`super::RemoteTables`], +/// like `ctx.db.puzzle_clear_event()`. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_event().on_insert(...)`. +pub struct PuzzleClearEventTableHandle<'ctx> { + imp: __sdk::TableHandle, + ctx: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the table `puzzle_clear_event`. +/// +/// Implemented for [`super::RemoteTables`]. +pub trait PuzzleClearEventTableAccess { + #[allow(non_snake_case)] + /// Obtain a [`PuzzleClearEventTableHandle`], which mediates access to the table `puzzle_clear_event`. + fn puzzle_clear_event(&self) -> PuzzleClearEventTableHandle<'_>; +} + +impl PuzzleClearEventTableAccess for super::RemoteTables { + fn puzzle_clear_event(&self) -> PuzzleClearEventTableHandle<'_> { + PuzzleClearEventTableHandle { + imp: self + .imp + .get_table::("puzzle_clear_event"), + ctx: std::marker::PhantomData, + } + } +} + +pub struct PuzzleClearEventInsertCallbackId(__sdk::CallbackId); +pub struct PuzzleClearEventDeleteCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::Table for PuzzleClearEventTableHandle<'ctx> { + type Row = PuzzleClearEventRow; + type EventContext = super::EventContext; + + fn count(&self) -> u64 { + self.imp.count() + } + fn iter(&self) -> impl Iterator + '_ { + self.imp.iter() + } + + type InsertCallbackId = PuzzleClearEventInsertCallbackId; + + fn on_insert( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearEventInsertCallbackId { + PuzzleClearEventInsertCallbackId(self.imp.on_insert(Box::new(callback))) + } + + fn remove_on_insert(&self, callback: PuzzleClearEventInsertCallbackId) { + self.imp.remove_on_insert(callback.0) + } + + type DeleteCallbackId = PuzzleClearEventDeleteCallbackId; + + fn on_delete( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearEventDeleteCallbackId { + PuzzleClearEventDeleteCallbackId(self.imp.on_delete(Box::new(callback))) + } + + fn remove_on_delete(&self, callback: PuzzleClearEventDeleteCallbackId) { + self.imp.remove_on_delete(callback.0) + } +} + +pub struct PuzzleClearEventUpdateCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::TableWithPrimaryKey for PuzzleClearEventTableHandle<'ctx> { + type UpdateCallbackId = PuzzleClearEventUpdateCallbackId; + + fn on_update( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row, &Self::Row) + Send + 'static, + ) -> PuzzleClearEventUpdateCallbackId { + PuzzleClearEventUpdateCallbackId(self.imp.on_update(Box::new(callback))) + } + + fn remove_on_update(&self, callback: PuzzleClearEventUpdateCallbackId) { + self.imp.remove_on_update(callback.0) + } +} + +/// Access to the `event_id` unique index on the table `puzzle_clear_event`, +/// which allows point queries on the field of the same name +/// via the [`PuzzleClearEventEventIdUnique::find`] method. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_event().event_id().find(...)`. +pub struct PuzzleClearEventEventIdUnique<'ctx> { + imp: __sdk::UniqueConstraintHandle, + phantom: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +impl<'ctx> PuzzleClearEventTableHandle<'ctx> { + /// Get a handle on the `event_id` unique index on the table `puzzle_clear_event`. + pub fn event_id(&self) -> PuzzleClearEventEventIdUnique<'ctx> { + PuzzleClearEventEventIdUnique { + imp: self.imp.get_unique_constraint::("event_id"), + phantom: std::marker::PhantomData, + } + } +} + +impl<'ctx> PuzzleClearEventEventIdUnique<'ctx> { + /// Find the subscribed row whose `event_id` column value is equal to `col_val`, + /// if such a row is present in the client cache. + pub fn find(&self, col_val: &String) -> Option { + self.imp.find(col_val) + } +} + +#[doc(hidden)] +pub(super) fn register_table(client_cache: &mut __sdk::ClientCache) { + let _table = client_cache.get_or_make_table::("puzzle_clear_event"); + _table.add_unique_constraint::("event_id", |row| &row.event_id); +} + +#[doc(hidden)] +pub(super) fn parse_table_update( + raw_updates: __ws::v2::TableUpdate, +) -> __sdk::Result<__sdk::TableUpdate> { + __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| { + __sdk::InternalError::failed_parse("TableUpdate", "TableUpdate") + .with_cause(e) + .into() + }) +} + +#[allow(non_camel_case_types)] +/// Extension trait for query builder access to the table `PuzzleClearEventRow`. +/// +/// Implemented for [`__sdk::QueryTableAccessor`]. +pub trait puzzle_clear_eventQueryTableAccess { + #[allow(non_snake_case)] + /// Get a query builder for the table `PuzzleClearEventRow`. + fn puzzle_clear_event(&self) -> __sdk::__query_builder::Table; +} + +impl puzzle_clear_eventQueryTableAccess for __sdk::QueryTableAccessor { + fn puzzle_clear_event(&self) -> __sdk::__query_builder::Table { + __sdk::__query_builder::Table::new("puzzle_clear_event") + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_card_view_row_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_card_view_row_type.rs new file mode 100644 index 00000000..575c7f92 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_card_view_row_type.rs @@ -0,0 +1,77 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearGalleryCardViewRow { + pub public_work_code: String, + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub cover_image_src: Option, + pub publication_status: String, + pub play_count: u32, + pub updated_at_micros: i64, + pub published_at_micros: Option, + pub generation_status: String, +} + +impl __sdk::InModule for PuzzleClearGalleryCardViewRow { + type Module = super::RemoteModule; +} + +/// Column accessor struct for the table `PuzzleClearGalleryCardViewRow`. +/// +/// Provides typed access to columns for query building. +pub struct PuzzleClearGalleryCardViewRowCols { + pub public_work_code: __sdk::__query_builder::Col, + pub work_id: __sdk::__query_builder::Col, + pub profile_id: __sdk::__query_builder::Col, + pub owner_user_id: __sdk::__query_builder::Col, + pub author_display_name: __sdk::__query_builder::Col, + pub work_title: __sdk::__query_builder::Col, + pub work_description: __sdk::__query_builder::Col, + pub theme_prompt: __sdk::__query_builder::Col, + pub cover_image_src: __sdk::__query_builder::Col>, + pub publication_status: __sdk::__query_builder::Col, + pub play_count: __sdk::__query_builder::Col, + pub updated_at_micros: __sdk::__query_builder::Col, + pub published_at_micros: + __sdk::__query_builder::Col>, + pub generation_status: __sdk::__query_builder::Col, +} + +impl __sdk::__query_builder::HasCols for PuzzleClearGalleryCardViewRow { + type Cols = PuzzleClearGalleryCardViewRowCols; + fn cols(table_name: &'static str) -> Self::Cols { + PuzzleClearGalleryCardViewRowCols { + public_work_code: __sdk::__query_builder::Col::new(table_name, "public_work_code"), + work_id: __sdk::__query_builder::Col::new(table_name, "work_id"), + profile_id: __sdk::__query_builder::Col::new(table_name, "profile_id"), + owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"), + author_display_name: __sdk::__query_builder::Col::new( + table_name, + "author_display_name", + ), + work_title: __sdk::__query_builder::Col::new(table_name, "work_title"), + work_description: __sdk::__query_builder::Col::new(table_name, "work_description"), + theme_prompt: __sdk::__query_builder::Col::new(table_name, "theme_prompt"), + cover_image_src: __sdk::__query_builder::Col::new(table_name, "cover_image_src"), + publication_status: __sdk::__query_builder::Col::new(table_name, "publication_status"), + play_count: __sdk::__query_builder::Col::new(table_name, "play_count"), + updated_at_micros: __sdk::__query_builder::Col::new(table_name, "updated_at_micros"), + published_at_micros: __sdk::__query_builder::Col::new( + table_name, + "published_at_micros", + ), + generation_status: __sdk::__query_builder::Col::new(table_name, "generation_status"), + } + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_card_view_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_card_view_table.rs new file mode 100644 index 00000000..1c78182b --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_card_view_table.rs @@ -0,0 +1,121 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use super::puzzle_clear_gallery_card_view_row_type::PuzzleClearGalleryCardViewRow; +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +/// Table handle for the table `puzzle_clear_gallery_card_view`. +/// +/// Obtain a handle from the [`PuzzleClearGalleryCardViewTableAccess::puzzle_clear_gallery_card_view`] method on [`super::RemoteTables`], +/// like `ctx.db.puzzle_clear_gallery_card_view()`. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_gallery_card_view().on_insert(...)`. +pub struct PuzzleClearGalleryCardViewTableHandle<'ctx> { + imp: __sdk::TableHandle, + ctx: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the table `puzzle_clear_gallery_card_view`. +/// +/// Implemented for [`super::RemoteTables`]. +pub trait PuzzleClearGalleryCardViewTableAccess { + #[allow(non_snake_case)] + /// Obtain a [`PuzzleClearGalleryCardViewTableHandle`], which mediates access to the table `puzzle_clear_gallery_card_view`. + fn puzzle_clear_gallery_card_view(&self) -> PuzzleClearGalleryCardViewTableHandle<'_>; +} + +impl PuzzleClearGalleryCardViewTableAccess for super::RemoteTables { + fn puzzle_clear_gallery_card_view(&self) -> PuzzleClearGalleryCardViewTableHandle<'_> { + PuzzleClearGalleryCardViewTableHandle { + imp: self + .imp + .get_table::("puzzle_clear_gallery_card_view"), + ctx: std::marker::PhantomData, + } + } +} + +pub struct PuzzleClearGalleryCardViewInsertCallbackId(__sdk::CallbackId); +pub struct PuzzleClearGalleryCardViewDeleteCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::Table for PuzzleClearGalleryCardViewTableHandle<'ctx> { + type Row = PuzzleClearGalleryCardViewRow; + type EventContext = super::EventContext; + + fn count(&self) -> u64 { + self.imp.count() + } + fn iter(&self) -> impl Iterator + '_ { + self.imp.iter() + } + + type InsertCallbackId = PuzzleClearGalleryCardViewInsertCallbackId; + + fn on_insert( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearGalleryCardViewInsertCallbackId { + PuzzleClearGalleryCardViewInsertCallbackId(self.imp.on_insert(Box::new(callback))) + } + + fn remove_on_insert(&self, callback: PuzzleClearGalleryCardViewInsertCallbackId) { + self.imp.remove_on_insert(callback.0) + } + + type DeleteCallbackId = PuzzleClearGalleryCardViewDeleteCallbackId; + + fn on_delete( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearGalleryCardViewDeleteCallbackId { + PuzzleClearGalleryCardViewDeleteCallbackId(self.imp.on_delete(Box::new(callback))) + } + + fn remove_on_delete(&self, callback: PuzzleClearGalleryCardViewDeleteCallbackId) { + self.imp.remove_on_delete(callback.0) + } +} + +#[doc(hidden)] +pub(super) fn register_table(client_cache: &mut __sdk::ClientCache) { + let _table = client_cache + .get_or_make_table::("puzzle_clear_gallery_card_view"); +} + +#[doc(hidden)] +pub(super) fn parse_table_update( + raw_updates: __ws::v2::TableUpdate, +) -> __sdk::Result<__sdk::TableUpdate> { + __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| { + __sdk::InternalError::failed_parse( + "TableUpdate", + "TableUpdate", + ) + .with_cause(e) + .into() + }) +} + +#[allow(non_camel_case_types)] +/// Extension trait for query builder access to the table `PuzzleClearGalleryCardViewRow`. +/// +/// Implemented for [`__sdk::QueryTableAccessor`]. +pub trait puzzle_clear_gallery_card_viewQueryTableAccess { + #[allow(non_snake_case)] + /// Get a query builder for the table `PuzzleClearGalleryCardViewRow`. + fn puzzle_clear_gallery_card_view( + &self, + ) -> __sdk::__query_builder::Table; +} + +impl puzzle_clear_gallery_card_viewQueryTableAccess for __sdk::QueryTableAccessor { + fn puzzle_clear_gallery_card_view( + &self, + ) -> __sdk::__query_builder::Table { + __sdk::__query_builder::Table::new("puzzle_clear_gallery_card_view") + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_view_row_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_view_row_type.rs new file mode 100644 index 00000000..884558a7 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_view_row_type.rs @@ -0,0 +1,124 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; +use super::puzzle_clear_image_asset_snapshot_type::PuzzleClearImageAssetSnapshot; +use super::puzzle_clear_pattern_group_snapshot_type::PuzzleClearPatternGroupSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearGalleryViewRow { + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub source_session_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + pub board_background_prompt: String, + pub card_back_image_src: Option, + pub atlas_asset: PuzzleClearImageAssetSnapshot, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub cover_image_src: Option, + pub publication_status: String, + pub publish_ready: bool, + pub play_count: u32, + pub generation_status: String, + pub updated_at_micros: i64, + pub published_at_micros: Option, +} + +impl __sdk::InModule for PuzzleClearGalleryViewRow { + type Module = super::RemoteModule; +} + +/// Column accessor struct for the table `PuzzleClearGalleryViewRow`. +/// +/// Provides typed access to columns for query building. +pub struct PuzzleClearGalleryViewRowCols { + pub work_id: __sdk::__query_builder::Col, + pub profile_id: __sdk::__query_builder::Col, + pub owner_user_id: __sdk::__query_builder::Col, + pub source_session_id: __sdk::__query_builder::Col, + pub author_display_name: __sdk::__query_builder::Col, + pub work_title: __sdk::__query_builder::Col, + pub work_description: __sdk::__query_builder::Col, + pub theme_prompt: __sdk::__query_builder::Col, + pub generate_board_background: __sdk::__query_builder::Col, + pub board_background_asset: __sdk::__query_builder::Col< + PuzzleClearGalleryViewRow, + Option, + >, + pub board_background_prompt: __sdk::__query_builder::Col, + pub card_back_image_src: __sdk::__query_builder::Col>, + pub atlas_asset: + __sdk::__query_builder::Col, + pub pattern_groups: __sdk::__query_builder::Col< + PuzzleClearGalleryViewRow, + Vec, + >, + pub card_assets: + __sdk::__query_builder::Col>, + pub cover_image_src: __sdk::__query_builder::Col>, + pub publication_status: __sdk::__query_builder::Col, + pub publish_ready: __sdk::__query_builder::Col, + pub play_count: __sdk::__query_builder::Col, + pub generation_status: __sdk::__query_builder::Col, + pub updated_at_micros: __sdk::__query_builder::Col, + pub published_at_micros: __sdk::__query_builder::Col>, +} + +impl __sdk::__query_builder::HasCols for PuzzleClearGalleryViewRow { + type Cols = PuzzleClearGalleryViewRowCols; + fn cols(table_name: &'static str) -> Self::Cols { + PuzzleClearGalleryViewRowCols { + work_id: __sdk::__query_builder::Col::new(table_name, "work_id"), + profile_id: __sdk::__query_builder::Col::new(table_name, "profile_id"), + owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"), + source_session_id: __sdk::__query_builder::Col::new(table_name, "source_session_id"), + author_display_name: __sdk::__query_builder::Col::new( + table_name, + "author_display_name", + ), + work_title: __sdk::__query_builder::Col::new(table_name, "work_title"), + work_description: __sdk::__query_builder::Col::new(table_name, "work_description"), + theme_prompt: __sdk::__query_builder::Col::new(table_name, "theme_prompt"), + generate_board_background: __sdk::__query_builder::Col::new( + table_name, + "generate_board_background", + ), + board_background_asset: __sdk::__query_builder::Col::new( + table_name, + "board_background_asset", + ), + board_background_prompt: __sdk::__query_builder::Col::new( + table_name, + "board_background_prompt", + ), + card_back_image_src: __sdk::__query_builder::Col::new( + table_name, + "card_back_image_src", + ), + atlas_asset: __sdk::__query_builder::Col::new(table_name, "atlas_asset"), + pattern_groups: __sdk::__query_builder::Col::new(table_name, "pattern_groups"), + card_assets: __sdk::__query_builder::Col::new(table_name, "card_assets"), + cover_image_src: __sdk::__query_builder::Col::new(table_name, "cover_image_src"), + publication_status: __sdk::__query_builder::Col::new(table_name, "publication_status"), + publish_ready: __sdk::__query_builder::Col::new(table_name, "publish_ready"), + play_count: __sdk::__query_builder::Col::new(table_name, "play_count"), + generation_status: __sdk::__query_builder::Col::new(table_name, "generation_status"), + updated_at_micros: __sdk::__query_builder::Col::new(table_name, "updated_at_micros"), + published_at_micros: __sdk::__query_builder::Col::new( + table_name, + "published_at_micros", + ), + } + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_view_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_view_table.rs new file mode 100644 index 00000000..f41b3c6b --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_gallery_view_table.rs @@ -0,0 +1,120 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use super::puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; +use super::puzzle_clear_gallery_view_row_type::PuzzleClearGalleryViewRow; +use super::puzzle_clear_image_asset_snapshot_type::PuzzleClearImageAssetSnapshot; +use super::puzzle_clear_pattern_group_snapshot_type::PuzzleClearPatternGroupSnapshot; +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +/// Table handle for the table `puzzle_clear_gallery_view`. +/// +/// Obtain a handle from the [`PuzzleClearGalleryViewTableAccess::puzzle_clear_gallery_view`] method on [`super::RemoteTables`], +/// like `ctx.db.puzzle_clear_gallery_view()`. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_gallery_view().on_insert(...)`. +pub struct PuzzleClearGalleryViewTableHandle<'ctx> { + imp: __sdk::TableHandle, + ctx: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the table `puzzle_clear_gallery_view`. +/// +/// Implemented for [`super::RemoteTables`]. +pub trait PuzzleClearGalleryViewTableAccess { + #[allow(non_snake_case)] + /// Obtain a [`PuzzleClearGalleryViewTableHandle`], which mediates access to the table `puzzle_clear_gallery_view`. + fn puzzle_clear_gallery_view(&self) -> PuzzleClearGalleryViewTableHandle<'_>; +} + +impl PuzzleClearGalleryViewTableAccess for super::RemoteTables { + fn puzzle_clear_gallery_view(&self) -> PuzzleClearGalleryViewTableHandle<'_> { + PuzzleClearGalleryViewTableHandle { + imp: self + .imp + .get_table::("puzzle_clear_gallery_view"), + ctx: std::marker::PhantomData, + } + } +} + +pub struct PuzzleClearGalleryViewInsertCallbackId(__sdk::CallbackId); +pub struct PuzzleClearGalleryViewDeleteCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::Table for PuzzleClearGalleryViewTableHandle<'ctx> { + type Row = PuzzleClearGalleryViewRow; + type EventContext = super::EventContext; + + fn count(&self) -> u64 { + self.imp.count() + } + fn iter(&self) -> impl Iterator + '_ { + self.imp.iter() + } + + type InsertCallbackId = PuzzleClearGalleryViewInsertCallbackId; + + fn on_insert( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearGalleryViewInsertCallbackId { + PuzzleClearGalleryViewInsertCallbackId(self.imp.on_insert(Box::new(callback))) + } + + fn remove_on_insert(&self, callback: PuzzleClearGalleryViewInsertCallbackId) { + self.imp.remove_on_insert(callback.0) + } + + type DeleteCallbackId = PuzzleClearGalleryViewDeleteCallbackId; + + fn on_delete( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearGalleryViewDeleteCallbackId { + PuzzleClearGalleryViewDeleteCallbackId(self.imp.on_delete(Box::new(callback))) + } + + fn remove_on_delete(&self, callback: PuzzleClearGalleryViewDeleteCallbackId) { + self.imp.remove_on_delete(callback.0) + } +} + +#[doc(hidden)] +pub(super) fn register_table(client_cache: &mut __sdk::ClientCache) { + let _table = + client_cache.get_or_make_table::("puzzle_clear_gallery_view"); +} + +#[doc(hidden)] +pub(super) fn parse_table_update( + raw_updates: __ws::v2::TableUpdate, +) -> __sdk::Result<__sdk::TableUpdate> { + __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| { + __sdk::InternalError::failed_parse("TableUpdate", "TableUpdate") + .with_cause(e) + .into() + }) +} + +#[allow(non_camel_case_types)] +/// Extension trait for query builder access to the table `PuzzleClearGalleryViewRow`. +/// +/// Implemented for [`__sdk::QueryTableAccessor`]. +pub trait puzzle_clear_gallery_viewQueryTableAccess { + #[allow(non_snake_case)] + /// Get a query builder for the table `PuzzleClearGalleryViewRow`. + fn puzzle_clear_gallery_view(&self) + -> __sdk::__query_builder::Table; +} + +impl puzzle_clear_gallery_viewQueryTableAccess for __sdk::QueryTableAccessor { + fn puzzle_clear_gallery_view( + &self, + ) -> __sdk::__query_builder::Table { + __sdk::__query_builder::Table::new("puzzle_clear_gallery_view") + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_image_asset_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_image_asset_snapshot_type.rs new file mode 100644 index 00000000..b9cf55a5 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_image_asset_snapshot_type.rs @@ -0,0 +1,22 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearImageAssetSnapshot { + pub asset_id: String, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub generation_provider: String, + pub prompt: String, + pub width: u32, + pub height: u32, +} + +impl __sdk::InModule for PuzzleClearImageAssetSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_pattern_group_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_pattern_group_snapshot_type.rs new file mode 100644 index 00000000..dfebc41a --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_pattern_group_snapshot_type.rs @@ -0,0 +1,22 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearPatternGroupSnapshot { + pub group_id: String, + pub shape: String, + pub width: u32, + pub height: u32, + pub atlas_x: u32, + pub atlas_y: u32, + pub atlas_width: u32, + pub atlas_height: u32, +} + +impl __sdk::InModule for PuzzleClearPatternGroupSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_get_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_get_input_type.rs new file mode 100644 index 00000000..3a45f25b --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_get_input_type.rs @@ -0,0 +1,16 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunGetInput { + pub run_id: String, + pub owner_user_id: String, +} + +impl __sdk::InModule for PuzzleClearRunGetInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_next_level_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_next_level_input_type.rs new file mode 100644 index 00000000..92fc2bfb --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_next_level_input_type.rs @@ -0,0 +1,18 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunNextLevelInput { + pub run_id: String, + pub owner_user_id: String, + pub client_action_id: String, + pub started_at_ms: i64, +} + +impl __sdk::InModule for PuzzleClearRunNextLevelInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_procedure_result_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_procedure_result_type.rs new file mode 100644 index 00000000..c9ed733c --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_procedure_result_type.rs @@ -0,0 +1,19 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_runtime_snapshot_type::PuzzleClearRuntimeSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunProcedureResult { + pub ok: bool, + pub run: Option, + pub error_message: Option, +} + +impl __sdk::InModule for PuzzleClearRunProcedureResult { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_retry_level_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_retry_level_input_type.rs new file mode 100644 index 00000000..1509038e --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_retry_level_input_type.rs @@ -0,0 +1,18 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunRetryLevelInput { + pub run_id: String, + pub owner_user_id: String, + pub client_action_id: String, + pub restarted_at_ms: i64, +} + +impl __sdk::InModule for PuzzleClearRunRetryLevelInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_start_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_start_input_type.rs new file mode 100644 index 00000000..8366824c --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_start_input_type.rs @@ -0,0 +1,19 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunStartInput { + pub run_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub client_event_id: String, + pub started_at_ms: i64, +} + +impl __sdk::InModule for PuzzleClearRunStartInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_swap_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_swap_input_type.rs new file mode 100644 index 00000000..119031fb --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_swap_input_type.rs @@ -0,0 +1,22 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunSwapInput { + pub run_id: String, + pub owner_user_id: String, + pub from_row: u32, + pub from_col: u32, + pub to_row: u32, + pub to_col: u32, + pub client_action_id: String, + pub swapped_at_ms: i64, +} + +impl __sdk::InModule for PuzzleClearRunSwapInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_time_up_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_time_up_input_type.rs new file mode 100644 index 00000000..4f3d2a50 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_run_time_up_input_type.rs @@ -0,0 +1,18 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRunTimeUpInput { + pub run_id: String, + pub owner_user_id: String, + pub client_action_id: String, + pub occurred_at_ms: i64, +} + +impl __sdk::InModule for PuzzleClearRunTimeUpInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_run_row_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_run_row_type.rs new file mode 100644 index 00000000..fa99c892 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_run_row_type.rs @@ -0,0 +1,83 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRuntimeRunRow { + pub run_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub status: String, + pub level_index: u32, + pub clears_done: u32, + pub snapshot_json: String, + pub started_at_ms: i64, + pub finished_at_ms: i64, + pub created_at: __sdk::Timestamp, + pub updated_at: __sdk::Timestamp, +} + +impl __sdk::InModule for PuzzleClearRuntimeRunRow { + type Module = super::RemoteModule; +} + +/// Column accessor struct for the table `PuzzleClearRuntimeRunRow`. +/// +/// Provides typed access to columns for query building. +pub struct PuzzleClearRuntimeRunRowCols { + pub run_id: __sdk::__query_builder::Col, + pub owner_user_id: __sdk::__query_builder::Col, + pub profile_id: __sdk::__query_builder::Col, + pub status: __sdk::__query_builder::Col, + pub level_index: __sdk::__query_builder::Col, + pub clears_done: __sdk::__query_builder::Col, + pub snapshot_json: __sdk::__query_builder::Col, + pub started_at_ms: __sdk::__query_builder::Col, + pub finished_at_ms: __sdk::__query_builder::Col, + pub created_at: __sdk::__query_builder::Col, + pub updated_at: __sdk::__query_builder::Col, +} + +impl __sdk::__query_builder::HasCols for PuzzleClearRuntimeRunRow { + type Cols = PuzzleClearRuntimeRunRowCols; + fn cols(table_name: &'static str) -> Self::Cols { + PuzzleClearRuntimeRunRowCols { + run_id: __sdk::__query_builder::Col::new(table_name, "run_id"), + owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"), + profile_id: __sdk::__query_builder::Col::new(table_name, "profile_id"), + status: __sdk::__query_builder::Col::new(table_name, "status"), + level_index: __sdk::__query_builder::Col::new(table_name, "level_index"), + clears_done: __sdk::__query_builder::Col::new(table_name, "clears_done"), + snapshot_json: __sdk::__query_builder::Col::new(table_name, "snapshot_json"), + started_at_ms: __sdk::__query_builder::Col::new(table_name, "started_at_ms"), + finished_at_ms: __sdk::__query_builder::Col::new(table_name, "finished_at_ms"), + created_at: __sdk::__query_builder::Col::new(table_name, "created_at"), + updated_at: __sdk::__query_builder::Col::new(table_name, "updated_at"), + } + } +} + +/// Indexed column accessor struct for the table `PuzzleClearRuntimeRunRow`. +/// +/// Provides typed access to indexed columns for query building. +pub struct PuzzleClearRuntimeRunRowIxCols { + pub owner_user_id: __sdk::__query_builder::IxCol, + pub profile_id: __sdk::__query_builder::IxCol, + pub run_id: __sdk::__query_builder::IxCol, +} + +impl __sdk::__query_builder::HasIxCols for PuzzleClearRuntimeRunRow { + type IxCols = PuzzleClearRuntimeRunRowIxCols; + fn ix_cols(table_name: &'static str) -> Self::IxCols { + PuzzleClearRuntimeRunRowIxCols { + owner_user_id: __sdk::__query_builder::IxCol::new(table_name, "owner_user_id"), + profile_id: __sdk::__query_builder::IxCol::new(table_name, "profile_id"), + run_id: __sdk::__query_builder::IxCol::new(table_name, "run_id"), + } + } +} + +impl __sdk::__query_builder::CanBeLookupTable for PuzzleClearRuntimeRunRow {} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_run_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_run_table.rs new file mode 100644 index 00000000..b83148fa --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_run_table.rs @@ -0,0 +1,162 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use super::puzzle_clear_runtime_run_row_type::PuzzleClearRuntimeRunRow; +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +/// Table handle for the table `puzzle_clear_runtime_run`. +/// +/// Obtain a handle from the [`PuzzleClearRuntimeRunTableAccess::puzzle_clear_runtime_run`] method on [`super::RemoteTables`], +/// like `ctx.db.puzzle_clear_runtime_run()`. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_runtime_run().on_insert(...)`. +pub struct PuzzleClearRuntimeRunTableHandle<'ctx> { + imp: __sdk::TableHandle, + ctx: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the table `puzzle_clear_runtime_run`. +/// +/// Implemented for [`super::RemoteTables`]. +pub trait PuzzleClearRuntimeRunTableAccess { + #[allow(non_snake_case)] + /// Obtain a [`PuzzleClearRuntimeRunTableHandle`], which mediates access to the table `puzzle_clear_runtime_run`. + fn puzzle_clear_runtime_run(&self) -> PuzzleClearRuntimeRunTableHandle<'_>; +} + +impl PuzzleClearRuntimeRunTableAccess for super::RemoteTables { + fn puzzle_clear_runtime_run(&self) -> PuzzleClearRuntimeRunTableHandle<'_> { + PuzzleClearRuntimeRunTableHandle { + imp: self + .imp + .get_table::("puzzle_clear_runtime_run"), + ctx: std::marker::PhantomData, + } + } +} + +pub struct PuzzleClearRuntimeRunInsertCallbackId(__sdk::CallbackId); +pub struct PuzzleClearRuntimeRunDeleteCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::Table for PuzzleClearRuntimeRunTableHandle<'ctx> { + type Row = PuzzleClearRuntimeRunRow; + type EventContext = super::EventContext; + + fn count(&self) -> u64 { + self.imp.count() + } + fn iter(&self) -> impl Iterator + '_ { + self.imp.iter() + } + + type InsertCallbackId = PuzzleClearRuntimeRunInsertCallbackId; + + fn on_insert( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearRuntimeRunInsertCallbackId { + PuzzleClearRuntimeRunInsertCallbackId(self.imp.on_insert(Box::new(callback))) + } + + fn remove_on_insert(&self, callback: PuzzleClearRuntimeRunInsertCallbackId) { + self.imp.remove_on_insert(callback.0) + } + + type DeleteCallbackId = PuzzleClearRuntimeRunDeleteCallbackId; + + fn on_delete( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearRuntimeRunDeleteCallbackId { + PuzzleClearRuntimeRunDeleteCallbackId(self.imp.on_delete(Box::new(callback))) + } + + fn remove_on_delete(&self, callback: PuzzleClearRuntimeRunDeleteCallbackId) { + self.imp.remove_on_delete(callback.0) + } +} + +pub struct PuzzleClearRuntimeRunUpdateCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::TableWithPrimaryKey for PuzzleClearRuntimeRunTableHandle<'ctx> { + type UpdateCallbackId = PuzzleClearRuntimeRunUpdateCallbackId; + + fn on_update( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row, &Self::Row) + Send + 'static, + ) -> PuzzleClearRuntimeRunUpdateCallbackId { + PuzzleClearRuntimeRunUpdateCallbackId(self.imp.on_update(Box::new(callback))) + } + + fn remove_on_update(&self, callback: PuzzleClearRuntimeRunUpdateCallbackId) { + self.imp.remove_on_update(callback.0) + } +} + +/// Access to the `run_id` unique index on the table `puzzle_clear_runtime_run`, +/// which allows point queries on the field of the same name +/// via the [`PuzzleClearRuntimeRunRunIdUnique::find`] method. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_runtime_run().run_id().find(...)`. +pub struct PuzzleClearRuntimeRunRunIdUnique<'ctx> { + imp: __sdk::UniqueConstraintHandle, + phantom: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +impl<'ctx> PuzzleClearRuntimeRunTableHandle<'ctx> { + /// Get a handle on the `run_id` unique index on the table `puzzle_clear_runtime_run`. + pub fn run_id(&self) -> PuzzleClearRuntimeRunRunIdUnique<'ctx> { + PuzzleClearRuntimeRunRunIdUnique { + imp: self.imp.get_unique_constraint::("run_id"), + phantom: std::marker::PhantomData, + } + } +} + +impl<'ctx> PuzzleClearRuntimeRunRunIdUnique<'ctx> { + /// Find the subscribed row whose `run_id` column value is equal to `col_val`, + /// if such a row is present in the client cache. + pub fn find(&self, col_val: &String) -> Option { + self.imp.find(col_val) + } +} + +#[doc(hidden)] +pub(super) fn register_table(client_cache: &mut __sdk::ClientCache) { + let _table = + client_cache.get_or_make_table::("puzzle_clear_runtime_run"); + _table.add_unique_constraint::("run_id", |row| &row.run_id); +} + +#[doc(hidden)] +pub(super) fn parse_table_update( + raw_updates: __ws::v2::TableUpdate, +) -> __sdk::Result<__sdk::TableUpdate> { + __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| { + __sdk::InternalError::failed_parse("TableUpdate", "TableUpdate") + .with_cause(e) + .into() + }) +} + +#[allow(non_camel_case_types)] +/// Extension trait for query builder access to the table `PuzzleClearRuntimeRunRow`. +/// +/// Implemented for [`__sdk::QueryTableAccessor`]. +pub trait puzzle_clear_runtime_runQueryTableAccess { + #[allow(non_snake_case)] + /// Get a query builder for the table `PuzzleClearRuntimeRunRow`. + fn puzzle_clear_runtime_run(&self) -> __sdk::__query_builder::Table; +} + +impl puzzle_clear_runtime_runQueryTableAccess for __sdk::QueryTableAccessor { + fn puzzle_clear_runtime_run(&self) -> __sdk::__query_builder::Table { + __sdk::__query_builder::Table::new("puzzle_clear_runtime_run") + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_snapshot_type.rs new file mode 100644 index 00000000..1ae78997 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_runtime_snapshot_type.rs @@ -0,0 +1,30 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_board_snapshot_type::PuzzleClearBoardSnapshot; +use super::puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearRuntimeSnapshot { + pub run_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub status: String, + pub level_index: u32, + pub clears_done: u32, + pub target_clears: u32, + pub level_duration_seconds: u32, + pub level_started_at_ms: u64, + pub board: PuzzleClearBoardSnapshot, + pub ready_columns: Vec>, + pub started_at_ms: u64, + pub finished_at_ms: Option, +} + +impl __sdk::InModule for PuzzleClearRuntimeSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_get_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_get_input_type.rs new file mode 100644 index 00000000..474a325f --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_get_input_type.rs @@ -0,0 +1,16 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorkGetInput { + pub profile_id: String, + pub owner_user_id: String, +} + +impl __sdk::InModule for PuzzleClearWorkGetInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_procedure_result_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_procedure_result_type.rs new file mode 100644 index 00000000..451180a5 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_procedure_result_type.rs @@ -0,0 +1,19 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_work_snapshot_type::PuzzleClearWorkSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorkProcedureResult { + pub ok: bool, + pub work: Option, + pub error_message: Option, +} + +impl __sdk::InModule for PuzzleClearWorkProcedureResult { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_profile_row_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_profile_row_type.rs new file mode 100644 index 00000000..601eb56a --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_profile_row_type.rs @@ -0,0 +1,139 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorkProfileRow { + pub profile_id: String, + pub work_id: String, + pub owner_user_id: String, + pub source_session_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: String, + pub board_background_prompt: Option, + pub card_back_image_src: String, + pub atlas_asset_json: String, + pub pattern_groups_json: String, + pub card_assets_json: String, + pub cover_image_src: String, + pub generation_status: String, + pub publication_status: String, + pub play_count: u32, + pub updated_at: __sdk::Timestamp, + pub published_at: Option<__sdk::Timestamp>, + pub visible: bool, +} + +impl __sdk::InModule for PuzzleClearWorkProfileRow { + type Module = super::RemoteModule; +} + +/// Column accessor struct for the table `PuzzleClearWorkProfileRow`. +/// +/// Provides typed access to columns for query building. +pub struct PuzzleClearWorkProfileRowCols { + pub profile_id: __sdk::__query_builder::Col, + pub work_id: __sdk::__query_builder::Col, + pub owner_user_id: __sdk::__query_builder::Col, + pub source_session_id: __sdk::__query_builder::Col, + pub author_display_name: __sdk::__query_builder::Col, + pub work_title: __sdk::__query_builder::Col, + pub work_description: __sdk::__query_builder::Col, + pub theme_prompt: __sdk::__query_builder::Col, + pub generate_board_background: __sdk::__query_builder::Col, + pub board_background_asset_json: __sdk::__query_builder::Col, + pub board_background_prompt: + __sdk::__query_builder::Col>, + pub card_back_image_src: __sdk::__query_builder::Col, + pub atlas_asset_json: __sdk::__query_builder::Col, + pub pattern_groups_json: __sdk::__query_builder::Col, + pub card_assets_json: __sdk::__query_builder::Col, + pub cover_image_src: __sdk::__query_builder::Col, + pub generation_status: __sdk::__query_builder::Col, + pub publication_status: __sdk::__query_builder::Col, + pub play_count: __sdk::__query_builder::Col, + pub updated_at: __sdk::__query_builder::Col, + pub published_at: + __sdk::__query_builder::Col>, + pub visible: __sdk::__query_builder::Col, +} + +impl __sdk::__query_builder::HasCols for PuzzleClearWorkProfileRow { + type Cols = PuzzleClearWorkProfileRowCols; + fn cols(table_name: &'static str) -> Self::Cols { + PuzzleClearWorkProfileRowCols { + profile_id: __sdk::__query_builder::Col::new(table_name, "profile_id"), + work_id: __sdk::__query_builder::Col::new(table_name, "work_id"), + owner_user_id: __sdk::__query_builder::Col::new(table_name, "owner_user_id"), + source_session_id: __sdk::__query_builder::Col::new(table_name, "source_session_id"), + author_display_name: __sdk::__query_builder::Col::new( + table_name, + "author_display_name", + ), + work_title: __sdk::__query_builder::Col::new(table_name, "work_title"), + work_description: __sdk::__query_builder::Col::new(table_name, "work_description"), + theme_prompt: __sdk::__query_builder::Col::new(table_name, "theme_prompt"), + generate_board_background: __sdk::__query_builder::Col::new( + table_name, + "generate_board_background", + ), + board_background_asset_json: __sdk::__query_builder::Col::new( + table_name, + "board_background_asset_json", + ), + board_background_prompt: __sdk::__query_builder::Col::new( + table_name, + "board_background_prompt", + ), + card_back_image_src: __sdk::__query_builder::Col::new( + table_name, + "card_back_image_src", + ), + atlas_asset_json: __sdk::__query_builder::Col::new(table_name, "atlas_asset_json"), + pattern_groups_json: __sdk::__query_builder::Col::new( + table_name, + "pattern_groups_json", + ), + card_assets_json: __sdk::__query_builder::Col::new(table_name, "card_assets_json"), + cover_image_src: __sdk::__query_builder::Col::new(table_name, "cover_image_src"), + generation_status: __sdk::__query_builder::Col::new(table_name, "generation_status"), + publication_status: __sdk::__query_builder::Col::new(table_name, "publication_status"), + play_count: __sdk::__query_builder::Col::new(table_name, "play_count"), + updated_at: __sdk::__query_builder::Col::new(table_name, "updated_at"), + published_at: __sdk::__query_builder::Col::new(table_name, "published_at"), + visible: __sdk::__query_builder::Col::new(table_name, "visible"), + } + } +} + +/// Indexed column accessor struct for the table `PuzzleClearWorkProfileRow`. +/// +/// Provides typed access to indexed columns for query building. +pub struct PuzzleClearWorkProfileRowIxCols { + pub owner_user_id: __sdk::__query_builder::IxCol, + pub profile_id: __sdk::__query_builder::IxCol, + pub publication_status: __sdk::__query_builder::IxCol, +} + +impl __sdk::__query_builder::HasIxCols for PuzzleClearWorkProfileRow { + type IxCols = PuzzleClearWorkProfileRowIxCols; + fn ix_cols(table_name: &'static str) -> Self::IxCols { + PuzzleClearWorkProfileRowIxCols { + owner_user_id: __sdk::__query_builder::IxCol::new(table_name, "owner_user_id"), + profile_id: __sdk::__query_builder::IxCol::new(table_name, "profile_id"), + publication_status: __sdk::__query_builder::IxCol::new( + table_name, + "publication_status", + ), + } + } +} + +impl __sdk::__query_builder::CanBeLookupTable for PuzzleClearWorkProfileRow {} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_profile_table.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_profile_table.rs new file mode 100644 index 00000000..5baf3316 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_profile_table.rs @@ -0,0 +1,165 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use super::puzzle_clear_work_profile_row_type::PuzzleClearWorkProfileRow; +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +/// Table handle for the table `puzzle_clear_work_profile`. +/// +/// Obtain a handle from the [`PuzzleClearWorkProfileTableAccess::puzzle_clear_work_profile`] method on [`super::RemoteTables`], +/// like `ctx.db.puzzle_clear_work_profile()`. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_work_profile().on_insert(...)`. +pub struct PuzzleClearWorkProfileTableHandle<'ctx> { + imp: __sdk::TableHandle, + ctx: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the table `puzzle_clear_work_profile`. +/// +/// Implemented for [`super::RemoteTables`]. +pub trait PuzzleClearWorkProfileTableAccess { + #[allow(non_snake_case)] + /// Obtain a [`PuzzleClearWorkProfileTableHandle`], which mediates access to the table `puzzle_clear_work_profile`. + fn puzzle_clear_work_profile(&self) -> PuzzleClearWorkProfileTableHandle<'_>; +} + +impl PuzzleClearWorkProfileTableAccess for super::RemoteTables { + fn puzzle_clear_work_profile(&self) -> PuzzleClearWorkProfileTableHandle<'_> { + PuzzleClearWorkProfileTableHandle { + imp: self + .imp + .get_table::("puzzle_clear_work_profile"), + ctx: std::marker::PhantomData, + } + } +} + +pub struct PuzzleClearWorkProfileInsertCallbackId(__sdk::CallbackId); +pub struct PuzzleClearWorkProfileDeleteCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::Table for PuzzleClearWorkProfileTableHandle<'ctx> { + type Row = PuzzleClearWorkProfileRow; + type EventContext = super::EventContext; + + fn count(&self) -> u64 { + self.imp.count() + } + fn iter(&self) -> impl Iterator + '_ { + self.imp.iter() + } + + type InsertCallbackId = PuzzleClearWorkProfileInsertCallbackId; + + fn on_insert( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearWorkProfileInsertCallbackId { + PuzzleClearWorkProfileInsertCallbackId(self.imp.on_insert(Box::new(callback))) + } + + fn remove_on_insert(&self, callback: PuzzleClearWorkProfileInsertCallbackId) { + self.imp.remove_on_insert(callback.0) + } + + type DeleteCallbackId = PuzzleClearWorkProfileDeleteCallbackId; + + fn on_delete( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row) + Send + 'static, + ) -> PuzzleClearWorkProfileDeleteCallbackId { + PuzzleClearWorkProfileDeleteCallbackId(self.imp.on_delete(Box::new(callback))) + } + + fn remove_on_delete(&self, callback: PuzzleClearWorkProfileDeleteCallbackId) { + self.imp.remove_on_delete(callback.0) + } +} + +pub struct PuzzleClearWorkProfileUpdateCallbackId(__sdk::CallbackId); + +impl<'ctx> __sdk::TableWithPrimaryKey for PuzzleClearWorkProfileTableHandle<'ctx> { + type UpdateCallbackId = PuzzleClearWorkProfileUpdateCallbackId; + + fn on_update( + &self, + callback: impl FnMut(&Self::EventContext, &Self::Row, &Self::Row) + Send + 'static, + ) -> PuzzleClearWorkProfileUpdateCallbackId { + PuzzleClearWorkProfileUpdateCallbackId(self.imp.on_update(Box::new(callback))) + } + + fn remove_on_update(&self, callback: PuzzleClearWorkProfileUpdateCallbackId) { + self.imp.remove_on_update(callback.0) + } +} + +/// Access to the `profile_id` unique index on the table `puzzle_clear_work_profile`, +/// which allows point queries on the field of the same name +/// via the [`PuzzleClearWorkProfileProfileIdUnique::find`] method. +/// +/// Users are encouraged not to explicitly reference this type, +/// but to directly chain method calls, +/// like `ctx.db.puzzle_clear_work_profile().profile_id().find(...)`. +pub struct PuzzleClearWorkProfileProfileIdUnique<'ctx> { + imp: __sdk::UniqueConstraintHandle, + phantom: std::marker::PhantomData<&'ctx super::RemoteTables>, +} + +impl<'ctx> PuzzleClearWorkProfileTableHandle<'ctx> { + /// Get a handle on the `profile_id` unique index on the table `puzzle_clear_work_profile`. + pub fn profile_id(&self) -> PuzzleClearWorkProfileProfileIdUnique<'ctx> { + PuzzleClearWorkProfileProfileIdUnique { + imp: self.imp.get_unique_constraint::("profile_id"), + phantom: std::marker::PhantomData, + } + } +} + +impl<'ctx> PuzzleClearWorkProfileProfileIdUnique<'ctx> { + /// Find the subscribed row whose `profile_id` column value is equal to `col_val`, + /// if such a row is present in the client cache. + pub fn find(&self, col_val: &String) -> Option { + self.imp.find(col_val) + } +} + +#[doc(hidden)] +pub(super) fn register_table(client_cache: &mut __sdk::ClientCache) { + let _table = + client_cache.get_or_make_table::("puzzle_clear_work_profile"); + _table.add_unique_constraint::("profile_id", |row| &row.profile_id); +} + +#[doc(hidden)] +pub(super) fn parse_table_update( + raw_updates: __ws::v2::TableUpdate, +) -> __sdk::Result<__sdk::TableUpdate> { + __sdk::TableUpdate::parse_table_update(raw_updates).map_err(|e| { + __sdk::InternalError::failed_parse("TableUpdate", "TableUpdate") + .with_cause(e) + .into() + }) +} + +#[allow(non_camel_case_types)] +/// Extension trait for query builder access to the table `PuzzleClearWorkProfileRow`. +/// +/// Implemented for [`__sdk::QueryTableAccessor`]. +pub trait puzzle_clear_work_profileQueryTableAccess { + #[allow(non_snake_case)] + /// Get a query builder for the table `PuzzleClearWorkProfileRow`. + fn puzzle_clear_work_profile(&self) + -> __sdk::__query_builder::Table; +} + +impl puzzle_clear_work_profileQueryTableAccess for __sdk::QueryTableAccessor { + fn puzzle_clear_work_profile( + &self, + ) -> __sdk::__query_builder::Table { + __sdk::__query_builder::Table::new("puzzle_clear_work_profile") + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_publish_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_publish_input_type.rs new file mode 100644 index 00000000..27863d67 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_publish_input_type.rs @@ -0,0 +1,17 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorkPublishInput { + pub profile_id: String, + pub owner_user_id: String, + pub published_at_micros: i64, +} + +impl __sdk::InModule for PuzzleClearWorkPublishInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_snapshot_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_snapshot_type.rs new file mode 100644 index 00000000..56df2029 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_snapshot_type.rs @@ -0,0 +1,40 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_card_asset_snapshot_type::PuzzleClearCardAssetSnapshot; +use super::puzzle_clear_image_asset_snapshot_type::PuzzleClearImageAssetSnapshot; +use super::puzzle_clear_pattern_group_snapshot_type::PuzzleClearPatternGroupSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorkSnapshot { + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub source_session_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + pub board_background_prompt: String, + pub card_back_image_src: Option, + pub atlas_asset: PuzzleClearImageAssetSnapshot, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub cover_image_src: Option, + pub publication_status: String, + pub publish_ready: bool, + pub play_count: u32, + pub generation_status: String, + pub updated_at_micros: i64, + pub published_at_micros: Option, +} + +impl __sdk::InModule for PuzzleClearWorkSnapshot { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_update_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_update_input_type.rs new file mode 100644 index 00000000..6ba0d466 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_work_update_input_type.rs @@ -0,0 +1,23 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorkUpdateInput { + pub profile_id: String, + pub owner_user_id: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: Option, + pub board_background_prompt: String, + pub updated_at_micros: i64, +} + +impl __sdk::InModule for PuzzleClearWorkUpdateInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_works_list_input_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_works_list_input_type.rs new file mode 100644 index 00000000..9fc783b0 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_works_list_input_type.rs @@ -0,0 +1,16 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorksListInput { + pub owner_user_id: String, + pub published_only: bool, +} + +impl __sdk::InModule for PuzzleClearWorksListInput { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_works_procedure_result_type.rs b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_works_procedure_result_type.rs new file mode 100644 index 00000000..44260189 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/puzzle_clear_works_procedure_result_type.rs @@ -0,0 +1,19 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_work_snapshot_type::PuzzleClearWorkSnapshot; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +pub struct PuzzleClearWorksProcedureResult { + pub ok: bool, + pub items: Vec, + pub error_message: Option, +} + +impl __sdk::InModule for PuzzleClearWorksProcedureResult { + type Module = super::RemoteModule; +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/retry_puzzle_clear_level_run_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/retry_puzzle_clear_level_run_procedure.rs new file mode 100644 index 00000000..4a7523c1 --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/retry_puzzle_clear_level_run_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; +use super::puzzle_clear_run_retry_level_input_type::PuzzleClearRunRetryLevelInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct RetryPuzzleClearLevelRunArgs { + pub input: PuzzleClearRunRetryLevelInput, +} + +impl __sdk::InModule for RetryPuzzleClearLevelRunArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `retry_puzzle_clear_level_run`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait retry_puzzle_clear_level_run { + fn retry_puzzle_clear_level_run(&self, input: PuzzleClearRunRetryLevelInput) { + self.retry_puzzle_clear_level_run_then(input, |_, _| {}); + } + + fn retry_puzzle_clear_level_run_then( + &self, + input: PuzzleClearRunRetryLevelInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl retry_puzzle_clear_level_run for super::RemoteProcedures { + fn retry_puzzle_clear_level_run_then( + &self, + input: PuzzleClearRunRetryLevelInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearRunProcedureResult>( + "retry_puzzle_clear_level_run", + RetryPuzzleClearLevelRunArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/start_puzzle_clear_runtime_run_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/start_puzzle_clear_runtime_run_procedure.rs new file mode 100644 index 00000000..c9f6660c --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/start_puzzle_clear_runtime_run_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; +use super::puzzle_clear_run_start_input_type::PuzzleClearRunStartInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct StartPuzzleClearRuntimeRunArgs { + pub input: PuzzleClearRunStartInput, +} + +impl __sdk::InModule for StartPuzzleClearRuntimeRunArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `start_puzzle_clear_runtime_run`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait start_puzzle_clear_runtime_run { + fn start_puzzle_clear_runtime_run(&self, input: PuzzleClearRunStartInput) { + self.start_puzzle_clear_runtime_run_then(input, |_, _| {}); + } + + fn start_puzzle_clear_runtime_run_then( + &self, + input: PuzzleClearRunStartInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl start_puzzle_clear_runtime_run for super::RemoteProcedures { + fn start_puzzle_clear_runtime_run_then( + &self, + input: PuzzleClearRunStartInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearRunProcedureResult>( + "start_puzzle_clear_runtime_run", + StartPuzzleClearRuntimeRunArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/swap_puzzle_clear_cards_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/swap_puzzle_clear_cards_procedure.rs new file mode 100644 index 00000000..d527f9ed --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/swap_puzzle_clear_cards_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_run_procedure_result_type::PuzzleClearRunProcedureResult; +use super::puzzle_clear_run_swap_input_type::PuzzleClearRunSwapInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct SwapPuzzleClearCardsArgs { + pub input: PuzzleClearRunSwapInput, +} + +impl __sdk::InModule for SwapPuzzleClearCardsArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `swap_puzzle_clear_cards`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait swap_puzzle_clear_cards { + fn swap_puzzle_clear_cards(&self, input: PuzzleClearRunSwapInput) { + self.swap_puzzle_clear_cards_then(input, |_, _| {}); + } + + fn swap_puzzle_clear_cards_then( + &self, + input: PuzzleClearRunSwapInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl swap_puzzle_clear_cards for super::RemoteProcedures { + fn swap_puzzle_clear_cards_then( + &self, + input: PuzzleClearRunSwapInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearRunProcedureResult>( + "swap_puzzle_clear_cards", + SwapPuzzleClearCardsArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/module_bindings/update_puzzle_clear_work_procedure.rs b/server-rs/crates/spacetime-client/src/module_bindings/update_puzzle_clear_work_procedure.rs new file mode 100644 index 00000000..5f4b592a --- /dev/null +++ b/server-rs/crates/spacetime-client/src/module_bindings/update_puzzle_clear_work_procedure.rs @@ -0,0 +1,59 @@ +// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE +// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD. + +#![allow(unused, clippy::all)] +use spacetimedb_sdk::__codegen::{self as __sdk, __lib, __sats, __ws}; + +use super::puzzle_clear_work_procedure_result_type::PuzzleClearWorkProcedureResult; +use super::puzzle_clear_work_update_input_type::PuzzleClearWorkUpdateInput; + +#[derive(__lib::ser::Serialize, __lib::de::Deserialize, Clone, PartialEq, Debug)] +#[sats(crate = __lib)] +struct UpdatePuzzleClearWorkArgs { + pub input: PuzzleClearWorkUpdateInput, +} + +impl __sdk::InModule for UpdatePuzzleClearWorkArgs { + type Module = super::RemoteModule; +} + +#[allow(non_camel_case_types)] +/// Extension trait for access to the procedure `update_puzzle_clear_work`. +/// +/// Implemented for [`super::RemoteProcedures`]. +pub trait update_puzzle_clear_work { + fn update_puzzle_clear_work(&self, input: PuzzleClearWorkUpdateInput) { + self.update_puzzle_clear_work_then(input, |_, _| {}); + } + + fn update_puzzle_clear_work_then( + &self, + input: PuzzleClearWorkUpdateInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ); +} + +impl update_puzzle_clear_work for super::RemoteProcedures { + fn update_puzzle_clear_work_then( + &self, + input: PuzzleClearWorkUpdateInput, + + __callback: impl FnOnce( + &super::ProcedureEventContext, + Result, + ) + Send + + 'static, + ) { + self.imp + .invoke_procedure_with_callback::<_, PuzzleClearWorkProcedureResult>( + "update_puzzle_clear_work", + UpdatePuzzleClearWorkArgs { input }, + __callback, + ); + } +} diff --git a/server-rs/crates/spacetime-client/src/puzzle_clear.rs b/server-rs/crates/spacetime-client/src/puzzle_clear.rs new file mode 100644 index 00000000..8d1dc0ed --- /dev/null +++ b/server-rs/crates/spacetime-client/src/puzzle_clear.rs @@ -0,0 +1,1021 @@ +use super::*; +use crate::mapper::{ + map_puzzle_clear_agent_session_procedure_result, map_puzzle_clear_gallery_card_view_row, + map_puzzle_clear_run_procedure_result, map_puzzle_clear_work_procedure_result, + map_puzzle_clear_works_procedure_result, +}; +use module_puzzle_clear::{PUZZLE_CLEAR_PROFILE_ID_PREFIX, PUZZLE_CLEAR_RUN_ID_PREFIX}; +use shared_contracts::puzzle_clear::{ + PuzzleClearActionRequest, PuzzleClearActionResponse, PuzzleClearActionType, + PuzzleClearGenerationStatus, PuzzleClearImageAsset, PuzzleClearNextLevelRequest, + PuzzleClearPatternGroup, PuzzleClearRetryLevelRequest, PuzzleClearRuntimeSnapshotResponse, + PuzzleClearSessionSnapshotResponse, PuzzleClearStartRunRequest, PuzzleClearSwapRequest, + PuzzleClearTimeUpRequest, PuzzleClearWorkProfileResponse, PuzzleClearWorkSummaryResponse, +}; +use shared_kernel::build_prefixed_uuid_id; + +const PUZZLE_CLEAR_TEMPLATE_ID: &str = "puzzle-clear"; +const PUZZLE_CLEAR_TEMPLATE_NAME: &str = "拼消消"; +const PUZZLE_CLEAR_ATLAS_CELL_SIZE: u32 = 128; +const PUZZLE_CLEAR_ASSET_OBJECT_ID_PREFIX: &str = "assetobj_"; + +impl SpacetimeClient { + pub async fn create_puzzle_clear_session( + &self, + session: PuzzleClearSessionSnapshotResponse, + ) -> Result { + let draft = session.draft.clone().ok_or_else(|| { + SpacetimeClientError::validation_failed("puzzle-clear session 缺少 draft") + })?; + let procedure_input = PuzzleClearAgentSessionCreateInput { + session_id: session.session_id, + owner_user_id: session.owner_user_id, + work_title: draft.work_title, + work_description: draft.work_description, + theme_prompt: draft.theme_prompt, + generate_board_background: draft.generate_board_background, + board_background_asset_json: draft + .board_background_asset + .as_ref() + .map(json_string) + .transpose()?, + board_background_prompt: draft.board_background_prompt, + created_at_micros: current_unix_micros(), + }; + + self.call_after_connect( + "create_puzzle_clear_agent_session", + move |connection, sender| { + connection + .procedures() + .create_puzzle_clear_agent_session_then(procedure_input, move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_agent_session_procedure_result); + send_once(&sender, mapped); + }); + }, + ) + .await + } + + pub async fn get_puzzle_clear_session( + &self, + session_id: String, + owner_user_id: String, + ) -> Result { + let procedure_input = PuzzleClearAgentSessionGetInput { + session_id, + owner_user_id, + }; + + self.call_after_connect( + "get_puzzle_clear_agent_session", + move |connection, sender| { + connection.procedures().get_puzzle_clear_agent_session_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_agent_session_procedure_result); + send_once(&sender, mapped); + }, + ); + }, + ) + .await + } + + pub async fn execute_puzzle_clear_action( + &self, + session_id: String, + owner_user_id: String, + author_display_name: String, + payload: PuzzleClearActionRequest, + ) -> Result { + let current = self + .get_puzzle_clear_session(session_id.clone(), owner_user_id.clone()) + .await?; + let (procedure, _) = build_puzzle_clear_action_plan( + ¤t, + &owner_user_id, + &author_display_name, + &payload, + current_unix_micros(), + )?; + let (session, work) = match procedure { + PuzzleClearActionProcedure::Compile(input) => { + let profile_id = input.profile_id.clone(); + let session = self.compile_puzzle_clear_draft(input).await?; + let work = self + .get_puzzle_clear_work_profile(profile_id, owner_user_id) + .await + .ok(); + (session, work) + } + PuzzleClearActionProcedure::Update(input) => { + let work = self.update_puzzle_clear_work(input).await?; + let session = apply_puzzle_clear_work_to_session(current, &work); + (session, Some(work)) + } + }; + + Ok(PuzzleClearActionResponse { + action_type: payload.action_type, + session, + work, + }) + } + + pub async fn compile_puzzle_clear_draft( + &self, + procedure_input: PuzzleClearDraftCompileInput, + ) -> Result { + self.call_after_connect("compile_puzzle_clear_draft", move |connection, sender| { + connection.procedures().compile_puzzle_clear_draft_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_agent_session_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn mark_puzzle_clear_generation_failed( + &self, + session_id: String, + owner_user_id: String, + author_display_name: String, + payload: PuzzleClearActionRequest, + ) -> Result { + let current = self + .get_puzzle_clear_session(session_id, owner_user_id.clone()) + .await?; + let procedure_input = build_failed_compile_input( + ¤t, + &owner_user_id, + &author_display_name, + &payload, + current_unix_micros(), + )?; + self.compile_puzzle_clear_draft(procedure_input).await + } + + pub async fn get_puzzle_clear_work_profile( + &self, + profile_id: String, + owner_user_id: String, + ) -> Result { + let procedure_input = PuzzleClearWorkGetInput { + profile_id, + owner_user_id, + }; + + self.call_after_connect( + "get_puzzle_clear_work_profile", + move |connection, sender| { + connection.procedures().get_puzzle_clear_work_profile_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_work_procedure_result); + send_once(&sender, mapped); + }, + ); + }, + ) + .await + } + + pub async fn update_puzzle_clear_work( + &self, + procedure_input: PuzzleClearWorkUpdateInput, + ) -> Result { + self.call_after_connect("update_puzzle_clear_work", move |connection, sender| { + connection.procedures().update_puzzle_clear_work_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_work_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn publish_puzzle_clear_work( + &self, + profile_id: String, + owner_user_id: String, + ) -> Result { + let procedure_input = PuzzleClearWorkPublishInput { + profile_id, + owner_user_id, + published_at_micros: current_unix_micros(), + }; + + self.call_after_connect("publish_puzzle_clear_work", move |connection, sender| { + connection.procedures().publish_puzzle_clear_work_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_work_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn list_puzzle_clear_works( + &self, + owner_user_id: String, + ) -> Result, SpacetimeClientError> { + let procedure_input = PuzzleClearWorksListInput { + owner_user_id, + published_only: false, + }; + + self.call_after_connect("list_puzzle_clear_works", move |connection, sender| { + connection.procedures().list_puzzle_clear_works_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_works_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn get_puzzle_clear_runtime_work( + &self, + profile_id: String, + ) -> Result { + let work = self + .get_puzzle_clear_work_profile(profile_id, String::new()) + .await?; + validate_puzzle_clear_runtime_ready(&work)?; + Ok(work) + } + + pub async fn start_puzzle_clear_run( + &self, + payload: PuzzleClearStartRunRequest, + owner_user_id: String, + ) -> Result { + let profile_id = payload.profile_id; + let work = self + .get_puzzle_clear_work_profile(profile_id.clone(), String::new()) + .await?; + validate_puzzle_clear_runtime_ready(&work)?; + let run_id = build_prefixed_uuid_id(PUZZLE_CLEAR_RUN_ID_PREFIX); + let procedure_input = PuzzleClearRunStartInput { + client_event_id: format!("{run_id}:start"), + run_id, + owner_user_id, + profile_id, + started_at_ms: current_unix_micros().div_euclid(1000), + }; + self.start_puzzle_clear_run_with_input(procedure_input) + .await + } + + pub async fn start_puzzle_clear_run_with_input( + &self, + procedure_input: PuzzleClearRunStartInput, + ) -> Result { + self.call_after_connect( + "start_puzzle_clear_runtime_run", + move |connection, sender| { + connection.procedures().start_puzzle_clear_runtime_run_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_run_procedure_result); + send_once(&sender, mapped); + }, + ); + }, + ) + .await + } + + pub async fn get_puzzle_clear_run( + &self, + run_id: String, + owner_user_id: String, + ) -> Result { + let procedure_input = PuzzleClearRunGetInput { + run_id, + owner_user_id, + }; + + self.call_after_connect("get_puzzle_clear_runtime_run", move |connection, sender| { + connection.procedures().get_puzzle_clear_runtime_run_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_run_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn swap_puzzle_clear_cards( + &self, + run_id: String, + owner_user_id: String, + payload: PuzzleClearSwapRequest, + ) -> Result { + let procedure_input = PuzzleClearRunSwapInput { + run_id, + owner_user_id, + from_row: payload.from_row, + from_col: payload.from_col, + to_row: payload.to_row, + to_col: payload.to_col, + client_action_id: payload.client_action_id, + swapped_at_ms: current_unix_micros().div_euclid(1000), + }; + + self.call_after_connect("swap_puzzle_clear_cards", move |connection, sender| { + connection.procedures().swap_puzzle_clear_cards_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_run_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn retry_puzzle_clear_level( + &self, + run_id: String, + owner_user_id: String, + payload: PuzzleClearRetryLevelRequest, + ) -> Result { + let procedure_input = PuzzleClearRunRetryLevelInput { + run_id, + owner_user_id, + client_action_id: payload.client_action_id, + restarted_at_ms: current_unix_micros().div_euclid(1000), + }; + + self.call_after_connect("retry_puzzle_clear_level_run", move |connection, sender| { + connection.procedures().retry_puzzle_clear_level_run_then( + procedure_input, + move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_run_procedure_result); + send_once(&sender, mapped); + }, + ); + }) + .await + } + + pub async fn advance_puzzle_clear_next_level( + &self, + run_id: String, + owner_user_id: String, + payload: PuzzleClearNextLevelRequest, + ) -> Result { + let procedure_input = PuzzleClearRunNextLevelInput { + run_id, + owner_user_id, + client_action_id: payload.client_action_id, + started_at_ms: current_unix_micros().div_euclid(1000), + }; + + self.call_after_connect( + "advance_puzzle_clear_next_level", + move |connection, sender| { + connection + .procedures() + .advance_puzzle_clear_next_level_then(procedure_input, move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_run_procedure_result); + send_once(&sender, mapped); + }); + }, + ) + .await + } + + pub async fn mark_puzzle_clear_level_time_up( + &self, + run_id: String, + owner_user_id: String, + payload: PuzzleClearTimeUpRequest, + ) -> Result { + let procedure_input = PuzzleClearRunTimeUpInput { + run_id, + owner_user_id, + client_action_id: payload.client_action_id, + occurred_at_ms: current_unix_micros().div_euclid(1000), + }; + + self.call_after_connect( + "mark_puzzle_clear_level_time_up", + move |connection, sender| { + connection + .procedures() + .mark_puzzle_clear_level_time_up_then(procedure_input, move |_, result| { + let mapped = result + .map_err(SpacetimeClientError::from_sdk_error) + .and_then(map_puzzle_clear_run_procedure_result); + send_once(&sender, mapped); + }); + }, + ) + .await + } + + pub async fn list_puzzle_clear_gallery( + &self, + ) -> Result, SpacetimeClientError> { + self.read_after_connect("list_puzzle_clear_gallery", move |connection| { + let mut items = connection + .db() + .puzzle_clear_gallery_card_view() + .iter() + .collect::>(); + items.sort_by(|left, right| { + right + .updated_at_micros + .cmp(&left.updated_at_micros) + .then_with(|| left.profile_id.cmp(&right.profile_id)) + }); + Ok(items + .into_iter() + .map(map_puzzle_clear_gallery_card_view_row) + .collect()) + }) + .await + } +} + +enum PuzzleClearActionProcedure { + Compile(PuzzleClearDraftCompileInput), + Update(PuzzleClearWorkUpdateInput), +} + +#[derive(Clone, Copy)] +enum PuzzleClearDraftMergeScope { + CompileDraft, + RegenerateAtlas, + UpdateWorkMeta, + UpdateBoardBackground, +} + +fn build_puzzle_clear_action_plan( + current: &PuzzleClearSessionSnapshotResponse, + owner_user_id: &str, + author_display_name: &str, + payload: &PuzzleClearActionRequest, + now_micros: i64, +) -> Result<(PuzzleClearActionProcedure, PuzzleClearDraftResponse), SpacetimeClientError> { + let scope = match payload.action_type { + PuzzleClearActionType::CompileDraft => PuzzleClearDraftMergeScope::CompileDraft, + PuzzleClearActionType::RegenerateAtlas => PuzzleClearDraftMergeScope::RegenerateAtlas, + PuzzleClearActionType::UpdateWorkMeta => PuzzleClearDraftMergeScope::UpdateWorkMeta, + PuzzleClearActionType::UpdateBoardBackground => { + PuzzleClearDraftMergeScope::UpdateBoardBackground + } + }; + let mut draft = merge_action_into_draft(current.draft.clone(), payload, scope)?; + let profile_id = resolve_puzzle_clear_profile_id( + &draft, + &payload.action_type, + payload.profile_id.as_deref(), + )?; + draft.profile_id = Some(profile_id.clone()); + let procedure = + match payload.action_type { + PuzzleClearActionType::CompileDraft | PuzzleClearActionType::RegenerateAtlas => { + PuzzleClearActionProcedure::Compile(build_compile_input( + current, + owner_user_id, + author_display_name, + &profile_id, + &mut draft, + now_micros, + )?) + } + PuzzleClearActionType::UpdateWorkMeta + | PuzzleClearActionType::UpdateBoardBackground => PuzzleClearActionProcedure::Update( + build_update_input(owner_user_id, &profile_id, &draft, now_micros)?, + ), + }; + + Ok((procedure, draft)) +} + +fn merge_action_into_draft( + draft: Option, + payload: &PuzzleClearActionRequest, + scope: PuzzleClearDraftMergeScope, +) -> Result { + let mut draft = draft.unwrap_or_else(default_draft); + if matches!( + scope, + PuzzleClearDraftMergeScope::CompileDraft + | PuzzleClearDraftMergeScope::UpdateWorkMeta + | PuzzleClearDraftMergeScope::RegenerateAtlas + ) { + if let Some(value) = payload + .work_title + .as_ref() + .and_then(|value| non_empty_str(value)) + { + draft.work_title = value; + } + if let Some(value) = payload.work_description.as_ref() { + draft.work_description = value.trim().to_string(); + } + if let Some(value) = payload + .theme_prompt + .as_ref() + .and_then(|value| non_empty_str(value)) + { + draft.theme_prompt = value; + } + if let Some(value) = payload + .board_background_prompt + .as_ref() + .and_then(|value| non_empty_str(value)) + { + draft.board_background_prompt = value; + } + } + if matches!( + scope, + PuzzleClearDraftMergeScope::CompileDraft + | PuzzleClearDraftMergeScope::UpdateBoardBackground + | PuzzleClearDraftMergeScope::RegenerateAtlas + ) { + if let Some(value) = payload.generate_board_background { + draft.generate_board_background = value; + } + if payload.board_background_asset.is_some() { + draft.board_background_asset = payload.board_background_asset.clone(); + } + } + if matches!( + scope, + PuzzleClearDraftMergeScope::CompileDraft | PuzzleClearDraftMergeScope::RegenerateAtlas + ) { + if let Some(asset) = payload.atlas_asset.clone() { + draft.atlas_asset = Some(asset); + } + if let Some(groups) = payload.pattern_groups.clone() { + draft.pattern_groups = groups; + } + if let Some(cards) = payload.card_assets.clone() { + draft.card_assets = cards; + } + if draft.pattern_groups.is_empty() { + draft.pattern_groups = default_pattern_groups(); + } + draft.generation_status = PuzzleClearGenerationStatus::Ready; + } + + if draft.work_title.trim().is_empty() || draft.theme_prompt.trim().is_empty() { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear 草稿需要标题和主题词", + )); + } + Ok(draft) +} + +fn build_compile_input( + current: &PuzzleClearSessionSnapshotResponse, + owner_user_id: &str, + author_display_name: &str, + profile_id: &str, + draft: &mut PuzzleClearDraftResponse, + now_micros: i64, +) -> Result { + if draft.pattern_groups.is_empty() { + draft.pattern_groups = default_pattern_groups(); + } + let atlas_asset = ensure_real_puzzle_clear_atlas_asset(draft.atlas_asset.as_ref())?; + ensure_real_puzzle_clear_card_assets(&draft.card_assets)?; + + Ok(PuzzleClearDraftCompileInput { + session_id: current.session_id.clone(), + owner_user_id: owner_user_id.to_string(), + profile_id: profile_id.to_string(), + author_display_name: non_empty_str(author_display_name) + .unwrap_or_else(|| "拼消消玩家".to_string()), + work_title: draft.work_title.clone(), + work_description: draft.work_description.clone(), + theme_prompt: draft.theme_prompt.clone(), + board_background_prompt: draft.board_background_prompt.clone(), + generate_board_background: draft.generate_board_background, + board_background_asset_json: draft + .board_background_asset + .as_ref() + .map(json_string) + .transpose()?, + atlas_asset_json: Some(json_string(atlas_asset)?), + pattern_groups_json: Some(json_string(&draft.pattern_groups)?), + card_assets_json: Some(json_string(&draft.card_assets)?), + generation_status: Some("ready".to_string()), + compiled_at_micros: now_micros, + }) +} + +fn build_failed_compile_input( + current: &PuzzleClearSessionSnapshotResponse, + owner_user_id: &str, + author_display_name: &str, + payload: &PuzzleClearActionRequest, + now_micros: i64, +) -> Result { + let mut draft = current.draft.clone().unwrap_or_else(default_draft); + if let Some(value) = payload + .work_title + .as_ref() + .and_then(|value| non_empty_str(value)) + { + draft.work_title = value; + } + if let Some(value) = payload.work_description.as_ref() { + draft.work_description = value.trim().to_string(); + } + if let Some(value) = payload + .theme_prompt + .as_ref() + .and_then(|value| non_empty_str(value)) + { + draft.theme_prompt = value; + } + if let Some(value) = payload + .board_background_prompt + .as_ref() + .and_then(|value| non_empty_str(value)) + { + draft.board_background_prompt = value; + } + if let Some(value) = payload.generate_board_background { + draft.generate_board_background = value; + } + if let Some(asset) = payload.board_background_asset.clone() { + draft.board_background_asset = Some(asset); + } + if let Some(profile_id) = payload + .profile_id + .as_ref() + .map(|value| value.trim()) + .filter(|value| !value.is_empty()) + { + draft.profile_id = Some(profile_id.to_string()); + } + draft.generation_status = PuzzleClearGenerationStatus::Failed; + let profile_id = resolve_puzzle_clear_profile_id( + &draft, + &PuzzleClearActionType::CompileDraft, + draft.profile_id.as_deref(), + )?; + draft.profile_id = Some(profile_id.clone()); + + Ok(PuzzleClearDraftCompileInput { + session_id: current.session_id.clone(), + owner_user_id: owner_user_id.to_string(), + profile_id, + author_display_name: non_empty_str(author_display_name) + .unwrap_or_else(|| "拼消消玩家".to_string()), + work_title: non_empty_str(draft.work_title.as_str()) + .unwrap_or_else(|| PUZZLE_CLEAR_TEMPLATE_NAME.to_string()), + work_description: draft.work_description.trim().to_string(), + theme_prompt: non_empty_str(draft.theme_prompt.as_str()) + .unwrap_or_else(|| PUZZLE_CLEAR_TEMPLATE_NAME.to_string()), + board_background_prompt: draft.board_background_prompt.clone(), + generate_board_background: draft.generate_board_background, + board_background_asset_json: draft + .board_background_asset + .as_ref() + .map(json_string) + .transpose()?, + atlas_asset_json: None, + pattern_groups_json: None, + card_assets_json: None, + generation_status: Some("failed".to_string()), + compiled_at_micros: now_micros, + }) +} + +fn build_update_input( + owner_user_id: &str, + profile_id: &str, + draft: &PuzzleClearDraftResponse, + now_micros: i64, +) -> Result { + Ok(PuzzleClearWorkUpdateInput { + profile_id: profile_id.to_string(), + owner_user_id: owner_user_id.to_string(), + work_title: draft.work_title.clone(), + work_description: draft.work_description.clone(), + theme_prompt: draft.theme_prompt.clone(), + board_background_prompt: draft.board_background_prompt.clone(), + generate_board_background: draft.generate_board_background, + board_background_asset_json: draft + .board_background_asset + .as_ref() + .map(json_string) + .transpose()?, + updated_at_micros: now_micros, + }) +} + +fn resolve_puzzle_clear_profile_id( + draft: &PuzzleClearDraftResponse, + action_type: &PuzzleClearActionType, + payload_profile_id: Option<&str>, +) -> Result { + if let Some(profile_id) = payload_profile_id + .map(str::trim) + .filter(|value| !value.is_empty()) + { + return Ok(profile_id.to_string()); + } + if let Some(profile_id) = draft + .profile_id + .as_ref() + .map(|value| value.trim()) + .filter(|value| !value.is_empty()) + { + return Ok(profile_id.to_string()); + } + if matches!(action_type, PuzzleClearActionType::CompileDraft) { + return Ok(build_prefixed_uuid_id(PUZZLE_CLEAR_PROFILE_ID_PREFIX)); + } + Err(SpacetimeClientError::validation_failed( + "puzzle-clear action 需要先完成 compile-draft", + )) +} + +fn apply_puzzle_clear_work_to_session( + mut session: PuzzleClearSessionSnapshotResponse, + work: &PuzzleClearWorkProfileResponse, +) -> PuzzleClearSessionSnapshotResponse { + session.status = work.draft.generation_status.clone(); + session.draft = Some(work.draft.clone()); + session.updated_at = work.summary.updated_at.clone(); + session +} + +fn validate_puzzle_clear_runtime_ready( + work: &PuzzleClearWorkProfileResponse, +) -> Result<(), SpacetimeClientError> { + if work.summary.publication_status != "published" { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear runtime 只能启动已发布作品", + )); + } + if work.summary.generation_status != PuzzleClearGenerationStatus::Ready { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear runtime 需要 ready 状态作品", + )); + } + if work.card_assets.is_empty() || work.pattern_groups.is_empty() { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear runtime 缺少切片卡牌资产", + )); + } + Ok(()) +} + +fn ensure_real_puzzle_clear_atlas_asset( + asset: Option<&PuzzleClearImageAsset>, +) -> Result<&PuzzleClearImageAsset, SpacetimeClientError> { + let Some(asset) = asset else { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear atlas 缺少真实生成资产", + )); + }; + if !is_real_puzzle_clear_asset( + asset.asset_object_id.as_str(), + asset.image_object_key.as_str(), + asset.image_src.as_str(), + ) { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear atlas 缺少真实生成资产", + )); + } + Ok(asset) +} + +fn ensure_real_puzzle_clear_card_assets( + assets: &[PuzzleClearCardAsset], +) -> Result<(), SpacetimeClientError> { + if assets.is_empty() { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear card assets 缺少真实生成资产", + )); + } + if assets.iter().any(|asset| { + !is_real_puzzle_clear_asset( + asset.asset_object_id.as_str(), + asset.image_object_key.as_str(), + asset.image_src.as_str(), + ) + }) { + return Err(SpacetimeClientError::validation_failed( + "puzzle-clear card assets 缺少真实生成资产", + )); + } + Ok(()) +} + +fn is_real_puzzle_clear_asset( + asset_object_id: &str, + image_object_key: &str, + image_src: &str, +) -> bool { + asset_object_id.starts_with(PUZZLE_CLEAR_ASSET_OBJECT_ID_PREFIX) + && image_object_key.starts_with("generated-puzzle-clear-assets/") + && image_src.starts_with("/generated-puzzle-clear-assets/") +} + +fn default_draft() -> PuzzleClearDraftResponse { + PuzzleClearDraftResponse { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: None, + work_title: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + work_description: String::new(), + theme_prompt: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + board_background_prompt: String::new(), + generate_board_background: true, + board_background_asset: None, + card_back_image_src: Some("/creation-type-references/puzzle.webp".to_string()), + atlas_asset: None, + pattern_groups: Vec::new(), + card_assets: Vec::new(), + generation_status: PuzzleClearGenerationStatus::Draft, + } +} + +fn default_pattern_groups() -> Vec { + module_puzzle_clear::plan_puzzle_clear_pattern_groups(PUZZLE_CLEAR_ATLAS_CELL_SIZE) + .unwrap_or_default() + .into_iter() + .map(|group| PuzzleClearPatternGroup { + group_id: group.group_id, + shape: group.shape.as_str().to_string(), + width: group.width, + height: group.height, + atlas_x: group.atlas_x, + atlas_y: group.atlas_y, + atlas_width: group.atlas_width, + atlas_height: group.atlas_height, + }) + .collect() +} + +fn non_empty_str(value: &str) -> Option { + let value = value.trim(); + if value.is_empty() { + None + } else { + Some(value.to_string()) + } +} + +fn json_string(value: &T) -> Result { + serde_json::to_string(value).map_err(SpacetimeClientError::validation_failed) +} + +#[cfg(test)] +mod tests { + use super::*; + + const SESSION_ID: &str = "puzzle-clear-session-test"; + const OWNER_USER_ID: &str = "user-test"; + const NOW_MICROS: i64 = 1_780_000_000_000_000; + + #[test] + fn puzzle_clear_compile_requires_real_atlas_assets_from_api_server() { + let session = session_with_draft(draft_without_assets()); + let payload = action(PuzzleClearActionType::CompileDraft); + + let error = match build_puzzle_clear_action_plan( + &session, + OWNER_USER_ID, + "拼消消玩家", + &payload, + NOW_MICROS, + ) { + Ok(_) => panic!("compile-draft should not synthesize placeholder atlas assets"), + Err(error) => error, + }; + + assert!(error.to_string().contains("atlas")); + assert!(error.to_string().contains("真实生成资产")); + } + + #[test] + fn puzzle_clear_failure_writeback_does_not_require_generated_assets() { + let session = session_with_draft(draft_without_assets()); + + let input = build_failed_compile_input( + &session, + OWNER_USER_ID, + "拼消消玩家", + &PuzzleClearActionRequest { + action_type: PuzzleClearActionType::CompileDraft, + profile_id: None, + work_title: None, + work_description: Some("VectorEngine 素材 atlas 生成失败".to_string()), + theme_prompt: None, + board_background_prompt: None, + generate_board_background: None, + board_background_asset: None, + atlas_asset: None, + pattern_groups: None, + card_assets: None, + }, + NOW_MICROS, + ) + .expect("failed writeback input should be buildable without assets"); + + assert_eq!(input.session_id, SESSION_ID); + assert_eq!(input.owner_user_id, OWNER_USER_ID); + assert_eq!(input.generation_status.as_deref(), Some("failed")); + assert!(input.atlas_asset_json.is_none()); + assert!(input.pattern_groups_json.is_none()); + assert!(input.card_assets_json.is_none()); + assert_eq!(input.work_title, "水果拼消消"); + assert_eq!(input.theme_prompt, "水果"); + assert_eq!(input.work_description, "VectorEngine 素材 atlas 生成失败"); + } + + fn session_with_draft(draft: PuzzleClearDraftResponse) -> PuzzleClearSessionSnapshotResponse { + PuzzleClearSessionSnapshotResponse { + session_id: SESSION_ID.to_string(), + owner_user_id: OWNER_USER_ID.to_string(), + status: draft.generation_status.clone(), + draft: Some(draft), + created_at: "2026-05-30T00:00:00Z".to_string(), + updated_at: "2026-05-30T00:00:00Z".to_string(), + } + } + + fn draft_without_assets() -> PuzzleClearDraftResponse { + PuzzleClearDraftResponse { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: None, + work_title: "水果拼消消".to_string(), + work_description: String::new(), + theme_prompt: "水果".to_string(), + board_background_prompt: String::new(), + generate_board_background: false, + board_background_asset: None, + card_back_image_src: Some("/creation-type-references/puzzle.webp".to_string()), + atlas_asset: None, + pattern_groups: Vec::new(), + card_assets: Vec::new(), + generation_status: PuzzleClearGenerationStatus::Draft, + } + } + + fn action(action_type: PuzzleClearActionType) -> PuzzleClearActionRequest { + PuzzleClearActionRequest { + action_type, + profile_id: None, + work_title: None, + work_description: None, + theme_prompt: None, + board_background_prompt: None, + generate_board_background: None, + board_background_asset: None, + atlas_asset: None, + pattern_groups: None, + card_assets: None, + } + } +} diff --git a/server-rs/crates/spacetime-client/src/wooden_fish.rs b/server-rs/crates/spacetime-client/src/wooden_fish.rs index 66304b09..275d7a89 100644 --- a/server-rs/crates/spacetime-client/src/wooden_fish.rs +++ b/server-rs/crates/spacetime-client/src/wooden_fish.rs @@ -813,9 +813,14 @@ mod tests { payload.back_button_asset = Some(generated_back_button_asset("generated-compile-back")); payload.hit_sound_asset = Some(generated_hit_sound_asset("generated-compile-sound")); - let (plan, draft) = - build_wooden_fish_action_plan(&session, OWNER_USER_ID, &payload, NOW_MICROS) - .expect("compile-draft should build plan"); + let (plan, draft) = build_wooden_fish_action_plan( + &session, + OWNER_USER_ID, + "敲木鱼玩家", + &payload, + NOW_MICROS, + ) + .expect("compile-draft should build plan"); let WoodenFishActionProcedure::Compile(input) = plan else { panic!("compile-draft should call compile_wooden_fish_draft"); @@ -862,11 +867,16 @@ mod tests { payload.background_asset = Some(generated_background_asset("generated-compile-background")); payload.back_button_asset = Some(generated_back_button_asset("generated-compile-back")); - let error = - match build_wooden_fish_action_plan(&session, OWNER_USER_ID, &payload, NOW_MICROS) { - Ok(_) => panic!("compile-draft should not synthesize fake hit sound assets"), - Err(error) => error, - }; + let error = match build_wooden_fish_action_plan( + &session, + OWNER_USER_ID, + "敲木鱼玩家", + &payload, + NOW_MICROS, + ) { + Ok(_) => panic!("compile-draft should not synthesize fake hit sound assets"), + Err(error) => error, + }; assert!( error @@ -883,11 +893,16 @@ mod tests { payload.hit_sound_asset = Some(generated_hit_sound_asset("generated-compile-sound")); payload.back_button_asset = Some(generated_back_button_asset("generated-compile-back")); - let error = - match build_wooden_fish_action_plan(&session, OWNER_USER_ID, &payload, NOW_MICROS) { - Ok(_) => panic!("compile-draft should not publish without background asset"), - Err(error) => error, - }; + let error = match build_wooden_fish_action_plan( + &session, + OWNER_USER_ID, + "敲木鱼玩家", + &payload, + NOW_MICROS, + ) { + Ok(_) => panic!("compile-draft should not publish without background asset"), + Err(error) => error, + }; assert!( error @@ -904,11 +919,16 @@ mod tests { payload.background_asset = Some(generated_background_asset("generated-compile-background")); payload.hit_sound_asset = Some(generated_hit_sound_asset("generated-compile-sound")); - let error = - match build_wooden_fish_action_plan(&session, OWNER_USER_ID, &payload, NOW_MICROS) { - Ok(_) => panic!("compile-draft should not publish without back button asset"), - Err(error) => error, - }; + let error = match build_wooden_fish_action_plan( + &session, + OWNER_USER_ID, + "敲木鱼玩家", + &payload, + NOW_MICROS, + ) { + Ok(_) => panic!("compile-draft should not publish without back button asset"), + Err(error) => error, + }; assert!( error @@ -926,9 +946,14 @@ mod tests { payload.background_asset = Some(generated_background_asset("generated-background")); payload.back_button_asset = Some(generated_back_button_asset("generated-back")); - let (plan, _draft) = - build_wooden_fish_action_plan(&session, OWNER_USER_ID, &payload, NOW_MICROS) - .expect("regenerate-hit-object should build plan"); + let (plan, _draft) = build_wooden_fish_action_plan( + &session, + OWNER_USER_ID, + "敲木鱼玩家", + &payload, + NOW_MICROS, + ) + .expect("regenerate-hit-object should build plan"); let WoodenFishActionProcedure::Compile(input) = plan else { panic!("regenerate-hit-object should call compile_wooden_fish_draft"); @@ -987,9 +1012,14 @@ mod tests { "健康+1".to_string(), ]); - let (plan, draft) = - build_wooden_fish_action_plan(&session, OWNER_USER_ID, &payload, NOW_MICROS) - .expect("update-floating-words should build plan"); + let (plan, draft) = build_wooden_fish_action_plan( + &session, + OWNER_USER_ID, + "敲木鱼玩家", + &payload, + NOW_MICROS, + ) + .expect("update-floating-words should build plan"); let WoodenFishActionProcedure::Update(input) = plan else { panic!("update-floating-words should call update_wooden_fish_work"); diff --git a/server-rs/crates/spacetime-module/Cargo.toml b/server-rs/crates/spacetime-module/Cargo.toml index a418c2ad..326b8468 100644 --- a/server-rs/crates/spacetime-module/Cargo.toml +++ b/server-rs/crates/spacetime-module/Cargo.toml @@ -23,6 +23,7 @@ module-wooden-fish = { workspace = true, features = ["spacetime-types"] } module-match3d = { workspace = true } module-npc = { workspace = true, features = ["spacetime-types"] } module-puzzle = { workspace = true, features = ["spacetime-types"] } +module-puzzle-clear = { workspace = true, features = ["spacetime-types"] } module-progression = { workspace = true, features = ["spacetime-types"] } module-quest = { workspace = true, features = ["spacetime-types"] } module-runtime = { workspace = true, features = ["spacetime-types"] } diff --git a/server-rs/crates/spacetime-module/src/auth/procedures.rs b/server-rs/crates/spacetime-module/src/auth/procedures.rs index 8ae86d70..22e1ff79 100644 --- a/server-rs/crates/spacetime-module/src/auth/procedures.rs +++ b/server-rs/crates/spacetime-module/src/auth/procedures.rs @@ -455,19 +455,42 @@ fn export_auth_store_snapshot_from_tables_tx( .find(&AUTH_STORE_PROJECTION_META_ID.to_string()) .map(|row| row.updated_at.to_micros_since_unix_epoch()); + let snapshot = build_auth_store_snapshot_from_rows(users, identities, sessions)?; + if let Some(updated_at_micros) = updated_at_micros { + upsert_auth_store_snapshot_rows(ctx, &snapshot, updated_at_micros)?; + } + let snapshot_json = serde_json::to_string_pretty(&snapshot) + .map_err(|error| format!("序列化认证快照失败：{error}"))?; + + Ok(AuthStoreSnapshotRecord { + snapshot_json: Some(snapshot_json), + updated_at_micros, + }) +} + +fn build_auth_store_snapshot_from_rows( + users: Vec, + identities: Vec, + sessions: Vec, +) -> Result { + let valid_user_ids = users + .iter() + .map(|user| user.user_id.clone()) + .collect::>(); let mut phone_identity_by_user_id = std::collections::HashMap::new(); - let mut phone_to_user_id = std::collections::HashMap::new(); let mut wechat_identity_by_provider_uid = std::collections::HashMap::new(); let mut user_id_by_provider_union_id = std::collections::HashMap::new(); for identity in identities { + if !valid_user_ids.contains(&identity.user_id) { + continue; + } match identity.provider.as_str() { "phone" => { let phone_number = identity .phone_e164 .clone() .unwrap_or_else(|| identity.provider_uid.clone()); - phone_to_user_id.insert(phone_number.clone(), identity.user_id.clone()); phone_identity_by_user_id.insert(identity.user_id, phone_number); } "wechat" => { @@ -490,6 +513,7 @@ fn export_auth_store_snapshot_from_tables_tx( } let mut next_user_id = 1_u64; + let mut phone_to_user_id = std::collections::HashMap::new(); let mut users_by_username = std::collections::HashMap::new(); for user in users { if let Some(numeric_id) = user @@ -499,6 +523,13 @@ fn export_auth_store_snapshot_from_tables_tx( { next_user_id = next_user_id.max(numeric_id.saturating_add(1)); } + let phone_number = user + .phone_number_e164 + .clone() + .or_else(|| phone_identity_by_user_id.remove(&user.user_id)); + if let Some(phone_number) = phone_number.clone() { + phone_to_user_id.insert(phone_number, user.user_id.clone()); + } let auth_user = AuthUserSnapshot { id: user.user_id.clone(), public_user_code: user.public_user_code, @@ -519,9 +550,7 @@ fn export_auth_store_snapshot_from_tables_tx( user: auth_user, password_hash: user.password_hash, password_login_enabled: user.password_login_enabled, - phone_number: user - .phone_number_e164 - .or_else(|| phone_identity_by_user_id.remove(&user.user_id)), + phone_number, }, ); } @@ -554,7 +583,7 @@ fn export_auth_store_snapshot_from_tables_tx( ); } - let snapshot = PersistentAuthStoreSnapshot { + Ok(PersistentAuthStoreSnapshot { next_user_id, users_by_username, phone_to_user_id, @@ -562,16 +591,6 @@ fn export_auth_store_snapshot_from_tables_tx( session_id_by_refresh_token_hash, wechat_identity_by_provider_uid, user_id_by_provider_union_id, - }; - if let Some(updated_at_micros) = updated_at_micros { - upsert_auth_store_snapshot_rows(ctx, &snapshot, updated_at_micros)?; - } - let snapshot_json = serde_json::to_string_pretty(&snapshot) - .map_err(|error| format!("序列化认证快照失败：{error}"))?; - - Ok(AuthStoreSnapshotRecord { - snapshot_json: Some(snapshot_json), - updated_at_micros, }) } @@ -710,4 +729,47 @@ mod tests { auth_store_snapshot_row_ids(&after) ); } + + #[test] + fn auth_export_ignores_phone_identity_without_user_account() { + let live_user = UserAccount { + user_id: "user_live".to_string(), + public_user_code: "SY-00000001".to_string(), + username: "phone_live".to_string(), + display_name: "测试玩家".to_string(), + avatar_url: None, + phone_number_masked: Some("138****8000".to_string()), + phone_number_e164: Some("+8613800008000".to_string()), + login_method: "phone".to_string(), + binding_status: "active".to_string(), + wechat_bound: false, + password_hash: "hash-live".to_string(), + password_login_enabled: true, + token_version: 1, + user_tags: Some(vec![]), + }; + let orphan_identity = AuthIdentity { + identity_id: "authi_phone_orphan".to_string(), + user_id: "user_deleted".to_string(), + provider: "phone".to_string(), + provider_uid: "+8613900009999".to_string(), + provider_union_id: None, + phone_e164: Some("+8613900009999".to_string()), + display_name: None, + avatar_url: None, + }; + + let snapshot = + build_auth_store_snapshot_from_rows(vec![live_user], vec![orphan_identity], vec![]) + .expect("auth rows should export"); + + assert_eq!( + snapshot.phone_to_user_id, + std::collections::HashMap::from([( + "+8613800008000".to_string(), + "user_live".to_string() + )]) + ); + assert!(!snapshot.phone_to_user_id.contains_key("+8613900009999")); + } } diff --git a/server-rs/crates/spacetime-module/src/custom_world.rs b/server-rs/crates/spacetime-module/src/custom_world.rs index d17c6910..6e88121e 100644 --- a/server-rs/crates/spacetime-module/src/custom_world.rs +++ b/server-rs/crates/spacetime-module/src/custom_world.rs @@ -5521,6 +5521,7 @@ mod tests { deleted_at: None, created_at: Timestamp::from_micros_since_unix_epoch(1), updated_at: Timestamp::from_micros_since_unix_epoch(1), + visible: true, } } diff --git a/server-rs/crates/spacetime-module/src/lib.rs b/server-rs/crates/spacetime-module/src/lib.rs index 2955c517..c54055ce 100644 --- a/server-rs/crates/spacetime-module/src/lib.rs +++ b/server-rs/crates/spacetime-module/src/lib.rs @@ -11,6 +11,7 @@ pub use module_inventory::*; pub use module_jump_hop::*; pub use module_npc::*; pub use module_progression::*; +pub use module_puzzle_clear::*; pub use module_quest::*; pub use module_runtime::*; pub use module_runtime_item::*; @@ -36,6 +37,7 @@ mod match3d; mod migration; mod public_work; mod puzzle; +mod puzzle_clear; mod runtime; mod square_hole; mod visual_novel; @@ -54,6 +56,7 @@ pub use jump_hop::*; pub use match3d::*; pub use migration::*; pub use public_work::*; +pub use puzzle_clear::*; pub use runtime::*; pub use square_hole::*; pub use visual_novel::*; diff --git a/server-rs/crates/spacetime-module/src/migration.rs b/server-rs/crates/spacetime-module/src/migration.rs index fade23b3..af3be1e2 100644 --- a/server-rs/crates/spacetime-module/src/migration.rs +++ b/server-rs/crates/spacetime-module/src/migration.rs @@ -22,6 +22,10 @@ use crate::puzzle::{ puzzle_agent_message, puzzle_agent_session, puzzle_event, puzzle_leaderboard_entry, puzzle_runtime_run, puzzle_work_profile, }; +use crate::puzzle_clear::tables::{ + puzzle_clear_agent_session, puzzle_clear_event, puzzle_clear_runtime_run, + puzzle_clear_work_profile, +}; use crate::square_hole::tables::{ square_hole_agent_message, square_hole_agent_session, square_hole_runtime_run, square_hole_work_profile, @@ -229,6 +233,10 @@ macro_rules! migration_tables { puzzle_event, puzzle_runtime_run, puzzle_leaderboard_entry, + puzzle_clear_agent_session, + puzzle_clear_work_profile, + puzzle_clear_runtime_run, + puzzle_clear_event, bark_battle_draft_config, bark_battle_published_config, bark_battle_runtime_run, @@ -1313,6 +1321,7 @@ fn normalize_migration_row(table_name: &str, value: &serde_json::Value) -> serde if matches!( table_name, "jump_hop_work_profile" + | "puzzle_clear_work_profile" | "square_hole_work_profile" | "visual_novel_work_profile" | "bark_battle_published_config" @@ -1322,6 +1331,12 @@ fn normalize_migration_row(table_name: &str, value: &serde_json::Value) -> serde object .entry("visible".to_string()) .or_insert_with(|| serde_json::Value::Bool(true)); + if table_name == "puzzle_clear_work_profile" { + // 中文注释：拼消消底图提示词字段晚于作品表加入，旧迁移包按空提示词兼容。 + object + .entry("board_background_prompt".to_string()) + .or_insert(serde_json::Value::Null); + } } } if table_name == "match_3_d_work_profile" || table_name == "match3d_work_profile" { diff --git a/server-rs/crates/spacetime-module/src/public_work.rs b/server-rs/crates/spacetime-module/src/public_work.rs index 98aaa6ce..1891b66d 100644 --- a/server-rs/crates/spacetime-module/src/public_work.rs +++ b/server-rs/crates/spacetime-module/src/public_work.rs @@ -1,4 +1,5 @@ use crate::puzzle::{PuzzleGalleryCardViewRow, puzzle_gallery_card_view, puzzle_gallery_view}; +use crate::puzzle_clear::{puzzle_clear_gallery_card_view, puzzle_clear_gallery_view}; use crate::*; use module_custom_world::{CustomWorldGalleryEntrySnapshot, CustomWorldProfileSnapshot}; use module_puzzle::PuzzleWorkProfile; @@ -17,6 +18,11 @@ pub fn public_work_gallery_entry(ctx: &AnonymousViewContext) -> Vec Vec PublicWorkDetailEntry { gallery_to_detail(entry, detail_payload_json) } +fn map_puzzle_clear_gallery_entry(row: PuzzleClearGalleryCardViewRow) -> PublicWorkGalleryEntry { + let sort_time_micros = row.published_at_micros.unwrap_or(row.updated_at_micros); + + PublicWorkGalleryEntry { + source_type: "puzzle-clear".to_string(), + work_id: row.work_id, + profile_id: row.profile_id, + source_session_id: None, + public_work_code: row.public_work_code, + owner_user_id: row.owner_user_id, + author_display_name: row.author_display_name, + world_name: row.work_title, + subtitle: "拼消消".to_string(), + summary_text: row.work_description, + cover_image_src: row.cover_image_src, + cover_asset_id: None, + theme_tags: fallback_tags(vec![row.theme_prompt], &["拼消消"]), + play_count: row.play_count, + remix_count: 0, + like_count: 0, + published_at_micros: row.published_at_micros, + updated_at_micros: row.updated_at_micros, + sort_time_micros, + } +} + +fn map_puzzle_clear_detail_entry(row: PuzzleClearGalleryViewRow) -> PublicWorkDetailEntry { + let entry = PublicWorkGalleryEntry { + source_type: "puzzle-clear".to_string(), + work_id: row.work_id, + profile_id: row.profile_id.clone(), + source_session_id: empty_string_to_option(row.source_session_id), + public_work_code: build_prefixed_public_work_code("PC", &row.profile_id), + owner_user_id: row.owner_user_id, + author_display_name: row.author_display_name, + world_name: row.work_title, + subtitle: "拼消消".to_string(), + summary_text: row.work_description, + cover_image_src: row.cover_image_src, + cover_asset_id: None, + theme_tags: fallback_tags(vec![row.theme_prompt.clone()], &["拼消消"]), + play_count: row.play_count, + remix_count: 0, + like_count: 0, + published_at_micros: row.published_at_micros, + updated_at_micros: row.updated_at_micros, + sort_time_micros: row.published_at_micros.unwrap_or(row.updated_at_micros), + }; + let detail_payload_json = json_string(json!({ + "sourceType": "puzzle-clear", + "themePrompt": row.theme_prompt, + "patternGroupCount": row.pattern_groups.len(), + "cardAssetCount": row.card_assets.len(), + "generationStatus": row.generation_status, + "hasBoardBackground": row.board_background_asset.is_some(), + })); + gallery_to_detail(entry, detail_payload_json) +} + fn map_custom_world_gallery_entry(row: CustomWorldGalleryEntrySnapshot) -> PublicWorkGalleryEntry { PublicWorkGalleryEntry { source_type: "custom-world".to_string(), diff --git a/server-rs/crates/spacetime-module/src/puzzle_clear.rs b/server-rs/crates/spacetime-module/src/puzzle_clear.rs new file mode 100644 index 00000000..ce917767 --- /dev/null +++ b/server-rs/crates/spacetime-module/src/puzzle_clear.rs @@ -0,0 +1,1647 @@ +pub(crate) mod tables; +mod types; + +pub use tables::*; +pub use types::*; + +use crate::{ProcedureContext, ReducerContext, SpacetimeType, Table, Timestamp, json}; +use module_puzzle_clear::{ + PUZZLE_CLEAR_LEVEL_DURATION_SECONDS, PuzzleClearBoard, PuzzleClearCard, PuzzleClearDeck, + PuzzleClearMove, PuzzleClearRunSnapshot as DomainRunSnapshot, advance_puzzle_clear_level, + apply_puzzle_clear_swap, create_puzzle_clear_board, fail_puzzle_clear_level_on_timeout, + parse_puzzle_clear_orientation, parse_puzzle_clear_shape_kind, puzzle_clear_level_configs, + retry_puzzle_clear_level, start_puzzle_clear_run, +}; +use serde::Serialize; +use serde::de::DeserializeOwned; +use spacetimedb::AnonymousViewContext; +use std::collections::BTreeMap; + +#[spacetimedb::view(accessor = puzzle_clear_gallery_view, public)] +pub fn puzzle_clear_gallery_view(ctx: &AnonymousViewContext) -> Vec { + let mut items = ctx + .db + .puzzle_clear_work_profile() + .by_puzzle_clear_work_publication_status() + .filter(PUZZLE_CLEAR_PUBLICATION_PUBLISHED) + .filter(|row| row.visible) + .filter_map(|row| match build_gallery_view_row(&row) { + Ok(item) => Some(item), + Err(error) => { + log::warn!( + "拼消消公开广场 view 跳过损坏作品 profile_id={}: {}", + row.profile_id, + error + ); + None + } + }) + .collect::>(); + items.sort_by(|left, right| { + right + .updated_at_micros + .cmp(&left.updated_at_micros) + .then_with(|| left.profile_id.cmp(&right.profile_id)) + }); + items +} + +#[spacetimedb::view(accessor = puzzle_clear_gallery_card_view, public)] +pub fn puzzle_clear_gallery_card_view( + ctx: &AnonymousViewContext, +) -> Vec { + puzzle_clear_gallery_view(ctx) + .into_iter() + .map(|row| PuzzleClearGalleryCardViewRow { + public_work_code: build_puzzle_clear_public_work_code(&row.profile_id), + work_id: row.work_id, + profile_id: row.profile_id, + owner_user_id: row.owner_user_id, + author_display_name: row.author_display_name, + work_title: row.work_title, + work_description: row.work_description, + theme_prompt: row.theme_prompt, + cover_image_src: row.cover_image_src, + publication_status: row.publication_status, + play_count: row.play_count, + updated_at_micros: row.updated_at_micros, + published_at_micros: row.published_at_micros, + generation_status: row.generation_status, + }) + .collect() +} + +#[derive(Clone, Debug, PartialEq, SpacetimeType)] +pub struct PuzzleClearGalleryViewRow { + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub source_session_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + pub board_background_prompt: String, + pub card_back_image_src: Option, + pub atlas_asset: PuzzleClearImageAssetSnapshot, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub cover_image_src: Option, + pub publication_status: String, + pub publish_ready: bool, + pub play_count: u32, + pub generation_status: String, + pub updated_at_micros: i64, + pub published_at_micros: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearGalleryCardViewRow { + pub public_work_code: String, + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub cover_image_src: Option, + pub publication_status: String, + pub play_count: u32, + pub updated_at_micros: i64, + pub published_at_micros: Option, + pub generation_status: String, +} + +#[spacetimedb::procedure] +pub fn create_puzzle_clear_agent_session( + ctx: &mut ProcedureContext, + input: PuzzleClearAgentSessionCreateInput, +) -> PuzzleClearAgentSessionProcedureResult { + match ctx.try_with_tx(|tx| create_puzzle_clear_agent_session_tx(tx, input.clone())) { + Ok(session) => session_result(session), + Err(message) => session_error(message), + } +} + +#[spacetimedb::procedure] +pub fn get_puzzle_clear_agent_session( + ctx: &mut ProcedureContext, + input: PuzzleClearAgentSessionGetInput, +) -> PuzzleClearAgentSessionProcedureResult { + match ctx.try_with_tx(|tx| get_puzzle_clear_agent_session_tx(tx, input.clone())) { + Ok(session) => session_result(session), + Err(message) => session_error(message), + } +} + +#[spacetimedb::procedure] +pub fn compile_puzzle_clear_draft( + ctx: &mut ProcedureContext, + input: PuzzleClearDraftCompileInput, +) -> PuzzleClearAgentSessionProcedureResult { + match ctx.try_with_tx(|tx| compile_puzzle_clear_draft_tx(tx, input.clone())) { + Ok(session) => session_result(session), + Err(message) => session_error(message), + } +} + +#[spacetimedb::procedure] +pub fn get_puzzle_clear_work_profile( + ctx: &mut ProcedureContext, + input: PuzzleClearWorkGetInput, +) -> PuzzleClearWorkProcedureResult { + match ctx.try_with_tx(|tx| get_puzzle_clear_work_profile_tx(tx, input.clone())) { + Ok(work) => work_result(work), + Err(message) => work_error(message), + } +} + +#[spacetimedb::procedure] +pub fn update_puzzle_clear_work( + ctx: &mut ProcedureContext, + input: PuzzleClearWorkUpdateInput, +) -> PuzzleClearWorkProcedureResult { + match ctx.try_with_tx(|tx| update_puzzle_clear_work_tx(tx, input.clone())) { + Ok(work) => work_result(work), + Err(message) => work_error(message), + } +} + +#[spacetimedb::procedure] +pub fn publish_puzzle_clear_work( + ctx: &mut ProcedureContext, + input: PuzzleClearWorkPublishInput, +) -> PuzzleClearWorkProcedureResult { + match ctx.try_with_tx(|tx| publish_puzzle_clear_work_tx(tx, input.clone())) { + Ok(work) => work_result(work), + Err(message) => work_error(message), + } +} + +#[spacetimedb::procedure] +pub fn list_puzzle_clear_works( + ctx: &mut ProcedureContext, + input: PuzzleClearWorksListInput, +) -> PuzzleClearWorksProcedureResult { + match ctx.try_with_tx(|tx| list_puzzle_clear_works_tx(tx, input.clone())) { + Ok(items) => PuzzleClearWorksProcedureResult { + ok: true, + items, + error_message: None, + }, + Err(message) => PuzzleClearWorksProcedureResult { + ok: false, + items: Vec::new(), + error_message: Some(message), + }, + } +} + +#[spacetimedb::procedure] +pub fn start_puzzle_clear_runtime_run( + ctx: &mut ProcedureContext, + input: PuzzleClearRunStartInput, +) -> PuzzleClearRunProcedureResult { + match ctx.try_with_tx(|tx| start_puzzle_clear_runtime_run_tx(tx, input.clone())) { + Ok(run) => run_result(run), + Err(message) => run_error(message), + } +} + +#[spacetimedb::procedure] +pub fn get_puzzle_clear_runtime_run( + ctx: &mut ProcedureContext, + input: PuzzleClearRunGetInput, +) -> PuzzleClearRunProcedureResult { + match ctx.try_with_tx(|tx| get_puzzle_clear_runtime_run_tx(tx, input.clone())) { + Ok(run) => run_result(run), + Err(message) => run_error(message), + } +} + +#[spacetimedb::procedure] +pub fn swap_puzzle_clear_cards( + ctx: &mut ProcedureContext, + input: PuzzleClearRunSwapInput, +) -> PuzzleClearRunProcedureResult { + match ctx.try_with_tx(|tx| swap_puzzle_clear_cards_tx(tx, input.clone())) { + Ok(run) => run_result(run), + Err(message) => run_error(message), + } +} + +#[spacetimedb::procedure] +pub fn retry_puzzle_clear_level_run( + ctx: &mut ProcedureContext, + input: PuzzleClearRunRetryLevelInput, +) -> PuzzleClearRunProcedureResult { + match ctx.try_with_tx(|tx| retry_puzzle_clear_level_run_tx(tx, input.clone())) { + Ok(run) => run_result(run), + Err(message) => run_error(message), + } +} + +#[spacetimedb::procedure] +pub fn advance_puzzle_clear_next_level( + ctx: &mut ProcedureContext, + input: PuzzleClearRunNextLevelInput, +) -> PuzzleClearRunProcedureResult { + match ctx.try_with_tx(|tx| advance_puzzle_clear_next_level_tx(tx, input.clone())) { + Ok(run) => run_result(run), + Err(message) => run_error(message), + } +} + +#[spacetimedb::procedure] +pub fn mark_puzzle_clear_level_time_up( + ctx: &mut ProcedureContext, + input: PuzzleClearRunTimeUpInput, +) -> PuzzleClearRunProcedureResult { + match ctx.try_with_tx(|tx| mark_puzzle_clear_level_time_up_tx(tx, input.clone())) { + Ok(run) => run_result(run), + Err(message) => run_error(message), + } +} + +fn create_puzzle_clear_agent_session_tx( + ctx: &ReducerContext, + input: PuzzleClearAgentSessionCreateInput, +) -> Result { + require_non_empty(&input.session_id, "puzzle_clear session_id")?; + require_non_empty(&input.owner_user_id, "puzzle_clear owner_user_id")?; + require_non_empty(&input.work_title, "work_title")?; + require_non_empty(&input.theme_prompt, "theme_prompt")?; + if ctx + .db + .puzzle_clear_agent_session() + .session_id() + .find(&input.session_id) + .is_some() + { + return Err("puzzle_clear_agent_session.session_id 已存在".to_string()); + } + + let created_at = Timestamp::from_micros_since_unix_epoch(input.created_at_micros); + let draft = PuzzleClearDraftSnapshot { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: None, + work_title: clean_string(&input.work_title, PUZZLE_CLEAR_TEMPLATE_NAME), + work_description: input.work_description.trim().to_string(), + theme_prompt: clean_string(&input.theme_prompt, PUZZLE_CLEAR_TEMPLATE_NAME), + generate_board_background: input.generate_board_background, + board_background_asset: input + .board_background_asset_json + .as_deref() + .map(parse_json) + .transpose()?, + board_background_prompt: clean_string(&input.board_background_prompt, &input.theme_prompt), + card_back_image_src: Some(PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC.to_string()), + atlas_asset: None, + pattern_groups: Vec::new(), + card_assets: Vec::new(), + generation_status: PUZZLE_CLEAR_GENERATION_DRAFT.to_string(), + }; + let owner_user_id = input.owner_user_id.clone(); + let session_id = input.session_id.clone(); + ctx.db + .puzzle_clear_agent_session() + .insert(PuzzleClearAgentSessionRow { + session_id: input.session_id.clone(), + owner_user_id: input.owner_user_id, + status: PUZZLE_CLEAR_GENERATION_DRAFT.to_string(), + draft_json: to_json_string(&draft), + published_profile_id: String::new(), + created_at, + updated_at: created_at, + }); + + get_puzzle_clear_agent_session_tx( + ctx, + PuzzleClearAgentSessionGetInput { + session_id, + owner_user_id, + }, + ) +} + +fn get_puzzle_clear_agent_session_tx( + ctx: &ReducerContext, + input: PuzzleClearAgentSessionGetInput, +) -> Result { + let row = find_owned_session(ctx, &input.session_id, &input.owner_user_id)?; + build_session_snapshot(&row) +} + +fn compile_puzzle_clear_draft_tx( + ctx: &ReducerContext, + input: PuzzleClearDraftCompileInput, +) -> Result { + require_non_empty(&input.profile_id, "puzzle_clear profile_id")?; + let session = find_owned_session(ctx, &input.session_id, &input.owner_user_id)?; + if input.generation_status.as_deref() == Some(PUZZLE_CLEAR_GENERATION_FAILED) { + return mark_puzzle_clear_generation_failed_tx(ctx, input, session); + } + let pattern_groups: Vec = input + .pattern_groups_json + .as_deref() + .map(parse_json) + .transpose()? + .ok_or_else(|| "puzzle_clear pattern_groups 缺少真实生成资产".to_string())?; + let atlas_asset: PuzzleClearImageAssetSnapshot = input + .atlas_asset_json + .as_deref() + .map(parse_json) + .transpose()? + .ok_or_else(|| "puzzle_clear atlas_asset 缺少真实生成资产".to_string())?; + let card_assets: Vec = input + .card_assets_json + .as_deref() + .map(parse_json) + .transpose()? + .ok_or_else(|| "puzzle_clear card_assets 缺少真实生成资产".to_string())?; + if card_assets.is_empty() { + return Err("puzzle_clear card_assets 不能为空".to_string()); + } + if !is_real_puzzle_clear_asset( + atlas_asset.asset_object_id.as_str(), + atlas_asset.image_object_key.as_str(), + atlas_asset.image_src.as_str(), + ) { + return Err("puzzle_clear atlas_asset 缺少真实生成资产".to_string()); + } + if card_assets.iter().any(|asset| { + !is_real_puzzle_clear_asset( + asset.asset_object_id.as_str(), + asset.image_object_key.as_str(), + asset.image_src.as_str(), + ) + }) { + return Err("puzzle_clear card_assets 缺少真实生成资产".to_string()); + } + let board_background_asset = input + .board_background_asset_json + .as_deref() + .map(parse_json) + .transpose()?; + let generation_status = input + .generation_status + .clone() + .unwrap_or_else(|| PUZZLE_CLEAR_GENERATION_READY.to_string()); + let compiled_at = Timestamp::from_micros_since_unix_epoch(input.compiled_at_micros); + let draft = PuzzleClearDraftSnapshot { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: Some(input.profile_id.clone()), + work_title: clean_string(&input.work_title, PUZZLE_CLEAR_TEMPLATE_NAME), + work_description: input.work_description.trim().to_string(), + theme_prompt: clean_string(&input.theme_prompt, PUZZLE_CLEAR_TEMPLATE_NAME), + generate_board_background: input.generate_board_background, + board_background_asset: board_background_asset.clone(), + board_background_prompt: clean_string(&input.board_background_prompt, &input.theme_prompt), + card_back_image_src: Some(PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC.to_string()), + atlas_asset: Some(atlas_asset.clone()), + pattern_groups: pattern_groups.clone(), + card_assets: card_assets.clone(), + generation_status: generation_status.clone(), + }; + let row = PuzzleClearWorkProfileRow { + profile_id: input.profile_id.clone(), + work_id: input.profile_id.clone(), + owner_user_id: input.owner_user_id.clone(), + source_session_id: input.session_id.clone(), + author_display_name: clean_string(&input.author_display_name, "拼消消玩家"), + work_title: draft.work_title.clone(), + work_description: draft.work_description.clone(), + theme_prompt: draft.theme_prompt.clone(), + generate_board_background: draft.generate_board_background, + board_background_asset_json: board_background_asset + .as_ref() + .map(to_json_string) + .unwrap_or_default(), + board_background_prompt: clean_optional(&draft.board_background_prompt), + card_back_image_src: PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC.to_string(), + atlas_asset_json: to_json_string(&atlas_asset), + pattern_groups_json: to_json_string(&pattern_groups), + card_assets_json: to_json_string(&card_assets), + cover_image_src: cover_image_src(&board_background_asset, &atlas_asset), + generation_status, + publication_status: PUZZLE_CLEAR_PUBLICATION_DRAFT.to_string(), + play_count: 0, + updated_at: compiled_at, + published_at: None, + visible: true, + }; + upsert_work(ctx, row); + replace_session( + ctx, + &session, + PuzzleClearAgentSessionRow { + status: draft.generation_status.clone(), + draft_json: to_json_string(&draft), + published_profile_id: input.profile_id, + updated_at: compiled_at, + ..clone_session(&session) + }, + ); + + get_puzzle_clear_agent_session_tx( + ctx, + PuzzleClearAgentSessionGetInput { + session_id: input.session_id, + owner_user_id: input.owner_user_id, + }, + ) +} + +fn mark_puzzle_clear_generation_failed_tx( + ctx: &ReducerContext, + input: PuzzleClearDraftCompileInput, + session: PuzzleClearAgentSessionRow, +) -> Result { + let failed_at = Timestamp::from_micros_since_unix_epoch(input.compiled_at_micros); + let mut draft = if session.draft_json.trim().is_empty() { + None + } else { + parse_json::(&session.draft_json).ok() + } + .unwrap_or_else(|| PuzzleClearDraftSnapshot { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: Some(input.profile_id.clone()), + work_title: clean_string(&input.work_title, PUZZLE_CLEAR_TEMPLATE_NAME), + work_description: input.work_description.trim().to_string(), + theme_prompt: clean_string(&input.theme_prompt, PUZZLE_CLEAR_TEMPLATE_NAME), + generate_board_background: input.generate_board_background, + board_background_asset: input + .board_background_asset_json + .as_deref() + .and_then(|json| parse_json::(json).ok()), + board_background_prompt: clean_string(&input.board_background_prompt, &input.theme_prompt), + card_back_image_src: Some(PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC.to_string()), + atlas_asset: None, + pattern_groups: Vec::new(), + card_assets: Vec::new(), + generation_status: PUZZLE_CLEAR_GENERATION_FAILED.to_string(), + }); + draft.profile_id = Some(input.profile_id.clone()); + draft.work_title = clean_string(&input.work_title, PUZZLE_CLEAR_TEMPLATE_NAME); + draft.work_description = input.work_description.trim().to_string(); + draft.theme_prompt = clean_string(&input.theme_prompt, PUZZLE_CLEAR_TEMPLATE_NAME); + draft.generate_board_background = input.generate_board_background; + draft.board_background_prompt = + clean_string(&input.board_background_prompt, &input.theme_prompt); + let existing_board_background_asset = draft.board_background_asset.take(); + draft.board_background_asset = input + .board_background_asset_json + .as_deref() + .map(parse_json) + .transpose()? + .or(existing_board_background_asset); + draft.generation_status = PUZZLE_CLEAR_GENERATION_FAILED.to_string(); + + replace_session( + ctx, + &session, + PuzzleClearAgentSessionRow { + status: PUZZLE_CLEAR_GENERATION_FAILED.to_string(), + draft_json: to_json_string(&draft), + updated_at: failed_at, + ..clone_session(&session) + }, + ); + + get_puzzle_clear_agent_session_tx( + ctx, + PuzzleClearAgentSessionGetInput { + session_id: input.session_id, + owner_user_id: input.owner_user_id, + }, + ) +} + +fn get_puzzle_clear_work_profile_tx( + ctx: &ReducerContext, + input: PuzzleClearWorkGetInput, +) -> Result { + let row = find_work(ctx, &input.profile_id)?; + if !input.owner_user_id.trim().is_empty() && row.owner_user_id != input.owner_user_id { + return Err("无权访问该 puzzle_clear work".to_string()); + } + build_work_snapshot(&row) +} + +fn update_puzzle_clear_work_tx( + ctx: &ReducerContext, + input: PuzzleClearWorkUpdateInput, +) -> Result { + let row = find_owned_work(ctx, &input.profile_id, &input.owner_user_id)?; + let updated_at = Timestamp::from_micros_since_unix_epoch(input.updated_at_micros); + let board_background_asset = input + .board_background_asset_json + .as_deref() + .map(parse_json::) + .transpose()?; + let atlas_asset = parse_json::(&row.atlas_asset_json)?; + let mut next = clone_work(&row); + next.work_title = clean_string(&input.work_title, &row.work_title); + next.work_description = input.work_description.trim().to_string(); + next.theme_prompt = clean_string(&input.theme_prompt, &row.theme_prompt); + next.generate_board_background = input.generate_board_background; + let next_board_background_prompt = + clean_string(&input.board_background_prompt, &input.theme_prompt); + next.board_background_prompt = clean_optional(&next_board_background_prompt); + next.board_background_asset_json = board_background_asset + .as_ref() + .map(to_json_string) + .unwrap_or_default(); + next.cover_image_src = cover_image_src(&board_background_asset, &atlas_asset); + next.updated_at = updated_at; + replace_work(ctx, &row, next); + let updated = find_work(ctx, &row.profile_id)?; + sync_session_from_work(ctx, &updated, updated_at)?; + build_work_snapshot(&updated) +} + +fn publish_puzzle_clear_work_tx( + ctx: &ReducerContext, + input: PuzzleClearWorkPublishInput, +) -> Result { + let row = find_owned_work(ctx, &input.profile_id, &input.owner_user_id)?; + let snapshot = build_work_snapshot(&row)?; + if !snapshot.publish_ready { + return Err("拼消消发布需要 atlas、切片卡牌和标题齐备".to_string()); + } + let published_at = Timestamp::from_micros_since_unix_epoch(input.published_at_micros); + replace_work( + ctx, + &row, + PuzzleClearWorkProfileRow { + publication_status: PUZZLE_CLEAR_PUBLICATION_PUBLISHED.to_string(), + updated_at: published_at, + published_at: Some(published_at), + ..clone_work(&row) + }, + ); + if let Some(session) = ctx + .db + .puzzle_clear_agent_session() + .session_id() + .find(&row.source_session_id) + { + replace_session( + ctx, + &session, + PuzzleClearAgentSessionRow { + status: PUZZLE_CLEAR_GENERATION_READY.to_string(), + updated_at: published_at, + ..clone_session(&session) + }, + ); + } + let updated = find_work(ctx, &row.profile_id)?; + build_work_snapshot(&updated) +} + +fn list_puzzle_clear_works_tx( + ctx: &ReducerContext, + input: PuzzleClearWorksListInput, +) -> Result, String> { + let mut rows = if input.owner_user_id.trim().is_empty() { + ctx.db + .puzzle_clear_work_profile() + .iter() + .collect::>() + } else { + ctx.db + .puzzle_clear_work_profile() + .by_puzzle_clear_work_owner_user_id() + .filter(input.owner_user_id.as_str()) + .collect::>() + }; + if input.published_only { + rows.retain(|row| row.publication_status == PUZZLE_CLEAR_PUBLICATION_PUBLISHED); + } + rows.sort_by(|left, right| { + right + .updated_at + .cmp(&left.updated_at) + .then_with(|| left.profile_id.cmp(&right.profile_id)) + }); + rows.into_iter() + .map(|row| build_work_snapshot(&row)) + .collect() +} + +fn start_puzzle_clear_runtime_run_tx( + ctx: &ReducerContext, + input: PuzzleClearRunStartInput, +) -> Result { + require_non_empty(&input.run_id, "puzzle_clear run_id")?; + let work = find_work(ctx, &input.profile_id)?; + if work.publication_status != PUZZLE_CLEAR_PUBLICATION_PUBLISHED { + return Err("拼消消 runtime 只能启动已发布作品".to_string()); + } + let cards = domain_cards_from_work(&work)?; + let (board, deck) = build_level_board_and_deck(1, &work.profile_id, &cards)?; + let domain_run = start_puzzle_clear_run( + input.run_id.clone(), + input.owner_user_id.clone(), + input.profile_id.clone(), + board, + deck, + input.started_at_ms.max(0) as u64, + ) + .map_err(|error| error.to_string())?; + upsert_run(ctx, &domain_run, input.started_at_ms); + increment_work_play_count(ctx, &work, input.started_at_ms); + insert_event( + ctx, + input.client_event_id, + input.owner_user_id.clone(), + input.profile_id, + input.run_id, + PUZZLE_CLEAR_EVENT_RUN_STARTED, + None, + input.started_at_ms, + ); + build_runtime_snapshot(&domain_run) +} + +fn get_puzzle_clear_runtime_run_tx( + ctx: &ReducerContext, + input: PuzzleClearRunGetInput, +) -> Result { + let row = find_owned_run(ctx, &input.run_id, &input.owner_user_id)?; + let snapshot = parse_json::(&row.snapshot_json)?; + build_runtime_snapshot(&snapshot) +} + +fn swap_puzzle_clear_cards_tx( + ctx: &ReducerContext, + input: PuzzleClearRunSwapInput, +) -> Result { + let row = find_owned_run(ctx, &input.run_id, &input.owner_user_id)?; + let snapshot = parse_json::(&row.snapshot_json)?; + let next = apply_puzzle_clear_swap( + &snapshot, + PuzzleClearMove { + from_row: input.from_row, + from_col: input.from_col, + to_row: input.to_row, + to_col: input.to_col, + }, + input.swapped_at_ms.max(0) as u64, + ) + .map_err(|error| error.to_string())?; + replace_run(ctx, &row, &next, input.swapped_at_ms); + insert_event( + ctx, + input.client_action_id, + input.owner_user_id.clone(), + next.profile_id.clone(), + input.run_id, + PUZZLE_CLEAR_EVENT_SWAP, + Some(runtime_event_result(&snapshot, &next, input.swapped_at_ms)), + input.swapped_at_ms, + ); + insert_terminal_runtime_event_if_needed( + ctx, + &snapshot, + &next, + input.owner_user_id, + input.swapped_at_ms, + ); + build_runtime_snapshot(&next) +} + +fn retry_puzzle_clear_level_run_tx( + ctx: &ReducerContext, + input: PuzzleClearRunRetryLevelInput, +) -> Result { + let row = find_owned_run(ctx, &input.run_id, &input.owner_user_id)?; + let snapshot = parse_json::(&row.snapshot_json)?; + let work = find_work(ctx, &snapshot.profile_id)?; + let cards = domain_cards_from_work(&work)?; + let (board, deck) = build_level_board_and_deck( + snapshot.level_index, + &format!("{}-retry-{}", snapshot.profile_id, input.restarted_at_ms), + &cards, + )?; + let next = + retry_puzzle_clear_level(&snapshot, board, deck, input.restarted_at_ms.max(0) as u64) + .map_err(|error| error.to_string())?; + replace_run(ctx, &row, &next, input.restarted_at_ms); + insert_event( + ctx, + input.client_action_id, + input.owner_user_id.clone(), + next.profile_id.clone(), + input.run_id, + PUZZLE_CLEAR_EVENT_RETRY_LEVEL, + None, + input.restarted_at_ms, + ); + build_runtime_snapshot(&next) +} + +fn advance_puzzle_clear_next_level_tx( + ctx: &ReducerContext, + input: PuzzleClearRunNextLevelInput, +) -> Result { + let row = find_owned_run(ctx, &input.run_id, &input.owner_user_id)?; + let snapshot = parse_json::(&row.snapshot_json)?; + let next_level = snapshot.level_index.saturating_add(1); + let work = find_work(ctx, &snapshot.profile_id)?; + let cards = domain_cards_from_work(&work)?; + let (board, deck) = build_level_board_and_deck( + next_level, + &format!("{}-level-{next_level}", snapshot.profile_id), + &cards, + )?; + let next = + advance_puzzle_clear_level(&snapshot, board, deck, input.started_at_ms.max(0) as u64) + .map_err(|error| error.to_string())?; + replace_run(ctx, &row, &next, input.started_at_ms); + insert_event( + ctx, + input.client_action_id, + input.owner_user_id.clone(), + next.profile_id.clone(), + input.run_id, + PUZZLE_CLEAR_EVENT_NEXT_LEVEL, + Some(next.level_index.to_string()), + input.started_at_ms, + ); + build_runtime_snapshot(&next) +} + +fn mark_puzzle_clear_level_time_up_tx( + ctx: &ReducerContext, + input: PuzzleClearRunTimeUpInput, +) -> Result { + let row = find_owned_run(ctx, &input.run_id, &input.owner_user_id)?; + let snapshot = parse_json::(&row.snapshot_json)?; + let next = fail_puzzle_clear_level_on_timeout(&snapshot, input.occurred_at_ms.max(0) as u64) + .map_err(|error| error.to_string())?; + replace_run(ctx, &row, &next, input.occurred_at_ms); + insert_event( + ctx, + input.client_action_id, + input.owner_user_id.clone(), + next.profile_id.clone(), + input.run_id, + PUZZLE_CLEAR_EVENT_TIME_UP, + Some(runtime_event_result(&snapshot, &next, input.occurred_at_ms)), + input.occurred_at_ms, + ); + insert_terminal_runtime_event_if_needed( + ctx, + &snapshot, + &next, + input.owner_user_id, + input.occurred_at_ms, + ); + build_runtime_snapshot(&next) +} + +fn build_gallery_view_row( + row: &PuzzleClearWorkProfileRow, +) -> Result { + let work = build_work_snapshot(row)?; + Ok(PuzzleClearGalleryViewRow { + work_id: work.work_id, + profile_id: work.profile_id, + owner_user_id: work.owner_user_id, + source_session_id: work.source_session_id, + author_display_name: work.author_display_name, + work_title: work.work_title, + work_description: work.work_description, + theme_prompt: work.theme_prompt, + generate_board_background: work.generate_board_background, + board_background_asset: work.board_background_asset, + board_background_prompt: work.board_background_prompt, + card_back_image_src: work.card_back_image_src, + atlas_asset: work.atlas_asset, + pattern_groups: work.pattern_groups, + card_assets: work.card_assets, + cover_image_src: work.cover_image_src, + publication_status: work.publication_status, + publish_ready: work.publish_ready, + play_count: work.play_count, + generation_status: work.generation_status, + updated_at_micros: work.updated_at_micros, + published_at_micros: work.published_at_micros, + }) +} + +pub fn build_puzzle_clear_public_work_code(profile_id: &str) -> String { + let normalized = profile_id + .chars() + .filter(|character| character.is_ascii_alphanumeric()) + .flat_map(|character| character.to_uppercase()) + .collect::(); + let suffix_source = if normalized.is_empty() { + "00000000".to_string() + } else { + normalized + }; + let suffix = if suffix_source.len() > 8 { + suffix_source[suffix_source.len() - 8..].to_string() + } else { + format!("{suffix_source:0>8}") + }; + format!("PC-{suffix}") +} + +fn build_session_snapshot( + row: &PuzzleClearAgentSessionRow, +) -> Result { + Ok(PuzzleClearAgentSessionSnapshot { + session_id: row.session_id.clone(), + owner_user_id: row.owner_user_id.clone(), + status: row.status.clone(), + draft: clean_optional(&row.draft_json) + .map(|value| parse_json(&value)) + .transpose()?, + published_profile_id: clean_optional(&row.published_profile_id), + created_at_micros: row.created_at.to_micros_since_unix_epoch(), + updated_at_micros: row.updated_at.to_micros_since_unix_epoch(), + }) +} + +fn build_work_snapshot(row: &PuzzleClearWorkProfileRow) -> Result { + let atlas_asset = parse_json(&row.atlas_asset_json)?; + let card_assets = parse_json_or_default(&row.card_assets_json); + let pattern_groups = parse_json_or_default(&row.pattern_groups_json); + Ok(PuzzleClearWorkSnapshot { + work_id: row.work_id.clone(), + profile_id: row.profile_id.clone(), + owner_user_id: row.owner_user_id.clone(), + source_session_id: row.source_session_id.clone(), + author_display_name: row.author_display_name.clone(), + work_title: row.work_title.clone(), + work_description: row.work_description.clone(), + theme_prompt: row.theme_prompt.clone(), + generate_board_background: row.generate_board_background, + board_background_asset: clean_optional(&row.board_background_asset_json) + .map(|value| parse_json(&value)) + .transpose()?, + board_background_prompt: row + .board_background_prompt + .as_deref() + .and_then(clean_optional) + .unwrap_or_default(), + card_back_image_src: clean_optional(&row.card_back_image_src), + atlas_asset, + pattern_groups, + card_assets, + cover_image_src: clean_optional(&row.cover_image_src), + publication_status: row.publication_status.clone(), + publish_ready: is_publish_ready(row), + play_count: row.play_count, + generation_status: row.generation_status.clone(), + updated_at_micros: row.updated_at.to_micros_since_unix_epoch(), + published_at_micros: row + .published_at + .map(|value| value.to_micros_since_unix_epoch()), + }) +} + +fn sync_session_from_work( + ctx: &ReducerContext, + work: &PuzzleClearWorkProfileRow, + updated_at: Timestamp, +) -> Result<(), String> { + let Some(session) = ctx + .db + .puzzle_clear_agent_session() + .session_id() + .find(&work.source_session_id) + else { + return Ok(()); + }; + let draft = PuzzleClearDraftSnapshot { + template_id: PUZZLE_CLEAR_TEMPLATE_ID.to_string(), + template_name: PUZZLE_CLEAR_TEMPLATE_NAME.to_string(), + profile_id: Some(work.profile_id.clone()), + work_title: work.work_title.clone(), + work_description: work.work_description.clone(), + theme_prompt: work.theme_prompt.clone(), + generate_board_background: work.generate_board_background, + board_background_asset: clean_optional(&work.board_background_asset_json) + .map(|value| parse_json(&value)) + .transpose()?, + board_background_prompt: work + .board_background_prompt + .as_deref() + .and_then(clean_optional) + .unwrap_or_default(), + card_back_image_src: clean_optional(&work.card_back_image_src), + atlas_asset: Some(parse_json(&work.atlas_asset_json)?), + pattern_groups: parse_json_or_default(&work.pattern_groups_json), + card_assets: parse_json_or_default(&work.card_assets_json), + generation_status: work.generation_status.clone(), + }; + replace_session( + ctx, + &session, + PuzzleClearAgentSessionRow { + status: work.generation_status.clone(), + draft_json: to_json_string(&draft), + updated_at, + ..clone_session(&session) + }, + ); + Ok(()) +} + +fn build_level_board_and_deck( + level_index: u32, + seed: &str, + all_cards: &[PuzzleClearCard], +) -> Result<(PuzzleClearBoard, PuzzleClearDeck), String> { + let level = puzzle_clear_level_configs() + .into_iter() + .find(|config| config.level_index == level_index) + .ok_or_else(|| "拼消消关卡不存在".to_string())?; + let allowed = ordered_level_cards( + all_cards + .iter() + .filter(|card| level.unlocked_shapes.contains(&card.shape)) + .cloned() + .collect::>(), + seed, + level.target_clears as usize, + ); + let board = create_puzzle_clear_board(&level, seed, allowed.clone()) + .map_err(|error| error.to_string())?; + let board_total = (level.board_size * level.board_size) as usize; + let mut ready_columns = vec![Vec::new(); level.board_size as usize]; + for (index, card) in allowed.into_iter().skip(board_total).enumerate() { + ready_columns[index % level.board_size as usize].push(card); + } + Ok((board, PuzzleClearDeck { ready_columns })) +} + +fn ordered_level_cards( + cards: Vec, + seed: &str, + target_groups: usize, +) -> Vec { + let mut groups: BTreeMap> = BTreeMap::new(); + for card in cards { + groups.entry(card.group_id.clone()).or_default().push(card); + } + let mut grouped = groups.into_values().collect::>(); + grouped.sort_by(|left, right| { + let left_key = left + .first() + .map(|card| stable_level_group_key(seed, &card.group_id)) + .unwrap_or_default(); + let right_key = right + .first() + .map(|card| stable_level_group_key(seed, &card.group_id)) + .unwrap_or_default(); + left_key.cmp(&right_key) + }); + grouped + .into_iter() + .take(target_groups) + .flat_map(|mut group| { + group.sort_by_key(|card| (card.part_y, card.part_x)); + group + }) + .collect() +} + +fn stable_level_group_key(seed: &str, group_id: &str) -> u64 { + let mut state = 0xcbf2_9ce4_8422_2325u64; + for byte in seed.bytes().chain(group_id.bytes()) { + state ^= u64::from(byte); + state = state.wrapping_mul(0x1000_0000_01b3); + } + state +} + +fn domain_cards_from_work(row: &PuzzleClearWorkProfileRow) -> Result, String> { + let cards = parse_json::>(&row.card_assets_json)?; + Ok(cards + .into_iter() + .map(|card| PuzzleClearCard { + card_id: card.card_id, + group_id: card.group_id, + shape: parse_puzzle_clear_shape_kind(&card.shape), + orientation: parse_puzzle_clear_orientation(&card.orientation), + part_x: card.part_x, + part_y: card.part_y, + image_src: card.image_src, + image_object_key: card.image_object_key, + asset_object_id: card.asset_object_id, + source_atlas_cell: card.source_atlas_cell, + }) + .collect()) +} + +fn build_runtime_snapshot( + snapshot: &DomainRunSnapshot, +) -> Result { + let level = puzzle_clear_level_configs() + .into_iter() + .find(|config| config.level_index == snapshot.level_index) + .ok_or_else(|| "拼消消 runtime 关卡不存在".to_string())?; + Ok(PuzzleClearRuntimeSnapshot { + run_id: snapshot.run_id.clone(), + profile_id: snapshot.profile_id.clone(), + owner_user_id: snapshot.owner_user_id.clone(), + status: snapshot.status.as_str().to_string(), + level_index: snapshot.level_index, + clears_done: snapshot.clears_done, + target_clears: level.target_clears, + level_duration_seconds: PUZZLE_CLEAR_LEVEL_DURATION_SECONDS, + level_started_at_ms: snapshot.level_started_at_ms, + board: PuzzleClearBoardSnapshot { + rows: snapshot.board.rows, + cols: snapshot.board.cols, + cells: snapshot + .board + .cells + .iter() + .map(|cell| PuzzleClearBoardCellSnapshot { + row: cell.row, + col: cell.col, + card: cell.card.as_ref().map(card_asset_from_domain), + locked_group_id: cell.locked_group_id.clone(), + }) + .collect(), + }, + ready_columns: snapshot + .deck + .ready_columns + .iter() + .map(|column| column.iter().map(card_asset_from_domain).collect()) + .collect(), + started_at_ms: snapshot.started_at_ms, + finished_at_ms: snapshot.finished_at_ms, + }) +} + +fn card_asset_from_domain(card: &PuzzleClearCard) -> PuzzleClearCardAssetSnapshot { + PuzzleClearCardAssetSnapshot { + card_id: card.card_id.clone(), + group_id: card.group_id.clone(), + shape: card.shape.as_str().to_string(), + orientation: card.orientation.as_str().to_string(), + part_x: card.part_x, + part_y: card.part_y, + image_src: card.image_src.clone(), + image_object_key: card.image_object_key.clone(), + asset_object_id: card.asset_object_id.clone(), + source_atlas_cell: card.source_atlas_cell.clone(), + } +} + +#[cfg(test)] +fn default_pattern_groups() -> Vec { + module_puzzle_clear::plan_puzzle_clear_pattern_groups(128) + .unwrap_or_default() + .into_iter() + .map(|group| PuzzleClearPatternGroupSnapshot { + group_id: group.group_id, + shape: group.shape.as_str().to_string(), + width: group.width, + height: group.height, + atlas_x: group.atlas_x, + atlas_y: group.atlas_y, + atlas_width: group.atlas_width, + atlas_height: group.atlas_height, + }) + .collect() +} + +#[cfg(test)] +fn default_atlas_asset(profile_id: &str, prompt: &str) -> PuzzleClearImageAssetSnapshot { + PuzzleClearImageAssetSnapshot { + asset_id: format!("{profile_id}-atlas"), + image_src: format!("/generated-puzzle-clear-assets/{profile_id}/atlas.png"), + image_object_key: format!("generated-puzzle-clear-assets/{profile_id}/atlas.png"), + asset_object_id: format!("{profile_id}-atlas-object"), + generation_provider: "deterministic-placeholder".to_string(), + prompt: prompt.to_string(), + width: 3072, + height: 3072, + } +} + +#[cfg(test)] +fn default_card_assets( + profile_id: &str, + groups: &[PuzzleClearPatternGroupSnapshot], +) -> Vec { + let domain_groups = groups + .iter() + .map(|group| module_puzzle_clear::PuzzleClearPatternGroup { + group_id: group.group_id.clone(), + shape: parse_puzzle_clear_shape_kind(&group.shape), + width: group.width, + height: group.height, + atlas_x: group.atlas_x, + atlas_y: group.atlas_y, + atlas_width: group.atlas_width, + atlas_height: group.atlas_height, + }) + .collect::>(); + module_puzzle_clear::build_cards_from_groups( + &domain_groups, + &format!("/generated-puzzle-clear-assets/{profile_id}/cards"), + ) + .into_iter() + .map(|card| card_asset_from_domain(&card)) + .collect() +} + +fn cover_image_src( + board_background_asset: &Option, + atlas_asset: &PuzzleClearImageAssetSnapshot, +) -> String { + board_background_asset + .as_ref() + .map(|asset| asset.image_src.clone()) + .filter(|value| !value.trim().is_empty()) + .unwrap_or_else(|| atlas_asset.image_src.clone()) +} + +fn find_owned_session( + ctx: &ReducerContext, + session_id: &str, + owner_user_id: &str, +) -> Result { + let row = ctx + .db + .puzzle_clear_agent_session() + .session_id() + .find(&session_id.to_string()) + .ok_or_else(|| "puzzle_clear_agent_session 不存在".to_string())?; + if row.owner_user_id != owner_user_id { + return Err("无权访问该 puzzle_clear session".to_string()); + } + Ok(row) +} + +fn find_work(ctx: &ReducerContext, profile_id: &str) -> Result { + ctx.db + .puzzle_clear_work_profile() + .profile_id() + .find(&profile_id.to_string()) + .ok_or_else(|| "puzzle_clear_work_profile 不存在".to_string()) +} + +fn find_owned_work( + ctx: &ReducerContext, + profile_id: &str, + owner_user_id: &str, +) -> Result { + let row = find_work(ctx, profile_id)?; + if row.owner_user_id != owner_user_id { + return Err("无权访问该 puzzle_clear work".to_string()); + } + Ok(row) +} + +fn find_owned_run( + ctx: &ReducerContext, + run_id: &str, + owner_user_id: &str, +) -> Result { + let row = ctx + .db + .puzzle_clear_runtime_run() + .run_id() + .find(&run_id.to_string()) + .ok_or_else(|| "puzzle_clear_runtime_run 不存在".to_string())?; + if row.owner_user_id != owner_user_id { + return Err("无权访问该 puzzle_clear run".to_string()); + } + Ok(row) +} + +fn upsert_work(ctx: &ReducerContext, row: PuzzleClearWorkProfileRow) { + if let Some(old) = ctx + .db + .puzzle_clear_work_profile() + .profile_id() + .find(&row.profile_id) + { + ctx.db.puzzle_clear_work_profile().delete(old); + } + ctx.db.puzzle_clear_work_profile().insert(row); +} + +fn replace_work( + ctx: &ReducerContext, + old: &PuzzleClearWorkProfileRow, + next: PuzzleClearWorkProfileRow, +) { + ctx.db.puzzle_clear_work_profile().delete(clone_work(old)); + ctx.db.puzzle_clear_work_profile().insert(next); +} + +fn replace_session( + ctx: &ReducerContext, + old: &PuzzleClearAgentSessionRow, + next: PuzzleClearAgentSessionRow, +) { + ctx.db + .puzzle_clear_agent_session() + .delete(clone_session(old)); + ctx.db.puzzle_clear_agent_session().insert(next); +} + +fn upsert_run(ctx: &ReducerContext, snapshot: &DomainRunSnapshot, updated_at_ms: i64) { + if let Some(old) = ctx + .db + .puzzle_clear_runtime_run() + .run_id() + .find(&snapshot.run_id) + { + ctx.db.puzzle_clear_runtime_run().delete(old); + } + let created_at = Timestamp::from_micros_since_unix_epoch(updated_at_ms.saturating_mul(1000)); + ctx.db + .puzzle_clear_runtime_run() + .insert(run_row_from_snapshot(snapshot, created_at, created_at)); +} + +fn replace_run( + ctx: &ReducerContext, + old: &PuzzleClearRuntimeRunRow, + snapshot: &DomainRunSnapshot, + updated_at_ms: i64, +) { + ctx.db.puzzle_clear_runtime_run().delete(clone_run(old)); + ctx.db + .puzzle_clear_runtime_run() + .insert(run_row_from_snapshot( + snapshot, + old.created_at, + Timestamp::from_micros_since_unix_epoch(updated_at_ms.saturating_mul(1000)), + )); +} + +fn run_row_from_snapshot( + snapshot: &DomainRunSnapshot, + created_at: Timestamp, + updated_at: Timestamp, +) -> PuzzleClearRuntimeRunRow { + PuzzleClearRuntimeRunRow { + run_id: snapshot.run_id.clone(), + owner_user_id: snapshot.owner_user_id.clone(), + profile_id: snapshot.profile_id.clone(), + status: snapshot.status.as_str().to_string(), + level_index: snapshot.level_index, + clears_done: snapshot.clears_done, + snapshot_json: to_json_string(snapshot), + started_at_ms: snapshot.started_at_ms as i64, + finished_at_ms: snapshot + .finished_at_ms + .map(|value| value as i64) + .unwrap_or(0), + created_at, + updated_at, + } +} + +fn increment_work_play_count( + ctx: &ReducerContext, + row: &PuzzleClearWorkProfileRow, + played_at_ms: i64, +) { + replace_work( + ctx, + row, + PuzzleClearWorkProfileRow { + play_count: row.play_count.saturating_add(1), + updated_at: Timestamp::from_micros_since_unix_epoch(played_at_ms.saturating_mul(1000)), + ..clone_work(row) + }, + ); +} + +fn insert_event( + ctx: &ReducerContext, + event_id: String, + owner_user_id: String, + profile_id: String, + run_id: String, + event_type: &str, + result: Option, + occurred_at_ms: i64, +) { + let event_id = clean_optional(&event_id).unwrap_or_else(|| { + format!( + "puzzle-clear-event-{}-{}-{}", + run_id, event_type, occurred_at_ms + ) + }); + if ctx + .db + .puzzle_clear_event() + .event_id() + .find(&event_id) + .is_some() + { + return; + } + ctx.db.puzzle_clear_event().insert(PuzzleClearEventRow { + event_id, + owner_user_id, + profile_id, + run_id, + event_type: event_type.to_string(), + result: result.unwrap_or_default(), + occurred_at: Timestamp::from_micros_since_unix_epoch(occurred_at_ms.saturating_mul(1000)), + }); +} + +fn insert_terminal_runtime_event_if_needed( + ctx: &ReducerContext, + previous: &DomainRunSnapshot, + next: &DomainRunSnapshot, + owner_user_id: String, + occurred_at_ms: i64, +) { + if previous.status == next.status { + return; + } + let event_type = match next.status { + module_puzzle_clear::PuzzleClearRunStatus::LevelCleared => { + Some(PUZZLE_CLEAR_EVENT_LEVEL_COMPLETED) + } + module_puzzle_clear::PuzzleClearRunStatus::Finished => { + Some(PUZZLE_CLEAR_EVENT_RUN_FINISHED) + } + module_puzzle_clear::PuzzleClearRunStatus::LevelFailed => { + Some(PUZZLE_CLEAR_EVENT_LEVEL_FAILED) + } + module_puzzle_clear::PuzzleClearRunStatus::Playing => None, + }; + let Some(event_type) = event_type else { + return; + }; + insert_event( + ctx, + format!("{}:{}:{}", next.run_id, event_type, next.level_index), + owner_user_id, + next.profile_id.clone(), + next.run_id.clone(), + event_type, + Some(runtime_event_result(previous, next, occurred_at_ms)), + occurred_at_ms, + ); +} + +fn runtime_event_result( + previous: &DomainRunSnapshot, + next: &DomainRunSnapshot, + occurred_at_ms: i64, +) -> String { + let elapsed_ms = occurred_at_ms + .max(0) + .saturating_sub(next.level_started_at_ms as i64); + json!({ + "status": next.status.as_str(), + "levelIndex": next.level_index, + "clearsDone": next.clears_done, + "clearDelta": next.clears_done.saturating_sub(previous.clears_done), + "elapsedMs": elapsed_ms, + }) + .to_string() +} + +fn is_publish_ready(row: &PuzzleClearWorkProfileRow) -> bool { + !row.work_title.trim().is_empty() + && !row.atlas_asset_json.trim().is_empty() + && !row.pattern_groups_json.trim().is_empty() + && !row.card_assets_json.trim().is_empty() + && row.generation_status == PUZZLE_CLEAR_GENERATION_READY + && parse_json::(&row.atlas_asset_json) + .map(|asset| { + is_real_puzzle_clear_asset( + asset.asset_object_id.as_str(), + asset.image_object_key.as_str(), + asset.image_src.as_str(), + ) + }) + .unwrap_or(false) + && parse_json::>(&row.card_assets_json) + .map(|assets| { + !assets.is_empty() + && assets.iter().all(|asset| { + is_real_puzzle_clear_asset( + asset.asset_object_id.as_str(), + asset.image_object_key.as_str(), + asset.image_src.as_str(), + ) + }) + }) + .unwrap_or(false) +} + +fn is_real_puzzle_clear_asset( + asset_object_id: &str, + image_object_key: &str, + image_src: &str, +) -> bool { + asset_object_id.starts_with("assetobj_") + && image_object_key.starts_with("generated-puzzle-clear-assets/") + && image_src.starts_with("/generated-puzzle-clear-assets/") +} + +fn require_non_empty(value: &str, label: &str) -> Result<(), String> { + if value.trim().is_empty() { + Err(format!("{label} 不能为空")) + } else { + Ok(()) + } +} + +fn clean_optional(value: &str) -> Option { + let value = value.trim(); + if value.is_empty() { + None + } else { + Some(value.to_string()) + } +} + +fn clean_string(value: &str, fallback: &str) -> String { + clean_optional(value).unwrap_or_else(|| fallback.to_string()) +} + +fn parse_json(value: &str) -> Result +where + T: DeserializeOwned, +{ + serde_json::from_str(value).map_err(|error| error.to_string()) +} + +fn parse_json_or_default(value: &str) -> T +where + T: DeserializeOwned + Default, +{ + serde_json::from_str(value).unwrap_or_default() +} + +fn to_json_string(value: &T) -> String +where + T: Serialize, +{ + serde_json::to_string(value).unwrap_or_else(|_| "{}".to_string()) +} + +fn session_result( + session: PuzzleClearAgentSessionSnapshot, +) -> PuzzleClearAgentSessionProcedureResult { + PuzzleClearAgentSessionProcedureResult { + ok: true, + session: Some(session), + error_message: None, + } +} + +fn session_error(message: String) -> PuzzleClearAgentSessionProcedureResult { + PuzzleClearAgentSessionProcedureResult { + ok: false, + session: None, + error_message: Some(message), + } +} + +fn work_result(work: PuzzleClearWorkSnapshot) -> PuzzleClearWorkProcedureResult { + PuzzleClearWorkProcedureResult { + ok: true, + work: Some(work), + error_message: None, + } +} + +fn work_error(message: String) -> PuzzleClearWorkProcedureResult { + PuzzleClearWorkProcedureResult { + ok: false, + work: None, + error_message: Some(message), + } +} + +fn run_result(run: PuzzleClearRuntimeSnapshot) -> PuzzleClearRunProcedureResult { + PuzzleClearRunProcedureResult { + ok: true, + run: Some(run), + error_message: None, + } +} + +fn run_error(message: String) -> PuzzleClearRunProcedureResult { + PuzzleClearRunProcedureResult { + ok: false, + run: None, + error_message: Some(message), + } +} + +fn clone_session(row: &PuzzleClearAgentSessionRow) -> PuzzleClearAgentSessionRow { + PuzzleClearAgentSessionRow { + session_id: row.session_id.clone(), + owner_user_id: row.owner_user_id.clone(), + status: row.status.clone(), + draft_json: row.draft_json.clone(), + published_profile_id: row.published_profile_id.clone(), + created_at: row.created_at, + updated_at: row.updated_at, + } +} + +fn clone_work(row: &PuzzleClearWorkProfileRow) -> PuzzleClearWorkProfileRow { + PuzzleClearWorkProfileRow { + profile_id: row.profile_id.clone(), + work_id: row.work_id.clone(), + owner_user_id: row.owner_user_id.clone(), + source_session_id: row.source_session_id.clone(), + author_display_name: row.author_display_name.clone(), + work_title: row.work_title.clone(), + work_description: row.work_description.clone(), + theme_prompt: row.theme_prompt.clone(), + generate_board_background: row.generate_board_background, + board_background_asset_json: row.board_background_asset_json.clone(), + board_background_prompt: row.board_background_prompt.clone(), + card_back_image_src: row.card_back_image_src.clone(), + atlas_asset_json: row.atlas_asset_json.clone(), + pattern_groups_json: row.pattern_groups_json.clone(), + card_assets_json: row.card_assets_json.clone(), + cover_image_src: row.cover_image_src.clone(), + generation_status: row.generation_status.clone(), + publication_status: row.publication_status.clone(), + play_count: row.play_count, + updated_at: row.updated_at, + published_at: row.published_at, + visible: row.visible, + } +} + +fn clone_run(row: &PuzzleClearRuntimeRunRow) -> PuzzleClearRuntimeRunRow { + PuzzleClearRuntimeRunRow { + run_id: row.run_id.clone(), + owner_user_id: row.owner_user_id.clone(), + profile_id: row.profile_id.clone(), + status: row.status.clone(), + level_index: row.level_index, + clears_done: row.clears_done, + snapshot_json: row.snapshot_json.clone(), + started_at_ms: row.started_at_ms, + finished_at_ms: row.finished_at_ms, + created_at: row.created_at, + updated_at: row.updated_at, + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn puzzle_clear_publish_ready_rejects_placeholder_assets() { + let now = Timestamp::from_micros_since_unix_epoch(1_780_000_000_000_000); + let groups = default_pattern_groups(); + let atlas = default_atlas_asset("puzzle-clear-profile-placeholder", "占位主题"); + let cards = default_card_assets("puzzle-clear-profile-placeholder", &groups); + let row = PuzzleClearWorkProfileRow { + profile_id: "puzzle-clear-profile-placeholder".to_string(), + work_id: "puzzle-clear-profile-placeholder".to_string(), + owner_user_id: "user-1".to_string(), + source_session_id: "puzzle-clear-session-placeholder".to_string(), + author_display_name: "拼消消玩家".to_string(), + work_title: "占位拼消消".to_string(), + work_description: String::new(), + theme_prompt: "占位主题".to_string(), + generate_board_background: false, + board_background_asset_json: String::new(), + board_background_prompt: None, + card_back_image_src: PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC.to_string(), + atlas_asset_json: to_json_string(&atlas), + pattern_groups_json: to_json_string(&groups), + card_assets_json: to_json_string(&cards), + cover_image_src: atlas.image_src, + generation_status: PUZZLE_CLEAR_GENERATION_READY.to_string(), + publication_status: PUZZLE_CLEAR_PUBLICATION_DRAFT.to_string(), + play_count: 0, + updated_at: now, + published_at: None, + visible: true, + }; + + assert!(!is_publish_ready(&row)); + } +} diff --git a/server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs b/server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs new file mode 100644 index 00000000..bdae388a --- /dev/null +++ b/server-rs/crates/spacetime-module/src/puzzle_clear/tables.rs @@ -0,0 +1,88 @@ +use crate::*; + +const WORK_VISIBLE_DEFAULT: bool = true; + +#[spacetimedb::table( + accessor = puzzle_clear_agent_session, + index(accessor = by_puzzle_clear_agent_session_owner_user_id, btree(columns = [owner_user_id])) +)] +pub struct PuzzleClearAgentSessionRow { + #[primary_key] + pub(crate) session_id: String, + pub(crate) owner_user_id: String, + pub(crate) status: String, + pub(crate) draft_json: String, + pub(crate) published_profile_id: String, + pub(crate) created_at: Timestamp, + pub(crate) updated_at: Timestamp, +} + +#[spacetimedb::table( + accessor = puzzle_clear_work_profile, + index(accessor = by_puzzle_clear_work_owner_user_id, btree(columns = [owner_user_id])), + index(accessor = by_puzzle_clear_work_publication_status, btree(columns = [publication_status])) +)] +pub struct PuzzleClearWorkProfileRow { + #[primary_key] + pub(crate) profile_id: String, + pub(crate) work_id: String, + pub(crate) owner_user_id: String, + pub(crate) source_session_id: String, + pub(crate) author_display_name: String, + pub(crate) work_title: String, + pub(crate) work_description: String, + pub(crate) theme_prompt: String, + pub(crate) generate_board_background: bool, + pub(crate) board_background_asset_json: String, + #[default(None::)] + pub(crate) board_background_prompt: Option, + pub(crate) card_back_image_src: String, + pub(crate) atlas_asset_json: String, + pub(crate) pattern_groups_json: String, + pub(crate) card_assets_json: String, + pub(crate) cover_image_src: String, + pub(crate) generation_status: String, + pub(crate) publication_status: String, + pub(crate) play_count: u32, + pub(crate) updated_at: Timestamp, + pub(crate) published_at: Option, + // 中文注释：后台可见性开关，隐藏后不进入公开列表。 + #[default(WORK_VISIBLE_DEFAULT)] + pub(crate) visible: bool, +} + +#[spacetimedb::table( + accessor = puzzle_clear_runtime_run, + index(accessor = by_puzzle_clear_run_owner_user_id, btree(columns = [owner_user_id])), + index(accessor = by_puzzle_clear_run_profile_id, btree(columns = [profile_id])) +)] +pub struct PuzzleClearRuntimeRunRow { + #[primary_key] + pub(crate) run_id: String, + pub(crate) owner_user_id: String, + pub(crate) profile_id: String, + pub(crate) status: String, + pub(crate) level_index: u32, + pub(crate) clears_done: u32, + pub(crate) snapshot_json: String, + pub(crate) started_at_ms: i64, + pub(crate) finished_at_ms: i64, + pub(crate) created_at: Timestamp, + pub(crate) updated_at: Timestamp, +} + +#[spacetimedb::table( + accessor = puzzle_clear_event, + index(accessor = by_puzzle_clear_event_profile_id, btree(columns = [profile_id])), + index(accessor = by_puzzle_clear_event_run_id, btree(columns = [run_id])) +)] +pub struct PuzzleClearEventRow { + #[primary_key] + pub(crate) event_id: String, + pub(crate) owner_user_id: String, + pub(crate) profile_id: String, + pub(crate) run_id: String, + pub(crate) event_type: String, + pub(crate) result: String, + pub(crate) occurred_at: Timestamp, +} diff --git a/server-rs/crates/spacetime-module/src/puzzle_clear/types.rs b/server-rs/crates/spacetime-module/src/puzzle_clear/types.rs new file mode 100644 index 00000000..4e3a12ae --- /dev/null +++ b/server-rs/crates/spacetime-module/src/puzzle_clear/types.rs @@ -0,0 +1,304 @@ +use crate::*; +use serde::{Deserialize, Serialize}; + +pub const PUZZLE_CLEAR_TEMPLATE_ID: &str = "puzzle-clear"; +pub const PUZZLE_CLEAR_TEMPLATE_NAME: &str = "拼消消"; +pub const PUZZLE_CLEAR_PUBLICATION_DRAFT: &str = "draft"; +pub const PUZZLE_CLEAR_PUBLICATION_PUBLISHED: &str = "published"; +pub const PUZZLE_CLEAR_GENERATION_DRAFT: &str = "draft"; +pub const PUZZLE_CLEAR_GENERATION_READY: &str = "ready"; +pub const PUZZLE_CLEAR_GENERATION_FAILED: &str = "failed"; +pub const PUZZLE_CLEAR_CARD_BACK_IMAGE_SRC: &str = "/creation-type-references/puzzle.webp"; +pub const PUZZLE_CLEAR_EVENT_RUN_STARTED: &str = "run-started"; +pub const PUZZLE_CLEAR_EVENT_SWAP: &str = "swap"; +pub const PUZZLE_CLEAR_EVENT_RETRY_LEVEL: &str = "retry-level"; +pub const PUZZLE_CLEAR_EVENT_NEXT_LEVEL: &str = "next-level"; +pub const PUZZLE_CLEAR_EVENT_TIME_UP: &str = "time-up"; +pub const PUZZLE_CLEAR_EVENT_LEVEL_COMPLETED: &str = "level-completed"; +pub const PUZZLE_CLEAR_EVENT_RUN_FINISHED: &str = "run-finished"; +pub const PUZZLE_CLEAR_EVENT_LEVEL_FAILED: &str = "level-failed"; + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearAgentSessionCreateInput { + pub session_id: String, + pub owner_user_id: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: Option, + pub board_background_prompt: String, + pub created_at_micros: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearAgentSessionGetInput { + pub session_id: String, + pub owner_user_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearDraftCompileInput { + pub session_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: Option, + pub board_background_prompt: String, + pub atlas_asset_json: Option, + pub pattern_groups_json: Option, + pub card_assets_json: Option, + pub generation_status: Option, + pub compiled_at_micros: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearWorkUpdateInput { + pub profile_id: String, + pub owner_user_id: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset_json: Option, + pub board_background_prompt: String, + pub updated_at_micros: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearWorkPublishInput { + pub profile_id: String, + pub owner_user_id: String, + pub published_at_micros: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearWorksListInput { + pub owner_user_id: String, + pub published_only: bool, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearWorkGetInput { + pub profile_id: String, + pub owner_user_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearRunStartInput { + pub run_id: String, + pub owner_user_id: String, + pub profile_id: String, + pub client_event_id: String, + pub started_at_ms: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearRunGetInput { + pub run_id: String, + pub owner_user_id: String, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearRunSwapInput { + pub run_id: String, + pub owner_user_id: String, + pub from_row: u32, + pub from_col: u32, + pub to_row: u32, + pub to_col: u32, + pub client_action_id: String, + pub swapped_at_ms: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearRunRetryLevelInput { + pub run_id: String, + pub owner_user_id: String, + pub client_action_id: String, + pub restarted_at_ms: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearRunNextLevelInput { + pub run_id: String, + pub owner_user_id: String, + pub client_action_id: String, + pub started_at_ms: i64, +} + +#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)] +pub struct PuzzleClearRunTimeUpInput { + pub run_id: String, + pub owner_user_id: String, + pub client_action_id: String, + pub occurred_at_ms: i64, +} + +#[derive(Clone, Debug, PartialEq, SpacetimeType)] +pub struct PuzzleClearAgentSessionProcedureResult { + pub ok: bool, + pub session: Option, + pub error_message: Option, +} + +#[derive(Clone, Debug, PartialEq, SpacetimeType)] +pub struct PuzzleClearWorkProcedureResult { + pub ok: bool, + pub work: Option, + pub error_message: Option, +} + +#[derive(Clone, Debug, PartialEq, SpacetimeType)] +pub struct PuzzleClearWorksProcedureResult { + pub ok: bool, + pub items: Vec, + pub error_message: Option, +} + +#[derive(Clone, Debug, PartialEq, SpacetimeType)] +pub struct PuzzleClearRunProcedureResult { + pub ok: bool, + pub run: Option, + pub error_message: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearImageAssetSnapshot { + pub asset_id: String, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub generation_provider: String, + pub prompt: String, + pub width: u32, + pub height: u32, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearPatternGroupSnapshot { + pub group_id: String, + pub shape: String, + pub width: u32, + pub height: u32, + pub atlas_x: u32, + pub atlas_y: u32, + pub atlas_width: u32, + pub atlas_height: u32, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearCardAssetSnapshot { + pub card_id: String, + pub group_id: String, + pub shape: String, + pub orientation: String, + pub part_x: u32, + pub part_y: u32, + pub image_src: String, + pub image_object_key: String, + pub asset_object_id: String, + pub source_atlas_cell: String, +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearDraftSnapshot { + pub template_id: String, + pub template_name: String, + pub profile_id: Option, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + #[serde(default)] + pub board_background_prompt: String, + pub card_back_image_src: Option, + pub atlas_asset: Option, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub generation_status: String, +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearAgentSessionSnapshot { + pub session_id: String, + pub owner_user_id: String, + pub status: String, + pub draft: Option, + pub published_profile_id: Option, + pub created_at_micros: i64, + pub updated_at_micros: i64, +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearWorkSnapshot { + pub work_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub source_session_id: String, + pub author_display_name: String, + pub work_title: String, + pub work_description: String, + pub theme_prompt: String, + pub generate_board_background: bool, + pub board_background_asset: Option, + #[serde(default)] + pub board_background_prompt: String, + pub card_back_image_src: Option, + pub atlas_asset: PuzzleClearImageAssetSnapshot, + pub pattern_groups: Vec, + pub card_assets: Vec, + pub cover_image_src: Option, + pub publication_status: String, + pub publish_ready: bool, + pub play_count: u32, + pub generation_status: String, + pub updated_at_micros: i64, + pub published_at_micros: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearBoardCellSnapshot { + pub row: u32, + pub col: u32, + pub card: Option, + pub locked_group_id: Option, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearBoardSnapshot { + pub rows: u32, + pub cols: u32, + pub cells: Vec, +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, SpacetimeType)] +#[serde(rename_all = "camelCase")] +pub struct PuzzleClearRuntimeSnapshot { + pub run_id: String, + pub profile_id: String, + pub owner_user_id: String, + pub status: String, + pub level_index: u32, + pub clears_done: u32, + pub target_clears: u32, + pub level_duration_seconds: u32, + pub level_started_at_ms: u64, + pub board: PuzzleClearBoardSnapshot, + pub ready_columns: Vec>, + pub started_at_ms: u64, + pub finished_at_ms: Option, +} diff --git a/server-rs/crates/spacetime-module/src/wooden_fish.rs b/server-rs/crates/spacetime-module/src/wooden_fish.rs index 33482ac2..240678f0 100644 --- a/server-rs/crates/spacetime-module/src/wooden_fish.rs +++ b/server-rs/crates/spacetime-module/src/wooden_fish.rs @@ -1412,6 +1412,7 @@ mod tests { height: 1536, })), back_button_asset_json: None, + visible: true, } } } diff --git a/src/components/CustomWorldCoverArtwork.tsx b/src/components/CustomWorldCoverArtwork.tsx index 4a9205f1..17911f06 100644 --- a/src/components/CustomWorldCoverArtwork.tsx +++ b/src/components/CustomWorldCoverArtwork.tsx @@ -1,4 +1,4 @@ -import type { ReactNode } from 'react'; +import React, { type ReactNode } from 'react'; import type { CustomWorldCoverRenderMode } from '../services/customWorldCover'; import { ResolvedAssetImage } from './ResolvedAssetImage'; diff --git a/src/components/ResolvedAssetImage.tsx b/src/components/ResolvedAssetImage.tsx index 536cb428..3bccab70 100644 --- a/src/components/ResolvedAssetImage.tsx +++ b/src/components/ResolvedAssetImage.tsx @@ -1,4 +1,4 @@ -import { type ImgHTMLAttributes, useEffect, useState } from 'react'; +import React, { type ImgHTMLAttributes, useEffect, useState } from 'react'; import { useResolvedAssetReadUrl } from '../hooks/useResolvedAssetReadUrl'; diff --git a/src/components/custom-world-home/CustomWorldCreationHub.tsx b/src/components/custom-world-home/CustomWorldCreationHub.tsx index 857f9f48..3b5f665f 100644 --- a/src/components/custom-world-home/CustomWorldCreationHub.tsx +++ b/src/components/custom-world-home/CustomWorldCreationHub.tsx @@ -6,6 +6,7 @@ import type { CustomWorldWorkSummary } from '../../../packages/shared/src/contra import type { BabyObjectMatchDraft } from '../../../packages/shared/src/contracts/edutainmentBabyObject'; import type { JumpHopWorkSummaryResponse } from '../../../packages/shared/src/contracts/jumpHop'; import type { Match3DWorkSummary } from '../../../packages/shared/src/contracts/match3dWorks'; +import type { PuzzleClearWorkSummaryResponse } from '../../../packages/shared/src/contracts/puzzleClear'; import type { PuzzleWorkSummary } from '../../../packages/shared/src/contracts/puzzleWorkSummary'; import type { WoodenFishWorkSummaryResponse } from '../../../packages/shared/src/contracts/woodenFish'; import type { CustomWorldLibraryEntry } from '../../../packages/shared/src/contracts/runtime'; @@ -68,6 +69,9 @@ type CustomWorldCreationHubProps = { woodenFishItems?: WoodenFishWorkSummaryResponse[]; onOpenWoodenFishDetail?: ((item: WoodenFishWorkSummaryResponse) => void) | null; onDeleteWoodenFish?: ((item: WoodenFishWorkSummaryResponse) => void) | null; + puzzleClearItems?: PuzzleClearWorkSummaryResponse[]; + onOpenPuzzleClearDetail?: ((item: PuzzleClearWorkSummaryResponse) => void) | null; + onDeletePuzzleClear?: ((item: PuzzleClearWorkSummaryResponse) => void) | null; puzzleItems?: PuzzleWorkSummary[]; onOpenPuzzleDetail?: (item: PuzzleWorkSummary) => void; onDeletePuzzle?: ((item: PuzzleWorkSummary) => void) | null; @@ -181,6 +185,9 @@ export function CustomWorldCreationHub({ woodenFishItems = [], onOpenWoodenFishDetail = null, onDeleteWoodenFish = null, + puzzleClearItems = [], + onOpenPuzzleClearDetail = null, + onDeletePuzzleClear = null, puzzleItems = [], onOpenPuzzleDetail, onDeletePuzzle = null, @@ -215,6 +222,7 @@ export function CustomWorldCreationHub({ squareHoleItems: isSquareHoleCreationVisible ? squareHoleItems : [], jumpHopItems, woodenFishItems, + puzzleClearItems, puzzleItems, babyObjectMatchItems, barkBattleItems, @@ -226,6 +234,7 @@ export function CustomWorldCreationHub({ isSquareHoleCreationVisible && Boolean(onDeleteSquareHole), canDeleteJumpHop: Boolean(onDeleteJumpHop), canDeleteWoodenFish: Boolean(onDeleteWoodenFish), + canDeletePuzzleClear: Boolean(onDeletePuzzleClear), canDeletePuzzle: Boolean(onDeletePuzzle), canDeleteBabyObjectMatch: Boolean(onDeleteBabyObjectMatch), canDeleteBarkBattle: Boolean(onDeleteBarkBattle), @@ -243,6 +252,8 @@ export function CustomWorldCreationHub({ onDeleteJumpHop: onDeleteJumpHop ?? undefined, onOpenWoodenFishDetail: onOpenWoodenFishDetail ?? undefined, onDeleteWoodenFish: onDeleteWoodenFish ?? undefined, + onOpenPuzzleClearDetail: onOpenPuzzleClearDetail ?? undefined, + onDeletePuzzleClear: onDeletePuzzleClear ?? undefined, onOpenPuzzleDetail, onDeletePuzzle: onDeletePuzzle ?? undefined, onClaimPuzzlePointIncentive: onClaimPuzzlePointIncentive ?? undefined, @@ -271,6 +282,7 @@ export function CustomWorldCreationHub({ onDeleteVisualNovel, onDeleteJumpHop, onDeleteWoodenFish, + onDeletePuzzleClear, onClaimPuzzlePointIncentive, onOpenBigFishDetail, onOpenDraft, @@ -281,8 +293,10 @@ export function CustomWorldCreationHub({ onOpenSquareHoleDetail, onOpenVisualNovelDetail, onOpenWoodenFishDetail, + onOpenPuzzleClearDetail, onEnterPublished, getWorkState, + puzzleClearItems, puzzleItems, rpgLibraryEntries, onOpenSquareHoleDetail, @@ -342,6 +356,9 @@ export function CustomWorldCreationHub({ case 'wooden-fish': onOpenWoodenFishDetail?.(item.source.item); return; + case 'puzzle-clear': + onOpenPuzzleClearDetail?.(item.source.item); + return; case 'rpg': if (item.status === 'draft') { onOpenDraft(item.source.item); diff --git a/src/components/custom-world-home/CustomWorldWorkCard.tsx b/src/components/custom-world-home/CustomWorldWorkCard.tsx index 00f38323..c3ad5cf4 100644 --- a/src/components/custom-world-home/CustomWorldWorkCard.tsx +++ b/src/components/custom-world-home/CustomWorldWorkCard.tsx @@ -6,6 +6,7 @@ import { Trash2, } from 'lucide-react'; import { + default as React, type CSSProperties, type KeyboardEvent as ReactKeyboardEvent, type PointerEvent as ReactPointerEvent, @@ -61,6 +62,7 @@ const CREATION_WORK_KIND_FALLBACK_COVER: Record = 'square-hole': '/creation-type-references/square-hole.webp', 'jump-hop': '/creation-type-references/jump-hop.webp', 'wooden-fish': '/wooden-fish/default-hit-object.png', + 'puzzle-clear': '/creation-type-references/puzzle.webp', puzzle: '/creation-type-references/puzzle.webp', 'baby-object-match': '/creation-type-references/creative-agent.webp', 'bark-battle': '/creation-type-references/bark-battle.webp', diff --git a/src/components/custom-world-home/creationWorkShelf.test.ts b/src/components/custom-world-home/creationWorkShelf.test.ts index 180e1e7a..706f5777 100644 --- a/src/components/custom-world-home/creationWorkShelf.test.ts +++ b/src/components/custom-world-home/creationWorkShelf.test.ts @@ -97,6 +97,47 @@ test('buildCreationWorkShelfItems maps wooden fish items with WF public code', ( expect(onOpenWoodenFishDetail).toHaveBeenCalledWith(woodenFishWork); }); +test('buildCreationWorkShelfItems maps puzzle clear items with PC public code', () => { + const onOpenPuzzleClearDetail = vi.fn(); + const puzzleClearWork = { + runtimeKind: 'puzzle-clear' as const, + workId: 'puzzle-clear-work-1', + profileId: 'puzzle-clear-profile-12345678', + ownerUserId: 'user-1', + sourceSessionId: 'puzzle-clear-session-1', + workTitle: '星港拼消消', + workDescription: '霓虹星港主题。', + themePrompt: '霓虹星港', + coverImageSrc: '/generated-puzzle-clear-assets/profile/atlas.png', + publicationStatus: 'published', + playCount: 6, + updatedAt: '2026-05-30T00:00:00.000Z', + publishedAt: '2026-05-30T00:00:00.000Z', + publishReady: true, + generationStatus: 'ready' as const, + }; + + const items = buildCreationWorkShelfItems({ + rpgItems: [], + bigFishItems: [], + puzzleItems: [], + puzzleClearItems: [puzzleClearWork], + onOpenPuzzleClearDetail, + }); + + items[0]?.actions.open(); + + expect(items).toHaveLength(1); + expect(items[0]?.kind).toBe('puzzle-clear'); + expect(items[0]?.status).toBe('published'); + expect(items[0]?.publicWorkCode).toBe('PC-12345678'); + expect(items[0]?.sharePath).toContain('/works/detail?work=PC-12345678'); + expect(items[0]?.openActionLabel).toBe('查看详情'); + expect(items[0]?.badges.some((badge) => badge.label === '拼消消')).toBe(true); + expect(items[0]?.metrics.find((metric) => metric.id === 'play-count')?.value).toBe(6); + expect(onOpenPuzzleClearDetail).toHaveBeenCalledWith(puzzleClearWork); +}); + test('buildCreationWorkShelfItems keeps published bark battle over duplicate draft', () => { const items = buildCreationWorkShelfItems({ rpgItems: [], diff --git a/src/components/custom-world-home/creationWorkShelf.ts b/src/components/custom-world-home/creationWorkShelf.ts index 81300a53..16ab8af1 100644 --- a/src/components/custom-world-home/creationWorkShelf.ts +++ b/src/components/custom-world-home/creationWorkShelf.ts @@ -3,6 +3,7 @@ import type { BigFishWorkSummary } from '../../../packages/shared/src/contracts/ import type { CustomWorldWorkSummary } from '../../../packages/shared/src/contracts/customWorldAgent'; import type { BabyObjectMatchDraft } from '../../../packages/shared/src/contracts/edutainmentBabyObject'; import type { Match3DWorkSummary } from '../../../packages/shared/src/contracts/match3dWorks'; +import type { PuzzleClearWorkSummaryResponse } from '../../../packages/shared/src/contracts/puzzleClear'; import type { PuzzleWorkSummary } from '../../../packages/shared/src/contracts/puzzleWorkSummary'; import type { CustomWorldLibraryEntry } from '../../../packages/shared/src/contracts/runtime'; import type { SquareHoleWorkSummary } from '../../../packages/shared/src/contracts/squareHoleWorks'; @@ -17,6 +18,7 @@ import { buildBigFishPublicWorkCode, buildJumpHopPublicWorkCode, buildMatch3DPublicWorkCode, + buildPuzzleClearPublicWorkCode, buildPuzzlePublicWorkCode, buildSquareHolePublicWorkCode, buildVisualNovelPublicWorkCode, @@ -37,6 +39,7 @@ export type CreationWorkShelfKind = | 'square-hole' | 'jump-hop' | 'wooden-fish' + | 'puzzle-clear' | 'puzzle' | 'baby-object-match' | 'bark-battle' @@ -97,6 +100,10 @@ export type CreationWorkShelfSource = kind: 'wooden-fish'; item: WoodenFishWorkSummaryResponse; } + | { + kind: 'puzzle-clear'; + item: PuzzleClearWorkSummaryResponse; + } | { kind: 'puzzle'; item: PuzzleWorkSummary; @@ -153,6 +160,7 @@ export function buildCreationWorkShelfItems(params: { squareHoleItems?: SquareHoleWorkSummary[]; jumpHopItems?: JumpHopWorkSummaryResponse[]; woodenFishItems?: WoodenFishWorkSummaryResponse[]; + puzzleClearItems?: PuzzleClearWorkSummaryResponse[]; puzzleItems: PuzzleWorkSummary[]; babyObjectMatchItems?: BabyObjectMatchDraft[]; barkBattleItems?: BarkBattleWorkSummary[]; @@ -163,6 +171,7 @@ export function buildCreationWorkShelfItems(params: { canDeleteSquareHole?: boolean; canDeleteJumpHop?: boolean; canDeleteWoodenFish?: boolean; + canDeletePuzzleClear?: boolean; canDeletePuzzle?: boolean; canDeleteBabyObjectMatch?: boolean; canDeleteBarkBattle?: boolean; @@ -180,6 +189,8 @@ export function buildCreationWorkShelfItems(params: { onDeleteJumpHop?: (item: JumpHopWorkSummaryResponse) => void; onOpenWoodenFishDetail?: (item: WoodenFishWorkSummaryResponse) => void; onDeleteWoodenFish?: (item: WoodenFishWorkSummaryResponse) => void; + onOpenPuzzleClearDetail?: (item: PuzzleClearWorkSummaryResponse) => void; + onDeletePuzzleClear?: (item: PuzzleClearWorkSummaryResponse) => void; onOpenPuzzleDetail?: (item: PuzzleWorkSummary) => void; onDeletePuzzle?: (item: PuzzleWorkSummary) => void; onClaimPuzzlePointIncentive?: (item: PuzzleWorkSummary) => void; @@ -201,6 +212,7 @@ export function buildCreationWorkShelfItems(params: { squareHoleItems = [], jumpHopItems = [], woodenFishItems = [], + puzzleClearItems = [], puzzleItems, babyObjectMatchItems = [], barkBattleItems = [], @@ -211,6 +223,7 @@ export function buildCreationWorkShelfItems(params: { canDeleteSquareHole = false, canDeleteJumpHop = false, canDeleteWoodenFish = false, + canDeletePuzzleClear = false, canDeletePuzzle = false, canDeleteBabyObjectMatch = false, canDeleteBarkBattle = false, @@ -228,6 +241,8 @@ export function buildCreationWorkShelfItems(params: { onDeleteJumpHop, onOpenWoodenFishDetail, onDeleteWoodenFish, + onOpenPuzzleClearDetail, + onDeletePuzzleClear, onOpenPuzzleDetail, onDeletePuzzle, onClaimPuzzlePointIncentive, @@ -278,6 +293,12 @@ export function buildCreationWorkShelfItems(params: { onDelete: onDeleteWoodenFish, }), ), + ...puzzleClearItems.map((item) => + mapPuzzleClearWorkToShelfItem(item, canDeletePuzzleClear, { + onOpen: onOpenPuzzleClearDetail, + onDelete: onDeletePuzzleClear, + }), + ), ...puzzleItems.map((item) => mapPuzzleWorkToShelfItem(item, canDeletePuzzle, { onOpen: onOpenPuzzleDetail, @@ -884,6 +905,56 @@ function mapWoodenFishWorkToShelfItem( }; } +function mapPuzzleClearWorkToShelfItem( + item: PuzzleClearWorkSummaryResponse, + canDelete: boolean, + adapter: WorkShelfAdapter, +): CreationWorkShelfItem { + const status = item.publicationStatus === 'published' ? 'published' : 'draft'; + const publicWorkCode = + status === 'published' + ? buildPuzzleClearPublicWorkCode(item.profileId) + : null; + const title = item.workTitle.trim() || '拼消消'; + const summary = + item.workDescription.trim() || (status === 'draft' ? '未填写作品描述' : ''); + + return { + id: item.workId, + kind: 'puzzle-clear', + status, + title, + summary, + authorDisplayName: resolveAuthorDisplayName(item), + updatedAt: item.updatedAt, + coverImageSrc: normalizeCoverImageSrc(item.coverImageSrc), + coverRenderMode: 'image', + coverCharacterImageSrcs: [], + publicWorkCode, + sharePath: + publicWorkCode && status === 'published' + ? buildPublicWorkStagePath('work-detail', publicWorkCode) + : null, + openActionLabel: status === 'published' ? '查看详情' : '继续创作', + canDelete, + canShare: status === 'published' && Boolean(publicWorkCode), + badges: [ + buildStatusBadge(status), + { id: 'type', label: '拼消消', tone: 'neutral' }, + ], + metrics: + status === 'published' + ? buildPublishedMetrics({ + playCount: item.playCount, + remixCount: 0, + likeCount: 0, + }) + : [], + actions: buildWorkShelfActions(item, adapter), + source: { kind: 'puzzle-clear', item }, + }; +} + function resolveAuthorDisplayName( ...sources: Array @@ -1097,6 +1168,8 @@ function isPersistedCreationWorkGenerating(item: CreationWorkShelfItem) { return isPersistedPuzzleDraftGenerating(item.source.item); case 'wooden-fish': return item.source.item.generationStatus === 'generating'; + case 'puzzle-clear': + return item.source.item.generationStatus === 'generating'; case 'bark-battle': return isPersistedBarkBattleDraftGenerating(item.source.item); default: diff --git a/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx b/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx index 32c45498..4b329506 100644 --- a/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx +++ b/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx @@ -107,6 +107,7 @@ import type { VisualNovelWorkDetail, VisualNovelWorkSummary, } from '../../../packages/shared/src/contracts/visualNovel'; +import type { WoodenFishWorkSummaryResponse } from '../../../packages/shared/src/contracts/woodenFish'; import { buildCustomWorldPlayableCharacters } from '../../data/characterPresets'; import { buildPublicWorkStagePath, @@ -211,6 +212,7 @@ import { buildJumpHopGenerationAnchorEntries, buildMatch3DGenerationAnchorEntries, buildMiniGameDraftGenerationProgress, + buildPuzzleClearGenerationAnchorEntries, buildPuzzleGenerationAnchorEntries, buildSquareHoleGenerationAnchorEntries, buildWoodenFishGenerationAnchorEntries, @@ -226,6 +228,7 @@ import { buildBigFishPublicWorkCode, buildJumpHopPublicWorkCode, buildMatch3DPublicWorkCode, + buildPuzzleClearPublicWorkCode, buildPuzzlePublicWorkCode, buildSquareHolePublicWorkCode, buildVisualNovelPublicWorkCode, @@ -235,6 +238,7 @@ import { isSameBigFishPublicWorkCode, isSameJumpHopPublicWorkCode, isSameMatch3DPublicWorkCode, + isSamePuzzleClearPublicWorkCode, isSamePuzzlePublicWorkCode, isSameSquareHolePublicWorkCode, isSameVisualNovelPublicWorkCode, @@ -246,6 +250,24 @@ import { getPuzzleAgentSession, streamPuzzleAgentMessage, } from '../../services/puzzle-agent'; +import { + puzzleClearClient, + type PuzzleClearGalleryCardResponse, + type PuzzleClearRunResponse, + type PuzzleClearSessionResponse, + type PuzzleClearSessionSnapshotResponse, + type PuzzleClearWorkProfileResponse, + type PuzzleClearWorkspaceCreateRequest, + type PuzzleClearWorkSummaryResponse, +} from '../../services/puzzle-clear/puzzleClearClient'; +import { + advancePuzzleClearLocalLevel, + createPuzzleClearLocalRuntimeSnapshot, + isPuzzleClearLocalRuntimeSnapshot, + markPuzzleClearLocalTimeUp, + retryPuzzleClearLocalLevel, + swapPuzzleClearLocalCards, +} from '../../services/puzzle-clear/puzzleClearLocalRuntime'; import { getPuzzleGalleryDetail, likePuzzleGalleryWork, @@ -343,7 +365,6 @@ import { type WoodenFishWorkProfileResponse, type WoodenFishWorkspaceCreateRequest, } from '../../services/wooden-fish/woodenFishClient'; -import type { WoodenFishWorkSummaryResponse } from '../../../packages/shared/src/contracts/woodenFish'; import type { CustomWorldProfile } from '../../types'; import { useAuthUi } from '../auth/AuthUiContext'; import { PublishShareModal } from '../common/PublishShareModal'; @@ -362,6 +383,7 @@ import { isEdutainmentGalleryEntry, isJumpHopGalleryEntry, isMatch3DGalleryEntry, + isPuzzleClearGalleryEntry, isPuzzleGalleryEntry, isSquareHoleGalleryEntry, isVisualNovelGalleryEntry, @@ -371,6 +393,7 @@ import { mapBigFishWorkToPlatformGalleryCard, mapJumpHopWorkToPlatformGalleryCard, mapMatch3DWorkToPlatformGalleryCard, + mapPuzzleClearWorkToPlatformGalleryCard, mapPuzzleWorkToPlatformGalleryCard, mapSquareHoleWorkToPlatformGalleryCard, mapVisualNovelWorkToPlatformGalleryCard, @@ -430,11 +453,12 @@ import { PlatformErrorDialog, type PlatformErrorDialogPayload, } from './PlatformErrorDialog'; +import { PlatformFeedbackView } from './PlatformFeedbackView'; +import { shouldTickPlatformGenerationProgressClock } from './platformGenerationProgressClock'; import { PlatformTaskCompletionDialog, type PlatformTaskCompletionDialogPayload, } from './PlatformTaskCompletionDialog'; -import { PlatformFeedbackView } from './PlatformFeedbackView'; import { PlatformWorkDetailView } from './PlatformWorkDetailView'; import { usePlatformCreationAgentFlowController } from './usePlatformCreationAgentFlowController'; import { usePlatformEntryBootstrap } from './usePlatformEntryBootstrap'; @@ -507,6 +531,7 @@ type RecommendRuntimeKind = | 'jump-hop' | 'match3d' | 'puzzle' + | 'puzzle-clear' | 'square-hole' | 'wooden-fish' | 'visual-novel' @@ -525,6 +550,10 @@ type BabyObjectMatchRuntimeReturnStage = | 'work-detail' | 'platform'; type JumpHopRuntimeReturnStage = 'jump-hop-result' | 'work-detail' | 'platform'; +type PuzzleClearRuntimeReturnStage = + | 'puzzle-clear-result' + | 'work-detail' + | 'platform'; type WoodenFishRuntimeReturnStage = | 'wooden-fish-result' | 'work-detail' @@ -539,6 +568,7 @@ type RecommendRuntimeState = { jumpHopRun: JumpHopRunResponse['run'] | null; match3dRun: Match3DRunSnapshot | null; puzzleRun: PuzzleRunSnapshot | null; + puzzleClearRun: PuzzleClearRunResponse['run'] | null; squareHoleRun: SquareHoleRunSnapshot | null; visualNovelRun: VisualNovelRunSnapshot | null; woodenFishRun: WoodenFishRunResponse['run'] | null; @@ -625,21 +655,23 @@ function getPlatformPublicGalleryEntryKey(entry: PlatformPublicGalleryCard) { ? 'big-fish' : isPuzzleGalleryEntry(entry) ? 'puzzle' - : isJumpHopGalleryEntry(entry) - ? 'jump-hop' - : isWoodenFishGalleryEntry(entry) - ? 'wooden-fish' - : isMatch3DGalleryEntry(entry) - ? 'match3d' - : isSquareHoleGalleryEntry(entry) - ? 'square-hole' - : isVisualNovelGalleryEntry(entry) - ? 'visual-novel' - : isBarkBattleGalleryEntry(entry) - ? 'bark-battle' - : isEdutainmentGalleryEntry(entry) - ? `edutainment:${entry.templateId}` - : 'rpg'; + : isPuzzleClearGalleryEntry(entry) + ? 'puzzle-clear' + : isJumpHopGalleryEntry(entry) + ? 'jump-hop' + : isWoodenFishGalleryEntry(entry) + ? 'wooden-fish' + : isMatch3DGalleryEntry(entry) + ? 'match3d' + : isSquareHoleGalleryEntry(entry) + ? 'square-hole' + : isVisualNovelGalleryEntry(entry) + ? 'visual-novel' + : isBarkBattleGalleryEntry(entry) + ? 'bark-battle' + : isEdutainmentGalleryEntry(entry) + ? `edutainment:${entry.templateId}` + : 'rpg'; return `${kind}:${entry.ownerUserId}:${entry.profileId}`; } @@ -654,6 +686,10 @@ function getPlatformRecommendRuntimeKind( return 'puzzle'; } + if (isPuzzleClearGalleryEntry(entry)) { + return 'puzzle-clear'; + } + if (isJumpHopGalleryEntry(entry)) { return 'jump-hop'; } @@ -712,6 +748,9 @@ function isRecommendRuntimeReadyForEntry( state.puzzleRun?.currentLevel?.profileId === entry.profileId ); } + if (expectedKind === 'puzzle-clear') { + return Boolean(state.puzzleClearRun); + } if (expectedKind === 'square-hole') { return Boolean(state.squareHoleRun); } @@ -1958,6 +1997,69 @@ function buildJumpHopCreationUrlState(params: { }; } +function buildPuzzleClearCreationUrlState(params: { + session?: PuzzleClearSessionSnapshotResponse | null; + work?: PuzzleClearWorkProfileResponse | null; +}): CreationUrlState { + const sessionId = normalizeCreationUrlValue(params.session?.sessionId); + const profileId = normalizeCreationUrlValue( + params.work?.summary.profileId ?? params.session?.draft?.profileId, + ); + return { + sessionId, + profileId, + workId: normalizeCreationUrlValue(params.work?.summary.workId ?? profileId), + }; +} + +function buildPuzzleClearSessionFromWorkDetail( + work: PuzzleClearWorkProfileResponse, + fallbackItem?: PuzzleClearWorkSummaryResponse | null, +): PuzzleClearSessionSnapshotResponse { + const sessionId = + normalizeCreationUrlValue(work.summary.sourceSessionId) ?? + normalizeCreationUrlValue(fallbackItem?.sourceSessionId) ?? + work.summary.profileId; + return { + sessionId, + ownerUserId: work.summary.ownerUserId, + status: work.summary.generationStatus, + draft: work.draft, + createdAt: work.summary.updatedAt, + updatedAt: work.summary.updatedAt, + }; +} + +function buildPuzzleClearPendingSession( + item: PuzzleClearWorkSummaryResponse, +): PuzzleClearSessionSnapshotResponse { + const sessionId = + normalizeCreationUrlValue(item.sourceSessionId) ?? item.profileId; + return { + sessionId, + ownerUserId: item.ownerUserId, + status: item.generationStatus, + draft: { + templateId: 'puzzle-clear', + templateName: '拼消消', + profileId: item.profileId, + workTitle: item.workTitle, + workDescription: item.workDescription, + themePrompt: item.themePrompt, + boardBackgroundPrompt: item.themePrompt, + generateBoardBackground: true, + boardBackgroundAsset: null, + cardBackImageSrc: null, + atlasAsset: null, + patternGroups: [], + cardAssets: [], + generationStatus: item.generationStatus, + }, + createdAt: item.updatedAt, + updatedAt: item.updatedAt, + }; +} + function buildWoodenFishCreationUrlState(params: { session?: WoodenFishSessionSnapshotResponse | null; work?: WoodenFishWorkProfileResponse | null; @@ -2146,6 +2248,8 @@ function buildDraftCompletionDialogSource( return formatPlatformTaskCompletionSource('方洞挑战草稿', sourceId); case 'jump-hop': return formatPlatformTaskCompletionSource('跳一跳草稿', sourceId); + case 'puzzle-clear': + return formatPlatformTaskCompletionSource('拼消消草稿', sourceId); case 'wooden-fish': return formatPlatformTaskCompletionSource('敲木鱼草稿', sourceId); case 'puzzle': @@ -2405,6 +2509,13 @@ function getGenerationNoticeShelfKeys(item: CreationWorkShelfItem): string[] { item.source.item.profileId, item.source.item.sourceSessionId, ]); + case 'puzzle-clear': + return collectDraftNoticeKeys('puzzle-clear', [ + item.id, + item.source.item.workId, + item.source.item.profileId, + item.source.item.sourceSessionId, + ]); case 'puzzle': return collectDraftNoticeKeys('puzzle', [ item.id, @@ -2563,6 +2674,37 @@ function buildPendingWoodenFishWorks( })); } +function buildPendingPuzzleClearWorks( + pending: Record | undefined, + existingItems: readonly PuzzleClearWorkSummaryResponse[], +): PuzzleClearWorkSummaryResponse[] { + if (!pending) { + return []; + } + + return Object.entries(pending) + .filter(([sessionId]) => + existingItems.every((item) => item.sourceSessionId !== sessionId), + ) + .map(([sessionId, state]) => ({ + runtimeKind: 'puzzle-clear', + workId: `puzzle-clear-work-${sessionId}`, + profileId: sessionId, + ownerUserId: '', + sourceSessionId: sessionId, + workTitle: '拼消消草稿', + workDescription: '正在生成拼消消草稿。', + themePrompt: '', + coverImageSrc: null, + publicationStatus: 'draft', + playCount: 0, + updatedAt: state.updatedAt, + publishedAt: null, + publishReady: false, + generationStatus: state.status === 'generating' ? 'generating' : 'ready', + })); +} + function buildPendingMatch3DWorks( pending: Record | undefined, existingItems: readonly Match3DWorkSummary[], @@ -2954,6 +3096,27 @@ const JumpHopRuntimeShell = lazy(async () => { }; }); +const PuzzleClearWorkspace = lazy(async () => { + const module = await import('../puzzle-clear-creation/PuzzleClearWorkspace'); + return { + default: module.PuzzleClearWorkspace, + }; +}); + +const PuzzleClearResultView = lazy(async () => { + const module = await import('../puzzle-clear-result/PuzzleClearResultView'); + return { + default: module.PuzzleClearResultView, + }; +}); + +const PuzzleClearRuntimeShell = lazy(async () => { + const module = await import('../puzzle-clear-runtime/PuzzleClearRuntimeShell'); + return { + default: module.PuzzleClearRuntimeShell, + }; +}); + const WoodenFishWorkspace = lazy(async () => { const module = await import('../wooden-fish-creation/WoodenFishWorkspace'); return { @@ -3247,6 +3410,25 @@ export function PlatformEntryFlowShellImpl({ useState(null); const [jumpHopError, setJumpHopError] = useState(null); const [isJumpHopBusy, setIsJumpHopBusy] = useState(false); + const [puzzleClearSession, setPuzzleClearSession] = + useState(null); + const [puzzleClearRun, setPuzzleClearRun] = useState< + PuzzleClearRunResponse['run'] | null + >(null); + const [puzzleClearWork, setPuzzleClearWork] = + useState(null); + const [puzzleClearWorks, setPuzzleClearWorks] = useState< + PuzzleClearWorkSummaryResponse[] + >([]); + const [puzzleClearGalleryEntries, setPuzzleClearGalleryEntries] = useState< + PuzzleClearGalleryCardResponse[] + >([]); + const [puzzleClearRuntimeReturnStage, setPuzzleClearRuntimeReturnStage] = + useState('puzzle-clear-result'); + const [puzzleClearGenerationState, setPuzzleClearGenerationState] = + useState(null); + const [puzzleClearError, setPuzzleClearError] = useState(null); + const [isPuzzleClearBusy, setIsPuzzleClearBusy] = useState(false); const [barkBattleWorks, setBarkBattleWorks] = useState< BarkBattleWorkSummary[] >([]); @@ -3465,6 +3647,10 @@ export function PlatformEntryFlowShellImpl({ creationEntryTypes, 'jump-hop', ); + const isPuzzleClearCreationVisible = isPlatformCreationTypeVisible( + creationEntryTypes, + 'puzzle-clear', + ); const isSquareHoleCreationVisible = isPlatformCreationTypeVisible( creationEntryTypes, 'square-hole', @@ -3999,6 +4185,36 @@ export function PlatformEntryFlowShellImpl({ } }, [isJumpHopCreationVisible]); + const refreshPuzzleClearGallery = useCallback(async () => { + try { + const galleryResponse = await puzzleClearClient.listGallery(); + setPuzzleClearGalleryEntries(galleryResponse.items); + return galleryResponse.items; + } catch { + setPuzzleClearGalleryEntries([]); + return []; + } + }, []); + + const refreshPuzzleClearShelf = useCallback(async () => { + if (!isPuzzleClearCreationVisible) { + setPuzzleClearWorks([]); + return []; + } + + try { + const worksResponse = await puzzleClearClient.listWorks(); + setPuzzleClearWorks(worksResponse.items); + return worksResponse.items; + } catch (error) { + setPuzzleClearWorks([]); + setPuzzleClearError( + resolvePuzzleErrorMessage(error, '读取拼消消作品列表失败。'), + ); + return []; + } + }, [isPuzzleClearCreationVisible]); + const refreshWoodenFishGallery = useCallback(async () => { try { const galleryResponse = await woodenFishClient.listGallery(); @@ -4463,6 +4679,9 @@ export function PlatformEntryFlowShellImpl({ const jumpHopPublicEntries = jumpHopGalleryEntries.map( mapJumpHopWorkToPlatformGalleryCard, ); + const puzzleClearPublicEntries = puzzleClearGalleryEntries.map( + mapPuzzleClearWorkToPlatformGalleryCard, + ); const woodenFishPublicEntries = woodenFishGalleryEntries.map( mapWoodenFishWorkToPlatformGalleryCard, ); @@ -4478,6 +4697,7 @@ export function PlatformEntryFlowShellImpl({ ...barkBattlePublicEntries, ...squareHolePublicEntries, ...jumpHopPublicEntries, + ...puzzleClearPublicEntries, ...woodenFishPublicEntries, ...(isVisualNovelCreationOpen ? visualNovelPublicEntries : []), ...babyObjectMatchPublicEntries, @@ -4492,6 +4712,7 @@ export function PlatformEntryFlowShellImpl({ jumpHopGalleryEntries, match3dGalleryEntries, platformBootstrap.publishedGalleryEntries, + puzzleClearGalleryEntries, puzzleGalleryEntries, barkBattleGalleryEntries, barkBattleWorks, @@ -4509,6 +4730,9 @@ export function PlatformEntryFlowShellImpl({ : []), ...match3dGalleryEntries.map(mapMatch3DWorkToPublicWorkDetail), ...puzzleGalleryEntries.map(mapPuzzleWorkToPlatformGalleryCard), + ...puzzleClearGalleryEntries.map( + mapPuzzleClearWorkToPlatformGalleryCard, + ), ...barkBattleGalleryEntries.map(mapBarkBattleWorkToPlatformGalleryCard), ...jumpHopGalleryEntries.map(mapJumpHopWorkToPlatformGalleryCard), ...(barkBattleGalleryEntries.length === 0 @@ -4543,6 +4767,7 @@ export function PlatformEntryFlowShellImpl({ jumpHopGalleryEntries, match3dGalleryEntries, platformBootstrap.publishedGalleryEntries, + puzzleClearGalleryEntries, puzzleGalleryEntries, squareHoleGalleryEntries, visualNovelGalleryEntries, @@ -4594,6 +4819,16 @@ export function PlatformEntryFlowShellImpl({ ], [jumpHopWorks, pendingDraftShelfItems], ); + const puzzleClearShelfItems = useMemo( + () => [ + ...buildPendingPuzzleClearWorks( + pendingDraftShelfItems['puzzle-clear'], + puzzleClearWorks, + ), + ...puzzleClearWorks, + ], + [pendingDraftShelfItems, puzzleClearWorks], + ); const woodenFishShelfItems = useMemo( () => [ ...buildPendingWoodenFishWorks( @@ -4686,6 +4921,13 @@ export function PlatformEntryFlowShellImpl({ item.sourceSessionId, ]), ), + ...puzzleClearShelfItems.flatMap((item) => + collectDraftNoticeKeys('puzzle-clear', [ + item.workId, + item.profileId, + item.sourceSessionId, + ]), + ), ...woodenFishShelfItems.flatMap((item) => collectDraftNoticeKeys('wooden-fish', [ item.workId, @@ -4736,6 +4978,7 @@ export function PlatformEntryFlowShellImpl({ barkBattleShelfItems, bigFishShelfItems, jumpHopShelfItems, + puzzleClearShelfItems, woodenFishShelfItems, creationHubItems, isSquareHoleCreationVisible, @@ -4779,22 +5022,29 @@ export function PlatformEntryFlowShellImpl({ ]); useEffect(() => { - const activeGenerationState = - selectionStage === 'puzzle-generating' - ? puzzleGenerationState - : selectionStage === 'match3d-generating' - ? match3dGenerationState - : selectionStage === 'baby-object-match-generating' - ? babyObjectMatchGenerationState - : null; - const shouldTickProgress = - selectionStage === 'visual-novel-generating' - ? visualNovelGenerationStartedAtMs != null && - visualNovelGenerationPhase !== 'ready' && - visualNovelGenerationPhase !== 'failed' - : activeGenerationState != null && - activeGenerationState.phase !== 'ready' && - activeGenerationState.phase !== 'failed'; + const shouldTickProgress = shouldTickPlatformGenerationProgressClock({ + selectionStage, + generationState: + selectionStage === 'big-fish-generating' + ? bigFishGenerationState + : selectionStage === 'match3d-generating' + ? match3dGenerationState + : selectionStage === 'square-hole-generating' + ? squareHoleGenerationState + : selectionStage === 'jump-hop-generating' + ? jumpHopGenerationState + : selectionStage === 'puzzle-clear-generating' + ? puzzleClearGenerationState + : selectionStage === 'wooden-fish-generating' + ? woodenFishGenerationState + : selectionStage === 'puzzle-generating' + ? puzzleGenerationState + : selectionStage === 'baby-object-match-generating' + ? babyObjectMatchGenerationState + : null, + visualNovelGenerationStartedAtMs, + visualNovelGenerationPhase, + }); if (!shouldTickProgress) { return undefined; @@ -4807,9 +5057,14 @@ export function PlatformEntryFlowShellImpl({ return () => window.clearInterval(timerId); }, [ + bigFishGenerationState, babyObjectMatchGenerationState, + jumpHopGenerationState, match3dGenerationState, puzzleGenerationState, + puzzleClearGenerationState, + squareHoleGenerationState, + woodenFishGenerationState, selectionStage, visualNovelGenerationPhase, visualNovelGenerationStartedAtMs, @@ -6146,6 +6401,20 @@ export function PlatformEntryFlowShellImpl({ ), message: jumpHopError, }, + { + key: 'puzzle-clear', + source: formatPlatformErrorSource( + selectionStage === 'puzzle-clear-runtime' + ? '拼消消游玩' + : selectionStage === 'puzzle-clear-generating' + ? '拼消消草稿生成' + : '拼消消草稿', + puzzleClearRun?.runId ?? + puzzleClearSession?.sessionId ?? + puzzleClearWork?.summary.profileId, + ), + message: puzzleClearError, + }, { key: 'wooden-fish', source: formatPlatformErrorSource( @@ -6259,6 +6528,10 @@ export function PlatformEntryFlowShellImpl({ match3dSession?.sessionId, platformBootstrap.platformError, publicWorkDetailError, + puzzleClearError, + puzzleClearRun?.runId, + puzzleClearSession?.sessionId, + puzzleClearWork?.summary.profileId, puzzleCreationError, puzzleError, puzzleGenerationViewError, @@ -6368,6 +6641,10 @@ export function PlatformEntryFlowShellImpl({ setJumpHopError(null); return; } + if (currentPlatformErrorDialog.key === 'puzzle-clear') { + setPuzzleClearError(null); + return; + } if (currentPlatformErrorDialog.key === 'wooden-fish') { setWoodenFishError(null); return; @@ -6621,6 +6898,18 @@ export function PlatformEntryFlowShellImpl({ setSelectionStage('jump-hop-workspace'); }, [enterCreateTab, markCreationFlowReturnToCreate, setSelectionStage]); + const openPuzzleClearWorkspace = useCallback(() => { + markCreationFlowReturnToCreate(); + setPuzzleClearError(null); + setPuzzleClearSession(null); + setPuzzleClearWork(null); + setPuzzleClearRun(null); + setPuzzleClearGenerationState(null); + enterCreateTab(); + setShowCreationTypeModal(false); + setSelectionStage('puzzle-clear-workspace'); + }, [enterCreateTab, markCreationFlowReturnToCreate, setSelectionStage]); + const openWoodenFishWorkspace = useCallback(() => { markCreationFlowReturnToCreate(); setWoodenFishError(null); @@ -7417,6 +7706,15 @@ export function PlatformEntryFlowShellImpl({ setPuzzleShelfError(null); setPuzzleCreationError(null); setPuzzleError(null); + setPuzzleClearSession(null); + setPuzzleClearWork(null); + setPuzzleClearWorks([]); + setPuzzleClearGalleryEntries([]); + setPuzzleClearRun(null); + setPuzzleClearRuntimeReturnStage('puzzle-clear-result'); + setPuzzleClearGenerationState(null); + setPuzzleClearError(null); + setIsPuzzleClearBusy(false); setVisualNovelSession(null); setVisualNovelWork(null); setVisualNovelWorks([]); @@ -7459,6 +7757,7 @@ export function PlatformEntryFlowShellImpl({ selectionStage !== 'match3d-agent-workspace' && selectionStage !== 'square-hole-agent-workspace' && selectionStage !== 'jump-hop-workspace' && + selectionStage !== 'puzzle-clear-workspace' && selectionStage !== 'wooden-fish-workspace' && selectionStage !== 'puzzle-agent-workspace' && selectionStage !== 'bark-battle-workspace' && @@ -7544,6 +7843,13 @@ export function PlatformEntryFlowShellImpl({ return; } + if (type === 'puzzle-clear') { + runProtectedAction(() => { + void openPuzzleClearWorkspace(); + }); + return; + } + if (type === 'wooden-fish') { runProtectedAction(() => { void openWoodenFishWorkspace(); @@ -7585,6 +7891,7 @@ export function PlatformEntryFlowShellImpl({ openBabyObjectMatchWorkspace, openJumpHopWorkspace, openMatch3DWorkspace, + openPuzzleClearWorkspace, prepareCreationLaunch, openPuzzleWorkspace, openSquareHoleAgentWorkspace, @@ -7633,6 +7940,16 @@ export function PlatformEntryFlowShellImpl({ returnToCreationFlowSource(); }, [returnToCreationFlowSource]); + const leavePuzzleClearFlow = useCallback(() => { + setPuzzleClearRun(null); + setPuzzleClearWork(null); + setPuzzleClearRuntimeReturnStage('puzzle-clear-result'); + setPuzzleClearGenerationState(null); + setPuzzleClearSession(null); + setPuzzleClearError(null); + returnToCreationFlowSource(); + }, [returnToCreationFlowSource]); + const leaveWoodenFishFlow = useCallback(() => { setWoodenFishRun(null); setWoodenFishWork(null); @@ -7652,6 +7969,15 @@ export function PlatformEntryFlowShellImpl({ [], ); + const createReadyPuzzleClearGenerationState = useCallback( + (state: MiniGameDraftGenerationState) => + resolveFinishedMiniGameDraftGenerationState(state, 'ready', { + completedAssetCount: 135, + totalAssetCount: 135, + }), + [], + ); + const createReadyWoodenFishGenerationState = useCallback( (state: MiniGameDraftGenerationState) => resolveFinishedMiniGameDraftGenerationState(state, 'ready', { @@ -8962,6 +9288,431 @@ export function PlatformEntryFlowShellImpl({ [jumpHopRun?.runId], ); + const compilePuzzleClearSession = useCallback( + async ( + created: PuzzleClearSessionResponse, + payload?: PuzzleClearWorkspaceCreateRequest, + ) => { + const generationState = + createMiniGameDraftGenerationState('puzzle-clear'); + setPuzzleClearError(null); + setPuzzleClearSession(created.session); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ session: created.session }), + ); + setPuzzleClearWork(null); + setPuzzleClearRun(null); + setPuzzleClearGenerationState(generationState); + setIsPuzzleClearBusy(true); + markDraftGenerating('puzzle-clear', [created.session.sessionId]); + markPendingDraftGenerating('puzzle-clear', created.session.sessionId); + selectionStageRef.current = 'puzzle-clear-generating'; + setSelectionStage('puzzle-clear-generating'); + + try { + const response = await puzzleClearClient.executeAction( + created.session.sessionId, + { + actionType: 'compile-draft', + workTitle: payload?.workTitle ?? created.session.draft?.workTitle, + workDescription: + payload?.workDescription ?? + created.session.draft?.workDescription, + themePrompt: + payload?.themePrompt ?? created.session.draft?.themePrompt, + boardBackgroundPrompt: + payload?.boardBackgroundPrompt ?? + created.session.draft?.boardBackgroundPrompt, + generateBoardBackground: + payload?.generateBoardBackground ?? + created.session.draft?.generateBoardBackground, + boardBackgroundAsset: + payload?.boardBackgroundAsset ?? + created.session.draft?.boardBackgroundAsset, + }, + ); + setPuzzleClearSession(response.session); + setPuzzleClearWork(response.work ?? null); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ + session: response.session, + work: response.work, + }), + ); + setPuzzleClearGenerationState( + createReadyPuzzleClearGenerationState(generationState), + ); + if (response.work) { + setPuzzleClearWorks((current) => [ + response.work!.summary, + ...current.filter( + (item) => + item.workId !== response.work!.summary.workId && + item.sourceSessionId !== + response.work!.summary.sourceSessionId, + ), + ]); + markPendingDraftReady( + 'puzzle-clear', + created.session.sessionId, + false, + ); + markDraftReady( + 'puzzle-clear', + [ + created.session.sessionId, + response.work.summary.workId, + response.work.summary.profileId, + response.work.summary.sourceSessionId, + ], + false, + ); + void refreshPuzzleClearShelf().catch(() => undefined); + } + setSelectionStage('puzzle-clear-result'); + } catch (error) { + const errorMessage = resolveRpgCreationErrorMessage( + error, + '生成拼消消草稿失败。', + ); + setPuzzleClearError(errorMessage); + setPuzzleClearGenerationState( + resolveFinishedMiniGameDraftGenerationState( + generationState, + 'failed', + { error: errorMessage }, + ), + ); + try { + const latest = await puzzleClearClient.getSession( + created.session.sessionId, + ); + setPuzzleClearSession(latest.session); + setPuzzleClearWork(null); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ session: latest.session }), + ); + } catch { + setPuzzleClearSession(created.session); + setPuzzleClearWork(null); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ session: created.session }), + ); + } + } finally { + setIsPuzzleClearBusy(false); + } + }, + [ + createReadyPuzzleClearGenerationState, + markDraftGenerating, + markDraftReady, + markPendingDraftGenerating, + markPendingDraftReady, + refreshPuzzleClearShelf, + setSelectionStage, + ], + ); + + const retryPuzzleClearDraftGeneration = useCallback(() => { + if (!puzzleClearSession) { + setSelectionStage('puzzle-clear-workspace'); + return; + } + + void compilePuzzleClearSession({ session: puzzleClearSession }); + }, [compilePuzzleClearSession, puzzleClearSession, setSelectionStage]); + + const regeneratePuzzleClearAtlas = useCallback(async () => { + if (!puzzleClearSession?.sessionId) { + setSelectionStage('puzzle-clear-workspace'); + return; + } + + const generationState = createMiniGameDraftGenerationState('puzzle-clear'); + setPuzzleClearError(null); + setPuzzleClearGenerationState(generationState); + setIsPuzzleClearBusy(true); + selectionStageRef.current = 'puzzle-clear-generating'; + setSelectionStage('puzzle-clear-generating'); + try { + const response = await puzzleClearClient.executeAction( + puzzleClearSession.sessionId, + { + actionType: 'regenerate-atlas', + profileId: + puzzleClearWork?.summary.profileId ?? + puzzleClearSession.draft?.profileId, + workTitle: puzzleClearSession.draft?.workTitle, + workDescription: puzzleClearSession.draft?.workDescription, + themePrompt: puzzleClearSession.draft?.themePrompt, + boardBackgroundPrompt: puzzleClearSession.draft?.boardBackgroundPrompt, + generateBoardBackground: + puzzleClearSession.draft?.generateBoardBackground, + boardBackgroundAsset: puzzleClearSession.draft?.boardBackgroundAsset, + }, + ); + setPuzzleClearSession(response.session); + setPuzzleClearWork(response.work ?? puzzleClearWork); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ + session: response.session, + work: response.work ?? puzzleClearWork, + }), + ); + setPuzzleClearGenerationState( + createReadyPuzzleClearGenerationState(generationState), + ); + setSelectionStage('puzzle-clear-result'); + } catch (error) { + const errorMessage = resolveRpgCreationErrorMessage( + error, + '重新生成拼消消图集失败。', + ); + setPuzzleClearError(errorMessage); + setPuzzleClearGenerationState( + resolveFinishedMiniGameDraftGenerationState( + generationState, + 'failed', + { error: errorMessage }, + ), + ); + } finally { + setIsPuzzleClearBusy(false); + } + }, [ + createReadyPuzzleClearGenerationState, + puzzleClearSession, + puzzleClearWork, + setSelectionStage, + ]); + + const publishPuzzleClearDraft = useCallback(async () => { + const profileId = puzzleClearWork?.summary.profileId?.trim(); + if (!profileId) { + setPuzzleClearError('拼消消草稿尚未生成可发布作品。'); + setSelectionStage('puzzle-clear-result'); + return; + } + + setIsPuzzleClearBusy(true); + setPuzzleClearError(null); + try { + const response = await puzzleClearClient.publishWork(profileId); + setPuzzleClearWork(response.item); + setPuzzleClearWorks((current) => [ + response.item.summary, + ...current.filter((item) => item.workId !== response.item.summary.workId), + ]); + void refreshPuzzleClearShelf(); + void refreshPuzzleClearGallery(); + openPublishShareModal({ + title: response.item.summary.workTitle || '拼消消', + publicWorkCode: buildPuzzleClearPublicWorkCode( + response.item.summary.profileId, + ), + stage: 'work-detail', + }); + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '发布拼消消作品失败。'), + ); + setSelectionStage('puzzle-clear-result'); + } finally { + setIsPuzzleClearBusy(false); + } + }, [ + openPublishShareModal, + puzzleClearWork?.summary.profileId, + refreshPuzzleClearGallery, + refreshPuzzleClearShelf, + setSelectionStage, + ]); + + const startPuzzleClearTestRunFromProfile = useCallback(async () => { + if (!puzzleClearWork) { + setPuzzleClearError('拼消消草稿尚未生成可试玩作品。'); + setSelectionStage('puzzle-clear-result'); + return; + } + + setPuzzleClearError(null); + setPuzzleClearRuntimeReturnStage('puzzle-clear-result'); + setPuzzleClearRun(createPuzzleClearLocalRuntimeSnapshot(puzzleClearWork)); + setSelectionStage('puzzle-clear-runtime'); + }, [puzzleClearWork, setSelectionStage]); + + const startPuzzleClearRunFromProfile = useCallback( + async ( + profileId: string, + options: { + embedded?: boolean; + returnStage?: 'work-detail' | 'platform'; + } = {}, + ) => { + const normalizedProfileId = profileId.trim(); + if (!normalizedProfileId) { + setPuzzleClearError('当前拼消消作品信息不完整，暂时无法进入玩法。'); + return false; + } + + setIsPuzzleClearBusy(true); + setPuzzleClearError(null); + setPuzzleClearRuntimeReturnStage(options.returnStage ?? 'work-detail'); + try { + const runtimeGuestOptions = await buildRecommendRuntimeAuthOptions( + authUi, + options.embedded, + ); + const [detail, runResponse] = await Promise.all([ + puzzleClearClient + .getRuntimeWorkDetail(normalizedProfileId) + .catch(() => null), + puzzleClearClient.startRun(normalizedProfileId, runtimeGuestOptions), + ]); + if (detail?.item) { + setPuzzleClearWork(detail.item); + } + setPuzzleClearRun(runResponse.run); + if (!options.embedded) { + setSelectionStage('puzzle-clear-runtime'); + pushAppHistoryPath( + buildPublicWorkStagePath( + 'puzzle-clear-runtime', + buildPuzzleClearPublicWorkCode(normalizedProfileId), + ), + ); + } + return true; + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '启动拼消消玩法失败。'), + ); + return false; + } finally { + setIsPuzzleClearBusy(false); + } + }, + [authUi, setSelectionStage], + ); + + const retryPuzzleClearLevelRun = useCallback(async () => { + const runId = puzzleClearRun?.runId; + if (!runId) { + await startPuzzleClearTestRunFromProfile(); + return; + } + if (isPuzzleClearLocalRuntimeSnapshot(puzzleClearRun)) { + if (!puzzleClearWork) { + setPuzzleClearError('拼消消草稿尚未生成可重试作品。'); + setSelectionStage('puzzle-clear-result'); + return; + } + setPuzzleClearError(null); + setPuzzleClearRun(retryPuzzleClearLocalLevel(puzzleClearRun, puzzleClearWork)); + return; + } + + setIsPuzzleClearBusy(true); + setPuzzleClearError(null); + try { + const response = await puzzleClearClient.retryLevel(runId); + setPuzzleClearRun(response.run); + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '重试拼消消关卡失败。'), + ); + } finally { + setIsPuzzleClearBusy(false); + } + }, [ + puzzleClearRun, + puzzleClearWork, + setSelectionStage, + startPuzzleClearTestRunFromProfile, + ]); + + const advancePuzzleClearLevelRun = useCallback(async () => { + const runId = puzzleClearRun?.runId; + if (!runId) { + return; + } + if (isPuzzleClearLocalRuntimeSnapshot(puzzleClearRun)) { + if (!puzzleClearWork) { + setPuzzleClearError('拼消消草稿尚未生成可继续作品。'); + setSelectionStage('puzzle-clear-result'); + return; + } + setPuzzleClearError(null); + setPuzzleClearRun( + advancePuzzleClearLocalLevel(puzzleClearRun, puzzleClearWork), + ); + return; + } + + setIsPuzzleClearBusy(true); + setPuzzleClearError(null); + try { + const response = await puzzleClearClient.advanceNextLevel(runId); + setPuzzleClearRun(response.run); + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '进入拼消消下一关失败。'), + ); + } finally { + setIsPuzzleClearBusy(false); + } + }, [puzzleClearRun, puzzleClearWork, setSelectionStage]); + + const markPuzzleClearLevelTimeUp = useCallback(async () => { + const runId = puzzleClearRun?.runId; + if (!runId) { + return; + } + if (isPuzzleClearLocalRuntimeSnapshot(puzzleClearRun)) { + setPuzzleClearError(null); + setPuzzleClearRun(markPuzzleClearLocalTimeUp(puzzleClearRun)); + return; + } + + try { + const response = await puzzleClearClient.markTimeUp(runId); + setPuzzleClearRun(response.run); + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '同步拼消消倒计时失败。'), + ); + } + }, [puzzleClearRun]); + + const swapPuzzleClearCardsInRun = useCallback( + async (payload: { + fromRow: number; + fromCol: number; + toRow: number; + toCol: number; + }) => { + const runId = puzzleClearRun?.runId; + if (!runId) { + return; + } + if (isPuzzleClearLocalRuntimeSnapshot(puzzleClearRun)) { + setPuzzleClearError(null); + setPuzzleClearRun(swapPuzzleClearLocalCards(puzzleClearRun, payload)); + return; + } + try { + const response = await puzzleClearClient.swapCards(runId, payload); + setPuzzleClearRun(response.run); + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '交换拼消消卡片失败。'), + ); + } + }, + [puzzleClearRun], + ); + const compileWoodenFishSession = useCallback( async ( created: WoodenFishSessionResponse, @@ -11890,6 +12641,95 @@ export function PlatformEntryFlowShellImpl({ [enterCreateTab, markDraftNoticeSeen, openPublicWorkDetail, setSelectionStage], ); + const openPuzzleClearPublicWorkDetail = useCallback( + async (profileId: string) => { + setIsPublicWorkDetailBusy(true); + setPuzzleClearError(null); + setPublicWorkDetailError(null); + setSelectionStage('work-detail'); + + try { + const detail = await puzzleClearClient.getRuntimeWorkDetail(profileId); + setPuzzleClearWork(detail.item); + openPublicWorkDetail(mapPuzzleClearWorkToPlatformGalleryCard(detail.item)); + } catch (error) { + setPublicWorkDetailError( + resolveRpgCreationErrorMessage(error, '读取拼消消详情失败。'), + ); + } finally { + setIsPublicWorkDetailBusy(false); + } + }, + [openPublicWorkDetail, setSelectionStage], + ); + + const openPuzzleClearDraft = useCallback( + async (item: PuzzleClearWorkSummaryResponse) => { + markDraftNoticeSeen( + collectDraftNoticeKeys('puzzle-clear', [ + item.workId, + item.profileId, + item.sourceSessionId, + ]), + ); + + if (item.publicationStatus === 'published') { + void openPuzzleClearPublicWorkDetail(item.profileId); + return; + } + + setPuzzleClearError(null); + setPublicWorkDetailError(null); + setIsPuzzleClearBusy(true); + if (item.generationStatus === 'generating') { + const pendingSession = buildPuzzleClearPendingSession(item); + setPuzzleClearSession(pendingSession); + setPuzzleClearRun(null); + setPuzzleClearWork(null); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ session: pendingSession }), + ); + enterCreateTab(); + setSelectionStage('puzzle-clear-generating'); + setIsPuzzleClearBusy(false); + return; + } + try { + const detail = await puzzleClearClient.getWorkDetail(item.profileId); + const recoveredSession = buildPuzzleClearSessionFromWorkDetail( + detail.item, + item, + ); + setPuzzleClearSession(recoveredSession); + setPuzzleClearRun(null); + setPuzzleClearWork(detail.item); + setPuzzleClearRuntimeReturnStage('puzzle-clear-result'); + writeCreationUrlState( + buildPuzzleClearCreationUrlState({ + session: recoveredSession, + work: detail.item, + }), + ); + enterCreateTab(); + setSelectionStage('puzzle-clear-result'); + } catch (error) { + setPuzzleClearError( + resolveRpgCreationErrorMessage(error, '读取拼消消草稿失败。'), + ); + enterCreateTab(); + setSelectionStage('puzzle-clear-generating'); + } finally { + setIsPuzzleClearBusy(false); + } + }, + [ + enterCreateTab, + markDraftNoticeSeen, + openPuzzleClearPublicWorkDetail, + setSelectionStage, + ], + ); + const openWoodenFishPublicWorkDetail = useCallback( async (profileId: string) => { setIsPublicWorkDetailBusy(true); @@ -11994,6 +12834,11 @@ export function PlatformEntryFlowShellImpl({ return; } + if (isPuzzleClearGalleryEntry(entry)) { + void openPuzzleClearPublicWorkDetail(entry.profileId); + return; + } + if (isMatch3DGalleryEntry(entry)) { openPublicWorkDetail(entry); return; @@ -12034,6 +12879,7 @@ export function PlatformEntryFlowShellImpl({ [ openPuzzlePublicWorkDetail, openPublicWorkDetail, + openPuzzleClearPublicWorkDetail, openJumpHopPublicWorkDetail, openWoodenFishPublicWorkDetail, openRpgPublicWorkDetail, @@ -12801,7 +13647,10 @@ export function PlatformEntryFlowShellImpl({ return; } - if (path.startsWith('/creation/puzzle')) { + if ( + path.startsWith('/creation/puzzle') && + !path.startsWith('/creation/puzzle-clear') + ) { const matchedWork = ( puzzleWorks.length > 0 @@ -12823,6 +13672,40 @@ export function PlatformEntryFlowShellImpl({ return; } + if (path.startsWith('/creation/puzzle-clear')) { + const matchedWork = + ( + puzzleClearWorks.length > 0 + ? puzzleClearWorks + : (await puzzleClearClient + .listWorks() + .catch(() => ({ items: [] }))).items + ).find( + (item) => + item.sourceSessionId === sessionId || + item.profileId === profileId || + item.workId === workId, + ) ?? null; + if (matchedWork) { + await openPuzzleClearDraft(matchedWork); + return; + } + if (sessionId) { + const { session } = await puzzleClearClient.getSession(sessionId); + setPuzzleClearSession(session); + setPuzzleClearWork(null); + enterCreateTab(); + setSelectionStage( + path.includes('/generating') + ? 'puzzle-clear-generating' + : session.draft + ? 'puzzle-clear-result' + : 'puzzle-clear-workspace', + ); + } + return; + } + if (path.startsWith('/creation/visual-novel')) { const matchedWork = ( @@ -12949,11 +13832,13 @@ export function PlatformEntryFlowShellImpl({ openBigFishDraft, openMatch3DDraft, openPuzzleDraft, + openPuzzleClearDraft, openSquareHoleDraft, openVisualNovelDraft, platformBootstrap.canReadProtectedData, platformBootstrap.isLoadingPlatform, puzzleFlow, + puzzleClearWorks, puzzleWorks, setSelectionStage, squareHoleFlow, @@ -13107,6 +13992,14 @@ export function PlatformEntryFlowShellImpl({ return; } + if (isPuzzleClearGalleryEntry(selectedPublicWorkDetail)) { + setPublicWorkDetailError(null); + void startPuzzleClearRunFromProfile(selectedPublicWorkDetail.profileId, { + returnStage: 'work-detail', + }); + return; + } + if (isJumpHopGalleryEntry(selectedPublicWorkDetail)) { setPublicWorkDetailError(null); void startJumpHopRunFromProfile(selectedPublicWorkDetail.profileId, { @@ -13231,6 +14124,7 @@ export function PlatformEntryFlowShellImpl({ startBarkBattleRunFromWork, startBigFishRunFromWork, startJumpHopRunFromProfile, + startPuzzleClearRunFromProfile, startWoodenFishRunFromProfile, startPuzzleRunFromProfile, startMatch3DRunFromProfile, @@ -13290,6 +14184,11 @@ export function PlatformEntryFlowShellImpl({ { embedded: true }, ); } + } else if (isPuzzleClearGalleryEntry(entry)) { + started = await startPuzzleClearRunFromProfile(entry.profileId, { + embedded: true, + returnStage: 'platform', + }); } else if (isJumpHopGalleryEntry(entry)) { started = await startJumpHopRunFromProfile(entry.profileId, { embedded: true, @@ -13390,10 +14289,12 @@ export function PlatformEntryFlowShellImpl({ setBigFishError, setMatch3DError, setPuzzleError, + setPuzzleClearError, setSquareHoleError, startBarkBattleRunFromWork, startBigFishRunFromWork, startJumpHopRunFromProfile, + startPuzzleClearRunFromProfile, startWoodenFishRunFromProfile, startMatch3DRunFromProfile, startPuzzleRunFromProfile, @@ -13652,6 +14553,32 @@ export function PlatformEntryFlowShellImpl({ ); } + if (activeRecommendRuntimeKind === 'puzzle-clear') { + return ( + { + setActiveRecommendRuntimeKind(null); + }} + onRetryLevel={() => { + void retryPuzzleClearLevelRun(); + }} + onNextLevel={() => { + void advancePuzzleClearLevelRun(); + }} + onTimeUp={() => { + void markPuzzleClearLevelTimeUp(); + }} + onSwapCards={async (payload) => { + await swapPuzzleClearCardsInRun(payload); + }} + /> + ); + } + if (activeRecommendRuntimeKind === 'wooden-fish') { return ( { @@ -13887,6 +14822,7 @@ export function PlatformEntryFlowShellImpl({ jumpHopRun, match3dRun, puzzleRun, + puzzleClearRun, squareHoleRun, visualNovelRun, woodenFishRun, @@ -13915,6 +14851,7 @@ export function PlatformEntryFlowShellImpl({ platformBootstrap.platformTab, isDesktopLayout, puzzleRun, + puzzleClearRun, recommendRuntimeEntries, selectRecommendRuntimeEntry, selectionStage, @@ -13971,6 +14908,12 @@ export function PlatformEntryFlowShellImpl({ return; } + if (isPuzzleClearGalleryEntry(entry)) { + setPublicWorkDetailError('拼消消作品改造将在后续版本开放。'); + setIsPublicWorkDetailBusy(false); + return; + } + if (isMatch3DGalleryEntry(entry)) { setPublicWorkDetailError('抓大鹅作品改造将在后续版本开放。'); setIsPublicWorkDetailBusy(false); @@ -14087,6 +15030,38 @@ export function PlatformEntryFlowShellImpl({ return; } + if (isPuzzleClearGalleryEntry(entry)) { + const matchedWork = + puzzleClearWork?.summary.profileId === entry.profileId + ? puzzleClearWork.summary + : puzzleClearWorks.find((work) => work.profileId === entry.profileId) ?? + { + runtimeKind: 'puzzle-clear', + workId: entry.workId, + profileId: entry.profileId, + ownerUserId: entry.ownerUserId, + sourceSessionId: entry.sourceSessionId ?? null, + workTitle: entry.worldName, + workDescription: entry.summaryText, + themePrompt: entry.themePrompt, + coverImageSrc: entry.coverImageSrc, + publicationStatus: 'published', + playCount: entry.playCount ?? 0, + updatedAt: entry.updatedAt, + publishedAt: entry.publishedAt, + publishReady: true, + generationStatus: 'ready', + }; + if (!matchedWork?.sourceSessionId?.trim()) { + setPublicWorkDetailError( + '这份拼消消作品缺少原草稿会话，暂时无法编辑。', + ); + return; + } + void openPuzzleClearDraft(matchedWork); + return; + } + if (isMatch3DGalleryEntry(entry)) { const work = mapPublicWorkDetailToMatch3DWork(entry); if (!work?.sourceSessionId?.trim()) { @@ -14176,12 +15151,15 @@ export function PlatformEntryFlowShellImpl({ openBigFishDraft, openMatch3DDraft, openPuzzleDraft, + openPuzzleClearDraft, openSquareHoleDraft, openVisualNovelDraft, barkBattleGalleryEntries, barkBattleWorks, openBabyObjectMatchDraft, openBarkBattleDraft, + puzzleClearWork, + puzzleClearWorks, resolveBabyObjectMatchRuntimeDraft, runProtectedAction, selectedDetailEntry, @@ -14225,6 +15203,7 @@ export function PlatformEntryFlowShellImpl({ const shouldSearchBabyObjectFirst = upperKeyword.startsWith('BO'); const shouldSearchJumpHopFirst = upperKeyword.startsWith('JH'); const shouldSearchWoodenFishFirst = upperKeyword.startsWith('WF'); + const shouldSearchPuzzleClearFirst = upperKeyword.startsWith('PC'); const shouldSearchMatch3DFirst = upperKeyword.startsWith('M3'); const shouldSearchPuzzleFirst = upperKeyword.startsWith('PZ'); const shouldSearchSquareHoleFirst = upperKeyword.startsWith('SH'); @@ -14236,6 +15215,7 @@ export function PlatformEntryFlowShellImpl({ !shouldSearchBigFishFirst && !shouldSearchJumpHopFirst && !shouldSearchWoodenFishFirst && + !shouldSearchPuzzleClearFirst && !shouldSearchMatch3DFirst && !shouldSearchPuzzleFirst && !shouldSearchSquareHoleFirst && @@ -14250,6 +15230,7 @@ export function PlatformEntryFlowShellImpl({ !shouldSearchBabyObjectFirst && !shouldSearchJumpHopFirst && !shouldSearchWoodenFishFirst && + !shouldSearchPuzzleClearFirst && !shouldSearchMatch3DFirst && !shouldSearchPuzzleFirst && !shouldSearchSquareHoleFirst && @@ -14365,6 +15346,28 @@ export function PlatformEntryFlowShellImpl({ openPublicWorkDetail(mapWoodenFishWorkToPublicWorkDetail(matchedEntry)); }; + const tryOpenPuzzleClearGalleryEntry = async () => { + const entries = + puzzleClearGalleryEntries.length > 0 + ? puzzleClearGalleryEntries + : await refreshPuzzleClearGallery(); + const matchedEntry = entries.find((entry) => { + const detailEntry = mapPuzzleClearWorkToPlatformGalleryCard(entry); + return ( + canExposePublicWork(detailEntry) && + isSamePuzzleClearPublicWorkCode( + normalizedKeyword, + entry.profileId, + ) + ); + }); + + if (!matchedEntry) { + throw new Error('未找到拼消消作品。'); + } + + await openPuzzleClearPublicWorkDetail(matchedEntry.profileId); + }; const tryOpenMatch3DGalleryEntry = async () => { const entries = match3dGalleryEntries.length > 0 @@ -14503,6 +15506,11 @@ export function PlatformEntryFlowShellImpl({ return; } + if (shouldSearchPuzzleClearFirst) { + await tryOpenPuzzleClearGalleryEntry(); + return; + } + if (shouldSearchBabyObjectFirst) { await tryOpenBabyObjectMatchGalleryEntry(); return; @@ -14591,14 +15599,17 @@ export function PlatformEntryFlowShellImpl({ bigFishGalleryEntries, jumpHopGalleryEntries, match3dGalleryEntries, + puzzleClearGalleryEntries, refreshMatch3DGallery, openPuzzlePublicWorkDetail, + openPuzzleClearPublicWorkDetail, openPublicWorkDetail, platformBootstrap.platformTab, puzzleGalleryEntries, refreshBarkBattleGallery, refreshBigFishGallery, refreshJumpHopGallery, + refreshPuzzleClearGallery, refreshWoodenFishGallery, refreshPuzzleGallery, refreshSquareHoleGallery, @@ -14686,6 +15697,19 @@ export function PlatformEntryFlowShellImpl({ return; } + if ( + worldType === 'puzzle-clear' || + worldType === 'puzzle_clear' || + work.worldKey.startsWith('puzzle-clear:') + ) { + const profileId = + work.profileId ?? work.worldKey.replace(/^puzzle-clear:/u, ''); + if (profileId) { + void openPuzzleClearPublicWorkDetail(profileId); + } + return; + } + if ( worldType === 'wooden-fish' || worldType === 'wooden_fish' || @@ -14780,6 +15804,7 @@ export function PlatformEntryFlowShellImpl({ openPuzzlePublicWorkDetail, openPublicWorkDetail, openJumpHopPublicWorkDetail, + openPuzzleClearPublicWorkDetail, openWoodenFishPublicWorkDetail, openRpgPublicWorkDetail, openSquareHolePublicWorkDetail, @@ -14808,6 +15833,7 @@ export function PlatformEntryFlowShellImpl({ void refreshBigFishGallery(); } void refreshJumpHopGallery(); + void refreshPuzzleClearGallery(); void refreshWoodenFishGallery(); void refreshMatch3DGallery(); void refreshPuzzleGallery(); @@ -14825,6 +15851,7 @@ export function PlatformEntryFlowShellImpl({ isVisualNovelCreationOpen, refreshBigFishGallery, refreshJumpHopGallery, + refreshPuzzleClearGallery, refreshWoodenFishGallery, refreshMatch3DGallery, refreshPuzzleGallery, @@ -14841,6 +15868,7 @@ export function PlatformEntryFlowShellImpl({ platformBootstrap.canReadProtectedData ) { void refreshPuzzleShelf(); + void refreshPuzzleClearShelf(); void refreshMatch3DShelf(); if (isSquareHoleCreationVisible) { void refreshSquareHoleShelf(); @@ -14861,6 +15889,7 @@ export function PlatformEntryFlowShellImpl({ refreshBarkBattleShelf, refreshMatch3DShelf, refreshPuzzleShelf, + refreshPuzzleClearShelf, refreshWoodenFishShelf, refreshSquareHoleShelf, refreshVisualNovelShelf, @@ -14919,7 +15948,8 @@ export function PlatformEntryFlowShellImpl({ puzzleShelfError ?? puzzleError ?? (isVisualNovelCreationOpen ? visualNovelError : null) ?? - babyObjectMatchError ?? + babyObjectMatchError ?? + puzzleClearError ?? barkBattleError) } onRetry={() => { @@ -14952,6 +15982,7 @@ export function PlatformEntryFlowShellImpl({ void refreshBigFishShelf(); } void refreshMatch3DShelf(); + void refreshPuzzleClearShelf(); if (isSquareHoleCreationVisible) { void refreshSquareHoleShelf(); } @@ -14971,6 +16002,7 @@ export function PlatformEntryFlowShellImpl({ isBigFishBusy || isMatch3DBusy || (isSquareHoleCreationVisible && isSquareHoleBusy) || + isPuzzleClearBusy || isWoodenFishBusy || isPuzzleBusy || (isVisualNovelCreationOpen && isVisualNovelBusy) || @@ -15010,6 +16042,9 @@ export function PlatformEntryFlowShellImpl({ rpgLibraryEntries={platformBootstrap.savedCustomWorldEntries} bigFishItems={isBigFishCreationVisible ? bigFishShelfItems : []} jumpHopItems={isJumpHopCreationVisible ? jumpHopShelfItems : []} + puzzleClearItems={ + isPuzzleClearCreationVisible ? puzzleClearShelfItems : [] + } woodenFishItems={woodenFishShelfItems} onOpenBigFishDetail={ isBigFishCreationVisible @@ -15039,6 +16074,17 @@ export function PlatformEntryFlowShellImpl({ : null } onDeleteJumpHop={null} + onOpenPuzzleClearDetail={ + isPuzzleClearCreationVisible + ? (item) => { + runProtectedAction(() => { + markCreationFlowReturnToDraftShelf(); + void openPuzzleClearDraft(item); + }); + } + : undefined + } + onDeletePuzzleClear={null} onOpenWoodenFishDetail={(item) => { runProtectedAction(() => { markCreationFlowReturnToDraftShelf(); @@ -15198,6 +16244,11 @@ export function PlatformEntryFlowShellImpl({ isBigFishBusy || (isPuzzleBusy && !(activeRecommendRuntimeKind === 'puzzle' && puzzleRun)) || + (isPuzzleClearBusy && + !( + activeRecommendRuntimeKind === 'puzzle-clear' && + puzzleClearRun + )) || isMatch3DBusy || isSquareHoleBusy || isVisualNovelBusy || @@ -15298,6 +16349,7 @@ export function PlatformEntryFlowShellImpl({ isBusy={ isPublicWorkDetailBusy || isPuzzleBusy || + isPuzzleClearBusy || isBigFishBusy || isMatch3DBusy || isSquareHoleBusy || @@ -15516,6 +16568,7 @@ export function PlatformEntryFlowShellImpl({ )} progress={buildMiniGameDraftGenerationProgress( bigFishGenerationState, + miniGameGenerationProgressNowMs, )} isGenerating={isBigFishBusy} error={bigFishError} @@ -16110,6 +17163,7 @@ export function PlatformEntryFlowShellImpl({ )} progress={buildMiniGameDraftGenerationProgress( squareHoleGenerationState, + miniGameGenerationProgressNowMs, )} isGenerating={isSquareHoleBusy} error={squareHoleError} @@ -16320,6 +17374,7 @@ export function PlatformEntryFlowShellImpl({ )} progress={buildMiniGameDraftGenerationProgress( jumpHopGenerationState, + miniGameGenerationProgressNowMs, )} isGenerating={isJumpHopBusy} error={jumpHopError} @@ -16402,6 +17457,142 @@ export function PlatformEntryFlowShellImpl({ )} + {selectionStage === 'puzzle-clear-workspace' && ( + + } + > + { + void compilePuzzleClearSession(result, payload); + }} + /> + + + )} + + {selectionStage === 'puzzle-clear-generating' && ( + + } + > + { + setSelectionStage('puzzle-clear-workspace'); + }} + onRetry={retryPuzzleClearDraftGeneration} + onInterrupt={undefined} + backLabel="返回创作中心" + settingActionLabel={null} + retryLabel="重新生成草稿" + settingTitle="当前拼消消信息" + settingDescription={null} + progressTitle="拼消消草稿生成进度" + activeBadgeLabel="素材生成中" + pausedBadgeLabel="素材生成已暂停" + idleBadgeLabel="等待返回工作区" + /> + + + )} + + {selectionStage === 'puzzle-clear-result' && + puzzleClearSession?.draft && ( + + } + > + { + setSelectionStage('puzzle-clear-workspace'); + }} + onStartTestRun={startPuzzleClearTestRunFromProfile} + onPublish={publishPuzzleClearDraft} + onRegenerateAtlas={() => { + void regeneratePuzzleClearAtlas(); + }} + /> + + + )} + + {selectionStage === 'puzzle-clear-runtime' && ( + + } + > + { + setSelectionStage(puzzleClearRuntimeReturnStage); + }} + onRetryLevel={() => { + void retryPuzzleClearLevelRun(); + }} + onNextLevel={() => { + void advancePuzzleClearLevelRun(); + }} + onTimeUp={() => { + void markPuzzleClearLevelTimeUp(); + }} + onSwapCards={async (payload) => { + await swapPuzzleClearCardsInRun(payload); + }} + /> + + + )} + {selectionStage === 'wooden-fish-workspace' && ( { + test('ticks while puzzle clear generation is still running', () => { + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'puzzle-clear-generating', + generationState: createMiniGameDraftGenerationState('puzzle-clear'), + }), + ).toBe(true); + }); + + test('stops ticking after puzzle clear generation is ready or failed', () => { + const runningState = createMiniGameDraftGenerationState('puzzle-clear'); + + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'puzzle-clear-generating', + generationState: { ...runningState, phase: 'ready' }, + }), + ).toBe(false); + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'puzzle-clear-generating', + generationState: { ...runningState, phase: 'failed' }, + }), + ).toBe(false); + }); + + test('ticks for other shared mini game generation stages', () => { + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'jump-hop-generating', + generationState: createMiniGameDraftGenerationState('jump-hop'), + }), + ).toBe(true); + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'wooden-fish-generating', + generationState: createMiniGameDraftGenerationState('wooden-fish'), + }), + ).toBe(true); + }); + + test('ticks visual novel generation from its phase source', () => { + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'visual-novel-generating', + visualNovelGenerationStartedAtMs: 1000, + visualNovelGenerationPhase: 'generating', + }), + ).toBe(true); + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'visual-novel-generating', + visualNovelGenerationStartedAtMs: 1000, + visualNovelGenerationPhase: 'ready', + }), + ).toBe(false); + }); + + test('does not tick when no generating stage is active', () => { + expect( + shouldTickPlatformGenerationProgressClock({ + selectionStage: 'platform', + generationState: createMiniGameDraftGenerationState('puzzle-clear'), + }), + ).toBe(false); + }); +}); diff --git a/src/components/platform-entry/platformGenerationProgressClock.ts b/src/components/platform-entry/platformGenerationProgressClock.ts new file mode 100644 index 00000000..dfc6421c --- /dev/null +++ b/src/components/platform-entry/platformGenerationProgressClock.ts @@ -0,0 +1,36 @@ +import type { MiniGameDraftGenerationState } from '../../services/miniGameDraftGenerationProgress'; +import type { SelectionStage } from './platformEntryTypes'; + +type VisualNovelEntryGenerationPhase = 'generating' | 'ready' | 'failed'; + +type PlatformGenerationProgressClockInput = { + selectionStage: SelectionStage; + generationState?: MiniGameDraftGenerationState | null; + visualNovelGenerationStartedAtMs?: number | null; + visualNovelGenerationPhase?: VisualNovelEntryGenerationPhase; +}; + +export function shouldTickPlatformGenerationProgressClock({ + selectionStage, + generationState, + visualNovelGenerationStartedAtMs, + visualNovelGenerationPhase, +}: PlatformGenerationProgressClockInput) { + if (selectionStage === 'visual-novel-generating') { + return ( + visualNovelGenerationStartedAtMs != null && + visualNovelGenerationPhase !== 'ready' && + visualNovelGenerationPhase !== 'failed' + ); + } + + if (!selectionStage.endsWith('-generating')) { + return false; + } + + return Boolean( + generationState && + generationState.phase !== 'ready' && + generationState.phase !== 'failed', + ); +} diff --git a/src/components/puzzle-clear-creation/PuzzleClearWorkspace.test.tsx b/src/components/puzzle-clear-creation/PuzzleClearWorkspace.test.tsx new file mode 100644 index 00000000..3425ddac --- /dev/null +++ b/src/components/puzzle-clear-creation/PuzzleClearWorkspace.test.tsx @@ -0,0 +1,222 @@ +/* @vitest-environment jsdom */ + +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import type { ImgHTMLAttributes } from 'react'; +import { beforeEach, expect, test, vi } from 'vitest'; + +import type { PuzzleClearSessionResponse } from '../../../packages/shared/src/contracts/puzzleClear'; +import { puzzleClearClient } from '../../services/puzzle-clear/puzzleClearClient'; +import { readPuzzleReferenceImageAsDataUrl } from '../../services/puzzleReferenceImage'; +import { PuzzleClearWorkspace } from './PuzzleClearWorkspace'; + +vi.mock('../ResolvedAssetImage', () => ({ + ResolvedAssetImage: ({ + src, + alt, + className, + refreshKey: _refreshKey, + ...rest + }: { + src?: string | null; + alt?: string; + className?: string; + refreshKey?: unknown; + [key: string]: unknown; + }) => + src ? ( + {alt})} + /> + ) : null, +})); + +vi.mock('../../services/puzzleReferenceImage', () => ({ + readPuzzleReferenceImageAsDataUrl: vi.fn(), +})); + +vi.mock('../../services/puzzle-clear/puzzleClearClient', () => ({ + puzzleClearClient: { + createSession: vi.fn(), + }, +})); + +function createSessionResponse(): PuzzleClearSessionResponse { + return { + session: { + sessionId: 'puzzle-clear-session-1', + ownerUserId: 'user-1', + status: 'draft', + draft: { + templateId: 'puzzle-clear', + templateName: '拼消消', + profileId: null, + workTitle: '星港拼消消', + workDescription: '霓虹星港主题', + themePrompt: '霓虹星港', + boardBackgroundPrompt: '星港中央棋盘底图', + generateBoardBackground: false, + boardBackgroundAsset: null, + cardBackImageSrc: '/creation-type-references/puzzle-clear-card-back.webp', + atlasAsset: null, + patternGroups: [], + cardAssets: [], + generationStatus: 'draft', + }, + createdAt: '2026-05-30T00:00:00.000Z', + updatedAt: '2026-05-30T00:00:00.000Z', + }, + }; +} + +beforeEach(() => { + vi.mocked(puzzleClearClient.createSession).mockReset(); + vi.mocked(readPuzzleReferenceImageAsDataUrl).mockReset(); +}); + +test('工作台提交结构化表单与底图槽位 payload', async () => { + const response = createSessionResponse(); + const onSubmitted = vi.fn(); + vi.mocked(puzzleClearClient.createSession).mockResolvedValue(response); + vi.mocked(readPuzzleReferenceImageAsDataUrl).mockResolvedValue( + 'data:image/png;base64,board-background', + ); + + render( + , + ); + + fireEvent.change(screen.getByLabelText('作品标题'), { + target: { value: ' 星港拼消消 ' }, + }); + fireEvent.change(screen.getByLabelText('简介'), { + target: { value: ' 霓虹星港主题 ' }, + }); + fireEvent.change(screen.getByLabelText('主题词'), { + target: { value: ' 霓虹星港 ' }, + }); + fireEvent.change(screen.getByLabelText('场地底图'), { + target: { value: '星港中央棋盘底图' }, + }); + fireEvent.change(screen.getByLabelText('上传底图'), { + target: { + files: [ + new File(['fake-image'], 'board.png', { + type: 'image/png', + }), + ], + }, + }); + + await waitFor(() => + expect(readPuzzleReferenceImageAsDataUrl).toHaveBeenCalledTimes(1), + ); + + fireEvent.click(screen.getByRole('button', { name: '生成' })); + + await waitFor(() => + expect(puzzleClearClient.createSession).toHaveBeenCalledWith({ + templateId: 'puzzle-clear', + workTitle: '星港拼消消', + workDescription: '霓虹星港主题', + themePrompt: '霓虹星港', + boardBackgroundPrompt: '星港中央棋盘底图', + generateBoardBackground: false, + boardBackgroundAsset: expect.objectContaining({ + imageSrc: 'data:image/png;base64,board-background', + generationProvider: 'local-upload', + prompt: '星港中央棋盘底图', + }), + }), + ); + expect(onSubmitted).toHaveBeenCalledWith( + response, + expect.objectContaining({ + templateId: 'puzzle-clear', + workTitle: '星港拼消消', + themePrompt: '霓虹星港', + }), + ); +}); + +test('工作台不渲染聊天式 Agent 输入', () => { + render( + , + ); + + expect(screen.queryByText(/发送消息|聊天|对话|输入想法/u)).toBeNull(); +}); + +test('关闭 AI 生成底图且未上传底图时不允许提交', async () => { + render( + , + ); + + fireEvent.change(screen.getByLabelText('作品标题'), { + target: { value: '星港拼消消' }, + }); + fireEvent.change(screen.getByLabelText('主题词'), { + target: { value: '霓虹星港' }, + }); + fireEvent.click(screen.getByRole('checkbox', { name: 'AI 生成底图' })); + + expect( + (screen.getByRole('button', { name: '生成' }) as HTMLButtonElement).disabled, + ).toBe(true); + + fireEvent.click(screen.getByRole('button', { name: '生成' })); + + await waitFor(() => + expect(puzzleClearClient.createSession).not.toHaveBeenCalled(), + ); +}); + +test('工作台支持原生表单提交生成', async () => { + const response = createSessionResponse(); + const onSubmitted = vi.fn(); + vi.mocked(puzzleClearClient.createSession).mockResolvedValue(response); + + render( + , + ); + + fireEvent.change(screen.getByLabelText('作品标题'), { + target: { value: '星港拼消消' }, + }); + fireEvent.change(screen.getByLabelText('主题词'), { + target: { value: '霓虹星港' }, + }); + fireEvent.change(screen.getByLabelText('场地底图'), { + target: { value: '星港中央棋盘底图' }, + }); + + const submitButton = screen.getByRole('button', { name: '生成' }); + const form = submitButton.closest('form'); + expect(form).toBeTruthy(); + fireEvent.submit(form!); + + await waitFor(() => + expect(puzzleClearClient.createSession).toHaveBeenCalledTimes(1), + ); + expect(onSubmitted).toHaveBeenCalledWith( + response, + expect.objectContaining({ + templateId: 'puzzle-clear', + workTitle: '星港拼消消', + }), + ); +}); diff --git a/src/components/puzzle-clear-creation/PuzzleClearWorkspace.tsx b/src/components/puzzle-clear-creation/PuzzleClearWorkspace.tsx new file mode 100644 index 00000000..75734d04 --- /dev/null +++ b/src/components/puzzle-clear-creation/PuzzleClearWorkspace.tsx @@ -0,0 +1,326 @@ +import { ArrowLeft, Loader2, Send } from 'lucide-react'; +import { useMemo, useState } from 'react'; + +import type { + PuzzleClearImageAsset, + PuzzleClearSessionResponse, + PuzzleClearWorkspaceCreateRequest, +} from '../../../packages/shared/src/contracts/puzzleClear'; +import { puzzleClearClient } from '../../services/puzzle-clear/puzzleClearClient'; +import { readPuzzleReferenceImageAsDataUrl } from '../../services/puzzleReferenceImage'; +import { CreativeImageInputPanel } from '../common/CreativeImageInputPanel'; + +type PuzzleClearWorkspaceProps = { + isBusy?: boolean; + error?: string | null; + onBack: () => void; + onSubmitted: ( + result: PuzzleClearSessionResponse, + payload: PuzzleClearWorkspaceCreateRequest, + ) => void; +}; + +type PuzzleClearWorkspaceFormState = { + workTitle: string; + workDescription: string; + themePrompt: string; + boardBackgroundPrompt: string; + boardBackgroundAsset: PuzzleClearImageAsset | null; + boardBackgroundImageSrc: string; + generateBoardBackground: boolean; +}; + +const DEFAULT_FORM_STATE: PuzzleClearWorkspaceFormState = { + workTitle: '', + workDescription: '', + themePrompt: '', + boardBackgroundPrompt: '', + boardBackgroundAsset: null, + boardBackgroundImageSrc: '', + generateBoardBackground: true, +}; + +function buildLocalBoardBackgroundAsset( + imageSrc: string, + prompt: string, +): PuzzleClearImageAsset { + return { + assetId: `local-board-background-${Date.now()}`, + imageSrc, + imageObjectKey: '', + assetObjectId: '', + generationProvider: 'local-upload', + prompt, + width: 0, + height: 0, + }; +} + +export function PuzzleClearWorkspace({ + isBusy = false, + error = null, + onBack, + onSubmitted, +}: PuzzleClearWorkspaceProps) { + const [formState, setFormState] = useState(DEFAULT_FORM_STATE); + const [localError, setLocalError] = useState(null); + const [isSubmitting, setIsSubmitting] = useState(false); + const hasBoardBackgroundInput = useMemo( + () => + formState.generateBoardBackground || + Boolean(formState.boardBackgroundAsset || formState.boardBackgroundImageSrc), + [ + formState.boardBackgroundAsset, + formState.boardBackgroundImageSrc, + formState.generateBoardBackground, + ], + ); + + const canSubmit = useMemo( + () => + Boolean( + formState.workTitle.trim() && + formState.themePrompt.trim() && + hasBoardBackgroundInput, + ), + [formState.themePrompt, formState.workTitle, hasBoardBackgroundInput], + ); + + const handleSubmit = async () => { + if (!canSubmit || isSubmitting || isBusy) { + setLocalError('请先补全输入。'); + return; + } + + setIsSubmitting(true); + setLocalError(null); + + try { + const boardBackgroundAsset = + formState.boardBackgroundAsset ?? + (formState.boardBackgroundImageSrc + ? buildLocalBoardBackgroundAsset( + formState.boardBackgroundImageSrc, + formState.boardBackgroundPrompt.trim() || + formState.themePrompt.trim(), + ) + : null); + const payload: PuzzleClearWorkspaceCreateRequest = { + templateId: 'puzzle-clear', + workTitle: formState.workTitle.trim(), + workDescription: formState.workDescription.trim(), + themePrompt: formState.themePrompt.trim(), + boardBackgroundPrompt: formState.boardBackgroundPrompt.trim(), + generateBoardBackground: formState.generateBoardBackground, + boardBackgroundAsset, + }; + const response = await puzzleClearClient.createSession(payload); + onSubmitted(response, payload); + } catch (caughtError) { + setLocalError( + caughtError instanceof Error ? caughtError.message : '创建草稿失败。', + ); + } finally { + setIsSubmitting(false); + } + }; + + return ( +
{ + event.preventDefault(); + void handleSubmit(); + }} + className="platform-remap-surface mx-auto flex h-full min-h-0 w-full max-w-5xl flex-col px-3 pb-3 pt-3 sm:px-4 sm:pt-4" + > +
+ +
+ +
+
+ + +