Compare commits
88 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 47f5be12c0 | |||
| 7c76e7a3f2 | |||
| 84bb9ffd28 | |||
| ff89951a9b | |||
| c0d4e76a01 | |||
| b0bb71a79e | |||
| d95a01cf08 | |||
| 4f2591b50a | |||
| 8e92bd2952 | |||
| fb6e00c966 | |||
| d3822a9a19 | |||
| a4be08d511 | |||
| e901937bb4 | |||
| 827164ed70 | |||
| 0b1caf7280 | |||
| a943048093 | |||
| 46c8573b0e | |||
| 71a17d6096 | |||
| 97b0a4b9b8 | |||
| e3ba986596 | |||
| 69af571242 | |||
| 166977baf0 | |||
| 5c58830545 | |||
| 14c2255d54 | |||
| f8f0479488 | |||
| a06c7d7f1e | |||
| c38e4b4175 | |||
| f3c362b1ec | |||
| fc53f362e4 | |||
| 8988e91ee9 | |||
| 784f38220b | |||
| 44798ba380 | |||
| 2d679122cf | |||
| 4cbbcecaa2 | |||
| 98bfa5efd0 | |||
| ab472b4562 | |||
| 1a1f124acd | |||
| 4dc199cf33 | |||
| ef34e0ed64 | |||
| 786898f7f8 | |||
| e880f58723 | |||
| 6f19e155ca | |||
| 6e9f991a76 | |||
| a6f99c8871 | |||
| 27e3d9bfd0 | |||
| c6f90c5b22 | |||
| 3b137ca369 | |||
| 3da0936c1f | |||
| c8311a47b0 | |||
| 1c1deff732 | |||
| 0459109897 | |||
| 6318baf7c6 | |||
| 28e6e67e98 | |||
| 4415723f7f | |||
| fa84a364d6 | |||
| bd0a06e3d3 | |||
| 939c35a9b9 | |||
| 42fdb57efe | |||
| 0c54cca81c | |||
| 1a2e60bf05 | |||
| 5ce267ae85 | |||
| 8924bf335e | |||
| ae257a6ff8 | |||
| ff4f42d2f2 | |||
| 2e2ed47bec | |||
| dedc58cce1 | |||
| c86ac04220 | |||
| 0817ea8158 | |||
| e393a803f2 | |||
| 89587c9e9e | |||
| 5cba2dbeb7 | |||
| d3407e8910 | |||
| 4888a0eb01 | |||
| 90b77d6bd0 | |||
| 1c950df116 | |||
| 6c33459b90 | |||
| 874d061cb9 | |||
| fa2b36654b | |||
| 345c9c3a99 | |||
| 99081455ee | |||
| 5b1b0ddb9a | |||
| f4315ffd23 | |||
| beb3c99240 | |||
| 1574f206a2 | |||
| 1367e9c04e | |||
| b294cbc3db | |||
| c34d24c2c8 | |||
| 0dbc34d13c |
-11
@@ -41,14 +41,3 @@
|
|||||||
## 注意
|
## 注意
|
||||||
|
|
||||||
不同 enum 的 variant 顺序必须以生成 binding 或 module 源码为准,不能复用其他 enum 的索引映射。
|
不同 enum 的 variant 顺序必须以生成 binding 或 module 源码为准,不能复用其他 enum 的索引映射。
|
||||||
|
|
||||||
## 通用表查询页的枚举展示(2026-09-23 起)
|
|
||||||
|
|
||||||
后台“表查询”(`#tables`)不再逐表硬编码枚举映射,改为按 schema 自动解析:
|
|
||||||
|
|
||||||
- api-server 在 `server-rs/crates/api-server/src/admin.rs` 读取 schema 的 `typespace.types` 和表的 `product_type_ref`,对每个“`Sum` 且所有变体都是单元变体(`Product.elements` 为空)”的列生成 `列名 -> [按变体索引排列的展示名]`,变体名归一到 snake_case。
|
|
||||||
- `Option<枚举>` 列单独标记为可空:`[0, [索引, []]]` 出变体名,`[1, []]` 仍是空值。`Option<普通值>` 与带载荷的 Sum 直接跳过,交回通用解码,避免把普通 `Option` 列误标成枚举名。
|
|
||||||
- 映射同时应用到 `cells` 与 `raw`,因此关键词搜索、结构化筛选、稳定排序解析到的都是展示名。
|
|
||||||
- 单变体枚举也要出名字;变体索引顺序以 schema 为准,不依赖生成 binding 的副本。
|
|
||||||
|
|
||||||
因此新增表或新增枚举列无需再改后端映射,只要模块已发布且 schema 可读;如果 schema 读取失败,表查询会以“表不存在”失败,而不是退回展示数字。定向验证:`cargo test -p api-server --manifest-path server-rs/Cargo.toml --bin api-server admin_database`。
|
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ Use OpenAPI as the final authority; these common values are a routing aid:
|
|||||||
|
|
||||||
- Image `kind`: `spec`, `character`, `quick-edit`, `ui-design`, `publication-material`; ordinary image generation may omit it.
|
- Image `kind`: `spec`, `character`, `quick-edit`, `ui-design`, `publication-material`; ordinary image generation may omit it.
|
||||||
- External v1 currently has no structured game-scene generation operation. Do not send `kind: "scene"` or `assetKind: "scene"` through generic image generation; the server rejects both before queueing.
|
- External v1 currently has no structured game-scene generation operation. Do not send `kind: "scene"` or `assetKind: "scene"` through generic image generation; the server rejects both before queueing.
|
||||||
- Image `model`: `gpt-image-2`, `gemini-3.1-flash-image-preview`, `nanobanana2`, `nano-banana`.
|
- Image `model`: `gpt-image-2.5`, `gemini-3.1-flash-image-preview`, `nanobanana2`, `nano-banana`. Persisted `gpt-image-2` is a legacy value resolved only when submitting a new task; the retired `gpt-image-2-c` is no longer accepted and is handled as an unsupported value.
|
||||||
- Image `aspectRatio`: `1:1`, `2:3`, `3:2`, `9:16`, `16:9`.
|
- Image `aspectRatio`: `1:1`, `2:3`, `3:2`, `9:16`, `16:9`.
|
||||||
- Image `imageSize`: `0.5K`, `1K`, `2K`.
|
- Image `imageSize`: `0.5K`, `1K`, `2K`.
|
||||||
- Video `model`: `seedance2.0`, `seedance2.0-fast`, `kling3.0`, `kling3.0-omni`, `veo3.1`, `veo3.1-fast`.
|
- Video `model`: `seedance2.0`, `seedance2.0-fast`, `kling3.0`, `kling3.0-omni`, `veo3.1`, `veo3.1-fast`.
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
---
|
---
|
||||||
name: gpt-image-2-apimart
|
name: gpt-image-2-apimart
|
||||||
description: Generate or inspect project image assets through this repository's VectorEngine gpt-image-2 workflow with gpt-image-2-c fallback. Use when Codex needs to create puzzle template sample images, reproduce the server-rs image request body, dry-run image prompts, batch-generate local project thumbnails, or debug VECTOR_ENGINE_BASE_URL / VECTOR_ENGINE_API_KEY image-generation configuration without exposing secrets. The directory name is historical.
|
description: Generate or inspect project image assets through this repository's Tiantoken GPT Image 2.5 workflow. Use when Codex needs to create puzzle template sample images, reproduce the server-rs image request body, dry-run image prompts, batch-generate local project thumbnails, or debug TIANTOKEN_BASE_URL / TIANTOKEN_API_KEY image-generation configuration without exposing secrets. The directory name is historical.
|
||||||
---
|
---
|
||||||
|
|
||||||
# gpt-image-2 VectorEngine
|
# GPT Image 2.5 project image workflow
|
||||||
|
|
||||||
Use this skill for project-local image asset generation that must match the repository's `server-rs` VectorEngine image path. Keep the product/price model identifier and primary provider request as `gpt-image-2`, then fall back once to `gpt-image-2-c` for eligible provider failures. The folder still contains `apimart` in its name for compatibility with existing local plugin references.
|
Use this skill for project-local image asset generation that must match the repository's image request contract. Provider routing is owned by `server-rs`; when this skill talks to the provider directly it must send the concrete provider model and the matching provider credentials, because the provider side only accepts concrete models:
|
||||||
|
|
||||||
|
- generation (no reference images): `gpt-image-2.5-flare-c` through Tiantoken
|
||||||
|
- edits (any reference image): `gpt-image-2.5-sunburst-c` through Tiantoken
|
||||||
|
- nanobanana (`gemini-3.1-flash-image-preview`) stays on VectorEngine
|
||||||
|
|
||||||
|
The business model name `gpt-image-2.5` is resolved to a concrete key by `server-rs` at the task boundary and is never sent to a provider directly. This client must not perform a cross-model fallback; the only retry the bundled scripts do is a same-model retry on transient upstream statuses (`408` / `429` / `5xx`, 1s/2s backoff, at most 3 attempts), which never changes the model. The folder still contains `apimart` in its name for compatibility with existing local plugin references.
|
||||||
|
|
||||||
## Workflow
|
## Workflow
|
||||||
|
|
||||||
@@ -24,15 +30,15 @@ Use this skill for project-local image asset generation that must match the repo
|
|||||||
```
|
```
|
||||||
|
|
||||||
5. Save final project assets under `public/` or another explicitly requested workspace path.
|
5. Save final project assets under `public/` or another explicitly requested workspace path.
|
||||||
6. Never print `VECTOR_ENGINE_API_KEY`. Report only whether configuration exists.
|
6. Never print `TIANTOKEN_API_KEY`. Report only whether configuration exists.
|
||||||
|
|
||||||
## Request Contract
|
## Request Contract
|
||||||
|
|
||||||
The repository image path uses:
|
The repository image path uses:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
POST {VECTOR_ENGINE_BASE_URL}/v1/images/generations
|
POST {TIANTOKEN_BASE_URL}/v1/images/generations
|
||||||
Authorization: Bearer {VECTOR_ENGINE_API_KEY}
|
Authorization: Bearer {TIANTOKEN_API_KEY}
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -40,7 +46,7 @@ Default body:
|
|||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"model": "gpt-image-2",
|
"model": "gpt-image-2.5-flare-c",
|
||||||
"prompt": "<prompt>",
|
"prompt": "<prompt>",
|
||||||
"n": 1,
|
"n": 1,
|
||||||
"size": "1024x1024"
|
"size": "1024x1024"
|
||||||
@@ -50,22 +56,22 @@ Default body:
|
|||||||
For visual references, use the edit endpoint instead of the create endpoint:
|
For visual references, use the edit endpoint instead of the create endpoint:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
POST {VECTOR_ENGINE_BASE_URL}/v1/images/edits
|
POST {TIANTOKEN_BASE_URL}/v1/images/edits
|
||||||
Authorization: Bearer {VECTOR_ENGINE_API_KEY}
|
Authorization: Bearer {TIANTOKEN_API_KEY}
|
||||||
Content-Type: multipart/form-data
|
Content-Type: multipart/form-data
|
||||||
```
|
```
|
||||||
|
|
||||||
Multipart fields:
|
Multipart fields:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
model=gpt-image-2
|
model=gpt-image-2.5-sunburst-c
|
||||||
prompt=<prompt>
|
prompt=<prompt>
|
||||||
n=1
|
n=1
|
||||||
size=1024x1024
|
size=1024x1024
|
||||||
image=@reference.png
|
image=@reference.png
|
||||||
```
|
```
|
||||||
|
|
||||||
In this repository, calls with no reference images use `POST /v1/images/generations`; calls with any reference image use `POST /v1/images/edits` and pass references as one or more `image` form parts. Both paths prefer `gpt-image-2`; on an eligible upstream/model failure they retry with `gpt-image-2-c`. Do not fall back for authentication, local validation, request-budget exhaustion, uncertain send/connection failure, content-safety rejection, or a generated image URL download failure. Match3D container UI generation embeds `public/match3d-background-references/pot-fused-reference.png` into the edit request as an `image` part.
|
In this repository, calls with no reference images use `POST /v1/images/generations` with `gpt-image-2.5-flare-c`; calls with any reference image use `POST /v1/images/edits` with `gpt-image-2.5-sunburst-c` and pass references as one or more `image` form parts. Server-side calls still submit the business model `gpt-image-2.5` and let `server-rs` resolve the concrete key; provider routing and retry policy remain server-owned, and pricing follows the same reference-image rule (generation with a reference image is charged at the edit tier). Match3D container UI generation embeds `public/match3d-background-references/pot-fused-reference.png` into the edit request as an `image` part.
|
||||||
|
|
||||||
Accept image output from `data[].url`, `data[].b64_json`, or direct nested `url` fields. VectorEngine image generation currently returns synchronously; do not poll APIMart task endpoints.
|
Accept image output from `data[].url`, `data[].b64_json`, or direct nested `url` fields. VectorEngine image generation currently returns synchronously; do not poll APIMart task endpoints.
|
||||||
|
|
||||||
@@ -75,12 +81,14 @@ Load environment values from process env first, then `.env.secrets.local`, `.env
|
|||||||
|
|
||||||
Required for live generation:
|
Required for live generation:
|
||||||
|
|
||||||
- `VECTOR_ENGINE_BASE_URL`
|
- `TIANTOKEN_BASE_URL`
|
||||||
- `VECTOR_ENGINE_API_KEY`
|
- `TIANTOKEN_API_KEY`
|
||||||
|
|
||||||
Optional:
|
Optional:
|
||||||
|
|
||||||
- `VECTOR_ENGINE_IMAGE_REQUEST_TIMEOUT_MS`
|
- `TIANTOKEN_IMAGE_REQUEST_TIMEOUT_MS`
|
||||||
|
|
||||||
|
`VECTOR_ENGINE_*` values no longer serve GPT Image 2.5: those credentials belong to VectorEngine, which only serves nanobanana. Do not fall back from `TIANTOKEN_*` to `VECTOR_ENGINE_*`.
|
||||||
|
|
||||||
If the key or base URL is missing, stop after dry-run or explain the missing configuration. Do not ask the user to paste the key in chat.
|
If the key or base URL is missing, stop after dry-run or explain the missing configuration. Do not ask the user to paste the key in chat.
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,9 @@ const skillRoot = path.resolve(__dirname, '..');
|
|||||||
const repoRoot = path.resolve(skillRoot, '..', '..', '..');
|
const repoRoot = path.resolve(skillRoot, '..', '..', '..');
|
||||||
const defaultOutDir = path.join(repoRoot, 'public', 'anthro-cat-illustrations');
|
const defaultOutDir = path.join(repoRoot, 'public', 'anthro-cat-illustrations');
|
||||||
const defaultTimeoutMs = 1000000;
|
const defaultTimeoutMs = 1000000;
|
||||||
const preferredImageModel = 'gpt-image-2';
|
// GPT Image 2.5 生成任务只接受 concrete provider model;业务模型名 `gpt-image-2.5`
|
||||||
const fallbackImageModel = 'gpt-image-2-c';
|
// 由 server-rs 在任务边界解析,脚本直连 provider 时必须自己给出 concrete key。
|
||||||
|
const imageModel = 'gpt-image-2.5-flare-c';
|
||||||
|
|
||||||
const prompts = [
|
const prompts = [
|
||||||
{
|
{
|
||||||
@@ -101,18 +102,18 @@ function resolveEnv() {
|
|||||||
...process.env,
|
...process.env,
|
||||||
};
|
};
|
||||||
return {
|
return {
|
||||||
baseUrl: String(loaded.VECTOR_ENGINE_BASE_URL || '')
|
baseUrl: String(loaded.TIANTOKEN_BASE_URL || '')
|
||||||
.trim()
|
.trim()
|
||||||
.replace(/\/+$/u, ''),
|
.replace(/\/+$/u, ''),
|
||||||
apiKey: String(loaded.VECTOR_ENGINE_API_KEY || '').trim(),
|
apiKey: String(loaded.TIANTOKEN_API_KEY || '').trim(),
|
||||||
timeoutMs: Number.parseInt(
|
timeoutMs: Number.parseInt(
|
||||||
String(loaded.VECTOR_ENGINE_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
|
String(loaded.TIANTOKEN_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
|
||||||
10,
|
10,
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildVectorEngineImagesGenerationUrl(baseUrl) {
|
function buildTiantokenImagesGenerationUrl(baseUrl) {
|
||||||
return baseUrl.endsWith('/v1')
|
return baseUrl.endsWith('/v1')
|
||||||
? `${baseUrl}/images/generations`
|
? `${baseUrl}/images/generations`
|
||||||
: `${baseUrl}/v1/images/generations`;
|
: `${baseUrl}/v1/images/generations`;
|
||||||
@@ -222,6 +223,15 @@ function inferExtensionFromBytes(bytes) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tiantoken 偶发 408/429/5xx 时重试同一个 concrete model;跨模型回退仍由
|
||||||
|
// server-rs 负责,脚本不做任何模型替换。
|
||||||
|
const transientRetryMaxAttempts = 3;
|
||||||
|
const transientRetryBaseDelayMs = 1000;
|
||||||
|
|
||||||
|
function isTransientProviderStatus(status) {
|
||||||
|
return status === 408 || status === 429 || status >= 500;
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchJson(url, options, timeoutMs) {
|
async function fetchJson(url, options, timeoutMs) {
|
||||||
const abortController = new AbortController();
|
const abortController = new AbortController();
|
||||||
const timer = setTimeout(() => abortController.abort(), timeoutMs);
|
const timer = setTimeout(() => abortController.abort(), timeoutMs);
|
||||||
@@ -233,22 +243,21 @@ async function fetchJson(url, options, timeoutMs) {
|
|||||||
const text = await response.text();
|
const text = await response.text();
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = new Error(
|
const error = new Error(
|
||||||
`VectorEngine ${response.status}: ${text.slice(0, 600)}`,
|
`Tiantoken ${response.status}: ${text.slice(0, 600)}`,
|
||||||
);
|
);
|
||||||
error.vectorEngineStatus = response.status;
|
error.providerStatus = response.status;
|
||||||
error.vectorEngineBody = text;
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
return JSON.parse(text);
|
return JSON.parse(text);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.vectorEngineResponseParse = true;
|
throw new Error(
|
||||||
error.vectorEngineBody = text;
|
`Tiantoken 返回无法解析的响应体:${error.message};响应片段:${text.slice(0, 600)}`,
|
||||||
throw error;
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error?.name === 'AbortError') {
|
if (error?.name === 'AbortError') {
|
||||||
throw new Error(`VectorEngine request timed out after ${timeoutMs}ms`);
|
throw new Error(`Tiantoken request timed out after ${timeoutMs}ms`);
|
||||||
}
|
}
|
||||||
throw error;
|
throw error;
|
||||||
} finally {
|
} finally {
|
||||||
@@ -256,50 +265,36 @@ async function fetchJson(url, options, timeoutMs) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function shouldFallbackImageModel(error) {
|
async function fetchJsonWithRetry(url, options, timeoutMs, requestId) {
|
||||||
const raw =
|
for (let attempt = 1; ; attempt += 1) {
|
||||||
`${error?.message || ''}\n${error?.vectorEngineBody || ''}`.toLowerCase();
|
try {
|
||||||
if (error?.vectorEngineResponseParse) {
|
return await fetchJson(url, options, timeoutMs);
|
||||||
return !containsContentRejection(raw);
|
} catch (error) {
|
||||||
|
if (
|
||||||
|
attempt >= transientRetryMaxAttempts ||
|
||||||
|
!isTransientProviderStatus(error?.providerStatus)
|
||||||
|
) {
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
const status = Number(error?.vectorEngineStatus || 0);
|
const delayMs = transientRetryBaseDelayMs * 2 ** (attempt - 1);
|
||||||
if (status === 408 || status >= 500) {
|
console.warn(
|
||||||
return true;
|
`Tiantoken ${error.providerStatus} on ${requestId}, retrying the same model in ${delayMs}ms (attempt ${attempt + 1}/${transientRetryMaxAttempts})`,
|
||||||
}
|
|
||||||
if (status === 429) {
|
|
||||||
return !containsContentRejection(raw);
|
|
||||||
}
|
|
||||||
const mentionsImageModel =
|
|
||||||
raw.includes('model') ||
|
|
||||||
raw.includes('模型') ||
|
|
||||||
raw.includes(preferredImageModel) ||
|
|
||||||
raw.includes(fallbackImageModel);
|
|
||||||
return (
|
|
||||||
[400, 404, 422].includes(status) &&
|
|
||||||
mentionsImageModel &&
|
|
||||||
/(not found|not supported|unsupported|unavailable|does not exist|invalid model|unknown model|不存在|不支持|不可用|未开通)/u.test(
|
|
||||||
raw,
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, delayMs));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function containsContentRejection(raw) {
|
|
||||||
return /(invalid_prompt|safety|content[_ ]policy|moderation|prompt rejected|content rejected|prompt refusal|content refusal|rejected by safety|rejected by moderation|敏感|违规|安全策略|内容审核|提示词拒绝|内容拒绝)/u.test(
|
|
||||||
raw,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function requestImagePayload(env, entry) {
|
async function requestImagePayload(env, entry) {
|
||||||
for (const model of [preferredImageModel, fallbackImageModel]) {
|
const model = imageModel;
|
||||||
const requestBody = {
|
const requestBody = {
|
||||||
model,
|
model,
|
||||||
prompt: buildPrompt(entry),
|
prompt: buildPrompt(entry),
|
||||||
n: 1,
|
n: 1,
|
||||||
size: '1024x1024',
|
size: '1024x1024',
|
||||||
};
|
};
|
||||||
try {
|
const payload = await fetchJsonWithRetry(
|
||||||
const payload = await fetchJson(
|
buildTiantokenImagesGenerationUrl(env.baseUrl),
|
||||||
buildVectorEngineImagesGenerationUrl(env.baseUrl),
|
|
||||||
{
|
{
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
@@ -310,28 +305,16 @@ async function requestImagePayload(env, entry) {
|
|||||||
body: JSON.stringify(requestBody),
|
body: JSON.stringify(requestBody),
|
||||||
},
|
},
|
||||||
env.timeoutMs,
|
env.timeoutMs,
|
||||||
|
entry.id,
|
||||||
);
|
);
|
||||||
const base64Image = decodeStrictBase64Image(
|
const base64Image = decodeStrictBase64Image(extractBase64Images(payload)[0]);
|
||||||
extractBase64Images(payload)[0],
|
|
||||||
);
|
|
||||||
if (extractImageUrls(payload)[0] || base64Image) {
|
if (extractImageUrls(payload)[0] || base64Image) {
|
||||||
return payload;
|
return payload;
|
||||||
}
|
}
|
||||||
const error = new Error(`VectorEngine returned no image for ${entry.id}`);
|
throw new Error(
|
||||||
error.vectorEngineResponseParse = true;
|
`Tiantoken returned no image for ${entry.id}:${JSON.stringify(payload).slice(0, 600)}`,
|
||||||
error.vectorEngineBody = JSON.stringify(payload).slice(0, 600);
|
|
||||||
throw error;
|
|
||||||
} catch (error) {
|
|
||||||
if (model !== preferredImageModel || !shouldFallbackImageModel(error)) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
console.warn(
|
|
||||||
`VectorEngine ${preferredImageModel} failed, retrying with ${fallbackImageModel}: ${error.message}`,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
throw new Error(`VectorEngine returned no image for ${entry.id}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function downloadUrl(url, timeoutMs) {
|
async function downloadUrl(url, timeoutMs) {
|
||||||
const abortController = new AbortController();
|
const abortController = new AbortController();
|
||||||
@@ -373,7 +356,7 @@ async function generateOne(env, entry, outDir) {
|
|||||||
const bytes = decodeStrictBase64Image(b64Images[0]);
|
const bytes = decodeStrictBase64Image(b64Images[0]);
|
||||||
if (!bytes) {
|
if (!bytes) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`VectorEngine returned invalid base64 image for ${entry.id}`,
|
`Tiantoken returned invalid base64 image for ${entry.id}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
image = {
|
image = {
|
||||||
@@ -381,7 +364,7 @@ async function generateOne(env, entry, outDir) {
|
|||||||
extension: inferExtensionFromBytes(bytes),
|
extension: inferExtensionFromBytes(bytes),
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
throw new Error(`VectorEngine returned no image for ${entry.id}`);
|
throw new Error(`Tiantoken returned no image for ${entry.id}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
mkdirSync(outDir, { recursive: true });
|
mkdirSync(outDir, { recursive: true });
|
||||||
@@ -408,9 +391,8 @@ if (dryRun) {
|
|||||||
requests: selectedPrompts.map((entry) => ({
|
requests: selectedPrompts.map((entry) => ({
|
||||||
id: entry.id,
|
id: entry.id,
|
||||||
title: entry.title,
|
title: entry.title,
|
||||||
fallbackModel: fallbackImageModel,
|
|
||||||
body: {
|
body: {
|
||||||
model: preferredImageModel,
|
model: imageModel,
|
||||||
prompt: buildPrompt(entry),
|
prompt: buildPrompt(entry),
|
||||||
n: 1,
|
n: 1,
|
||||||
size: '1024x1024',
|
size: '1024x1024',
|
||||||
@@ -429,7 +411,7 @@ if (!env.baseUrl || !env.apiKey) {
|
|||||||
console.error(
|
console.error(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
ok: false,
|
ok: false,
|
||||||
error: 'Missing VECTOR_ENGINE_BASE_URL or VECTOR_ENGINE_API_KEY',
|
error: 'Missing TIANTOKEN_BASE_URL or TIANTOKEN_API_KEY',
|
||||||
hasBaseUrl: Boolean(env.baseUrl),
|
hasBaseUrl: Boolean(env.baseUrl),
|
||||||
hasApiKey: Boolean(env.apiKey),
|
hasApiKey: Boolean(env.apiKey),
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -18,8 +18,9 @@ const defaultOutDir = path.join(
|
|||||||
'puzzle-creation-templates',
|
'puzzle-creation-templates',
|
||||||
);
|
);
|
||||||
const defaultTimeoutMs = 1000000;
|
const defaultTimeoutMs = 1000000;
|
||||||
const preferredImageModel = 'gpt-image-2';
|
// GPT Image 2.5 生成任务只接受 concrete provider model;业务模型名 `gpt-image-2.5`
|
||||||
const fallbackImageModel = 'gpt-image-2-c';
|
// 由 server-rs 在任务边界解析,脚本直连 provider 时必须自己给出 concrete key。
|
||||||
|
const imageModel = 'gpt-image-2.5-flare-c';
|
||||||
|
|
||||||
const args = new Map();
|
const args = new Map();
|
||||||
for (let index = 2; index < process.argv.length; index += 1) {
|
for (let index = 2; index < process.argv.length; index += 1) {
|
||||||
@@ -71,18 +72,18 @@ function resolveEnv() {
|
|||||||
...process.env,
|
...process.env,
|
||||||
};
|
};
|
||||||
return {
|
return {
|
||||||
baseUrl: String(loaded.VECTOR_ENGINE_BASE_URL || '')
|
baseUrl: String(loaded.TIANTOKEN_BASE_URL || '')
|
||||||
.trim()
|
.trim()
|
||||||
.replace(/\/+$/u, ''),
|
.replace(/\/+$/u, ''),
|
||||||
apiKey: String(loaded.VECTOR_ENGINE_API_KEY || '').trim(),
|
apiKey: String(loaded.TIANTOKEN_API_KEY || '').trim(),
|
||||||
timeoutMs: Number.parseInt(
|
timeoutMs: Number.parseInt(
|
||||||
String(loaded.VECTOR_ENGINE_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
|
String(loaded.TIANTOKEN_IMAGE_REQUEST_TIMEOUT_MS || defaultTimeoutMs),
|
||||||
10,
|
10,
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildVectorEngineImagesGenerationUrl(baseUrl) {
|
function buildTiantokenImagesGenerationUrl(baseUrl) {
|
||||||
return baseUrl.endsWith('/v1')
|
return baseUrl.endsWith('/v1')
|
||||||
? `${baseUrl}/images/generations`
|
? `${baseUrl}/images/generations`
|
||||||
: `${baseUrl}/v1/images/generations`;
|
: `${baseUrl}/v1/images/generations`;
|
||||||
@@ -192,6 +193,15 @@ function inferExtensionFromBytes(bytes) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tiantoken 偶发 408/429/5xx 时重试同一个 concrete model;跨模型回退仍由
|
||||||
|
// server-rs 负责,脚本不做任何模型替换。
|
||||||
|
const transientRetryMaxAttempts = 3;
|
||||||
|
const transientRetryBaseDelayMs = 1000;
|
||||||
|
|
||||||
|
function isTransientProviderStatus(status) {
|
||||||
|
return status === 408 || status === 429 || status >= 500;
|
||||||
|
}
|
||||||
|
|
||||||
async function fetchJson(url, options, timeoutMs) {
|
async function fetchJson(url, options, timeoutMs) {
|
||||||
const abortController = new AbortController();
|
const abortController = new AbortController();
|
||||||
const timer = setTimeout(() => abortController.abort(), timeoutMs);
|
const timer = setTimeout(() => abortController.abort(), timeoutMs);
|
||||||
@@ -203,22 +213,21 @@ async function fetchJson(url, options, timeoutMs) {
|
|||||||
const text = await response.text();
|
const text = await response.text();
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = new Error(
|
const error = new Error(
|
||||||
`VectorEngine ${response.status}: ${text.slice(0, 600)}`,
|
`Tiantoken ${response.status}: ${text.slice(0, 600)}`,
|
||||||
);
|
);
|
||||||
error.vectorEngineStatus = response.status;
|
error.providerStatus = response.status;
|
||||||
error.vectorEngineBody = text;
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
return JSON.parse(text);
|
return JSON.parse(text);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
error.vectorEngineResponseParse = true;
|
throw new Error(
|
||||||
error.vectorEngineBody = text;
|
`Tiantoken 返回无法解析的响应体:${error.message};响应片段:${text.slice(0, 600)}`,
|
||||||
throw error;
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error?.name === 'AbortError') {
|
if (error?.name === 'AbortError') {
|
||||||
throw new Error(`VectorEngine request timed out after ${timeoutMs}ms`);
|
throw new Error(`Tiantoken request timed out after ${timeoutMs}ms`);
|
||||||
}
|
}
|
||||||
throw error;
|
throw error;
|
||||||
} finally {
|
} finally {
|
||||||
@@ -226,50 +235,36 @@ async function fetchJson(url, options, timeoutMs) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function shouldFallbackImageModel(error) {
|
async function fetchJsonWithRetry(url, options, timeoutMs, requestId) {
|
||||||
const raw =
|
for (let attempt = 1; ; attempt += 1) {
|
||||||
`${error?.message || ''}\n${error?.vectorEngineBody || ''}`.toLowerCase();
|
try {
|
||||||
if (error?.vectorEngineResponseParse) {
|
return await fetchJson(url, options, timeoutMs);
|
||||||
return !containsContentRejection(raw);
|
} catch (error) {
|
||||||
|
if (
|
||||||
|
attempt >= transientRetryMaxAttempts ||
|
||||||
|
!isTransientProviderStatus(error?.providerStatus)
|
||||||
|
) {
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
const status = Number(error?.vectorEngineStatus || 0);
|
const delayMs = transientRetryBaseDelayMs * 2 ** (attempt - 1);
|
||||||
if (status === 408 || status >= 500) {
|
console.warn(
|
||||||
return true;
|
`Tiantoken ${error.providerStatus} on ${requestId}, retrying the same model in ${delayMs}ms (attempt ${attempt + 1}/${transientRetryMaxAttempts})`,
|
||||||
}
|
|
||||||
if (status === 429) {
|
|
||||||
return !containsContentRejection(raw);
|
|
||||||
}
|
|
||||||
const mentionsImageModel =
|
|
||||||
raw.includes('model') ||
|
|
||||||
raw.includes('模型') ||
|
|
||||||
raw.includes(preferredImageModel) ||
|
|
||||||
raw.includes(fallbackImageModel);
|
|
||||||
return (
|
|
||||||
[400, 404, 422].includes(status) &&
|
|
||||||
mentionsImageModel &&
|
|
||||||
/(not found|not supported|unsupported|unavailable|does not exist|invalid model|unknown model|不存在|不支持|不可用|未开通)/u.test(
|
|
||||||
raw,
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, delayMs));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function containsContentRejection(raw) {
|
|
||||||
return /(invalid_prompt|safety|content[_ ]policy|moderation|prompt rejected|content rejected|prompt refusal|content refusal|rejected by safety|rejected by moderation|敏感|违规|安全策略|内容审核|提示词拒绝|内容拒绝)/u.test(
|
|
||||||
raw,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function requestImagePayload(env, template) {
|
async function requestImagePayload(env, template) {
|
||||||
for (const model of [preferredImageModel, fallbackImageModel]) {
|
const model = imageModel;
|
||||||
const requestBody = {
|
const requestBody = {
|
||||||
model,
|
model,
|
||||||
prompt: buildPrompt(template),
|
prompt: buildPrompt(template),
|
||||||
n: 1,
|
n: 1,
|
||||||
size: '1024x1024',
|
size: '1024x1024',
|
||||||
};
|
};
|
||||||
try {
|
const payload = await fetchJsonWithRetry(
|
||||||
const payload = await fetchJson(
|
buildTiantokenImagesGenerationUrl(env.baseUrl),
|
||||||
buildVectorEngineImagesGenerationUrl(env.baseUrl),
|
|
||||||
{
|
{
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
@@ -280,29 +275,15 @@ async function requestImagePayload(env, template) {
|
|||||||
body: JSON.stringify(requestBody),
|
body: JSON.stringify(requestBody),
|
||||||
},
|
},
|
||||||
env.timeoutMs,
|
env.timeoutMs,
|
||||||
|
template.id,
|
||||||
);
|
);
|
||||||
const base64Image = decodeStrictBase64Image(
|
const base64Image = decodeStrictBase64Image(extractBase64Images(payload)[0]);
|
||||||
extractBase64Images(payload)[0],
|
|
||||||
);
|
|
||||||
if (extractImageUrls(payload)[0] || base64Image) {
|
if (extractImageUrls(payload)[0] || base64Image) {
|
||||||
return payload;
|
return payload;
|
||||||
}
|
}
|
||||||
const error = new Error(
|
throw new Error(
|
||||||
`VectorEngine returned no image for ${template.id}`,
|
`Tiantoken returned no image for ${template.id}:${JSON.stringify(payload).slice(0, 600)}`,
|
||||||
);
|
);
|
||||||
error.vectorEngineResponseParse = true;
|
|
||||||
error.vectorEngineBody = JSON.stringify(payload).slice(0, 600);
|
|
||||||
throw error;
|
|
||||||
} catch (error) {
|
|
||||||
if (model !== preferredImageModel || !shouldFallbackImageModel(error)) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
console.warn(
|
|
||||||
`VectorEngine ${preferredImageModel} failed, retrying with ${fallbackImageModel}: ${error.message}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new Error(`VectorEngine returned no image for ${template.id}`);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function downloadUrl(url, timeoutMs) {
|
async function downloadUrl(url, timeoutMs) {
|
||||||
@@ -345,7 +326,7 @@ async function generateOne(env, template, outDir) {
|
|||||||
const bytes = decodeStrictBase64Image(b64Images[0]);
|
const bytes = decodeStrictBase64Image(b64Images[0]);
|
||||||
if (!bytes) {
|
if (!bytes) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`VectorEngine returned invalid base64 image for ${template.id}`,
|
`Tiantoken returned invalid base64 image for ${template.id}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
image = {
|
image = {
|
||||||
@@ -353,7 +334,7 @@ async function generateOne(env, template, outDir) {
|
|||||||
extension: inferExtensionFromBytes(bytes),
|
extension: inferExtensionFromBytes(bytes),
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
throw new Error(`VectorEngine returned no image for ${template.id}`);
|
throw new Error(`Tiantoken returned no image for ${template.id}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
mkdirSync(outDir, { recursive: true });
|
mkdirSync(outDir, { recursive: true });
|
||||||
@@ -384,9 +365,8 @@ if (dryRun) {
|
|||||||
requests: selectedTemplates.map((template) => ({
|
requests: selectedTemplates.map((template) => ({
|
||||||
id: template.id,
|
id: template.id,
|
||||||
title: template.title,
|
title: template.title,
|
||||||
fallbackModel: fallbackImageModel,
|
|
||||||
body: {
|
body: {
|
||||||
model: preferredImageModel,
|
model: imageModel,
|
||||||
prompt: buildPrompt(template),
|
prompt: buildPrompt(template),
|
||||||
n: 1,
|
n: 1,
|
||||||
size: '1024x1024',
|
size: '1024x1024',
|
||||||
@@ -405,7 +385,7 @@ if (!env.baseUrl || !env.apiKey) {
|
|||||||
console.error(
|
console.error(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
ok: false,
|
ok: false,
|
||||||
error: 'Missing VECTOR_ENGINE_BASE_URL or VECTOR_ENGINE_API_KEY',
|
error: 'Missing TIANTOKEN_BASE_URL or TIANTOKEN_API_KEY',
|
||||||
hasBaseUrl: Boolean(env.baseUrl),
|
hasBaseUrl: Boolean(env.baseUrl),
|
||||||
hasApiKey: Boolean(env.apiKey),
|
hasApiKey: Boolean(env.apiKey),
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -30,3 +30,8 @@ server-rs/.data
|
|||||||
server-rs/.spacetimedb
|
server-rs/.spacetimedb
|
||||||
|
|
||||||
public/generated-*
|
public/generated-*
|
||||||
|
|
||||||
|
scripts/loadtest/data/*.local.json
|
||||||
|
scripts/loadtest/data/k6-*.log
|
||||||
|
scripts/loadtest/data/k6-*summary*.md
|
||||||
|
scripts/loadtest/data/latest-*-prefix.txt
|
||||||
|
|||||||
@@ -237,8 +237,6 @@ GENARRATIVE_ENABLE_IMAGE_EDITOR_AGENT_SIDEBAR="false"
|
|||||||
|
|
||||||
# 官网客户端下载检测渠道:dev、release 或自定义渠道;修改后重启 API 服务。
|
# 官网客户端下载检测渠道:dev、release 或自定义渠道;修改后重启 API 服务。
|
||||||
# Windows/macOS 是系统维度,不填写 dev-win/dev-mac。
|
# Windows/macOS 是系统维度,不填写 dev-win/dev-mac。
|
||||||
# 客户端埋点也复用该渠道:dev 对应 https://dev.genarrative.world,release 对应 https://www.genarrative.world。
|
|
||||||
# 埋点不接受其它渠道;本地 dev 且 GENARRATIVE_ENV 为 development(默认)/test/container 时允许 loopback 地址及可变端口。
|
|
||||||
GENARRATIVE_CLIENT_DOWNLOAD_CHANNEL="dev"
|
GENARRATIVE_CLIENT_DOWNLOAD_CHANNEL="dev"
|
||||||
|
|
||||||
# Optional: official VikingDB credentials for regenerating build-tag similarities
|
# Optional: official VikingDB credentials for regenerating build-tag similarities
|
||||||
|
|||||||
+1
-2
@@ -213,8 +213,6 @@ module.exports = {
|
|||||||
'!src/services/clipboard.test.ts',
|
'!src/services/clipboard.test.ts',
|
||||||
'!src/services/frontendRuntimeConfigService.ts',
|
'!src/services/frontendRuntimeConfigService.ts',
|
||||||
'!src/services/frontendRuntimeConfigService.test.ts',
|
'!src/services/frontendRuntimeConfigService.test.ts',
|
||||||
'!src/services/gameDistributionClient.ts',
|
|
||||||
'!src/services/gameDistributionClient.test.ts',
|
|
||||||
'!src/services/sseStream.ts',
|
'!src/services/sseStream.ts',
|
||||||
'!src/services/sseStream.test.ts',
|
'!src/services/sseStream.test.ts',
|
||||||
'src/AdventurePanel.tsx',
|
'src/AdventurePanel.tsx',
|
||||||
@@ -365,6 +363,7 @@ module.exports = {
|
|||||||
'src/types.ts',
|
'src/types.ts',
|
||||||
'src/types/**',
|
'src/types/**',
|
||||||
'src/uiAssets.ts',
|
'src/uiAssets.ts',
|
||||||
|
'scripts/loadtest/**',
|
||||||
'packages/shared/src/contracts/jumpHop.ts',
|
'packages/shared/src/contracts/jumpHop.ts',
|
||||||
'packages/shared/src/contracts/match3dAgent.ts',
|
'packages/shared/src/contracts/match3dAgent.ts',
|
||||||
'packages/shared/src/contracts/match3dRuntime.ts',
|
'packages/shared/src/contracts/match3dRuntime.ts',
|
||||||
|
|||||||
@@ -98,12 +98,6 @@ jobs:
|
|||||||
- name: Report isolated Rust compilation cache
|
- name: Report isolated Rust compilation cache
|
||||||
if: always()
|
if: always()
|
||||||
run: bash scripts/ci-rust-cache.sh report
|
run: bash scripts/ci-rust-cache.sh report
|
||||||
- name: Publish master Rust cache artifact
|
|
||||||
continue-on-error: true
|
|
||||||
if: ${{ !cancelled() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
env:
|
|
||||||
GENARRATIVE_GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: python3 scripts/export-gitea-rust-cache.py
|
|
||||||
|
|
||||||
ai-game-creator-shell-rust-lane-2:
|
ai-game-creator-shell-rust-lane-2:
|
||||||
name: AI game creator shell Rust lane 2/2
|
name: AI game creator shell Rust lane 2/2
|
||||||
@@ -147,12 +141,6 @@ jobs:
|
|||||||
- name: Report isolated Rust compilation cache
|
- name: Report isolated Rust compilation cache
|
||||||
if: always()
|
if: always()
|
||||||
run: bash scripts/ci-rust-cache.sh report
|
run: bash scripts/ci-rust-cache.sh report
|
||||||
- name: Publish master Rust cache artifact
|
|
||||||
continue-on-error: true
|
|
||||||
if: ${{ !cancelled() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
env:
|
|
||||||
GENARRATIVE_GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: python3 scripts/export-gitea-rust-cache.py
|
|
||||||
|
|
||||||
# agent-run smoke 会 spawn `cargo run`(走壳自己的 manifest),同样不装 npm 依赖,
|
# agent-run smoke 会 spawn `cargo run`(走壳自己的 manifest),同样不装 npm 依赖,
|
||||||
# 单独一个 job,免得把已经压到 4 分钟级的片 job 拖长。
|
# 单独一个 job,免得把已经压到 4 分钟级的片 job 拖长。
|
||||||
@@ -195,12 +183,6 @@ jobs:
|
|||||||
- name: Report isolated Rust compilation cache
|
- name: Report isolated Rust compilation cache
|
||||||
if: always()
|
if: always()
|
||||||
run: bash scripts/ci-rust-cache.sh report
|
run: bash scripts/ci-rust-cache.sh report
|
||||||
- name: Publish master Rust cache artifact
|
|
||||||
continue-on-error: true
|
|
||||||
if: ${{ !cancelled() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
env:
|
|
||||||
GENARRATIVE_GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: python3 scripts/export-gitea-rust-cache.py
|
|
||||||
|
|
||||||
# AGC 壳依赖的共享 / 平台和编辑器插件 crate 各自预热独立 manifest,再运行对应测试。
|
# AGC 壳依赖的共享 / 平台和编辑器插件 crate 各自预热独立 manifest,再运行对应测试。
|
||||||
ai-game-creator-shell-rust-crates:
|
ai-game-creator-shell-rust-crates:
|
||||||
@@ -309,12 +291,6 @@ jobs:
|
|||||||
- name: Report isolated Rust compilation cache
|
- name: Report isolated Rust compilation cache
|
||||||
if: always()
|
if: always()
|
||||||
run: bash scripts/ci-rust-cache.sh report
|
run: bash scripts/ci-rust-cache.sh report
|
||||||
- name: Publish master Rust cache artifact
|
|
||||||
continue-on-error: true
|
|
||||||
if: ${{ !cancelled() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
env:
|
|
||||||
GENARRATIVE_GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: python3 scripts/export-gitea-rust-cache.py
|
|
||||||
|
|
||||||
backend-tests:
|
backend-tests:
|
||||||
name: Backend tests
|
name: Backend tests
|
||||||
@@ -404,12 +380,6 @@ jobs:
|
|||||||
- name: Report isolated Rust compilation cache
|
- name: Report isolated Rust compilation cache
|
||||||
if: always()
|
if: always()
|
||||||
run: bash scripts/ci-rust-cache.sh report
|
run: bash scripts/ci-rust-cache.sh report
|
||||||
- name: Publish master Rust cache artifact
|
|
||||||
continue-on-error: true
|
|
||||||
if: ${{ !cancelled() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
env:
|
|
||||||
GENARRATIVE_GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: python3 scripts/export-gitea-rust-cache.py
|
|
||||||
|
|
||||||
# 客户端的壳级与契约门禁:静态契约断言、H5 / 微信 / 移动 / 桌面壳运行时门禁,
|
# 客户端的壳级与契约门禁:静态契约断言、H5 / 微信 / 移动 / 桌面壳运行时门禁,
|
||||||
# 以及依赖发布产物的构建 smoke。
|
# 以及依赖发布产物的构建 smoke。
|
||||||
@@ -472,12 +442,6 @@ jobs:
|
|||||||
- name: Report isolated Rust compilation cache
|
- name: Report isolated Rust compilation cache
|
||||||
if: always()
|
if: always()
|
||||||
run: bash scripts/ci-rust-cache.sh report
|
run: bash scripts/ci-rust-cache.sh report
|
||||||
- name: Publish master Rust cache artifact
|
|
||||||
continue-on-error: true
|
|
||||||
if: ${{ !cancelled() && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
env:
|
|
||||||
GENARRATIVE_GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: python3 scripts/export-gitea-rust-cache.py
|
|
||||||
|
|
||||||
frontend-tests:
|
frontend-tests:
|
||||||
name: Frontend tests
|
name: Frontend tests
|
||||||
@@ -560,11 +524,6 @@ jobs:
|
|||||||
- name: Install npm dependencies
|
- name: Install npm dependencies
|
||||||
run: bash scripts/ci-npm-ci-with-retry.sh
|
run: bash scripts/ci-npm-ci-with-retry.sh
|
||||||
|
|
||||||
- name: Validate CI cache maintenance behavior
|
|
||||||
run: |
|
|
||||||
python3 -m unittest discover -s scripts -p 'test_gitea_cache_*.py'
|
|
||||||
node --test scripts/export-ci-npm-download-cache.test.mjs
|
|
||||||
|
|
||||||
- name: Run repository checks
|
- name: Run repository checks
|
||||||
run: npm run check:repository-ci
|
run: npm run check:repository-ci
|
||||||
|
|
||||||
|
|||||||
@@ -88,3 +88,11 @@ nohup.out
|
|||||||
spacetime.local.json
|
spacetime.local.json
|
||||||
deploy/container/api-server.env
|
deploy/container/api-server.env
|
||||||
deploy/container/worker-smoke/
|
deploy/container/worker-smoke/
|
||||||
|
|
||||||
|
# Local load-test data extracted from private migration files
|
||||||
|
scripts/loadtest/data/*.local.json
|
||||||
|
|
||||||
|
# Local load-test run artifacts
|
||||||
|
scripts/loadtest/data/k6-*.log
|
||||||
|
scripts/loadtest/data/k6-*summary*.md
|
||||||
|
scripts/loadtest/data/latest-*-prefix.txt
|
||||||
|
|||||||
+29
-53
@@ -44,6 +44,35 @@ _Avoid_: 把同一资源的全局元数据和某一次摆放坐标混在同一
|
|||||||
由图片生成或图片修改流程产生的画布资源,必须记录来源资源、提示词、实际提示词、模型、provider、任务 ID 和生成时间;本期 `/editor` 的生成修改先允许 mock 生成资源,但仍按生成资源元数据形状保存。
|
由图片生成或图片修改流程产生的画布资源,必须记录来源资源、提示词、实际提示词、模型、provider、任务 ID 和生成时间;本期 `/editor` 的生成修改先允许 mock 生成资源,但仍按生成资源元数据形状保存。
|
||||||
_Avoid_: 无来源的静态素材、只显示在 UI 但不落工程资源记录的生成结果
|
_Avoid_: 无来源的静态素材、只显示在 UI 但不落工程资源记录的生成结果
|
||||||
|
|
||||||
|
**图片模型历史值与使用端解析**:
|
||||||
|
图片资源中已持久化的 `gpt-image-2` 是历史业务事实,读回时保持原值;新任务使用业务模型值 `gpt-image-2.5`。当用户基于历史资源再次发起生成或编辑任务时,服务端只在新任务的使用端把历史值解析为当前业务模型,不改写历史资源。provider route 属于服务端执行与审计边界,前端不接收、不持久化、不展示,也不据此分支。
|
||||||
|
_Avoid_: 读取数据库时改写历史模型值、把 provider route 暴露为前端模型选项或公开 DTO
|
||||||
|
|
||||||
|
**图片 provider 显式路由**:
|
||||||
|
api-server 在任务入口按业务语义显式选择具体 provider model name(生成或编辑),并把同一具体名传给图片平台适配器和后台定价解析;图片平台适配器不从参考图数量或前端字段猜测任务。具体 provider model name 只存在于服务端调用、定价配置和审计边界。
|
||||||
|
后台管理 Web/API 是明确例外,可以查看和编辑两个具体定价 key;主站普通前端与公开定价 API 不接收这些 key。
|
||||||
|
_Avoid_: 让图片适配器隐式猜路由、让主站前端携带 provider model name
|
||||||
|
|
||||||
|
**业务模型**:
|
||||||
|
面向任务与产品契约的稳定模型值;当前 GPT 图片新任务的业务模型是 `gpt-image-2.5`。业务模型不等同于 provider 的具体计费/请求 model,也不暴露 provider 凭证或 endpoint。
|
||||||
|
_Avoid_: 把 provider concrete model 当作前端业务选项、用业务模型值直接推断 provider 凭证
|
||||||
|
|
||||||
|
**具体模型**:
|
||||||
|
服务端发送请求和定价使用的 concrete model name。GPT Image 2.5 生成与编辑分别是 `gpt-image-2.5-flare-c` 和 `gpt-image-2.5-sunburst-c`;nanobanana 仍使用 `gemini-3.1-flash-image-preview`。具体模型只在服务端执行、定价和审计边界出现。
|
||||||
|
_Avoid_: 把具体模型写入普通前端 DTO、让未知字符串自动选择 provider
|
||||||
|
|
||||||
|
**provider client**:
|
||||||
|
按具体模型选出的外部图片 provider 连接配置,包含 provider identity、base URL 和 API key;VectorEngine 与 Tiantoken client 共享图片协议执行器,不复制请求/响应业务逻辑。两套 required client 在 api-server 启动时构造。
|
||||||
|
_Avoid_: 在首次请求时才创建 client、在 provider client 中复制尺寸/重试/审计逻辑、跨 provider credential fallback
|
||||||
|
|
||||||
|
**历史模型值**:
|
||||||
|
已持久化的 `gpt-image-2` 字符串,只作为历史事实原样读取和审计;基于历史资源提交新任务时,在使用端解析为当前 GPT Image 2.5 业务任务,不回写历史记录,也不把旧值作为现役 provider route。已退役的 `gpt-image-2-c` 已从代码整体删除,只有数据库里的历史审计字符串原样保留,任何入口传入该值都按不支持的值处理。
|
||||||
|
_Avoid_: 数据库批量改写历史值、把历史值重新路由到 VectorEngine、把兼容解析扩散到普通前端、为已删除的 `gpt-image-2-c` 重新加回常量或解析分支
|
||||||
|
|
||||||
|
**GPT Image 2.5 新生成展示名**:
|
||||||
|
`GPT Image 2.5` 是新生成任务的产品展示名;历史资源与既有编辑上下文不因新模型上线而改写展示语义。
|
||||||
|
_Avoid_: 把新生成展示名扩散到历史记录、历史生成器或旧编辑上下文
|
||||||
|
|
||||||
**系列素材图集生成**:
|
**系列素材图集生成**:
|
||||||
一组同类素材的统一批量生成方式,采用批量规划、sheet 生图、后端切图、透明化、OSS 持久化和局部重生成的通用流水线。
|
一组同类素材的统一批量生成方式,采用批量规划、sheet 生图、后端切图、透明化、OSS 持久化和局部重生成的通用流水线。
|
||||||
_Avoid_: 为每个玩法单独发明素材流水线、把系列素材建模成任一玩法专属 DTO
|
_Avoid_: 为每个玩法单独发明素材流水线、把系列素材建模成任一玩法专属 DTO
|
||||||
@@ -194,54 +223,6 @@ _Avoid_: 进度通知、快照轮询、第二套历史
|
|||||||
把项目对话历史条目与运行态事件转换成消息气泡和工具卡片的读取期转换;不持久化,也不构成事实源。
|
把项目对话历史条目与运行态事件转换成消息气泡和工具卡片的读取期转换;不持久化,也不构成事实源。
|
||||||
_Avoid_: 投影缓存文件、已脱敏卡片库、第二套 reducer
|
_Avoid_: 投影缓存文件、已脱敏卡片库、第二套 reducer
|
||||||
|
|
||||||
**项目对话输入**:
|
|
||||||
AGC 项目对话的输入只有自然语言回合(含 `@` 素材引用与附件);需要动作时由 Runtime 工具与确认卡承接,不从输入文本解析控制词。
|
|
||||||
_Avoid_: 斜杠命令、聊天命令草稿、命令发现列表
|
|
||||||
|
|
||||||
**项目命令 id**:
|
|
||||||
AGC 运行期工具与项目权限策略使用的稳定标识(`GAME_CREATION_APP_COMMANDS` 与 `GameCreationAppPermission`),由 Rust 运行期策略校验与 App 权限审计 / 项目前置条件判定消费,不是用户输入语法。
|
|
||||||
_Avoid_: 把命令 id 当作可输入的聊天命令、为权限位补聊天入口
|
|
||||||
|
|
||||||
**引用候选**:
|
|
||||||
输入区可以命中的对象集合(`@` 素材、`$` Skill),由宿主按种类注入;输入区不判断候选属于哪一类。
|
|
||||||
_Avoid_: 输入区自己读项目清单或应用目录、把候选取值写死在组件里
|
|
||||||
|
|
||||||
**引用 provider**:
|
|
||||||
一种引用种类向输入区提供的全部能力:触发符、候选、身份解析与正文文本形态;每种引用各一份,宿主按需选择性注入。
|
|
||||||
_Avoid_: 一个总装对象决定所有种类、输入区按种类分叉、provider 之间互相知道对方
|
|
||||||
|
|
||||||
**静默 provider**:
|
|
||||||
不提供候选、只负责已有引用身份与文本形态的 provider;附件与运行画面区域属于这一类,只能由外部插入或草稿回填进入正文。
|
|
||||||
_Avoid_: 给附件或运行画面区域造候选、为它们保留输入区内的专门分支
|
|
||||||
|
|
||||||
**引用文本语法**:
|
|
||||||
引用在正文文本里的形态(`@显示名` / `$名称` / `@附件名`)及其反解析;出站与解析必须同一口径,token 前后各留一个空白。
|
|
||||||
_Avoid_: 出站与解析各写一套、在空白边界之外再补兼容别名、让解析依赖具体种类的字段
|
|
||||||
|
|
||||||
**引用名**:
|
|
||||||
引用自己的名字,同时就是它在正文里的 token(资源显示名、Skill 名、附件名);内部不允许出现空白,空白统一经 `normalizeMentionName` 折成 `-`。
|
|
||||||
_Avoid_: 名字与 token 各存一份、靠补兼容别名或 `resourceId` 兜底来消化空白
|
|
||||||
|
|
||||||
**引用候选枚举**:
|
|
||||||
一种引用种类当前就绪的全部可引用对象,与候选菜单共用同一份集合;区别只在没有查询过滤和条数上限。
|
|
||||||
_Avoid_: 拿菜单查询当枚举、为粘贴另建一份候选清单
|
|
||||||
|
|
||||||
**引用粘贴解析**:
|
|
||||||
把粘贴进来的纯文本按引用文本语法反解析回正文引用;只有身份唯一且逐字确认的 token 才成为引用,其余按原文保留。
|
|
||||||
_Avoid_: 猜文件名或路径、为不确定的 token 挑一个候选、改写用户粘贴的其余文字
|
|
||||||
|
|
||||||
**引用输入区**:
|
|
||||||
只负责编辑与渲染引用的共享输入组件;候选、身份解析与文本语法都来自注入的 provider,它不持有项目清单、不访问后端。
|
|
||||||
_Avoid_: 输入区自己拉 Skill 目录、把选择器面板塞在输入区内部
|
|
||||||
|
|
||||||
**引用选择器**:
|
|
||||||
宿主渲染的独立面板,自己拿数据与筛选状态,确认后把选中的引用交给输入区的插入缝。
|
|
||||||
_Avoid_: 输入区自带面板、每个宿主各画一个、绕开插入缝另开第二条通道
|
|
||||||
|
|
||||||
**附件芯片**:
|
|
||||||
聊天附件在正文里的唯一表示;附件导入成功即以芯片进入正文,正文之外不存在第二份附件状态。
|
|
||||||
_Avoid_: 待发送附件列表与正文芯片并存、提交时再拼一遍附件
|
|
||||||
|
|
||||||
## Relationships
|
## Relationships
|
||||||
|
|
||||||
- 一个 **汪汪声浪大作战** 单局包含多个 **有效声浪触发**。
|
- 一个 **汪汪声浪大作战** 单局包含多个 **有效声浪触发**。
|
||||||
@@ -257,11 +238,6 @@ _Avoid_: 待发送附件列表与正文芯片并存、提交时再拼一遍附
|
|||||||
- **个人历史成绩** 由最近记录列表和个人最佳摘要组成,只允许本人查看;排行榜只公开入榜胜利成绩。
|
- **个人历史成绩** 由最近记录列表和个人最佳摘要组成,只允许本人查看;排行榜只公开入榜胜利成绩。
|
||||||
- **正式作品入口闭环** 必须覆盖创作入口、作品详情 CTA、广场/作品卡片、我的作品/个人作品架、稳定作品 ID runtime 路由和 `work_play_start` 埋点。
|
- **正式作品入口闭环** 必须覆盖创作入口、作品详情 CTA、广场/作品卡片、我的作品/个人作品架、稳定作品 ID runtime 路由和 `work_play_start` 埋点。
|
||||||
- **Phase 2 实施顺序** 固定为:契约与领域规则 → SpacetimeDB 表/reducer 与 api-server BFF → 最小前端纵切 → 投影与列表体验 → 收口验证。
|
- **Phase 2 实施顺序** 固定为:契约与领域规则 → SpacetimeDB 表/reducer 与 api-server BFF → 最小前端纵切 → 投影与列表体验 → 收口验证。
|
||||||
- **引用输入区** 由宿主注入的若干 **引用 provider** 组成;**引用候选** 与 **引用文本语法** 都来自 provider,输入区不判断引用种类。
|
|
||||||
- **引用选择器** 不属于 **引用输入区**:它自己拿数据,确认后只通过输入区的插入缝交付引用。
|
|
||||||
- 只有带触发符的 **引用 provider** 会产生候选;**静默 provider** 没有触发符,只能由外部插入或草稿回填进入正文。
|
|
||||||
- **引用粘贴解析** 与出站显示是同一条 **引用文本语法** 的两端;**静默 provider** 的 token(`@附件名` / `@区域标签`)没有候选,因此粘贴时不重建。
|
|
||||||
- **附件芯片** 是本轮附件的唯一事实源;附件导入失败时不产生芯片。
|
|
||||||
|
|
||||||
## Example dialogue
|
## Example dialogue
|
||||||
|
|
||||||
|
|||||||
@@ -7,15 +7,9 @@ import {
|
|||||||
getAdminFeatureGateConfig,
|
getAdminFeatureGateConfig,
|
||||||
getAdminUserDetail,
|
getAdminUserDetail,
|
||||||
importAdminAgcTemplates,
|
importAdminAgcTemplates,
|
||||||
listAdminAgcTrackingEvents,
|
|
||||||
listAdminGameDistributionGames,
|
|
||||||
listAdminGameDistributionReviews,
|
|
||||||
listAdminRechargeOrders,
|
listAdminRechargeOrders,
|
||||||
reconcileAdminUserConsumption,
|
reconcileAdminUserConsumption,
|
||||||
resolveAdminRechargeRefundManualReview,
|
resolveAdminRechargeRefundManualReview,
|
||||||
restoreAdminGameDistributionGame,
|
|
||||||
reviewAdminGameDistributionVersion,
|
|
||||||
suspendAdminGameDistributionGame,
|
|
||||||
updateAdminAccount,
|
updateAdminAccount,
|
||||||
updateAdminAgcTemplate,
|
updateAdminAgcTemplate,
|
||||||
uploadAdminEditorShowcaseCampaignImage,
|
uploadAdminEditorShowcaseCampaignImage,
|
||||||
@@ -27,30 +21,6 @@ afterEach(() => {
|
|||||||
vi.unstubAllGlobals();
|
vi.unstubAllGlobals();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('客户端埋点查询传递筛选和游标并复用后台认证', async () => {
|
|
||||||
const payload = { entries: [], nextCursor: null };
|
|
||||||
const fetchMock = vi.fn().mockResolvedValue(
|
|
||||||
new Response(JSON.stringify({ ok: true, data: payload }), {
|
|
||||||
status: 200,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
vi.stubGlobal('fetch', fetchMock);
|
|
||||||
expect(
|
|
||||||
await listAdminAgcTrackingEvents('token', {
|
|
||||||
userId: 'user+1',
|
|
||||||
projectId: 'project-1',
|
|
||||||
cursor: 'page/2',
|
|
||||||
limit: 50,
|
|
||||||
}),
|
|
||||||
).toEqual(payload);
|
|
||||||
expect(fetchMock).toHaveBeenCalledWith(
|
|
||||||
'/admin/api/agc/tracking-events?userId=user%2B1&projectId=project-1&cursor=page%2F2&limit=50',
|
|
||||||
expect.objectContaining({
|
|
||||||
headers: expect.objectContaining({ Authorization: 'Bearer token' }),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('模板管理读取和更新复用认证封装,提交 revision 和封面但不提交 ZIP 或版本', async () => {
|
test('模板管理读取和更新复用认证封装,提交 revision 和封面但不提交 ZIP 或版本', async () => {
|
||||||
const library = { revision: 'revision-new', writable: true, templates: [] };
|
const library = { revision: 'revision-new', writable: true, templates: [] };
|
||||||
const fetchMock = vi.fn().mockImplementation(
|
const fetchMock = vi.fn().mockImplementation(
|
||||||
@@ -484,211 +454,3 @@ test('退款人工复核使用独立 resolve 管理员路由', async () => {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('游戏审核列表与审核动作使用约定的 URL、方法和幂等键', async () => {
|
|
||||||
const fetchMock = vi.fn().mockImplementation(() =>
|
|
||||||
Promise.resolve(
|
|
||||||
new Response(JSON.stringify({ entries: [], nextCursor: null }), {
|
|
||||||
status: 200,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
vi.stubGlobal('fetch', fetchMock);
|
|
||||||
|
|
||||||
await listAdminGameDistributionReviews('admin-token');
|
|
||||||
await reviewAdminGameDistributionVersion(
|
|
||||||
'admin-token',
|
|
||||||
'gamever/1',
|
|
||||||
'game-review-key-1',
|
|
||||||
{
|
|
||||||
decision: 'approve',
|
|
||||||
expectedPublicationRevision: 3,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(fetchMock.mock.calls[0]?.[0]).toBe(
|
|
||||||
'/admin/api/game-distribution/reviews?limit=48',
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[1]?.[0]).toBe(
|
|
||||||
'/admin/api/game-distribution/versions/gamever%2F1/review',
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[1]?.[1]).toEqual(
|
|
||||||
expect.objectContaining({
|
|
||||||
method: 'POST',
|
|
||||||
headers: expect.objectContaining({
|
|
||||||
Authorization: 'Bearer admin-token',
|
|
||||||
'Idempotency-Key': 'game-review-key-1',
|
|
||||||
}),
|
|
||||||
body: JSON.stringify({
|
|
||||||
decision: 'approve',
|
|
||||||
expectedPublicationRevision: 3,
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('游戏管理列表与恢复动作使用约定的 URL、方法和幂等键', async () => {
|
|
||||||
const fetchMock = vi
|
|
||||||
.fn()
|
|
||||||
.mockResolvedValueOnce(
|
|
||||||
new Response(JSON.stringify({ ok: true, data: { games: [] } }), {
|
|
||||||
status: 200,
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.mockResolvedValueOnce(
|
|
||||||
new Response(
|
|
||||||
JSON.stringify({
|
|
||||||
ok: true,
|
|
||||||
data: {
|
|
||||||
game: {
|
|
||||||
id: 'game/1',
|
|
||||||
title: '测试游戏',
|
|
||||||
status: 'published',
|
|
||||||
publicationRevision: 10,
|
|
||||||
},
|
|
||||||
replayed: false,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
{ status: 200 },
|
|
||||||
),
|
|
||||||
);
|
|
||||||
vi.stubGlobal('fetch', fetchMock);
|
|
||||||
const controller = new AbortController();
|
|
||||||
|
|
||||||
await listAdminGameDistributionGames(
|
|
||||||
'admin-token',
|
|
||||||
{ limit: 80 },
|
|
||||||
controller.signal,
|
|
||||||
);
|
|
||||||
await restoreAdminGameDistributionGame(
|
|
||||||
'admin-token',
|
|
||||||
' game/1 ',
|
|
||||||
' game-restore-key-1 ',
|
|
||||||
{ expectedPublicationRevision: 9 },
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(fetchMock.mock.calls[0]?.[0]).toBe(
|
|
||||||
'/admin/api/game-distribution/games?limit=50',
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[0]?.[1]).toEqual(
|
|
||||||
expect.objectContaining({
|
|
||||||
method: 'GET',
|
|
||||||
signal: controller.signal,
|
|
||||||
headers: expect.objectContaining({
|
|
||||||
Authorization: 'Bearer admin-token',
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[1]?.[0]).toBe(
|
|
||||||
'/admin/api/game-distribution/games/game%2F1/restore',
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[1]?.[1]).toEqual(
|
|
||||||
expect.objectContaining({
|
|
||||||
method: 'POST',
|
|
||||||
headers: expect.objectContaining({
|
|
||||||
Authorization: 'Bearer admin-token',
|
|
||||||
'Idempotency-Key': 'game-restore-key-1',
|
|
||||||
}),
|
|
||||||
body: JSON.stringify({ expectedPublicationRevision: 9 }),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(() =>
|
|
||||||
restoreAdminGameDistributionGame('admin-token', ' ', 'key', {
|
|
||||||
expectedPublicationRevision: 9,
|
|
||||||
}),
|
|
||||||
).toThrow('缺少游戏 ID');
|
|
||||||
expect(() =>
|
|
||||||
restoreAdminGameDistributionGame('admin-token', 'game-1', ' ', {
|
|
||||||
expectedPublicationRevision: 9,
|
|
||||||
}),
|
|
||||||
).toThrow('恢复幂等键必须是 1 到 128 个字符');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('安全下架请求携带公开修订号、原因与幂等键', async () => {
|
|
||||||
const fetchMock = vi.fn().mockImplementation(() =>
|
|
||||||
Promise.resolve(
|
|
||||||
new Response(JSON.stringify({ game: {}, replayed: false }), {
|
|
||||||
status: 200,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
vi.stubGlobal('fetch', fetchMock);
|
|
||||||
|
|
||||||
await suspendAdminGameDistributionGame(
|
|
||||||
'admin-token',
|
|
||||||
'game/1',
|
|
||||||
'game-suspend-key-1',
|
|
||||||
{ expectedPublicationRevision: 7, reason: '版权投诉' },
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(fetchMock.mock.calls[0]?.[0]).toBe(
|
|
||||||
'/admin/api/game-distribution/games/game%2F1/suspend',
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[0]?.[1]).toEqual(
|
|
||||||
expect.objectContaining({
|
|
||||||
method: 'POST',
|
|
||||||
headers: expect.objectContaining({
|
|
||||||
Authorization: 'Bearer admin-token',
|
|
||||||
'Idempotency-Key': 'game-suspend-key-1',
|
|
||||||
}),
|
|
||||||
body: JSON.stringify({
|
|
||||||
expectedPublicationRevision: 7,
|
|
||||||
reason: '版权投诉',
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(() =>
|
|
||||||
suspendAdminGameDistributionGame('admin-token', ' ', 'key', {
|
|
||||||
expectedPublicationRevision: 1,
|
|
||||||
}),
|
|
||||||
).toThrow('缺少游戏 ID');
|
|
||||||
expect(() =>
|
|
||||||
suspendAdminGameDistributionGame('admin-token', 'game-1', ' ', {
|
|
||||||
expectedPublicationRevision: 1,
|
|
||||||
}),
|
|
||||||
).toThrow('下架幂等键必须是 1 到 128 个字符');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('游戏审核拒绝请求携带理由,空幂等键在本地失败关闭', async () => {
|
|
||||||
const fetchMock = vi.fn().mockImplementation(() =>
|
|
||||||
Promise.resolve(
|
|
||||||
new Response(JSON.stringify({ version: {}, replayed: false }), {
|
|
||||||
status: 200,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
vi.stubGlobal('fetch', fetchMock);
|
|
||||||
|
|
||||||
await reviewAdminGameDistributionVersion(
|
|
||||||
'admin-token',
|
|
||||||
'version-1',
|
|
||||||
'game-review-key-2',
|
|
||||||
{
|
|
||||||
decision: 'reject',
|
|
||||||
expectedPublicationRevision: 0,
|
|
||||||
reviewReason: '运行时报错',
|
|
||||||
},
|
|
||||||
);
|
|
||||||
expect(fetchMock.mock.calls[0]?.[1]).toEqual(
|
|
||||||
expect.objectContaining({
|
|
||||||
body: JSON.stringify({
|
|
||||||
decision: 'reject',
|
|
||||||
expectedPublicationRevision: 0,
|
|
||||||
reviewReason: '运行时报错',
|
|
||||||
}),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(() =>
|
|
||||||
reviewAdminGameDistributionVersion('admin-token', 'version-1', ' ', {
|
|
||||||
decision: 'reject',
|
|
||||||
expectedPublicationRevision: 0,
|
|
||||||
reviewReason: 'x',
|
|
||||||
}),
|
|
||||||
).toThrow('审核幂等键必须是 1 到 128 个字符');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
import type {
|
import type {
|
||||||
AdminAccountListResponse,
|
AdminAccountListResponse,
|
||||||
AdminAgcTemplateLibraryResponse,
|
AdminAgcTemplateLibraryResponse,
|
||||||
AdminAgcTrackingEventListResponse,
|
|
||||||
AdminAgcTrackingEventQuery,
|
|
||||||
AdminConfirmEditorShowcaseCampaignImageUploadRequest,
|
AdminConfirmEditorShowcaseCampaignImageUploadRequest,
|
||||||
AdminCreateAccountRequest,
|
AdminCreateAccountRequest,
|
||||||
AdminCreateAccountResponse,
|
AdminCreateAccountResponse,
|
||||||
@@ -32,12 +30,6 @@ import type {
|
|||||||
AdminExternalApiKeyListQuery,
|
AdminExternalApiKeyListQuery,
|
||||||
AdminExternalApiKeyListResponse,
|
AdminExternalApiKeyListResponse,
|
||||||
AdminFeatureGateConfigResponse,
|
AdminFeatureGateConfigResponse,
|
||||||
AdminGameDistributionGameListResponse,
|
|
||||||
AdminGameDistributionRestoreRequest,
|
|
||||||
AdminGameDistributionRestoreResponse,
|
|
||||||
AdminGameDistributionReviewListResponse,
|
|
||||||
AdminGameDistributionReviewRequest,
|
|
||||||
AdminGameDistributionReviewResponse,
|
|
||||||
AdminImportAgcTemplatesResponse,
|
AdminImportAgcTemplatesResponse,
|
||||||
AdminLoginResponse,
|
AdminLoginResponse,
|
||||||
AdminMeResponse,
|
AdminMeResponse,
|
||||||
@@ -414,31 +406,6 @@ export function listAdminTrackingEventKeys(token: string) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function listAdminAgcTrackingEvents(
|
|
||||||
token: string,
|
|
||||||
query: AdminAgcTrackingEventQuery = {},
|
|
||||||
) {
|
|
||||||
return request<AdminAgcTrackingEventListResponse>(
|
|
||||||
`/admin/api/agc/tracking-events${buildQueryString((params) => {
|
|
||||||
for (const key of [
|
|
||||||
'userId',
|
|
||||||
'projectId',
|
|
||||||
'creativeTaskId',
|
|
||||||
'agentRunId',
|
|
||||||
'eventName',
|
|
||||||
'clientVersion',
|
|
||||||
'startTime',
|
|
||||||
'endTime',
|
|
||||||
'cursor',
|
|
||||||
] as const) {
|
|
||||||
appendQueryParam(params, key, query[key]);
|
|
||||||
}
|
|
||||||
appendNumericQueryParam(params, 'limit', query.limit);
|
|
||||||
})}`,
|
|
||||||
{ token },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function listAdminErrorReports(
|
export function listAdminErrorReports(
|
||||||
token: string,
|
token: string,
|
||||||
query: {
|
query: {
|
||||||
@@ -1233,115 +1200,6 @@ export function saveAgcModelCatalog(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function listAdminGameDistributionReviews(token: string, limit = 48) {
|
|
||||||
const normalizedLimit = Number.isFinite(limit)
|
|
||||||
? Math.min(Math.max(Math.trunc(limit), 1), 48)
|
|
||||||
: 48;
|
|
||||||
return request<AdminGameDistributionReviewListResponse>(
|
|
||||||
`/admin/api/game-distribution/reviews?limit=${normalizedLimit}`,
|
|
||||||
{ token },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function listAdminGameDistributionGames(
|
|
||||||
token: string,
|
|
||||||
options: { limit?: number } = {},
|
|
||||||
signal?: AbortSignal,
|
|
||||||
) {
|
|
||||||
const requestedLimit = options.limit ?? 50;
|
|
||||||
const normalizedLimit = Number.isFinite(requestedLimit)
|
|
||||||
? Math.min(Math.max(Math.trunc(requestedLimit), 1), 50)
|
|
||||||
: 50;
|
|
||||||
return request<AdminGameDistributionGameListResponse>(
|
|
||||||
`/admin/api/game-distribution/games?limit=${normalizedLimit}`,
|
|
||||||
{ token, signal },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function restoreAdminGameDistributionGame(
|
|
||||||
token: string,
|
|
||||||
gameId: string,
|
|
||||||
idempotencyKey: string,
|
|
||||||
payload: AdminGameDistributionRestoreRequest,
|
|
||||||
) {
|
|
||||||
const normalizedGameId = gameId.trim();
|
|
||||||
const normalizedKey = idempotencyKey.trim();
|
|
||||||
if (!normalizedGameId) {
|
|
||||||
throw new Error('缺少游戏 ID');
|
|
||||||
}
|
|
||||||
if (!normalizedKey || normalizedKey.length > 128) {
|
|
||||||
throw new Error('恢复幂等键必须是 1 到 128 个字符');
|
|
||||||
}
|
|
||||||
return request<AdminGameDistributionRestoreResponse>(
|
|
||||||
`/admin/api/game-distribution/games/${encodeURIComponent(normalizedGameId)}/restore`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
token,
|
|
||||||
headers: { 'Idempotency-Key': normalizedKey },
|
|
||||||
body: payload,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 审核游戏发行版本。幂等键由调用方生成并在同一次提交内复用,避免重复点击产生
|
|
||||||
* 两条审核结论。
|
|
||||||
*/
|
|
||||||
/**
|
|
||||||
* 安全下架整个游戏。管理员下架同样要求 CAS 修订号与幂等键,避免并发审核互相覆盖。
|
|
||||||
*/
|
|
||||||
export function suspendAdminGameDistributionGame(
|
|
||||||
token: string,
|
|
||||||
gameId: string,
|
|
||||||
idempotencyKey: string,
|
|
||||||
payload: import('./adminApiTypes').AdminGameDistributionSuspendRequest,
|
|
||||||
) {
|
|
||||||
const normalizedGameId = gameId.trim();
|
|
||||||
const normalizedKey = idempotencyKey.trim();
|
|
||||||
if (!normalizedGameId) {
|
|
||||||
throw new Error('缺少游戏 ID');
|
|
||||||
}
|
|
||||||
if (!normalizedKey || normalizedKey.length > 128) {
|
|
||||||
throw new Error('下架幂等键必须是 1 到 128 个字符');
|
|
||||||
}
|
|
||||||
return request<
|
|
||||||
import('./adminApiTypes').AdminGameDistributionSuspendResponse
|
|
||||||
>(
|
|
||||||
`/admin/api/game-distribution/games/${encodeURIComponent(normalizedGameId)}/suspend`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
token,
|
|
||||||
headers: { 'Idempotency-Key': normalizedKey },
|
|
||||||
body: payload,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function reviewAdminGameDistributionVersion(
|
|
||||||
token: string,
|
|
||||||
versionId: string,
|
|
||||||
idempotencyKey: string,
|
|
||||||
payload: AdminGameDistributionReviewRequest,
|
|
||||||
) {
|
|
||||||
const normalizedVersionId = versionId.trim();
|
|
||||||
const normalizedKey = idempotencyKey.trim();
|
|
||||||
if (!normalizedVersionId) {
|
|
||||||
throw new Error('缺少发行版本 ID');
|
|
||||||
}
|
|
||||||
if (!normalizedKey || normalizedKey.length > 128) {
|
|
||||||
throw new Error('审核幂等键必须是 1 到 128 个字符');
|
|
||||||
}
|
|
||||||
return request<AdminGameDistributionReviewResponse>(
|
|
||||||
`/admin/api/game-distribution/versions/${encodeURIComponent(normalizedVersionId)}/review`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
token,
|
|
||||||
headers: { 'Idempotency-Key': normalizedKey },
|
|
||||||
body: payload,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getAdminAgcTemplates(token: string, signal?: AbortSignal) {
|
export function getAdminAgcTemplates(token: string, signal?: AbortSignal) {
|
||||||
return request<AdminAgcTemplateLibraryResponse>('/admin/api/agc-templates', {
|
return request<AdminAgcTemplateLibraryResponse>('/admin/api/agc-templates', {
|
||||||
token,
|
token,
|
||||||
|
|||||||
@@ -193,10 +193,7 @@ export interface AdminDashboardRangePayload {
|
|||||||
|
|
||||||
export interface AdminDashboardMetricsPayload {
|
export interface AdminDashboardMetricsPayload {
|
||||||
generatedAssets: number;
|
generatedAssets: number;
|
||||||
/** 已对冲退还(生成失败 / 精选审核返还 / LLM Router 冲正)的净消耗泥点。 */
|
|
||||||
consumedMudPoints: number;
|
consumedMudPoints: number;
|
||||||
/** 同期退还泥点,用于核对「消耗 + 退还」的毛消耗口径。 */
|
|
||||||
refundedMudPoints: number;
|
|
||||||
totalRegisteredUsers: number;
|
totalRegisteredUsers: number;
|
||||||
newRegisteredUsers: number;
|
newRegisteredUsers: number;
|
||||||
newUserPaymentConversion: AdminDashboardPaymentConversionPayload;
|
newUserPaymentConversion: AdminDashboardPaymentConversionPayload;
|
||||||
@@ -823,44 +820,6 @@ export interface AdminTrackingEventListResponse {
|
|||||||
entries: AdminTrackingEventEntryPayload[];
|
entries: AdminTrackingEventEntryPayload[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AdminAgcTrackingEventQuery {
|
|
||||||
userId?: string;
|
|
||||||
projectId?: string;
|
|
||||||
creativeTaskId?: string;
|
|
||||||
agentRunId?: string;
|
|
||||||
eventName?: string;
|
|
||||||
clientVersion?: string;
|
|
||||||
startTime?: string;
|
|
||||||
endTime?: string;
|
|
||||||
cursor?: string;
|
|
||||||
limit?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminAgcTrackingEventEntry {
|
|
||||||
eventId: string;
|
|
||||||
schemaVersion: number;
|
|
||||||
eventName: string;
|
|
||||||
eventTime: string;
|
|
||||||
userId: string;
|
|
||||||
editorSessionId: string;
|
|
||||||
projectId: string | null;
|
|
||||||
creativeTaskId: string | null;
|
|
||||||
agentRunId: string | null;
|
|
||||||
agentTurnId: string | null;
|
|
||||||
status: string | null;
|
|
||||||
errorCode: string | null;
|
|
||||||
source: string;
|
|
||||||
clientVersion: string;
|
|
||||||
properties: Record<string, unknown>;
|
|
||||||
batchId: string;
|
|
||||||
receivedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminAgcTrackingEventListResponse {
|
|
||||||
entries: AdminAgcTrackingEventEntry[];
|
|
||||||
nextCursor: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminTrackingEventKeyPayload {
|
export interface AdminTrackingEventKeyPayload {
|
||||||
eventKey: string;
|
eventKey: string;
|
||||||
eventTitle: string;
|
eventTitle: string;
|
||||||
@@ -958,8 +917,6 @@ export interface AdminRechargeOrderEntryPayload {
|
|||||||
productTitle: string;
|
productTitle: string;
|
||||||
productKind: string;
|
productKind: string;
|
||||||
amountCents: number;
|
amountCents: number;
|
||||||
/** 真实支付金额(分):未支付 / 已关闭 / 已过期订单固定为 0,不能拿订单金额当实付。 */
|
|
||||||
paidAmountCents: number;
|
|
||||||
status: string;
|
status: string;
|
||||||
paymentChannel: string;
|
paymentChannel: string;
|
||||||
paidAtMicros?: number | null;
|
paidAtMicros?: number | null;
|
||||||
@@ -999,8 +956,6 @@ export interface AdminUserDetailResponse {
|
|||||||
phoneBound: boolean;
|
phoneBound: boolean;
|
||||||
wechatBound: boolean;
|
wechatBound: boolean;
|
||||||
historicalConsumedPoints: number;
|
historicalConsumedPoints: number;
|
||||||
/** 累计充值金额(分):读取失败或命中读取上限时为 null,前端按未知展示。 */
|
|
||||||
cumulativeRechargedCents?: number | null;
|
|
||||||
canReconcileConsumption: boolean;
|
canReconcileConsumption: boolean;
|
||||||
wallet: AdminProfileWalletPayload;
|
wallet: AdminProfileWalletPayload;
|
||||||
rechargeOrders: AdminRechargeOrderEntryPayload[];
|
rechargeOrders: AdminRechargeOrderEntryPayload[];
|
||||||
@@ -1088,101 +1043,6 @@ export interface AdminAgcModelCatalog {
|
|||||||
models: AdminAgcModel[];
|
models: AdminAgcModel[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AdminGameDistributionReviewEntry {
|
|
||||||
versionId: string;
|
|
||||||
gameId: string;
|
|
||||||
versionNumber: number;
|
|
||||||
packageSha256: string;
|
|
||||||
packageBytes: number;
|
|
||||||
status: string;
|
|
||||||
publicationRevision: number;
|
|
||||||
reviewReason: string | null;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionReviewListResponse {
|
|
||||||
entries: AdminGameDistributionReviewEntry[];
|
|
||||||
nextCursor: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionReviewRequest {
|
|
||||||
decision: 'approve' | 'reject';
|
|
||||||
expectedPublicationRevision: number;
|
|
||||||
reviewReason?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionReviewResponse {
|
|
||||||
version: AdminGameDistributionReviewEntry;
|
|
||||||
replayed: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionSuspendRequest {
|
|
||||||
expectedPublicationRevision: number;
|
|
||||||
reason?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionSuspendResponse {
|
|
||||||
game: {
|
|
||||||
id: string;
|
|
||||||
title: string;
|
|
||||||
status: string;
|
|
||||||
publicationRevision: number;
|
|
||||||
};
|
|
||||||
replayed: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionGameVersionEntry {
|
|
||||||
versionId: string;
|
|
||||||
gameId: string;
|
|
||||||
versionNumber: number;
|
|
||||||
status: string;
|
|
||||||
reviewReason: string | null;
|
|
||||||
packageBytes: number;
|
|
||||||
packageSha256: string;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
reviewedAt: string | null;
|
|
||||||
publishedAt: string | null;
|
|
||||||
entryUrl: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionGameEntry {
|
|
||||||
gameId: string;
|
|
||||||
title: string;
|
|
||||||
author: {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
avatarUrl: string | null;
|
|
||||||
};
|
|
||||||
status: string;
|
|
||||||
versionCount: number;
|
|
||||||
playCount: number;
|
|
||||||
activeVersionId: string | null;
|
|
||||||
publicationRevision: number;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
versions: AdminGameDistributionGameVersionEntry[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionGameListResponse {
|
|
||||||
games: AdminGameDistributionGameEntry[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionRestoreRequest {
|
|
||||||
expectedPublicationRevision: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminGameDistributionRestoreResponse {
|
|
||||||
game: {
|
|
||||||
id: string;
|
|
||||||
title: string;
|
|
||||||
status: string;
|
|
||||||
publicationRevision: number;
|
|
||||||
};
|
|
||||||
replayed: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AdminAgcTemplatePayload {
|
export interface AdminAgcTemplatePayload {
|
||||||
id: string;
|
id: string;
|
||||||
title: string;
|
title: string;
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import {
|
|||||||
import { AdminAccountsPage } from '../pages/AdminAccountsPage';
|
import { AdminAccountsPage } from '../pages/AdminAccountsPage';
|
||||||
import { AdminAgcModelsPage } from '../pages/AdminAgcModelsPage';
|
import { AdminAgcModelsPage } from '../pages/AdminAgcModelsPage';
|
||||||
import { AdminAgcTemplatesPage } from '../pages/AdminAgcTemplatesPage';
|
import { AdminAgcTemplatesPage } from '../pages/AdminAgcTemplatesPage';
|
||||||
import { AdminAgcTrackingPage } from '../pages/AdminAgcTrackingPage';
|
|
||||||
import { AdminDashboardPage } from '../pages/AdminDashboardPage';
|
import { AdminDashboardPage } from '../pages/AdminDashboardPage';
|
||||||
import { AdminDatabaseTablesPage } from '../pages/AdminDatabaseTablesPage';
|
import { AdminDatabaseTablesPage } from '../pages/AdminDatabaseTablesPage';
|
||||||
import { AdminDebugHttpPage } from '../pages/AdminDebugHttpPage';
|
import { AdminDebugHttpPage } from '../pages/AdminDebugHttpPage';
|
||||||
@@ -28,8 +27,6 @@ import { AdminEditorAssetQueryPage } from '../pages/AdminEditorAssetQueryPage';
|
|||||||
import { AdminEditorGenerationPricingPage } from '../pages/AdminEditorGenerationPricingPage';
|
import { AdminEditorGenerationPricingPage } from '../pages/AdminEditorGenerationPricingPage';
|
||||||
import { AdminEditorShowcaseReviewPage } from '../pages/AdminEditorShowcaseReviewPage';
|
import { AdminEditorShowcaseReviewPage } from '../pages/AdminEditorShowcaseReviewPage';
|
||||||
import { AdminErrorReportsPage } from '../pages/AdminErrorReportsPage';
|
import { AdminErrorReportsPage } from '../pages/AdminErrorReportsPage';
|
||||||
import { AdminGameDistributionReviewPage } from '../pages/AdminGameDistributionReviewPage';
|
|
||||||
import { AdminGameManagementPage } from '../pages/AdminGameManagementPage';
|
|
||||||
import { AdminGrayReleaseConfigPage } from '../pages/AdminGrayReleaseConfigPage';
|
import { AdminGrayReleaseConfigPage } from '../pages/AdminGrayReleaseConfigPage';
|
||||||
import { AdminInviteCodePage } from '../pages/AdminInviteCodePage';
|
import { AdminInviteCodePage } from '../pages/AdminInviteCodePage';
|
||||||
import { AdminLoginPage } from '../pages/AdminLoginPage';
|
import { AdminLoginPage } from '../pages/AdminLoginPage';
|
||||||
@@ -235,12 +232,6 @@ export function AdminApp() {
|
|||||||
onUnauthorized={handleUnauthorized}
|
onUnauthorized={handleUnauthorized}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{activeRouteId === 'agc-tracking' ? (
|
|
||||||
<AdminAgcTrackingPage
|
|
||||||
token={token}
|
|
||||||
onUnauthorized={handleUnauthorized}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{activeRouteId === 'error-reports' ? (
|
{activeRouteId === 'error-reports' ? (
|
||||||
<AdminErrorReportsPage
|
<AdminErrorReportsPage
|
||||||
token={token}
|
token={token}
|
||||||
@@ -316,18 +307,6 @@ export function AdminApp() {
|
|||||||
onUnauthorized={handleUnauthorized}
|
onUnauthorized={handleUnauthorized}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{activeRouteId === 'game-distribution' ? (
|
|
||||||
<AdminGameDistributionReviewPage
|
|
||||||
token={token}
|
|
||||||
onUnauthorized={handleUnauthorized}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{activeRouteId === 'game-management' ? (
|
|
||||||
<AdminGameManagementPage
|
|
||||||
token={token}
|
|
||||||
onUnauthorized={handleUnauthorized}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{activeRouteId === 'editor-assets' ? (
|
{activeRouteId === 'editor-assets' ? (
|
||||||
<AdminEditorAssetQueryPage
|
<AdminEditorAssetQueryPage
|
||||||
token={token}
|
token={token}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
Coins,
|
Coins,
|
||||||
Database,
|
Database,
|
||||||
FolderArchive,
|
FolderArchive,
|
||||||
Gamepad2,
|
|
||||||
GitBranch,
|
GitBranch,
|
||||||
Images,
|
Images,
|
||||||
LayoutDashboard,
|
LayoutDashboard,
|
||||||
@@ -14,7 +13,6 @@ import {
|
|||||||
ReceiptText,
|
ReceiptText,
|
||||||
ShieldCheck,
|
ShieldCheck,
|
||||||
Star,
|
Star,
|
||||||
Swords,
|
|
||||||
Table2,
|
Table2,
|
||||||
TicketCheck,
|
TicketCheck,
|
||||||
TicketPercent,
|
TicketPercent,
|
||||||
@@ -41,7 +39,6 @@ const routeIcons = {
|
|||||||
tables: Database,
|
tables: Database,
|
||||||
debug: Bug,
|
debug: Bug,
|
||||||
tracking: Table2,
|
tracking: Table2,
|
||||||
'agc-tracking': Table2,
|
|
||||||
'error-reports': Bug,
|
'error-reports': Bug,
|
||||||
'gray-release': GitBranch,
|
'gray-release': GitBranch,
|
||||||
redeem: TicketPercent,
|
redeem: TicketPercent,
|
||||||
@@ -52,8 +49,6 @@ const routeIcons = {
|
|||||||
'recharge-orders': ReceiptText,
|
'recharge-orders': ReceiptText,
|
||||||
'editor-generation-pricing': Coins,
|
'editor-generation-pricing': Coins,
|
||||||
'editor-showcase': Star,
|
'editor-showcase': Star,
|
||||||
'game-distribution': Gamepad2,
|
|
||||||
'game-management': Swords,
|
|
||||||
'editor-assets': Images,
|
'editor-assets': Images,
|
||||||
'project-snapshots': FolderArchive,
|
'project-snapshots': FolderArchive,
|
||||||
accounts: Users,
|
accounts: Users,
|
||||||
|
|||||||
@@ -8,22 +8,6 @@ import {
|
|||||||
routeHash,
|
routeHash,
|
||||||
} from './adminRoutes';
|
} from './adminRoutes';
|
||||||
|
|
||||||
test('客户端埋点路由遵守成员页签权限', () => {
|
|
||||||
expect(resolveAdminRoute('#agc-tracking')).toBe('agc-tracking');
|
|
||||||
expect(
|
|
||||||
getAccessibleAdminRoutes({
|
|
||||||
accountRole: 'member',
|
|
||||||
tabPermissions: ['agc-tracking'],
|
|
||||||
}).map((route) => route.id),
|
|
||||||
).toEqual(['agc-tracking']);
|
|
||||||
expect(
|
|
||||||
getAccessibleAdminRoutes({
|
|
||||||
accountRole: 'member',
|
|
||||||
tabPermissions: ['tracking'],
|
|
||||||
}).some((route) => route.id === 'agc-tracking'),
|
|
||||||
).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('后台默认进入 Dashboard', () => {
|
test('后台默认进入 Dashboard', () => {
|
||||||
expect(adminRoutes[0]).toEqual({
|
expect(adminRoutes[0]).toEqual({
|
||||||
id: 'dashboard',
|
id: 'dashboard',
|
||||||
@@ -59,6 +43,12 @@ test('后台灰度发布路由可通过导航和 hash 访问', () => {
|
|||||||
expect(routeHash('gray-release')).toBe('#gray-release');
|
expect(routeHash('gray-release')).toBe('#gray-release');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('后台不再暴露旧创作模板管理路由', () => {
|
||||||
|
expect(resolveAdminRoute('#creation-entry')).toBe('dashboard');
|
||||||
|
expect(resolveAdminRoute('#creation-announcement')).toBe('dashboard');
|
||||||
|
expect(resolveAdminRoute('#work-visibility')).toBe('dashboard');
|
||||||
|
});
|
||||||
|
|
||||||
test('后台素材查询路由可通过导航和 hash 访问', () => {
|
test('后台素材查询路由可通过导航和 hash 访问', () => {
|
||||||
expect(adminRoutes).toContainEqual({
|
expect(adminRoutes).toContainEqual({
|
||||||
id: 'editor-assets',
|
id: 'editor-assets',
|
||||||
@@ -158,37 +148,6 @@ test('项目工程入口对 owner 与已授权 member 开放且可分配权限',
|
|||||||
).not.toContainEqual(route);
|
).not.toContainEqual(route);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('后台游戏审核路由可通过导航和 hash 访问', () => {
|
|
||||||
expect(adminRoutes).toContainEqual({
|
|
||||||
id: 'game-distribution',
|
|
||||||
label: '游戏审核',
|
|
||||||
hash: '#game-distribution',
|
|
||||||
});
|
|
||||||
expect(resolveAdminRoute('#game-distribution')).toBe('game-distribution');
|
|
||||||
expect(routeHash('game-distribution')).toBe('#game-distribution');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('后台游戏管理路由可通过导航和 hash 访问', () => {
|
|
||||||
expect(adminRoutes).toContainEqual({
|
|
||||||
id: 'game-management',
|
|
||||||
label: '游戏管理',
|
|
||||||
hash: '#game-management',
|
|
||||||
});
|
|
||||||
expect(resolveAdminRoute('#game-management')).toBe('game-management');
|
|
||||||
expect(routeHash('game-management')).toBe('#game-management');
|
|
||||||
});
|
|
||||||
|
|
||||||
test('member 可单独获得游戏审核 Tab 权限', () => {
|
|
||||||
const routes = getAccessibleAdminRoutes({
|
|
||||||
accountRole: 'member',
|
|
||||||
tabPermissions: ['game-distribution'],
|
|
||||||
});
|
|
||||||
expect(routes.map((route) => route.id)).toEqual(['game-distribution']);
|
|
||||||
expect(resolveAccessibleAdminRoute('#game-distribution', routes)).toBe(
|
|
||||||
'game-distribution',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('模板管理只对 owner 或具有 agc-templates 权限的 member 可见', () => {
|
test('模板管理只对 owner 或具有 agc-templates 权限的 member 可见', () => {
|
||||||
expect(adminRoutes).toContainEqual({
|
expect(adminRoutes).toContainEqual({
|
||||||
id: 'agc-templates',
|
id: 'agc-templates',
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ export type AdminRouteId =
|
|||||||
| 'tables'
|
| 'tables'
|
||||||
| 'debug'
|
| 'debug'
|
||||||
| 'tracking'
|
| 'tracking'
|
||||||
| 'agc-tracking'
|
|
||||||
| 'error-reports'
|
| 'error-reports'
|
||||||
| 'gray-release'
|
| 'gray-release'
|
||||||
| 'redeem'
|
| 'redeem'
|
||||||
@@ -16,8 +15,6 @@ export type AdminRouteId =
|
|||||||
| 'recharge-orders'
|
| 'recharge-orders'
|
||||||
| 'editor-generation-pricing'
|
| 'editor-generation-pricing'
|
||||||
| 'editor-showcase'
|
| 'editor-showcase'
|
||||||
| 'game-distribution'
|
|
||||||
| 'game-management'
|
|
||||||
| 'editor-assets'
|
| 'editor-assets'
|
||||||
| 'project-snapshots'
|
| 'project-snapshots'
|
||||||
| 'agc-models'
|
| 'agc-models'
|
||||||
@@ -43,7 +40,6 @@ export const adminRoutes: AdminRouteDefinition[] = [
|
|||||||
{ id: 'tables', label: '表查询', hash: '#tables' },
|
{ id: 'tables', label: '表查询', hash: '#tables' },
|
||||||
{ id: 'debug', label: 'API 调试', hash: '#debug' },
|
{ id: 'debug', label: 'API 调试', hash: '#debug' },
|
||||||
{ id: 'tracking', label: '埋点数据', hash: '#tracking' },
|
{ id: 'tracking', label: '埋点数据', hash: '#tracking' },
|
||||||
{ id: 'agc-tracking', label: '客户端埋点', hash: '#agc-tracking' },
|
|
||||||
{ id: 'error-reports', label: '错误报告', hash: '#error-reports' },
|
{ id: 'error-reports', label: '错误报告', hash: '#error-reports' },
|
||||||
{ id: 'gray-release', label: '灰度发布', hash: '#gray-release' },
|
{ id: 'gray-release', label: '灰度发布', hash: '#gray-release' },
|
||||||
{ id: 'redeem', label: '兑换码', hash: '#redeem' },
|
{ id: 'redeem', label: '兑换码', hash: '#redeem' },
|
||||||
@@ -60,8 +56,6 @@ export const adminRoutes: AdminRouteDefinition[] = [
|
|||||||
{ id: 'agc-models', label: 'AGC 模型', hash: '#agc-models', ownerOnly: true },
|
{ id: 'agc-models', label: 'AGC 模型', hash: '#agc-models', ownerOnly: true },
|
||||||
{ id: 'agc-templates', label: '模板管理', hash: '#agc-templates' },
|
{ id: 'agc-templates', label: '模板管理', hash: '#agc-templates' },
|
||||||
{ id: 'editor-showcase', label: '精选审核', hash: '#editor-showcase' },
|
{ id: 'editor-showcase', label: '精选审核', hash: '#editor-showcase' },
|
||||||
{ id: 'game-distribution', label: '游戏审核', hash: '#game-distribution' },
|
|
||||||
{ id: 'game-management', label: '游戏管理', hash: '#game-management' },
|
|
||||||
{ id: 'editor-assets', label: '素材查询', hash: '#editor-assets' },
|
{ id: 'editor-assets', label: '素材查询', hash: '#editor-assets' },
|
||||||
{ id: 'project-snapshots', label: '项目工程', hash: '#project-snapshots' },
|
{ id: 'project-snapshots', label: '项目工程', hash: '#project-snapshots' },
|
||||||
{ id: 'accounts', label: '账号管理', hash: '#accounts', ownerOnly: true },
|
{ id: 'accounts', label: '账号管理', hash: '#accounts', ownerOnly: true },
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ const detail: AdminUserDetailResponse = {
|
|||||||
phoneBound: true,
|
phoneBound: true,
|
||||||
wechatBound: true,
|
wechatBound: true,
|
||||||
historicalConsumedPoints: 1234,
|
historicalConsumedPoints: 1234,
|
||||||
cumulativeRechargedCents: 128800,
|
|
||||||
canReconcileConsumption: true,
|
canReconcileConsumption: true,
|
||||||
wallet,
|
wallet,
|
||||||
rechargeOrders: [
|
rechargeOrders: [
|
||||||
@@ -63,7 +62,6 @@ const detail: AdminUserDetailResponse = {
|
|||||||
productTitle: '60泥点',
|
productTitle: '60泥点',
|
||||||
productKind: 'points',
|
productKind: 'points',
|
||||||
amountCents: 600,
|
amountCents: 600,
|
||||||
paidAmountCents: 600,
|
|
||||||
status: 'paid',
|
status: 'paid',
|
||||||
paymentChannel: 'wechat_native',
|
paymentChannel: 'wechat_native',
|
||||||
paidAtMicros: 1_720_000_000_000_000,
|
paidAtMicros: 1_720_000_000_000_000,
|
||||||
@@ -126,11 +124,7 @@ test('用户查看按钮按内部 ID 查询并展示脱敏资料、余额与退
|
|||||||
expect(screen.getByText('25', { selector: 'strong' })).toBeTruthy();
|
expect(screen.getByText('25', { selector: 'strong' })).toBeTruthy();
|
||||||
expect(screen.getByText('历史花费')).toBeTruthy();
|
expect(screen.getByText('历史花费')).toBeTruthy();
|
||||||
expect(screen.getByText('1234', { selector: 'strong' })).toBeTruthy();
|
expect(screen.getByText('1234', { selector: 'strong' })).toBeTruthy();
|
||||||
expect(screen.getByText('累计充值')).toBeTruthy();
|
|
||||||
expect(screen.getByText('¥1288.00')).toBeTruthy();
|
|
||||||
expect(screen.getByText('order-1')).toBeTruthy();
|
expect(screen.getByText('order-1')).toBeTruthy();
|
||||||
expect(screen.getByRole('columnheader', { name: '实付' })).toBeTruthy();
|
|
||||||
expect(screen.getByRole('columnheader', { name: '发放泥点' })).toBeTruthy();
|
|
||||||
|
|
||||||
await user.keyboard('{Escape}');
|
await user.keyboard('{Escape}');
|
||||||
await waitFor(() =>
|
await waitFor(() =>
|
||||||
@@ -139,29 +133,6 @@ test('用户查看按钮按内部 ID 查询并展示脱敏资料、余额与退
|
|||||||
await waitFor(() => expect(document.activeElement).toBe(trigger));
|
await waitFor(() => expect(document.activeElement).toBe(trigger));
|
||||||
});
|
});
|
||||||
|
|
||||||
test('累计充值读取不到时展示未知,不用订单列表近似', async () => {
|
|
||||||
vi.mocked(getAdminUserDetail).mockResolvedValue({
|
|
||||||
...detail,
|
|
||||||
cumulativeRechargedCents: null,
|
|
||||||
});
|
|
||||||
const user = userEvent.setup();
|
|
||||||
render(
|
|
||||||
<AdminUserReferenceButton
|
|
||||||
token="admin-token"
|
|
||||||
userId="user-1"
|
|
||||||
onUnauthorized={vi.fn()}
|
|
||||||
/>,
|
|
||||||
);
|
|
||||||
|
|
||||||
await user.click(screen.getByRole('button', { name: '查看用户信息' }));
|
|
||||||
await screen.findByText('陶泥用户');
|
|
||||||
|
|
||||||
expect(screen.getByText('累计充值')).toBeTruthy();
|
|
||||||
expect(screen.getByText('累计充值').nextElementSibling?.textContent).toBe(
|
|
||||||
'未知',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('只有陶泥号时按 publicUserCode 查询用户', async () => {
|
test('只有陶泥号时按 publicUserCode 查询用户', async () => {
|
||||||
const user = userEvent.setup();
|
const user = userEvent.setup();
|
||||||
render(
|
render(
|
||||||
|
|||||||
@@ -364,7 +364,6 @@ export function AdminUserDetailDialog({
|
|||||||
<th>订单</th>
|
<th>订单</th>
|
||||||
<th>商品</th>
|
<th>商品</th>
|
||||||
<th>实付</th>
|
<th>实付</th>
|
||||||
<th>发放泥点</th>
|
|
||||||
<th>退款</th>
|
<th>退款</th>
|
||||||
<th>状态</th>
|
<th>状态</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -378,13 +377,11 @@ export function AdminUserDetailDialog({
|
|||||||
</span>
|
</span>
|
||||||
<small>{formatMicros(order.createdAtMicros)}</small>
|
<small>{formatMicros(order.createdAtMicros)}</small>
|
||||||
</td>
|
</td>
|
||||||
<td>{order.productTitle || order.productId}</td>
|
|
||||||
<td>
|
<td>
|
||||||
{order.paidAmountCents > 0
|
{order.productTitle || order.productId}
|
||||||
? formatMoney(order.paidAmountCents)
|
<small>发放 {order.pointsDelta} 泥点</small>
|
||||||
: '未支付'}
|
|
||||||
</td>
|
</td>
|
||||||
<td>{order.pointsDelta} 泥点</td>
|
<td>{formatMoney(order.amountCents)}</td>
|
||||||
<td>
|
<td>
|
||||||
{formatMoney(order.cumulativeSuccessRefundCents)}
|
{formatMoney(order.cumulativeSuccessRefundCents)}
|
||||||
<small>欠账 {order.unrecoveredPoints} 泥点</small>
|
<small>欠账 {order.unrecoveredPoints} 泥点</small>
|
||||||
@@ -438,14 +435,6 @@ function UserIdentityHeader({ detail }: { detail: AdminUserDetailResponse }) {
|
|||||||
<dt>登录方式</dt>
|
<dt>登录方式</dt>
|
||||||
<dd>{detail.loginMethod || '-'}</dd>
|
<dd>{detail.loginMethod || '-'}</dd>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
|
||||||
<dt>累计充值</dt>
|
|
||||||
<dd>
|
|
||||||
{typeof detail.cumulativeRechargedCents === 'number'
|
|
||||||
? formatMoney(detail.cumulativeRechargedCents)
|
|
||||||
: '未知'}
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
<div>
|
<div>
|
||||||
<dt>绑定状态</dt>
|
<dt>绑定状态</dt>
|
||||||
<dd>
|
<dd>
|
||||||
|
|||||||
@@ -339,10 +339,7 @@ test.each([409, 503])(
|
|||||||
await confirmWrite();
|
await confirmWrite();
|
||||||
const message = await screen.findByRole('alert');
|
const message = await screen.findByRole('alert');
|
||||||
const feedback = message.parentElement!;
|
const feedback = message.parentElement!;
|
||||||
// 聚焦发生在 React passive effect 里(AdminAgcTemplatesPage 的 feedback 聚焦 useEffect),
|
expect(document.activeElement).toBe(feedback);
|
||||||
// 而 findByRole 在 alert 节点一挂上就返回,可能早于该 effect 执行;这里等聚焦落地,
|
|
||||||
// 避免在 CI 负载下抢跑。断言口径不变:焦点最终必须落在提示区而不是弹窗面板。
|
|
||||||
await waitFor(() => expect(document.activeElement).toBe(feedback));
|
|
||||||
expect(feedback.tabIndex).toBe(-1);
|
expect(feedback.tabIndex).toBe(-1);
|
||||||
expect(focus).toHaveBeenCalledWith({ preventScroll: true });
|
expect(focus).toHaveBeenCalledWith({ preventScroll: true });
|
||||||
expect(viewport.scrollTop).toBe(20);
|
expect(viewport.scrollTop).toBe(20);
|
||||||
|
|||||||
@@ -1,129 +0,0 @@
|
|||||||
// @vitest-environment jsdom
|
|
||||||
import {
|
|
||||||
cleanup,
|
|
||||||
fireEvent,
|
|
||||||
render,
|
|
||||||
screen,
|
|
||||||
waitFor,
|
|
||||||
within,
|
|
||||||
} from '@testing-library/react';
|
|
||||||
import { afterEach, beforeEach, expect, test, vi } from 'vitest';
|
|
||||||
|
|
||||||
import {
|
|
||||||
AdminApiError,
|
|
||||||
listAdminAgcTrackingEvents,
|
|
||||||
} from '../api/adminApiClient';
|
|
||||||
import type { AdminAgcTrackingEventEntry } from '../api/adminApiTypes';
|
|
||||||
import { AdminAgcTrackingPage } from './AdminAgcTrackingPage';
|
|
||||||
|
|
||||||
vi.mock('../api/adminApiClient', async (original) => ({
|
|
||||||
...(await original<typeof import('../api/adminApiClient')>()),
|
|
||||||
listAdminAgcTrackingEvents: vi.fn(),
|
|
||||||
}));
|
|
||||||
vi.mock('../components/AdminUserReferenceButton', () => ({
|
|
||||||
AdminUserReferenceButton: () => null,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const entry: AdminAgcTrackingEventEntry = {
|
|
||||||
eventId: 'event-1',
|
|
||||||
schemaVersion: 1,
|
|
||||||
eventName: 'project_save',
|
|
||||||
eventTime: '2026-09-21T12:00:00.123Z',
|
|
||||||
userId: 'user-1',
|
|
||||||
editorSessionId: 'session-1',
|
|
||||||
projectId: 'project-1',
|
|
||||||
creativeTaskId: 'project-1',
|
|
||||||
agentRunId: null,
|
|
||||||
agentTurnId: null,
|
|
||||||
status: 'success',
|
|
||||||
errorCode: null,
|
|
||||||
source: 'gui',
|
|
||||||
clientVersion: '1.0',
|
|
||||||
properties: { reason: 'manual' },
|
|
||||||
batchId: 'batch-1',
|
|
||||||
receivedAt: '2026-09-21T12:15:00.000Z',
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.mocked(listAdminAgcTrackingEvents).mockReset();
|
|
||||||
});
|
|
||||||
afterEach(cleanup);
|
|
||||||
|
|
||||||
test('翻页沿用游标,筛选和刷新从第一页重新查询,详情保留 null 和事件属性', async () => {
|
|
||||||
vi.mocked(listAdminAgcTrackingEvents)
|
|
||||||
.mockResolvedValueOnce({ entries: [entry], nextCursor: 'cursor-page-2' })
|
|
||||||
.mockResolvedValueOnce({
|
|
||||||
entries: [{ ...entry, eventId: 'event-2' }],
|
|
||||||
nextCursor: null,
|
|
||||||
})
|
|
||||||
.mockResolvedValue({ entries: [entry], nextCursor: 'cursor-new' });
|
|
||||||
render(<AdminAgcTrackingPage token="admin-token" onUnauthorized={vi.fn()} />);
|
|
||||||
await screen.findByText('保存项目', { selector: 'td' });
|
|
||||||
expect(listAdminAgcTrackingEvents).toHaveBeenLastCalledWith('admin-token', {
|
|
||||||
cursor: undefined,
|
|
||||||
limit: 50,
|
|
||||||
});
|
|
||||||
fireEvent.click(screen.getByText('查看详情'));
|
|
||||||
const dialog = screen.getByRole('dialog');
|
|
||||||
expect(within(dialog).getAllByText('—').length).toBe(3);
|
|
||||||
expect(within(dialog).getByText(/"reason": "manual"/)).toBeTruthy();
|
|
||||||
expect(within(dialog).getByText(entry.eventTime)).toBeTruthy();
|
|
||||||
fireEvent.click(within(dialog).getByLabelText('关闭详情'));
|
|
||||||
fireEvent.click(screen.getByText('下一页'));
|
|
||||||
await waitFor(() =>
|
|
||||||
expect(listAdminAgcTrackingEvents).toHaveBeenLastCalledWith('admin-token', {
|
|
||||||
cursor: 'cursor-page-2',
|
|
||||||
limit: 50,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
await waitFor(() =>
|
|
||||||
expect(screen.getByText('查询').closest('button')?.disabled).toBe(false),
|
|
||||||
);
|
|
||||||
fireEvent.click(screen.getByText('上一页'));
|
|
||||||
await screen.findByText('第 1 页');
|
|
||||||
expect(listAdminAgcTrackingEvents).toHaveBeenCalledTimes(2);
|
|
||||||
fireEvent.change(screen.getByLabelText('项目 ID'), {
|
|
||||||
target: { value: 'project-2' },
|
|
||||||
});
|
|
||||||
fireEvent.click(screen.getByText('查询'));
|
|
||||||
await waitFor(() =>
|
|
||||||
expect(listAdminAgcTrackingEvents).toHaveBeenLastCalledWith(
|
|
||||||
'admin-token',
|
|
||||||
expect.objectContaining({
|
|
||||||
projectId: 'project-2',
|
|
||||||
cursor: undefined,
|
|
||||||
limit: 50,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
expect(screen.getByText('第 1 页')).toBeTruthy();
|
|
||||||
await waitFor(() =>
|
|
||||||
expect(screen.getByText('刷新').closest('button')?.disabled).toBe(false),
|
|
||||||
);
|
|
||||||
fireEvent.click(screen.getByText('刷新'));
|
|
||||||
await waitFor(() =>
|
|
||||||
expect(listAdminAgcTrackingEvents).toHaveBeenCalledTimes(4),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('空结果、权限失败与登录失效沿用后台反馈', async () => {
|
|
||||||
const unauthorized = vi.fn();
|
|
||||||
vi.mocked(listAdminAgcTrackingEvents)
|
|
||||||
.mockResolvedValueOnce({ entries: [], nextCursor: null })
|
|
||||||
.mockRejectedValueOnce(
|
|
||||||
new AdminApiError({ status: 403, message: '无权访问客户端埋点' }),
|
|
||||||
)
|
|
||||||
.mockRejectedValueOnce(
|
|
||||||
new AdminApiError({ status: 401, message: '登录失效' }),
|
|
||||||
);
|
|
||||||
render(<AdminAgcTrackingPage token="token" onUnauthorized={unauthorized} />);
|
|
||||||
await screen.findByText('暂无客户端埋点数据');
|
|
||||||
fireEvent.click(screen.getByText('刷新'));
|
|
||||||
expect((await screen.findByRole('alert')).textContent).toContain(
|
|
||||||
'无权访问客户端埋点',
|
|
||||||
);
|
|
||||||
fireEvent.click(screen.getByText('刷新'));
|
|
||||||
await waitFor(() =>
|
|
||||||
expect(unauthorized).toHaveBeenCalledWith('登录状态已失效'),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
@@ -1,379 +0,0 @@
|
|||||||
import { Modal } from '@genarrative/shared/components';
|
|
||||||
import { FormEvent, useEffect, useRef, useState } from 'react';
|
|
||||||
|
|
||||||
import { listAdminAgcTrackingEvents } from '../api/adminApiClient';
|
|
||||||
import type {
|
|
||||||
AdminAgcTrackingEventEntry,
|
|
||||||
AdminAgcTrackingEventListResponse,
|
|
||||||
AdminAgcTrackingEventQuery,
|
|
||||||
} from '../api/adminApiTypes';
|
|
||||||
import { AdminUserReferenceButton } from '../components/AdminUserReferenceButton';
|
|
||||||
import { handlePageError } from './pageUtils';
|
|
||||||
|
|
||||||
const eventLabels: Record<string, string> = {
|
|
||||||
editor_session_start: '编辑器会话开始',
|
|
||||||
editor_session_end: '编辑器会话结束',
|
|
||||||
editor_focus_start: '编辑器获得焦点',
|
|
||||||
editor_focus_end: '编辑器失去焦点',
|
|
||||||
project_create_success: '项目创建成功',
|
|
||||||
project_open: '打开项目',
|
|
||||||
creative_task_submit: '首次提交创作目标',
|
|
||||||
agent_run_completed: 'Agent 运行完成',
|
|
||||||
agent_run_failed: 'Agent 运行失败',
|
|
||||||
project_revision_created: '项目产生修改',
|
|
||||||
preview_ready: '预览就绪',
|
|
||||||
project_save: '保存项目',
|
|
||||||
};
|
|
||||||
|
|
||||||
const fieldLabels: Record<keyof AdminAgcTrackingEventEntry, string> = {
|
|
||||||
eventId: '事件 ID',
|
|
||||||
schemaVersion: '事件版本',
|
|
||||||
eventName: '事件类型',
|
|
||||||
eventTime: '发生时间',
|
|
||||||
userId: '用户 ID',
|
|
||||||
editorSessionId: '编辑器会话 ID',
|
|
||||||
projectId: '项目 ID',
|
|
||||||
creativeTaskId: '创作目标 ID',
|
|
||||||
agentRunId: 'Agent run ID',
|
|
||||||
agentTurnId: 'Agent turn ID',
|
|
||||||
status: '结果',
|
|
||||||
errorCode: '错误码',
|
|
||||||
source: '来源',
|
|
||||||
clientVersion: '客户端版本',
|
|
||||||
properties: '事件属性',
|
|
||||||
batchId: '批次 ID',
|
|
||||||
receivedAt: '入库时间',
|
|
||||||
};
|
|
||||||
|
|
||||||
function formatTime(value: string) {
|
|
||||||
const date = new Date(value);
|
|
||||||
return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN');
|
|
||||||
}
|
|
||||||
|
|
||||||
export function AdminAgcTrackingPage({
|
|
||||||
token,
|
|
||||||
onUnauthorized,
|
|
||||||
}: {
|
|
||||||
token: string;
|
|
||||||
onUnauthorized: (message?: string) => void;
|
|
||||||
}) {
|
|
||||||
const [filters, setFilters] = useState({
|
|
||||||
userId: '',
|
|
||||||
projectId: '',
|
|
||||||
eventName: '',
|
|
||||||
startTime: '',
|
|
||||||
endTime: '',
|
|
||||||
});
|
|
||||||
const [query, setQuery] = useState<AdminAgcTrackingEventQuery>({});
|
|
||||||
const [cursors, setCursors] = useState<Array<string | undefined>>([
|
|
||||||
undefined,
|
|
||||||
]);
|
|
||||||
const [page, setPage] = useState(0);
|
|
||||||
const [refresh, setRefresh] = useState(0);
|
|
||||||
const [entries, setEntries] = useState<AdminAgcTrackingEventEntry[]>([]);
|
|
||||||
const [nextCursor, setNextCursor] = useState<string | null>(null);
|
|
||||||
const [loading, setLoading] = useState(true);
|
|
||||||
const [error, setError] = useState('');
|
|
||||||
const [detail, setDetail] = useState<AdminAgcTrackingEventEntry | null>(null);
|
|
||||||
const cursor = cursors[page];
|
|
||||||
// 首页没有入站游标,返回首页时保留原快照,刷新才获取新数据。
|
|
||||||
const firstPage = useRef<{
|
|
||||||
token: string;
|
|
||||||
query: AdminAgcTrackingEventQuery;
|
|
||||||
response: AdminAgcTrackingEventListResponse;
|
|
||||||
} | null>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const saved = firstPage.current;
|
|
||||||
if (!cursor && saved?.token === token && saved.query === query) {
|
|
||||||
setEntries(saved.response.entries);
|
|
||||||
setNextCursor(saved.response.nextCursor);
|
|
||||||
setError('');
|
|
||||||
setLoading(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let active = true;
|
|
||||||
setLoading(true);
|
|
||||||
setError('');
|
|
||||||
setEntries([]);
|
|
||||||
setNextCursor(null);
|
|
||||||
void listAdminAgcTrackingEvents(token, { ...query, cursor, limit: 50 })
|
|
||||||
.then((response) => {
|
|
||||||
if (!active) return;
|
|
||||||
if (!cursor) firstPage.current = { token, query, response };
|
|
||||||
setEntries(response.entries);
|
|
||||||
setNextCursor(response.nextCursor);
|
|
||||||
})
|
|
||||||
.catch((failure: unknown) => {
|
|
||||||
if (active) handlePageError(failure, onUnauthorized, setError);
|
|
||||||
})
|
|
||||||
.finally(() => {
|
|
||||||
if (active) setLoading(false);
|
|
||||||
});
|
|
||||||
return () => {
|
|
||||||
active = false;
|
|
||||||
};
|
|
||||||
}, [token, query, cursor, refresh, onUnauthorized]);
|
|
||||||
|
|
||||||
function resetPages() {
|
|
||||||
firstPage.current = null;
|
|
||||||
setCursors([undefined]);
|
|
||||||
setPage(0);
|
|
||||||
setDetail(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
function search(event: FormEvent<HTMLFormElement>) {
|
|
||||||
event.preventDefault();
|
|
||||||
if (
|
|
||||||
filters.startTime &&
|
|
||||||
filters.endTime &&
|
|
||||||
new Date(filters.startTime) >= new Date(filters.endTime)
|
|
||||||
) {
|
|
||||||
setError('结束时间必须晚于开始时间');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
resetPages();
|
|
||||||
setQuery({
|
|
||||||
userId: filters.userId.trim(),
|
|
||||||
projectId: filters.projectId.trim(),
|
|
||||||
eventName: filters.eventName,
|
|
||||||
startTime: filters.startTime
|
|
||||||
? new Date(filters.startTime).toISOString()
|
|
||||||
: undefined,
|
|
||||||
endTime: filters.endTime
|
|
||||||
? new Date(filters.endTime).toISOString()
|
|
||||||
: undefined,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function related(
|
|
||||||
key: 'creativeTaskId' | 'agentRunId' | 'clientVersion',
|
|
||||||
value: string,
|
|
||||||
) {
|
|
||||||
resetPages();
|
|
||||||
setFilters({
|
|
||||||
userId: '',
|
|
||||||
projectId: '',
|
|
||||||
eventName: '',
|
|
||||||
startTime: '',
|
|
||||||
endTime: '',
|
|
||||||
});
|
|
||||||
setQuery({ [key]: value });
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<section className="admin-page admin-page-wide">
|
|
||||||
<div className="admin-page-heading">
|
|
||||||
<div>
|
|
||||||
<h2>客户端埋点</h2>
|
|
||||||
<p>按发生时间倒序展示</p>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="admin-secondary-button"
|
|
||||||
disabled={loading}
|
|
||||||
onClick={() => {
|
|
||||||
resetPages();
|
|
||||||
setRefresh((value) => value + 1);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
刷新
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<form className="admin-panel admin-form" onSubmit={search}>
|
|
||||||
<div className="admin-filter-grid">
|
|
||||||
{(['userId', 'projectId'] as const).map((key) => (
|
|
||||||
<label key={key} className="admin-field">
|
|
||||||
<span>{fieldLabels[key]}</span>
|
|
||||||
<input
|
|
||||||
value={filters[key]}
|
|
||||||
onChange={(event) =>
|
|
||||||
setFilters({ ...filters, [key]: event.target.value })
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
))}
|
|
||||||
<label className="admin-field">
|
|
||||||
<span>事件类型</span>
|
|
||||||
<select
|
|
||||||
value={filters.eventName}
|
|
||||||
onChange={(event) =>
|
|
||||||
setFilters({ ...filters, eventName: event.target.value })
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<option value="">全部</option>
|
|
||||||
{Object.entries(eventLabels).map(([value, label]) => (
|
|
||||||
<option key={value} value={value}>
|
|
||||||
{label}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
{(['startTime', 'endTime'] as const).map((key) => (
|
|
||||||
<label key={key} className="admin-field">
|
|
||||||
<span>
|
|
||||||
{key === 'startTime'
|
|
||||||
? '发生时间起点(含)'
|
|
||||||
: '发生时间终点(不含)'}
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
type="datetime-local"
|
|
||||||
value={filters[key]}
|
|
||||||
onChange={(event) =>
|
|
||||||
setFilters({ ...filters, [key]: event.target.value })
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div className="admin-action-row">
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
className="admin-primary-button"
|
|
||||||
disabled={loading}
|
|
||||||
>
|
|
||||||
查询
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{(['creativeTaskId', 'agentRunId', 'clientVersion'] as const)
|
|
||||||
.filter((key) => query[key])
|
|
||||||
.map((key) => (
|
|
||||||
<p key={key}>
|
|
||||||
{fieldLabels[key]}:{query[key]}(重新查询可清除)
|
|
||||||
</p>
|
|
||||||
))}
|
|
||||||
</form>
|
|
||||||
{error ? (
|
|
||||||
<p role="alert" className="admin-error-message">
|
|
||||||
{error}
|
|
||||||
</p>
|
|
||||||
) : null}
|
|
||||||
<div className="admin-panel">
|
|
||||||
<div className="admin-table-wrap">
|
|
||||||
<table className="admin-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
{[
|
|
||||||
'入库时间',
|
|
||||||
'发生时间',
|
|
||||||
'用户',
|
|
||||||
'事件名称',
|
|
||||||
'项目',
|
|
||||||
'来源',
|
|
||||||
'结果',
|
|
||||||
'客户端版本',
|
|
||||||
'详情',
|
|
||||||
].map((label) => (
|
|
||||||
<th key={label}>{label}</th>
|
|
||||||
))}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{entries.map((entry) => (
|
|
||||||
<tr key={entry.eventId}>
|
|
||||||
<td>{formatTime(entry.receivedAt)}</td>
|
|
||||||
<td>{formatTime(entry.eventTime)}</td>
|
|
||||||
<td>
|
|
||||||
{entry.userId}
|
|
||||||
<AdminUserReferenceButton
|
|
||||||
token={token}
|
|
||||||
userId={entry.userId}
|
|
||||||
onUnauthorized={onUnauthorized}
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
<td>{eventLabels[entry.eventName] ?? entry.eventName}</td>
|
|
||||||
<td>{entry.projectId ?? '—'}</td>
|
|
||||||
<td>{entry.source}</td>
|
|
||||||
<td>{entry.status ?? '—'}</td>
|
|
||||||
<td>{entry.clientVersion}</td>
|
|
||||||
<td>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="admin-ghost-button"
|
|
||||||
onClick={() => setDetail(entry)}
|
|
||||||
>
|
|
||||||
查看详情
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
{loading ? (
|
|
||||||
<p role="status">加载中…</p>
|
|
||||||
) : !error && entries.length === 0 ? (
|
|
||||||
<p>暂无客户端埋点数据</p>
|
|
||||||
) : null}
|
|
||||||
<div className="admin-action-row">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="admin-secondary-button"
|
|
||||||
disabled={loading || page === 0}
|
|
||||||
onClick={() => setPage((value) => value - 1)}
|
|
||||||
>
|
|
||||||
上一页
|
|
||||||
</button>
|
|
||||||
<span>第 {page + 1} 页</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="admin-secondary-button"
|
|
||||||
disabled={loading || !nextCursor}
|
|
||||||
onClick={() => {
|
|
||||||
if (!nextCursor) return;
|
|
||||||
setCursors([...cursors.slice(0, page + 1), nextCursor]);
|
|
||||||
setPage(page + 1);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
下一页
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{detail ? (
|
|
||||||
<Modal
|
|
||||||
open
|
|
||||||
title="客户端埋点详情"
|
|
||||||
closeLabel="关闭详情"
|
|
||||||
onClose={() => setDetail(null)}
|
|
||||||
className="genarrative-ui"
|
|
||||||
>
|
|
||||||
<dl>
|
|
||||||
{(
|
|
||||||
Object.keys(fieldLabels) as Array<
|
|
||||||
keyof AdminAgcTrackingEventEntry
|
|
||||||
>
|
|
||||||
)
|
|
||||||
.filter((key) => key !== 'properties')
|
|
||||||
.map((key) => (
|
|
||||||
<div key={key}>
|
|
||||||
<dt>{fieldLabels[key]}</dt>
|
|
||||||
<dd style={{ overflowWrap: 'anywhere' }}>
|
|
||||||
{detail[key] == null ? '—' : String(detail[key])}
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</dl>
|
|
||||||
<div className="admin-action-row">
|
|
||||||
{(['creativeTaskId', 'agentRunId', 'clientVersion'] as const).map(
|
|
||||||
(key) =>
|
|
||||||
detail[key] ? (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
key={key}
|
|
||||||
className="admin-secondary-button"
|
|
||||||
onClick={() => related(key, detail[key]!)}
|
|
||||||
>
|
|
||||||
查询同一{fieldLabels[key]}
|
|
||||||
</button>
|
|
||||||
) : null,
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<h3>事件属性</h3>
|
|
||||||
<pre style={{ whiteSpace: 'pre-wrap', overflowWrap: 'anywhere' }}>
|
|
||||||
{JSON.stringify(detail.properties, null, 2)}
|
|
||||||
</pre>
|
|
||||||
</Modal>
|
|
||||||
) : null}
|
|
||||||
</section>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -34,7 +34,6 @@ const dashboardResponse: AdminDashboardResponse = {
|
|||||||
metrics: {
|
metrics: {
|
||||||
generatedAssets: 12,
|
generatedAssets: 12,
|
||||||
consumedMudPoints: 88,
|
consumedMudPoints: 88,
|
||||||
refundedMudPoints: 24,
|
|
||||||
totalRegisteredUsers: 1200,
|
totalRegisteredUsers: 1200,
|
||||||
newRegisteredUsers: 16,
|
newRegisteredUsers: 16,
|
||||||
newUserPaymentConversion: {
|
newUserPaymentConversion: {
|
||||||
@@ -106,8 +105,6 @@ test('Dashboard 默认加载今日指标并支持运营汇总页签', async () =
|
|||||||
expect(await screen.findByText('总计数据')).toBeTruthy();
|
expect(await screen.findByText('总计数据')).toBeTruthy();
|
||||||
expect(screen.getByText('时段数据')).toBeTruthy();
|
expect(screen.getByText('时段数据')).toBeTruthy();
|
||||||
expect(screen.getByText('本日生产素材数')).toBeTruthy();
|
expect(screen.getByText('本日生产素材数')).toBeTruthy();
|
||||||
expect(screen.getByText('本日消耗泥点数')).toBeTruthy();
|
|
||||||
expect(screen.getByText('本日退还泥点数')).toBeTruthy();
|
|
||||||
expect(screen.getByText('总注册用户')).toBeTruthy();
|
expect(screen.getByText('总注册用户')).toBeTruthy();
|
||||||
expect(screen.getByText('本日新增用户数')).toBeTruthy();
|
expect(screen.getByText('本日新增用户数')).toBeTruthy();
|
||||||
expect(screen.getByText('新增用户转化与留存')).toBeTruthy();
|
expect(screen.getByText('新增用户转化与留存')).toBeTruthy();
|
||||||
|
|||||||
@@ -128,12 +128,6 @@ export function AdminDashboardPage({
|
|||||||
value: metrics?.consumedMudPoints ?? 0,
|
value: metrics?.consumedMudPoints ?? 0,
|
||||||
unit: '泥点',
|
unit: '泥点',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
id: 'refunded-mud-points',
|
|
||||||
label: `${rangePrefix(granularity)}退还泥点数`,
|
|
||||||
value: metrics?.refundedMudPoints ?? 0,
|
|
||||||
unit: '泥点',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
id: 'new-registered-users',
|
id: 'new-registered-users',
|
||||||
label: `${rangePrefix(granularity)}新增用户数`,
|
label: `${rangePrefix(granularity)}新增用户数`,
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user