gamekit777 0.1.2 → 0.1.5

package/studio/app/panels/PublishPanel.svelte

@@ -1,58 +1,43 @@
 <script lang="ts">
-  /* 发布：身份是从站点借来的那个人（见 lib/identity.svelte.ts；/v1 同源反代，cookie 由浏览器带）。
-     node 侧只排队和记录；MCP 发起的请求也落在这里，作者点确认才真传。发布不可逆。 */
+  /* 发布：node 侧一键跑完（vite build → 传包 → 传表 → 发布），页面只发起、看进度、看历史。
+     身份是从站点借来的那个人（lib/identity.svelte.ts）；页面一连上，反代就把 cookie 抄给了 node，
+     所以 MCP 的 publish 和这里的按钮走的是同一条路、同一个身份。发布不可逆。 */
   import { onMount } from 'svelte';
-  import type { GameModule } from 'gamekit777/sdk';
-  import game from 'virtual:studio/game';
+  import type { PublishPreflight, PublishRequest } from '../../src/engine.ts';
   import { api, type Info } from '../lib/api.ts';
   import { bus } from '../lib/bus.svelte.ts';
   import { identity } from '../lib/identity.svelte.ts';
-  import { planFromArtifacts, runUpload } from '../lib/upload.ts';
 
   let { info }: { info: Info } = $props();
-  const spec = $derived(info.snapshot.spec);
   const me = $derived(identity.me);
   let note = $state('');
-  let running = $state<string | null>(null);
-  let log = $state<string[]>([]);
+  let running = $state(false);
+  let pre = $state<PublishPreflight | null>(null);
+  let checking = $state(false);
 
   const reqs = $derived(Object.values(bus.publish).sort((a, b) => b.createdAt - a.createdAt));
-  const pct = (ppm: number) => `${(ppm / 1e4).toFixed(4)}%`;
 
-  onMount(() => { void identity.refresh(); void api.publishList().then((l) => { for (const r of l) bus.publish = { ...bus.publish, [r.id]: r }; }); });
+  async function check() {
+    checking = true;
+    try { pre = await api.publishPreflight(); } catch (e) { pre = { ok: false, issues: [e instanceof Error ? e.message : String(e)], warnings: [], artifacts: [], session: false, remote: null }; }
+    finally { checking = false; }
+  }
 
-  const lowest = $derived(info.artifacts.reduce<number | null>((m, a) => (m === null || a.computedRtpPpm < m ? a.computedRtpPpm : m), null));
-  const localIssues = $derived.by(() => {
-    const out: string[] = [];
-    const declared = Math.round(spec.rtp * 1e6);
-    if (!info.artifacts.length) out.push('当前指纹下没有已建的表');
-    if (lowest !== null && lowest + 100 < declared) out.push(`最低实算 RTP ${pct(lowest)} 低于游戏声明 ${pct(declared)}，平台会拒`);
-    const miss = spec.modes.filter((m) => !info.artifacts.some((a) => a.mode === m.name));
-    if (miss.length) out.push(`未建：${miss.map((m) => m.name).join('、')}`);
-    return out;
+  onMount(() => {
+    void identity.refresh().then(check);
+    void api.publishList().then((l) => { for (const r of l) bus.publish = { ...bus.publish, [r.id]: r }; });
   });
 
-  async function approve(id: string) {
-    const req = bus.publish[id]; if (!req) return;
-    running = id; log = [];
-    const say = (m: string) => { log = [...log, m]; void api.publishUpdate(id, { progress: [...(bus.publish[id]?.progress ?? []), m] }); };
-    await api.publishUpdate(id, { status: 'running' });
+  async function publish() {
+    running = true;
     try {
-      const arts = req.modes ? info.artifacts.filter((a) => req.modes!.includes(a.mode)) : info.artifacts;
-      if (!arts.length) throw new Error('没有可发布的表');
-      say(`拼装 ${arts.length} 张表…`);
-      const plan = await planFromArtifacts(game as GameModule<object, unknown>, arts);
-      const r = await runUpload(plan, { publishModes: req.modes ?? undefined, onProgress: say });
-      await api.publishUpdate(id, { status: 'published', result: { gameId: r.game.id, slug: r.game.slug, verifiedRtpPpm: r.game.verifiedRtpPpm, modes: r.tables.map((t) => t.mode) } });
-      say(`✅ 已发布 ${r.game.slug}（${r.game.id}）`);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      await api.publishUpdate(id, { status: 'failed', error: msg });
-      say(`✗ ${msg}`);
-    } finally { running = null; }
+      const job = await api.publishRequest(null, note || null);
+      note = '';
+      await api.waitJob(job.id);
+      await check();
+    } finally { running = false; }
   }
-  const reject = (id: string) => api.publishUpdate(id, { status: 'rejected' });
-  const request = () => api.publishRequest(null, note || null).then(() => { note = ''; });
+  const label = (r: PublishRequest) => r.status === 'running' ? '进行中' : r.status === 'published' ? '已发布' : '失败';
 </script>
 
 <div class="grid">
@@ -60,7 +45,7 @@
     <h2>身份</h2>
     {#if me}
       <p>{me.user.isAnonymous ? '游客' : me.user.name ?? '玩家'} <span class="mono hint">{me.user.id.slice(0, 8)}…</span> · 余额 {me.wallet.balanceCents}</p>
-      <p class="hint">这就是你在 {info.urls.site} 上的身份，发布出来的游戏归它。{#if me.user.isAnonymous}匿名身份换浏览器就丢了——要长期用，先在站点上登录，再回来重新连接。{/if}</p>
+      <p class="hint">这就是你在 {info.urls.site} 上的身份，发布出来的游戏归它。页面连上后 node 侧也记住了它，AI 用 publish 工具时不用再来点确认。{#if me.user.isAnonymous}匿名身份换浏览器就丢了——要长期用，先在站点上登录，再回来重新连接。{/if}</p>
       <button class="sec" onclick={() => identity.redirect(info.urls.site)}>换个身份 / 重新连接</button>
     {:else}
       <p class="hint">{identity.error ?? '没有身份'}</p>
@@ -69,28 +54,36 @@
   </div>
 
   <div class="card">
-    <h2>本地体检</h2>
-    {#if localIssues.length}{#each localIssues as i (i)}<p class="bad">✗ {i}</p>{/each}{:else}<p class="ok">✓ {info.artifacts.length} 张表就绪，最低实算 RTP {lowest !== null ? pct(lowest) : '-'}</p>{/if}
-    <div class="row"><input placeholder="说明（可空）" bind:value={note} style="flex:1" /><button class="pri" onclick={request} disabled={!!localIssues.length}>发起发布请求</button></div>
+    <h2>体检</h2>
+    <p class="hint">游戏在平台上按 <span class="mono">game.meta.json</span> 的 gameId 绑定：{info.gameId ? `${info.gameId}` : '还没有，第一次发布会新建并写回'}。改名只改 id / title。</p>
+    {#if checking}<p class="hint">检查中…</p>
+    {:else if pre}
+      {#each pre.issues as i (i)}<p class="bad">✗ {i}</p>{/each}
+      {#each pre.warnings as w (w)}<p class="warn">⚠ {w}</p>{/each}
+      {#if pre.ok}<p class="ok">✓ {pre.artifacts.length} 张表就绪{#if pre.remote}，这次会发布：{pre.remote.willPublish.join('、') || '（无新表，只换包）'}{/if}</p>{/if}
+      {#if pre.remote?.game}<p class="hint">平台上的游戏：{pre.remote.game.slug}（{pre.remote.game.status}），已生效 mode：{pre.remote.game.liveModes.join('、') || '无'}</p>{/if}
+    {/if}
+    <div class="row">
+      <input placeholder="说明（可空，记进发布记录）" bind:value={note} style="flex:1" />
+      <button class="sec" onclick={check} disabled={checking || running}>重新体检</button>
+      <button class="pri" onclick={publish} disabled={running || !pre?.ok} title="不可逆：已生效的 mode 不能再换表">{running ? '发布中…' : '发布'}</button>
+    </div>
   </div>
 
   <div class="card">
-    <h2>发布请求</h2>
-    {#if !reqs.length}<p class="hint">没有待处理的请求。AI 用 publish 工具发起的请求会出现在这里。</p>{/if}
+    <h2>发布记录</h2>
+    {#if !reqs.length}<p class="hint">还没有发布过。AI 用 publish 工具发的也会出现在这里。</p>{/if}
     {#each reqs as r (r.id)}
-      <div class="req" class:active={r.status === 'awaiting-approval'}>
+      <div class="req" class:active={r.status === 'running'}>
         <div class="row">
           <b class="mono">{r.id}</b><span class="hint">来自 {r.from} · {new Date(r.createdAt).toLocaleTimeString()}</span>
-          <span class:ok={r.status === 'published'} class:bad={r.status === 'failed' || r.status === 'rejected'} class:warn={r.status === 'awaiting-approval'}>{r.status}</span>
+          <span class:ok={r.status === 'published'} class:bad={r.status === 'failed'} class:warn={r.status === 'running'}>{label(r)}</span>
           <span style="flex:1"></span>
-          {#if r.status === 'awaiting-approval'}
-            <button class="pri" onclick={() => approve(r.id)} disabled={!!running || !me || !!localIssues.length} title="不可逆：已生效的 mode 不能再换表">确认发布{r.modes ? `（${r.modes.join('、')}）` : '（全部）'}</button>
-            <button class="sec" onclick={() => reject(r.id)}>拒绝</button>
-          {/if}
+          {#if r.result}<a href={r.result.playUrl} target="_blank" rel="noreferrer">试玩</a>{/if}
         </div>
         {#if r.note}<p class="hint">{r.note}</p>{/if}
         {#if r.error}<p class="bad">{r.error}</p>{/if}
-        {#if running === r.id && log.length}<pre>{log.join('\n')}</pre>{:else if r.progress.length}<pre>{r.progress.join('\n')}</pre>{/if}
+        {#if r.progress.length}<pre>{r.progress.join('\n')}</pre>{/if}
       </div>
     {/each}
   </div>

package/studio/bin.ts

@@ -37,11 +37,13 @@ const placeholder = { studio: '', preview: '', backend: cfg.backendUrl, site: cf
 const engine = new Engine(cfg.gameDir, placeholder);
 
 const server = await startGameServer({
+  onSession: (c) => engine.rememberSession(c),
   gameDir: cfg.gameDir, studioRoot: cfg.studioRoot, port: cfg.gamePort, backendUrl, engine, quiet: mcpMode,
 });
 const base = (server.resolvedUrls?.local[0] ?? `http://127.0.0.1:${cfg.gamePort}/`).replace(/\/$/, '');
 placeholder.studio = `${base}${PAGE_PATH}`;
 placeholder.preview = `${base}${PREVIEW_PATH}`;
+engine.syncAssetsInBackground();
 
 let mcp: Awaited<ReturnType<typeof serveStdio>> | null = null;
 if (mcpMode) mcp = await serveStdio(engine);

package/studio/src/api.ts

@@ -93,6 +93,17 @@ export function createApi(engine: Engine): (req: IncomingMessage, res: ServerRes
     return undefined;
   });
 
+  /* 游戏包：dist/ 里的文件清单与字节，页面用浏览器身份传到平台 */
+  on('GET', '/bundle', () => engine.bundleFiles());
+  on('GET', '/bundle/file', (req, res) => {
+    const path = new URL(req.url!, 'http://x').searchParams.get('path') ?? '';
+    const bytes = engine.bundleFile(path);
+    if (!bytes) { json(res, 404, { error: `dist/ 里没有 ${path}` }); return undefined; }
+    res.writeHead(200, { 'Content-Type': 'application/octet-stream', 'Access-Control-Allow-Origin': '*' });
+    res.end(bytes);
+    return undefined;
+  });
+
   /* 长任务 */
   on('GET', '/jobs', () => engine.jobs.list());
   on('GET', '/jobs/:id', (_r, res, p) => {
@@ -111,16 +122,18 @@ export function createApi(engine: Engine): (req: IncomingMessage, res: ServerRes
   on('POST', '/cases/bless', (_r, _s, _p, body) => ({ blessed: engine.cases.bless((body as { updates: never[] }).updates) }));
   on('DELETE', '/cases/:id', (_r, _s, p) => ({ removed: engine.cases.remove(p.id!) }));
 
-  /* 发布 */
+  /* 动画库：列表 / 详情（源码 + NOTES + 预览用的绝对路径）/ 复制进游戏 / 手动同步 */
+  on('GET', '/assets', () => ({ entries: engine.assets.list(), syncedAt: engine.assets.syncedAt }));
+  on('GET', '/assets/:name', (_r, _s, p) => engine.assets.show(p.name!));
+  on('POST', '/assets/:name/use', (_r, _s, p, body) => engine.assets.use(p.name!, { force: !!(body as { force?: boolean } | null)?.force }));
+  on('POST', '/assets/sync', async () => ({ result: await engine.assets.sync(), entries: engine.assets.list() }));
+
+  /* 发布：node 侧一键跑完（身份是反代抄下来的站点 cookie），页面只发起和看进度 */
   on('GET', '/publish', () => engine.publishRequests());
+  on('GET', '/publish/preflight', () => engine.publishPreflight(null));
   on('POST', '/publish/request', (_r, _s, _p, body) => {
     const b = (body ?? {}) as { modes?: unknown; note?: string };
-    return engine.requestPublish(list(b.modes), b.note ?? null, 'page');
-  });
-  on('POST', '/publish/:id', (_r, res, p, body) => {
-    const r = engine.updatePublish(p.id!, body as never);
-    if (!r) { json(res, 404, { error: `没有发布请求 ${p.id}` }); return undefined; }
-    return r;
+    return engine.publish(list(b.modes), { note: b.note ?? null, from: 'page' });
   });
 
   return (req, res, next) => {

package/studio/src/assets.ts

@@ -0,0 +1,160 @@
+/* 资源库（动画 + 套路）在创作者机器上的那一半：后台拉、按哈希存、给页面预览、给 AI 查看、复制进游戏。
+ *
+ * 内容按内容寻址存在 ~/.gamekit/assets/<hash>/，跨项目共用、永不失效；index.json 的本地副本是目录。
+ * 拉下来的每个文件都按目录里的 sha256 核一遍，对不上就不落盘——目录走 TLS 从平台来，文件的完整性挂在它上面。
+ * 游戏用它是**复制**不是依赖：库里删一条，已经复制进游戏的副本照常构建。
+ * 两种条目只在 use() 上分叉：动画是一个文件，套路是一个目录（Demo 和范例不进游戏）。 */
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { Sha256 } from 'gamekit777/sdk/hash';
+import {
+  ASSET_INDEX_PATH, AssetIndex, assetCopyFiles, assetFilePath, assetPreviewFile, assetTargetDir,
+  type AssetIndexEntry, type AssetKind,
+} from 'gamekit777/protocol';
+
+export const assetsDir = (): string => process.env.GAMEKIT_ASSETS_DIR ?? join(homedir(), '.gamekit', 'assets');
+
+export interface AssetSyncResult { added: string[]; removed: string[]; total: number; at: number }
+
+export interface AssetShown {
+  entry: AssetIndexEntry;
+  notes: string;
+  /** 除 asset.json / NOTES.md 之外的全部文件正文，按目录顺序。动画就一个，套路是机制 + Demo + 范例 */
+  files: { path: string; text: string; copied: boolean }[];
+  /** 预览要挂的组件（动画本身 / 套路的 Demo）的绝对路径，页面用 /@fs 让 vite 现场编译 */
+  previewPath: string;
+  /** 复制进游戏后落在哪（相对游戏目录） */
+  target: string;
+}
+
+export interface UseResult { path: string; written: boolean; reason?: string; files: string[] }
+
+export class AssetStore {
+  readonly dir: string;
+  #index: AssetIndex | null = null;
+  #syncedAt = 0;
+  #syncing: Promise<AssetSyncResult | null> | null = null;
+
+  constructor(readonly backendUrl: string, readonly gameDir: string, private readonly onChange: (r: AssetSyncResult) => void, dir = assetsDir()) {
+    this.dir = dir;
+    mkdirSync(dir, { recursive: true });
+    this.#index = this.#readLocal();
+  }
+
+  get syncedAt(): number { return this.#syncedAt; }
+
+  #readLocal(): AssetIndex | null {
+    try { return AssetIndex.parse(JSON.parse(readFileSync(join(this.dir, 'index.json'), 'utf8'))); }
+    catch { return null; }
+  }
+
+  list(kind?: AssetKind): AssetIndexEntry[] {
+    const all = this.#index?.entries ?? [];
+    return kind ? all.filter((e) => e.kind === kind) : all;
+  }
+
+  get(name: string): AssetIndexEntry | null { return this.list().find((e) => e.name === name) ?? null; }
+
+  filePath(entry: AssetIndexEntry, path: string): string { return join(this.dir, entry.hash, path); }
+
+  /** 后台拉一次。并发调用共用同一次；失败（离线、平台没发过库）返回 null，本地目录照旧可用 */
+  sync(): Promise<AssetSyncResult | null> {
+    if (this.#syncing) return this.#syncing;
+    this.#syncing = this.#sync().finally(() => { this.#syncing = null; });
+    return this.#syncing;
+  }
+
+  async #sync(): Promise<AssetSyncResult | null> {
+    let remote: AssetIndex;
+    try {
+      const r = await fetch(`${this.backendUrl}${ASSET_INDEX_PATH}`);
+      if (!r.ok) return null;
+      remote = AssetIndex.parse(await r.json());
+    } catch { return null; }
+
+    const before = new Map(this.list().map((e) => [e.name, e.hash]));
+    const added: string[] = [];
+    for (const e of remote.entries) {
+      if (this.#complete(e)) { if (before.get(e.name) !== e.hash) added.push(e.name); continue; }
+      const tmp = join(this.dir, `.${e.hash}.part`);
+      rmSync(tmp, { recursive: true, force: true });
+      for (const f of e.files) {
+        const r = await fetch(`${this.backendUrl}${assetFilePath(e.hash, f.path)}`);
+        if (!r.ok) throw new Error(`拉 ${e.name}/${f.path} 失败：${r.status}`);
+        const bytes = new Uint8Array(await r.arrayBuffer());
+        const got = new Sha256().update(bytes).hex();
+        if (got !== f.sha256) throw new Error(`${e.name}/${f.path} 的 sha256 对不上目录（${got.slice(0, 8)} ≠ ${f.sha256.slice(0, 8)}），不落盘`);
+        mkdirSync(dirname(join(tmp, f.path)), { recursive: true });
+        writeFileSync(join(tmp, f.path), bytes);
+      }
+      rmSync(join(this.dir, e.hash), { recursive: true, force: true });
+      // 整条文件齐了再改名到位：vite 看到的目录要么完整要么没有
+      renameDir(tmp, join(this.dir, e.hash));
+      added.push(e.name);
+    }
+    const names = new Set(remote.entries.map((e) => e.name));
+    const removed = [...before.keys()].filter((n) => !names.has(n));
+
+    writeFileSync(join(this.dir, 'index.json'), `${JSON.stringify(remote, null, 2)}\n`);
+    this.#index = remote;
+    this.#syncedAt = Date.now();
+    const result = { added, removed, total: remote.entries.length, at: this.#syncedAt };
+    if (added.length || removed.length) this.onChange(result);
+    return result;
+  }
+
+  #complete(e: AssetIndexEntry): boolean {
+    const d = join(this.dir, e.hash);
+    if (!existsSync(d)) return false;
+    const have = new Set(readdirSync(d));
+    return e.files.every((f) => have.has(f.path));
+  }
+
+  show(name: string): AssetShown {
+    const entry = this.get(name);
+    if (!entry) throw new Error(`资源库里没有 ${name}。有的是：${this.list().map((e) => `${e.name}（${e.kind}）`).join('、') || '（空，先等后台同步或检查后端）'}`);
+    const read = (p: string): string => readFileSync(this.filePath(entry, p), 'utf8');
+    const paths = entry.files.map((f) => f.path);
+    const copied = new Set(assetCopyFiles(entry, paths));
+    return {
+      entry, notes: read('NOTES.md'),
+      files: paths.filter((p) => p !== 'asset.json' && p !== 'NOTES.md').map((p) => ({ path: p, text: read(p), copied: copied.has(p) })),
+      previewPath: this.filePath(entry, assetPreviewFile(entry)),
+      target: entry.kind === 'animation' ? `${assetTargetDir('animation')}/${entry.component}` : `${assetTargetDir('pattern')}/${entry.name}/`,
+    };
+  }
+
+  /**
+   * 复制进游戏，每个文件头注来源与哈希。
+   * 动画 → src/animations/<Component>.svelte；套路 → src/patterns/<name>/ 下的机制文件（Demo、范例不进）。
+   * 目标已有且内容不同时拒绝，除非 force——那是创作者改过的副本，不能静默覆盖
+   */
+  use(name: string, o: { force?: boolean } = {}): UseResult {
+    const s = this.show(name);
+    const e = s.entry;
+    const tag = `来自 GameKit 资源库 ${e.kind === 'animation' ? 'animations' : 'patterns'}/${e.name}@${e.hash.slice(0, 12)}。这是你的副本，随意改；库更新不会动它`;
+    const header = (p: string): string => p.endsWith('.svelte') ? `<!-- ${tag} -->\n` : p.endsWith('.ts') ? `// ${tag}\n` : '';
+    const destDir = e.kind === 'animation' ? join(this.gameDir, assetTargetDir('animation')) : join(this.gameDir, assetTargetDir('pattern'), e.name);
+    const plan = s.files.filter((f) => f.copied).map((f) => ({ path: f.path, dest: join(destDir, f.path), content: header(f.path) + f.text }));
+    const shownPath = e.kind === 'animation' ? plan[0]!.dest : destDir;
+
+    const existing = plan.filter((f) => existsSync(f.dest));
+    if (existing.length === plan.length && existing.every((f) => readFileSync(f.dest, 'utf8') === f.content)) {
+      return { path: shownPath, written: false, reason: '已有同一份', files: plan.map((f) => f.path) };
+    }
+    const changed = existing.filter((f) => readFileSync(f.dest, 'utf8') !== f.content);
+    if (changed.length && !o.force) {
+      return { path: shownPath, written: false, reason: `已有同名文件且内容不同（你改过？）：${changed.map((f) => f.path).join('、')}。确定要覆盖就 force`, files: plan.map((f) => f.path) };
+    }
+    mkdirSync(destDir, { recursive: true });
+    for (const f of plan) writeFileSync(f.dest, f.content);
+    return { path: shownPath, written: true, files: plan.map((f) => f.path) };
+  }
+}
+
+function renameDir(from: string, to: string): void {
+  // 同一目录下 rename 不会跨设备；万一失败就复制再删
+  try { renameSync(from, to); }
+  catch { cpSync(from, to, { recursive: true }); rmSync(from, { recursive: true, force: true }); }
+}

package/studio/src/bus.ts

@@ -14,7 +14,8 @@ export type BusEvent =
   | { t: 'cmd'; id: string; cmd: unknown }
   | { t: 'cases'; changed: true }
   | { t: 'build'; artifacts: unknown }
-  | { t: 'publish'; request: unknown };
+  | { t: 'publish'; request: unknown }
+  | { t: 'assets'; added: string[]; removed: string[]; total: number };
 
 interface Waiter { resolve: (v: unknown) => void; reject: (e: Error) => void; timer: ReturnType<typeof setTimeout> }