Compare commits
129
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a510200cb2 | ||
|
|
d07a41752d | ||
|
|
071c622f35 | ||
|
|
69f447b614 | ||
|
|
210554628d | ||
|
|
3a018dfa37 | ||
|
|
c6e893515c | ||
|
|
a173222d74 | ||
|
|
f244920a61 | ||
|
|
5e8a491f2a | ||
|
|
ff115f70ca | ||
|
|
a70b9fc241 | ||
|
|
ef6950c5df | ||
|
|
2cd85cd7cd | ||
|
|
9de0d2a63c | ||
|
|
fd4cd277cc | ||
|
|
910e32917f | ||
|
|
83fe57f319 | ||
|
|
51d613f459 | ||
|
|
3779cfbadc | ||
|
|
e8ce1d9031 | ||
|
|
edbefcc738 | ||
|
|
1713607572 | ||
|
|
e4aec01ea6 | ||
|
|
468bb5579d | ||
|
|
9d2aa879e9 | ||
|
|
d9e39702e0 | ||
|
|
7de633d4c9 | ||
|
|
b995662388 | ||
|
|
92434aec17 | ||
|
|
f7cac5dabf | ||
|
|
a7f62adad4 | ||
|
|
b1f143c238 | ||
|
|
99fd3b1802 | ||
|
|
fd0003a804 | ||
|
|
bfdfe44f87 | ||
|
|
cbb7f658a3 | ||
|
|
43d946bb5c | ||
|
|
79b01ebc81 | ||
|
|
90f812fae5 | ||
|
|
1155a81c3b | ||
|
|
3dca4ad77c | ||
|
|
99fe07a761 | ||
|
|
443e8b94f0 | ||
|
|
693fa117b7 | ||
|
|
08f3cccae4 | ||
|
|
a22b1f19e9 | ||
|
|
194b59d4a5 | ||
|
|
0f03b12f64 | ||
|
|
ad86b4ddcc | ||
|
|
08e9c39e49 | ||
|
|
ffd1643848 | ||
|
|
95ab0cb93b | ||
|
|
b2793a2392 | ||
|
|
a7140e99e1 | ||
|
|
76b4f93709 | ||
|
|
bc6fa3d517 | ||
|
|
5631ef80f9 | ||
|
|
6bd5364d95 | ||
|
|
604c524298 | ||
|
|
898679dd59 | ||
|
|
79ef17b7f0 | ||
|
|
0328aa8ef5 | ||
|
|
a54efb146a | ||
|
|
6e5313e283 | ||
|
|
03500bf47e | ||
|
|
e3c21b63a5 | ||
|
|
f4fabb66e5 | ||
|
|
4aaba9f2bb | ||
|
|
d7a24a5ecb | ||
|
|
4a0fb1bfae | ||
|
|
f931c04853 | ||
|
|
3093c4470a | ||
|
|
75a589dad8 | ||
|
|
534c82678a | ||
|
|
05949230ca | ||
|
|
382d50058c | ||
|
|
f7bed92e61 | ||
|
|
d03b491d2f | ||
|
|
63de0917a0 | ||
|
|
fa925bfe12 | ||
|
|
0201c3e896 | ||
|
|
8337906dd2 | ||
|
|
ae725a2d01 | ||
|
|
9d6f4ac24b | ||
|
|
0938997327 | ||
|
|
8c349fb56c | ||
|
|
55646ba1b4 | ||
|
|
b8e30ab0b2 | ||
|
|
66295287ce | ||
|
|
0ed7b3f0ce | ||
|
|
8abf1397a6 | ||
|
|
e0e101ef28 | ||
|
|
33f87f8db3 | ||
|
|
84a845136e | ||
|
|
470d243b5b | ||
|
|
a7772a7e92 | ||
|
|
c2f89453a2 | ||
|
|
2bfb5f2953 | ||
|
|
597f4647ef | ||
|
|
68a1991255 | ||
|
|
4ec8327f5e | ||
|
|
28e6f66a1d | ||
|
|
cca0a38ada | ||
|
|
d474768a2b | ||
|
|
623cad25b2 | ||
|
|
c601c848f5 | ||
|
|
c0a8bd6d43 | ||
|
|
1c46311e05 | ||
|
|
c589b8bb4e | ||
|
|
d11e036c22 | ||
|
|
33b02df970 | ||
|
|
76bb685b5b | ||
|
|
361b435506 | ||
|
|
15f7afbe4d | ||
|
|
e054cda94f | ||
|
|
8c0adde77c | ||
|
|
c2521f7208 | ||
|
|
70754ec12b | ||
|
|
d738ea175e | ||
|
|
5041dc03c3 | ||
|
|
b00500512e | ||
|
|
2c803454de | ||
|
|
eed125c118 | ||
|
|
5e2d4e7aaf | ||
|
|
e8ffeac269 | ||
|
|
c92a91a127 | ||
|
|
dc83408ec2 | ||
|
|
40ecf0414a |
@@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"appVersion": "0.0.0",
|
||||||
|
"browsers": [
|
||||||
|
{
|
||||||
|
"brand": "Google Chrome",
|
||||||
|
"fullVersion": "150.0.7871.187",
|
||||||
|
"supportedMajorVersions": [150, 151]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"brand": "Microsoft Edge",
|
||||||
|
"fullVersion": "151.0.4129.59"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"buildCommit": "08f3cccae4a1e75e2f2292eef14611313523916d",
|
||||||
|
"deferredExternalTasks": [
|
||||||
|
"TASK-WP7-03",
|
||||||
|
"TASK-WP7-04"
|
||||||
|
],
|
||||||
|
"finalRelease": true,
|
||||||
|
"fixedPort": 43121,
|
||||||
|
"frozenFromCommit": "08e9c39e49d68f8642d5acfe22b0fdb40a3a08fa",
|
||||||
|
"recordedAt": "2026-08-04T15:20:54.271Z",
|
||||||
|
"releaseStatus": "first_version_internal",
|
||||||
|
"schemaVersion": "1.0",
|
||||||
|
"windows": {
|
||||||
|
"arch": "x64",
|
||||||
|
"build": "26200.8875",
|
||||||
|
"displayVersion": "25H2"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,12 +11,14 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@dada/asset-release-manifest": "workspace:*",
|
"@dada/asset-release-manifest": "workspace:*",
|
||||||
"@dada/shared-contracts": "workspace:*",
|
"@dada/shared-contracts": "workspace:*",
|
||||||
|
"@dada/static-sticker-catalog": "workspace:*",
|
||||||
"@fastify/multipart": "10.1.0",
|
"@fastify/multipart": "10.1.0",
|
||||||
"@fastify/swagger": "9.8.1",
|
"@fastify/swagger": "9.8.1",
|
||||||
"@sinclair/typebox": "0.34.52",
|
"@sinclair/typebox": "0.34.52",
|
||||||
"better-sqlite3": "13.0.1",
|
"better-sqlite3": "13.0.1",
|
||||||
"drizzle-orm": "0.45.2",
|
"drizzle-orm": "0.45.2",
|
||||||
"fastify": "5.10.0"
|
"fastify": "5.10.0",
|
||||||
|
"sharp": "0.35.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/better-sqlite3": "7.6.13",
|
"@types/better-sqlite3": "7.6.13",
|
||||||
|
|||||||
@@ -0,0 +1,148 @@
|
|||||||
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
|
import type {
|
||||||
|
AdminAuditQuery,
|
||||||
|
AdminOperationAuditItem,
|
||||||
|
AdminOperationAuditResponse,
|
||||||
|
PrivateContentAccessAuditItem,
|
||||||
|
PrivateContentAccessAuditResponse,
|
||||||
|
} from "@dada/shared-contracts";
|
||||||
|
|
||||||
|
interface AuditCursor {
|
||||||
|
logId: string;
|
||||||
|
occurredAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface AdminOperationRow {
|
||||||
|
actor_ref: string;
|
||||||
|
actor_type: "system" | "super_admin";
|
||||||
|
after_summary: string | null;
|
||||||
|
before_summary: string | null;
|
||||||
|
expires_at: number;
|
||||||
|
log_id: string;
|
||||||
|
occurred_at: number;
|
||||||
|
operation_type: string;
|
||||||
|
result: "failed" | "succeeded";
|
||||||
|
target_ref: string;
|
||||||
|
target_type: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PrivateContentAccessRow {
|
||||||
|
actor_ref: string;
|
||||||
|
content_type: "image" | "prompt";
|
||||||
|
expires_at: number;
|
||||||
|
log_id: string;
|
||||||
|
occurred_at: number;
|
||||||
|
target_ref: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class AdminAuditQueryError extends Error {
|
||||||
|
constructor() {
|
||||||
|
super("admin_audit_query_invalid");
|
||||||
|
this.name = "AdminAuditQueryError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function encodeCursor(row: { log_id: string; occurred_at: number }) {
|
||||||
|
return Buffer.from(JSON.stringify([row.occurred_at, row.log_id]), "utf8").toString("base64url");
|
||||||
|
}
|
||||||
|
|
||||||
|
function decodeCursor(cursor: string | undefined): AuditCursor | undefined {
|
||||||
|
if (!cursor) return undefined;
|
||||||
|
try {
|
||||||
|
const parsed: unknown = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
|
||||||
|
if (!Array.isArray(parsed) || parsed.length !== 2 || !Number.isSafeInteger(parsed[0])
|
||||||
|
|| typeof parsed[1] !== "string" || !/^[A-Za-z0-9][A-Za-z0-9_.:-]{0,159}$/.test(parsed[1])) {
|
||||||
|
throw new AdminAuditQueryError();
|
||||||
|
}
|
||||||
|
return { occurredAt: parsed[0] as number, logId: parsed[1] };
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof AdminAuditQueryError) throw error;
|
||||||
|
throw new AdminAuditQueryError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeLimit(limit: number | undefined) {
|
||||||
|
if (limit === undefined) return 50;
|
||||||
|
if (!Number.isSafeInteger(limit) || limit < 1 || limit > 100) throw new AdminAuditQueryError();
|
||||||
|
return limit;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pageRows<Row extends { log_id: string; occurred_at: number }>(rows: Row[], limit: number) {
|
||||||
|
const hasMore = rows.length > limit;
|
||||||
|
const items = hasMore ? rows.slice(0, limit) : rows;
|
||||||
|
return { items, nextCursor: hasMore ? encodeCursor(items[items.length - 1]!) : null };
|
||||||
|
}
|
||||||
|
|
||||||
|
function iso(value: number) {
|
||||||
|
return new Date(value).toISOString();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function listAdminOperationAudit(
|
||||||
|
database: BetterSqlite3.Database,
|
||||||
|
query: AdminAuditQuery,
|
||||||
|
clock: () => number = Date.now,
|
||||||
|
): AdminOperationAuditResponse {
|
||||||
|
const cursor = decodeCursor(query.cursor);
|
||||||
|
const limit = normalizeLimit(query.limit);
|
||||||
|
const rows = (cursor
|
||||||
|
? database.prepare(`
|
||||||
|
SELECT actor_ref, actor_type, after_summary, before_summary, expires_at, log_id,
|
||||||
|
occurred_at, operation_type, result, target_ref, target_type
|
||||||
|
FROM admin_operation_logs
|
||||||
|
WHERE occurred_at < ? OR (occurred_at = ? AND log_id < ?)
|
||||||
|
ORDER BY occurred_at DESC, log_id DESC LIMIT ?
|
||||||
|
`).all(cursor.occurredAt, cursor.occurredAt, cursor.logId, limit + 1)
|
||||||
|
: database.prepare(`
|
||||||
|
SELECT actor_ref, actor_type, after_summary, before_summary, expires_at, log_id,
|
||||||
|
occurred_at, operation_type, result, target_ref, target_type
|
||||||
|
FROM admin_operation_logs
|
||||||
|
ORDER BY occurred_at DESC, log_id DESC LIMIT ?
|
||||||
|
`).all(limit + 1)) as AdminOperationRow[];
|
||||||
|
const page = pageRows(rows, limit);
|
||||||
|
const items: AdminOperationAuditItem[] = page.items.map((row) => ({
|
||||||
|
actor_ref: row.actor_ref,
|
||||||
|
actor_type: row.actor_type,
|
||||||
|
after_summary: row.after_summary,
|
||||||
|
before_summary: row.before_summary,
|
||||||
|
expires_at: iso(row.expires_at),
|
||||||
|
log_id: row.log_id,
|
||||||
|
occurred_at: iso(row.occurred_at),
|
||||||
|
operation_type: row.operation_type,
|
||||||
|
result: row.result,
|
||||||
|
target_ref: row.target_ref,
|
||||||
|
target_type: row.target_type,
|
||||||
|
}));
|
||||||
|
return { generated_at: iso(clock()), items, next_cursor: page.nextCursor };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function listPrivateContentAccessAudit(
|
||||||
|
database: BetterSqlite3.Database,
|
||||||
|
query: AdminAuditQuery,
|
||||||
|
clock: () => number = Date.now,
|
||||||
|
): PrivateContentAccessAuditResponse {
|
||||||
|
const cursor = decodeCursor(query.cursor);
|
||||||
|
const limit = normalizeLimit(query.limit);
|
||||||
|
const rows = (cursor
|
||||||
|
? database.prepare(`
|
||||||
|
SELECT actor_ref, content_type, expires_at, log_id, occurred_at, target_ref
|
||||||
|
FROM private_content_access_logs
|
||||||
|
WHERE occurred_at < ? OR (occurred_at = ? AND log_id < ?)
|
||||||
|
ORDER BY occurred_at DESC, log_id DESC LIMIT ?
|
||||||
|
`).all(cursor.occurredAt, cursor.occurredAt, cursor.logId, limit + 1)
|
||||||
|
: database.prepare(`
|
||||||
|
SELECT actor_ref, content_type, expires_at, log_id, occurred_at, target_ref
|
||||||
|
FROM private_content_access_logs
|
||||||
|
ORDER BY occurred_at DESC, log_id DESC LIMIT ?
|
||||||
|
`).all(limit + 1)) as PrivateContentAccessRow[];
|
||||||
|
const page = pageRows(rows, limit);
|
||||||
|
const items: PrivateContentAccessAuditItem[] = page.items.map((row) => ({
|
||||||
|
actor_ref: row.actor_ref,
|
||||||
|
content_type: row.content_type,
|
||||||
|
expires_at: iso(row.expires_at),
|
||||||
|
log_id: row.log_id,
|
||||||
|
occurred_at: iso(row.occurred_at),
|
||||||
|
target_ref: row.target_ref,
|
||||||
|
}));
|
||||||
|
return { generated_at: iso(clock()), items, next_cursor: page.nextCursor };
|
||||||
|
}
|
||||||
@@ -0,0 +1,197 @@
|
|||||||
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
|
import type { AdminDiagnosticsResponse, AdminServicesStorageResponse } from "@dada/shared-contracts";
|
||||||
|
|
||||||
|
import type { BrowserSupportRelease } from "./browser-support.js";
|
||||||
|
import type { ManagedStorage } from "./managed-storage.js";
|
||||||
|
import type { ModelConfigurationService } from "./model-configuration.js";
|
||||||
|
|
||||||
|
type AdminService = AdminServicesStorageResponse["services"][number];
|
||||||
|
const adminServiceIds = ["resend", "amap", "ai_gateway", "worker", "api", "asset_root"] as const;
|
||||||
|
const forbiddenDiagnosticPatterns = [
|
||||||
|
/\b(?:api[_ -]?key|secret|password|credential|authorization|bearer|session[_ -]?token|cookie|prompt|email|token)\b/i,
|
||||||
|
/[A-Z]:[\\/](?:Users|Documents|ProgramData|Windows)[\\/]/i,
|
||||||
|
/\\\\[^\\\s]+\\[^\s]+/,
|
||||||
|
/[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}/i,
|
||||||
|
/https?:\/\//i,
|
||||||
|
];
|
||||||
|
const safePauseReasons = new Set([
|
||||||
|
"asset_manifest_invalid", "asset_root_missing", "asset_root_state_missing", "balance_insufficient", "configured_disabled", "contract_blocked",
|
||||||
|
"contract_unverified", "gateway_balance_insufficient", "gateway_paused", "health_check_failed",
|
||||||
|
"model_disabled", "provider_unavailable", "quota_exhausted", "service_state_missing", "unknown",
|
||||||
|
"worker_degraded", "worker_state_missing", "worker_stopped",
|
||||||
|
]);
|
||||||
|
|
||||||
|
function iso(value: number | string | null | undefined) {
|
||||||
|
if (value === null || value === undefined) return null;
|
||||||
|
return typeof value === "number" ? new Date(value).toISOString() : value;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tableExists(database: BetterSqlite3.Database, table: string) {
|
||||||
|
return Boolean(database.prepare("SELECT 1 AS present FROM sqlite_master WHERE type = 'table' AND name = ?").get(table));
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeService(
|
||||||
|
service_id: AdminService["service_id"],
|
||||||
|
status: AdminService["status"],
|
||||||
|
impact_scope: AdminService["impact_scope"],
|
||||||
|
configured: boolean,
|
||||||
|
checked_at: string | null,
|
||||||
|
pause_reason: string | null = null,
|
||||||
|
): AdminService {
|
||||||
|
return { checked_at, configured, impact_scope, pause_reason, service_id, status };
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeReason(value: unknown) {
|
||||||
|
return typeof value === "string" && safePauseReasons.has(value) ? value : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function serviceUsage(database: BetterSqlite3.Database, serviceName: string) {
|
||||||
|
if (!tableExists(database, "external_service_usage")) return undefined;
|
||||||
|
const columns = new Set((database.prepare("PRAGMA table_info(external_service_usage)").all() as Array<{ name: string }>).map((column) => column.name));
|
||||||
|
const serviceColumn = columns.has("service_name") ? "service_name" : columns.has("service_id") ? "service_id" : undefined;
|
||||||
|
if (!serviceColumn || !columns.has("service_status")) return undefined;
|
||||||
|
const row = database.prepare(`SELECT service_status, ${columns.has("checked_at") ? "checked_at" : "NULL AS checked_at"}, ${columns.has("pause_reason") ? "pause_reason" : "NULL AS pause_reason"} FROM external_service_usage WHERE ${serviceColumn} = ? ORDER BY rowid DESC LIMIT 1`).get(serviceName) as { service_status: string; checked_at: number | string | null; pause_reason: string | null } | undefined;
|
||||||
|
if (!row) return undefined;
|
||||||
|
const status = new Set<AdminService["status"]>(["active", "paused_quota", "paused_provider", "disabled"]).has(row.service_status as AdminService["status"])
|
||||||
|
? row.service_status as AdminService["status"]
|
||||||
|
: "degraded";
|
||||||
|
return { status, checked_at: iso(row.checked_at), pause_reason: safeReason(row.pause_reason) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function workerStatus(database: BetterSqlite3.Database) {
|
||||||
|
if (!tableExists(database, "worker_runtime_state")) return { status: "unavailable" as const, checked_at: null, pause_reason: "worker_state_missing" };
|
||||||
|
const row = database.prepare("SELECT status, reason, updated_at FROM worker_runtime_state WHERE singleton = 1").get() as { status: string; reason: string | null; updated_at: number | string | null } | undefined;
|
||||||
|
if (!row) return { status: "unavailable" as const, checked_at: null, pause_reason: "worker_state_missing" };
|
||||||
|
return {
|
||||||
|
status: row.status === "ready" ? "active" as const : row.status === "degraded" ? "degraded" as const : "unavailable" as const,
|
||||||
|
checked_at: iso(row.updated_at),
|
||||||
|
pause_reason: safeReason(row.reason),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createAdminServicesStorageProvider(input: {
|
||||||
|
database: BetterSqlite3.Database;
|
||||||
|
models?: ModelConfigurationService;
|
||||||
|
storage?: ManagedStorage;
|
||||||
|
assetRoot?: Pick<AdminService, "configured" | "status" | "checked_at" | "pause_reason">;
|
||||||
|
clock?: () => number;
|
||||||
|
}): () => AdminServicesStorageResponse {
|
||||||
|
const clock = input.clock ?? Date.now;
|
||||||
|
return () => {
|
||||||
|
const generatedAt = new Date(clock()).toISOString();
|
||||||
|
const resend = serviceUsage(input.database, "resend");
|
||||||
|
const amap = serviceUsage(input.database, "amap");
|
||||||
|
const worker = workerStatus(input.database);
|
||||||
|
const modelRuntime = input.models?.read().models ?? [];
|
||||||
|
const unavailableModels = modelRuntime.filter((model) => !model.runtime_availability.available_for_new_jobs);
|
||||||
|
const gatewayReason = unavailableModels[0]?.runtime_availability.reason ?? null;
|
||||||
|
const storageState = input.storage?.getState();
|
||||||
|
const cleanupPendingCount = tableExists(input.database, "file_cleanup_queue")
|
||||||
|
? (input.database.prepare("SELECT COUNT(*) AS count FROM file_cleanup_queue WHERE status IN ('pending', 'failed')").get() as { count: number }).count
|
||||||
|
: 0;
|
||||||
|
const services: AdminService[] = [
|
||||||
|
safeService("resend", resend?.status ?? "unavailable", "authentication", Boolean(resend), resend?.checked_at ?? null, resend?.pause_reason ?? "service_state_missing"),
|
||||||
|
safeService("amap", amap?.status ?? "unavailable", "location", Boolean(amap), amap?.checked_at ?? null, amap?.pause_reason ?? "service_state_missing"),
|
||||||
|
safeService("ai_gateway", unavailableModels.length > 0 ? "degraded" : modelRuntime.length > 0 ? "active" : "unavailable", "generation", modelRuntime.length > 0, generatedAt, safeReason(gatewayReason)),
|
||||||
|
safeService("worker", worker.status, "generation", worker.status !== "unavailable", worker.checked_at, worker.pause_reason),
|
||||||
|
safeService("api", "active", "api", true, generatedAt),
|
||||||
|
safeService(
|
||||||
|
"asset_root",
|
||||||
|
input.assetRoot?.status ?? "unavailable",
|
||||||
|
"storage",
|
||||||
|
input.assetRoot?.configured ?? false,
|
||||||
|
input.assetRoot?.checked_at ?? null,
|
||||||
|
input.assetRoot?.pause_reason ?? "asset_root_state_missing",
|
||||||
|
),
|
||||||
|
];
|
||||||
|
return assertSafeAdminServicesStorage({
|
||||||
|
generated_at: generatedAt,
|
||||||
|
services,
|
||||||
|
storage: {
|
||||||
|
capacity_notice_level: storageState?.capacity_notice_level ?? "normal",
|
||||||
|
cleanup_pending_count: cleanupPendingCount,
|
||||||
|
data_root_ref: "configured_local_data_root",
|
||||||
|
hard_limit_bytes: storageState?.hard_limit_bytes ?? 5_368_709_120,
|
||||||
|
last_measured_at: storageState?.measured_at ?? null,
|
||||||
|
managed_content_bytes: storageState?.managed_content_bytes ?? 0,
|
||||||
|
remeasurement_required: storageState?.storage_status === "unavailable",
|
||||||
|
status: storageState?.storage_status ?? "unavailable",
|
||||||
|
storage_backend: "local_filesystem",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function diagnosticText(input: AdminServicesStorageResponse, system: AdminDiagnosticsResponse["system"]) {
|
||||||
|
const lines = [
|
||||||
|
"Dada P0-A diagnostics",
|
||||||
|
`app_version=${system.app_version}`,
|
||||||
|
`api_status=${system.api_status}`,
|
||||||
|
`worker_status=${system.worker_status}`,
|
||||||
|
`storage_status=${input.storage.status}`,
|
||||||
|
`capacity_notice_level=${input.storage.capacity_notice_level}`,
|
||||||
|
`managed_content_bytes=${input.storage.managed_content_bytes}`,
|
||||||
|
`hard_limit_bytes=${input.storage.hard_limit_bytes}`,
|
||||||
|
`cleanup_pending_count=${input.storage.cleanup_pending_count}`,
|
||||||
|
];
|
||||||
|
for (const service of input.services) lines.push(`service.${service.service_id}=${service.status}`);
|
||||||
|
return lines.join("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createAdminDiagnosticsProvider(input: {
|
||||||
|
servicesStorage: () => AdminServicesStorageResponse;
|
||||||
|
browserSupportRelease?: BrowserSupportRelease;
|
||||||
|
appVersion?: string;
|
||||||
|
clock?: () => number;
|
||||||
|
}): () => AdminDiagnosticsResponse {
|
||||||
|
const clock = input.clock ?? Date.now;
|
||||||
|
return () => {
|
||||||
|
const services = input.servicesStorage();
|
||||||
|
const system: AdminDiagnosticsResponse["system"] = {
|
||||||
|
api_status: "ready",
|
||||||
|
app_version: input.appVersion ?? input.browserSupportRelease?.appVersion ?? "0.0.0",
|
||||||
|
browser_support: (input.browserSupportRelease?.browsers ?? []).flatMap((browser) => {
|
||||||
|
const majors = browser.supportedMajorVersions
|
||||||
|
?? [Number.parseInt(browser.fullVersion.split(".")[0] ?? "0", 10)];
|
||||||
|
return majors
|
||||||
|
.map((major) => ({ brand: browser.brand, major }))
|
||||||
|
.filter((entry) => Number.isSafeInteger(entry.major) && entry.major > 0);
|
||||||
|
}),
|
||||||
|
worker_status: services.services.find((service) => service.service_id === "worker")?.status === "active"
|
||||||
|
? "ready"
|
||||||
|
: services.services.find((service) => service.service_id === "worker")?.status === "unavailable"
|
||||||
|
? "unavailable"
|
||||||
|
: "degraded",
|
||||||
|
};
|
||||||
|
return assertSafeAdminDiagnostics({
|
||||||
|
generated_at: new Date(clock()).toISOString(),
|
||||||
|
diagnostic_text: diagnosticText(services, system),
|
||||||
|
services,
|
||||||
|
system,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assertSafeAdminServicesStorage(input: AdminServicesStorageResponse) {
|
||||||
|
const ids = input.services.map((service) => service.service_id);
|
||||||
|
if (ids.length !== adminServiceIds.length || new Set(ids).size !== adminServiceIds.length
|
||||||
|
|| adminServiceIds.some((serviceId) => !ids.includes(serviceId))) {
|
||||||
|
throw new Error("admin_service_state_incomplete");
|
||||||
|
}
|
||||||
|
if (input.services.some((service) => service.pause_reason !== null && !safePauseReasons.has(service.pause_reason))) {
|
||||||
|
throw new Error("admin_services_redaction_failed");
|
||||||
|
}
|
||||||
|
if (forbiddenDiagnosticPatterns.some((pattern) => pattern.test(JSON.stringify(input)))) {
|
||||||
|
throw new Error("admin_services_redaction_failed");
|
||||||
|
}
|
||||||
|
return input;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assertSafeAdminDiagnostics(input: AdminDiagnosticsResponse) {
|
||||||
|
assertSafeAdminServicesStorage(input.services);
|
||||||
|
if (forbiddenDiagnosticPatterns.some((pattern) => pattern.test(input.diagnostic_text))) {
|
||||||
|
throw new Error("admin_diagnostics_redaction_failed");
|
||||||
|
}
|
||||||
|
return input;
|
||||||
|
}
|
||||||
@@ -1,5 +1,31 @@
|
|||||||
|
import { request as httpsRequest } from "node:https";
|
||||||
|
|
||||||
|
const amapHostname = "restapi.amap.com" as const;
|
||||||
|
const amapMaxResponseBytes = 65_536;
|
||||||
|
const amapTimeoutMs = 15_000;
|
||||||
|
|
||||||
|
export interface AmapHttpRequest {
|
||||||
|
allowRedirects: false;
|
||||||
|
hostname: typeof amapHostname;
|
||||||
|
maxResponseBytes: number;
|
||||||
|
method: "GET";
|
||||||
|
path: string;
|
||||||
|
protocol: "https:";
|
||||||
|
rejectUnauthorized: true;
|
||||||
|
timeoutMs: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
type AmapRequester = (request: AmapHttpRequest) => Promise<unknown>;
|
||||||
|
|
||||||
|
export class AmapAdapterError extends Error {
|
||||||
|
constructor(readonly code: "amap_adapter_disposed" | "amap_invalid_request" | "amap_invalid_response" | "amap_provider_rejected" | "amap_provider_unavailable" | "amap_redirect_rejected" | "amap_request_timeout" | "amap_response_too_large") {
|
||||||
|
super(code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export interface AmapAdapter {
|
export interface AmapAdapter {
|
||||||
reverseGeocode(coordinates: { latitude: number; longitude: number }): Promise<{ formattedValue: string; serviceMode: "mock" }>;
|
dispose?(): void;
|
||||||
|
reverseGeocode(coordinates: { latitude: number; longitude: number }): Promise<{ formattedValue: string; serviceMode: "mock" | "real" }>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class MockAmapAdapter implements AmapAdapter {
|
export class MockAmapAdapter implements AmapAdapter {
|
||||||
@@ -13,3 +39,126 @@ export class MockAmapAdapter implements AmapAdapter {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function requestAmapJson(input: AmapHttpRequest) {
|
||||||
|
return new Promise<unknown>((resolve, reject) => {
|
||||||
|
if (input.protocol !== "https:" || input.hostname !== amapHostname || input.allowRedirects || !input.rejectUnauthorized) {
|
||||||
|
reject(new AmapAdapterError("amap_invalid_request"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let settled = false;
|
||||||
|
const finish = (callback: () => void) => {
|
||||||
|
if (settled) return;
|
||||||
|
settled = true;
|
||||||
|
callback();
|
||||||
|
};
|
||||||
|
const request = httpsRequest({
|
||||||
|
headers: { Accept: "application/json" },
|
||||||
|
hostname: input.hostname,
|
||||||
|
method: input.method,
|
||||||
|
path: input.path,
|
||||||
|
port: 443,
|
||||||
|
protocol: input.protocol,
|
||||||
|
rejectUnauthorized: input.rejectUnauthorized,
|
||||||
|
servername: input.hostname,
|
||||||
|
}, (response) => {
|
||||||
|
const statusCode = response.statusCode ?? 0;
|
||||||
|
if (statusCode >= 300 && statusCode < 400) {
|
||||||
|
response.resume();
|
||||||
|
finish(() => reject(new AmapAdapterError("amap_redirect_rejected")));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (statusCode !== 200) {
|
||||||
|
response.resume();
|
||||||
|
finish(() => reject(new AmapAdapterError("amap_provider_unavailable")));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const declaredLength = Number(response.headers["content-length"] ?? 0);
|
||||||
|
if (Number.isFinite(declaredLength) && declaredLength > input.maxResponseBytes) {
|
||||||
|
response.destroy();
|
||||||
|
finish(() => reject(new AmapAdapterError("amap_response_too_large")));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const chunks: Buffer[] = [];
|
||||||
|
let receivedBytes = 0;
|
||||||
|
response.on("data", (chunk: Buffer | string) => {
|
||||||
|
const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
|
||||||
|
receivedBytes += bytes.length;
|
||||||
|
if (receivedBytes > input.maxResponseBytes) {
|
||||||
|
response.destroy();
|
||||||
|
finish(() => reject(new AmapAdapterError("amap_response_too_large")));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
chunks.push(bytes);
|
||||||
|
});
|
||||||
|
response.on("end", () => {
|
||||||
|
finish(() => {
|
||||||
|
try {
|
||||||
|
resolve(JSON.parse(Buffer.concat(chunks).toString("utf8")));
|
||||||
|
} catch {
|
||||||
|
reject(new AmapAdapterError("amap_invalid_response"));
|
||||||
|
} finally {
|
||||||
|
for (const chunk of chunks) chunk.fill(0);
|
||||||
|
chunks.length = 0;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
request.setTimeout(input.timeoutMs, () => request.destroy(new AmapAdapterError("amap_request_timeout")));
|
||||||
|
request.on("error", (error) => finish(() => reject(error instanceof AmapAdapterError ? error : new AmapAdapterError("amap_provider_unavailable"))));
|
||||||
|
request.end();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||||
|
return Boolean(value) && typeof value === "object" && !Array.isArray(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RealAmapAdapter implements AmapAdapter {
|
||||||
|
private readonly credential: Buffer;
|
||||||
|
private readonly requester: AmapRequester;
|
||||||
|
private disposed = false;
|
||||||
|
|
||||||
|
constructor(value: string, options: { request?: AmapRequester } = {}) {
|
||||||
|
if (!value.trim()) throw new AmapAdapterError("amap_invalid_request");
|
||||||
|
this.credential = Buffer.from(value, "utf8");
|
||||||
|
this.requester = options.request ?? requestAmapJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
async reverseGeocode(coordinates: { latitude: number; longitude: number }) {
|
||||||
|
if (this.disposed) throw new AmapAdapterError("amap_adapter_disposed");
|
||||||
|
if (!Number.isFinite(coordinates.latitude) || coordinates.latitude < -90 || coordinates.latitude > 90
|
||||||
|
|| !Number.isFinite(coordinates.longitude) || coordinates.longitude < -180 || coordinates.longitude > 180) {
|
||||||
|
throw new AmapAdapterError("amap_invalid_request");
|
||||||
|
}
|
||||||
|
const query = new URLSearchParams({
|
||||||
|
extensions: "base",
|
||||||
|
key: this.credential.toString("utf8"),
|
||||||
|
location: `${coordinates.longitude},${coordinates.latitude}`,
|
||||||
|
});
|
||||||
|
const response = await this.requester({
|
||||||
|
allowRedirects: false,
|
||||||
|
hostname: amapHostname,
|
||||||
|
maxResponseBytes: amapMaxResponseBytes,
|
||||||
|
method: "GET",
|
||||||
|
path: `/v3/geocode/regeo?${query.toString()}`,
|
||||||
|
protocol: "https:",
|
||||||
|
rejectUnauthorized: true,
|
||||||
|
timeoutMs: amapTimeoutMs,
|
||||||
|
});
|
||||||
|
if (!isRecord(response) || response.status !== "1" || !isRecord(response.regeocode)) {
|
||||||
|
throw new AmapAdapterError("amap_provider_rejected");
|
||||||
|
}
|
||||||
|
const formattedValue = typeof response.regeocode.formatted_address === "string"
|
||||||
|
? response.regeocode.formatted_address.trim()
|
||||||
|
: "";
|
||||||
|
if (!formattedValue || formattedValue.length > 200) throw new AmapAdapterError("amap_invalid_response");
|
||||||
|
return { formattedValue, serviceMode: "real" as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
dispose() {
|
||||||
|
if (this.disposed) return;
|
||||||
|
this.disposed = true;
|
||||||
|
this.credential.fill(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+841
-7
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,7 @@ export const BrowserSupportSuccessSchema = Type.Object(
|
|||||||
app_version: Type.String({ maxLength: 80 }),
|
app_version: Type.String({ maxLength: 80 }),
|
||||||
browser: SupportedBrowserSummarySchema,
|
browser: SupportedBrowserSummarySchema,
|
||||||
status: Type.Literal("supported"),
|
status: Type.Literal("supported"),
|
||||||
supported_browsers: Type.Array(SupportedBrowserSummarySchema, { maxItems: 2 }),
|
supported_browsers: Type.Array(SupportedBrowserSummarySchema, { maxItems: 8 }),
|
||||||
},
|
},
|
||||||
{ additionalProperties: false, $id: "BrowserSupportSuccess" },
|
{ additionalProperties: false, $id: "BrowserSupportSuccess" },
|
||||||
);
|
);
|
||||||
@@ -57,6 +57,7 @@ export interface BrowserSupportRelease {
|
|||||||
browsers: ReadonlyArray<{
|
browsers: ReadonlyArray<{
|
||||||
brand: SupportedBrand;
|
brand: SupportedBrand;
|
||||||
fullVersion: string;
|
fullVersion: string;
|
||||||
|
supportedMajorVersions?: ReadonlyArray<number>;
|
||||||
}>;
|
}>;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,7 +116,14 @@ function supportedIdentity(entries: Array<{ brand: string; version: string }>) {
|
|||||||
|
|
||||||
export function supportedBrowserSummary(release: BrowserSupportRelease | undefined) {
|
export function supportedBrowserSummary(release: BrowserSupportRelease | undefined) {
|
||||||
if (!release) return [];
|
if (!release) return [];
|
||||||
return release.browsers.map(({ brand, fullVersion }) => ({ brand, major: major(fullVersion)! }));
|
return release.browsers.flatMap(({ brand, fullVersion, supportedMajorVersions }) => {
|
||||||
|
const majors = supportedMajorVersions ?? [major(fullVersion)!];
|
||||||
|
return majors.map((supportedMajor) => ({ brand, major: supportedMajor }));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function acceptedMajorVersions(browser: BrowserSupportRelease["browsers"][number]) {
|
||||||
|
return browser.supportedMajorVersions ?? [major(browser.fullVersion)!];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function validateBrowserSupportRelease(value: unknown): value is BrowserSupportRelease {
|
export function validateBrowserSupportRelease(value: unknown): value is BrowserSupportRelease {
|
||||||
@@ -126,13 +134,26 @@ export function validateBrowserSupportRelease(value: unknown): value is BrowserS
|
|||||||
}
|
}
|
||||||
if (!Array.isArray(release.browsers) || release.browsers.length !== 2) return false;
|
if (!Array.isArray(release.browsers) || release.browsers.length !== 2) return false;
|
||||||
const brands = new Set(release.browsers.map(({ brand }) => brand));
|
const brands = new Set(release.browsers.map(({ brand }) => brand));
|
||||||
|
const supportedMajorCount = release.browsers.reduce(
|
||||||
|
(count, browser) => count + (browser.supportedMajorVersions?.length ?? 1),
|
||||||
|
0,
|
||||||
|
);
|
||||||
return (
|
return (
|
||||||
brands.size === 2 &&
|
brands.size === 2 &&
|
||||||
brands.has("Google Chrome") &&
|
brands.has("Google Chrome") &&
|
||||||
brands.has("Microsoft Edge") &&
|
brands.has("Microsoft Edge") &&
|
||||||
release.browsers.every(
|
supportedMajorCount <= 8 &&
|
||||||
({ brand, fullVersion }) => supportedBrands.has(brand) && fullVersionPattern.test(fullVersion),
|
release.browsers.every(({ brand, fullVersion, supportedMajorVersions }) => {
|
||||||
)
|
if (!supportedBrands.has(brand) || !fullVersionPattern.test(fullVersion)) return false;
|
||||||
|
const baselineMajor = major(fullVersion);
|
||||||
|
if (!baselineMajor) return false;
|
||||||
|
if (supportedMajorVersions === undefined) return true;
|
||||||
|
return supportedMajorVersions.length > 0
|
||||||
|
&& supportedMajorVersions.length <= 8
|
||||||
|
&& supportedMajorVersions.every((value: number) => Number.isSafeInteger(value) && value >= 1)
|
||||||
|
&& new Set(supportedMajorVersions).size === supportedMajorVersions.length
|
||||||
|
&& supportedMajorVersions.includes(baselineMajor);
|
||||||
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,7 +209,7 @@ export function checkBrowserSupport(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const supported = release?.browsers.find(({ brand }) => brand === fullIdentity.brand);
|
const supported = release?.browsers.find(({ brand }) => brand === fullIdentity.brand);
|
||||||
if (!supported || major(supported.fullVersion) !== fullIdentity.major) {
|
if (!supported || !acceptedMajorVersions(supported).includes(fullIdentity.major)) {
|
||||||
return { reason: "version_unsupported", supported: false };
|
return { reason: "version_unsupported", supported: false };
|
||||||
}
|
}
|
||||||
return { identity: fullIdentity, supported: true };
|
return { identity: fullIdentity, supported: true };
|
||||||
@@ -268,7 +289,7 @@ export function verifyBrowserSupportCookie(input: {
|
|||||||
return { reason: "identity_unavailable" as const, supported: false as const };
|
return { reason: "identity_unavailable" as const, supported: false as const };
|
||||||
}
|
}
|
||||||
const supported = input.release.browsers.find(({ brand }) => brand === currentIdentity.brand);
|
const supported = input.release.browsers.find(({ brand }) => brand === currentIdentity.brand);
|
||||||
if (currentIdentity.major !== payload.major || major(supported?.fullVersion ?? "") !== currentIdentity.major) {
|
if (!supported || currentIdentity.major !== payload.major || !acceptedMajorVersions(supported).includes(currentIdentity.major)) {
|
||||||
return { reason: "version_unsupported" as const, supported: false as const };
|
return { reason: "version_unsupported" as const, supported: false as const };
|
||||||
}
|
}
|
||||||
return { identity: currentIdentity, supported: true as const };
|
return { identity: currentIdentity, supported: true as const };
|
||||||
|
|||||||
@@ -0,0 +1,459 @@
|
|||||||
|
import { randomUUID } from "node:crypto";
|
||||||
|
|
||||||
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
|
import { serializeAuditSummary } from "./audit-policy.js";
|
||||||
|
|
||||||
|
export type ExternalServiceId = "resend_email" | "amap_web_service";
|
||||||
|
export type ExternalServicePeriodType = "daily" | "monthly";
|
||||||
|
export type ExternalServiceStatus = "active" | "paused_quota" | "paused_provider" | "disabled";
|
||||||
|
|
||||||
|
const retentionMilliseconds = 180 * 24 * 60 * 60 * 1_000;
|
||||||
|
const recoveryCheckLifetimeMilliseconds = 15 * 60 * 1_000;
|
||||||
|
const maximumHardLimits: Record<ExternalServiceId, Partial<Record<ExternalServicePeriodType, number>>> = {
|
||||||
|
resend_email: { daily: 80, monthly: 2_400 },
|
||||||
|
amap_web_service: { monthly: 1_000 },
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface ExternalServiceUsageRow {
|
||||||
|
serviceId: ExternalServiceId;
|
||||||
|
periodType: ExternalServicePeriodType;
|
||||||
|
periodStart: number;
|
||||||
|
hardLimit: number;
|
||||||
|
usedCount: number;
|
||||||
|
status: ExternalServiceStatus;
|
||||||
|
pauseReason: string | null;
|
||||||
|
updatedAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ExternalServiceUsageError extends Error {
|
||||||
|
constructor(
|
||||||
|
readonly code:
|
||||||
|
| "service_paused_quota"
|
||||||
|
| "service_paused_provider"
|
||||||
|
| "service_disabled"
|
||||||
|
| "hard_limit_increase_forbidden"
|
||||||
|
| "hard_limit_invalid"
|
||||||
|
| "health_check_required"
|
||||||
|
| "quota_exhausted"
|
||||||
|
| "service_not_found",
|
||||||
|
message = code,
|
||||||
|
) {
|
||||||
|
super(message);
|
||||||
|
this.name = "ExternalServiceUsageError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ExternalServiceUsageOptions {
|
||||||
|
clock?: () => number;
|
||||||
|
database: BetterSqlite3.Database;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface RawUsageRow {
|
||||||
|
service_id: ExternalServiceId;
|
||||||
|
period_type: ExternalServicePeriodType;
|
||||||
|
period_start: number;
|
||||||
|
hard_limit: number;
|
||||||
|
used_count: number;
|
||||||
|
service_status: ExternalServiceStatus;
|
||||||
|
pause_reason: string | null;
|
||||||
|
updated_at: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function periodStart(periodType: ExternalServicePeriodType, now: number) {
|
||||||
|
const date = new Date(now);
|
||||||
|
if (periodType === "daily") return Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
|
||||||
|
return Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function requiredPeriods(serviceId: ExternalServiceId): ExternalServicePeriodType[] {
|
||||||
|
return serviceId === "resend_email" ? ["daily", "monthly"] : ["monthly"];
|
||||||
|
}
|
||||||
|
|
||||||
|
function toPublic(row: RawUsageRow): ExternalServiceUsageRow {
|
||||||
|
return {
|
||||||
|
hardLimit: row.hard_limit,
|
||||||
|
pauseReason: row.pause_reason,
|
||||||
|
periodStart: row.period_start,
|
||||||
|
periodType: row.period_type,
|
||||||
|
serviceId: row.service_id,
|
||||||
|
status: row.service_status,
|
||||||
|
updatedAt: row.updated_at,
|
||||||
|
usedCount: row.used_count,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ExternalServiceUsage {
|
||||||
|
readonly database: BetterSqlite3.Database;
|
||||||
|
readonly clock: () => number;
|
||||||
|
|
||||||
|
constructor(options: ExternalServiceUsageOptions) {
|
||||||
|
this.database = options.database;
|
||||||
|
this.clock = options.clock ?? Date.now;
|
||||||
|
this.ensureSchema();
|
||||||
|
this.runImmediate(() => {
|
||||||
|
this.ensureCurrentRows(this.clock(), "resend_email");
|
||||||
|
this.ensureCurrentRows(this.clock(), "amap_web_service");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
claimResend(now = this.clock()) {
|
||||||
|
return this.runImmediate(() => this.claimWithinTransaction("resend_email", now));
|
||||||
|
}
|
||||||
|
|
||||||
|
claimResendWithinTransaction(now = this.clock()) {
|
||||||
|
return this.claimWithinTransaction("resend_email", now);
|
||||||
|
}
|
||||||
|
|
||||||
|
claimAmap(now = this.clock()) {
|
||||||
|
return this.runImmediate(() => this.claimWithinTransaction("amap_web_service", now));
|
||||||
|
}
|
||||||
|
|
||||||
|
claimAmapWithinTransaction(now = this.clock()) {
|
||||||
|
return this.claimWithinTransaction("amap_web_service", now);
|
||||||
|
}
|
||||||
|
|
||||||
|
markProviderFailure(input: { serviceId: ExternalServiceId; reason: string; now?: number }) {
|
||||||
|
return this.runImmediate(() => this.markProviderFailureWithinTransaction(input));
|
||||||
|
}
|
||||||
|
|
||||||
|
markProviderFailureWithinTransaction(input: { serviceId: ExternalServiceId; reason: string; now?: number }) {
|
||||||
|
const now = input.now ?? this.clock();
|
||||||
|
const rows = this.ensureCurrentRows(now, input.serviceId);
|
||||||
|
const reason = normalizeReason(input.reason);
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.service_status === "disabled") continue;
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE external_service_usage
|
||||||
|
SET service_status = 'paused_provider', pause_reason = ?, updated_at = ?
|
||||||
|
WHERE service_id = ? AND period_type = ? AND period_start = ?
|
||||||
|
`).run(reason, now, row.service_id, row.period_type, row.period_start);
|
||||||
|
}
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: "external_service_runtime",
|
||||||
|
actorType: "system",
|
||||||
|
afterSummary: { pause_reason: reason, status: "paused_provider" },
|
||||||
|
beforeSummary: { status: rows[0]?.service_status ?? "active" },
|
||||||
|
operationType: "service_provider_pause",
|
||||||
|
result: "succeeded",
|
||||||
|
targetRef: input.serviceId,
|
||||||
|
targetType: "external_service",
|
||||||
|
}, now);
|
||||||
|
return this.read(input.serviceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
recordHealthCheck(input: { serviceId: ExternalServiceId; available: boolean; reason?: string; now?: number }) {
|
||||||
|
const now = input.now ?? this.clock();
|
||||||
|
const checkId = randomUUID();
|
||||||
|
const currentPeriod = periodStart(requiredPeriods(input.serviceId)[0]!, now);
|
||||||
|
const result = this.runImmediate(() => {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO service_recovery_checks (
|
||||||
|
check_id, service_name, target_ref, status, checked_at, expires_at, details_json,
|
||||||
|
service_id, period_start, available, check_reason
|
||||||
|
) VALUES (?, 'external_service', ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
checkId,
|
||||||
|
input.serviceId,
|
||||||
|
input.available ? "passed" : "failed",
|
||||||
|
now,
|
||||||
|
now + recoveryCheckLifetimeMilliseconds,
|
||||||
|
JSON.stringify({ non_sensitive: true }),
|
||||||
|
input.serviceId,
|
||||||
|
currentPeriod,
|
||||||
|
input.available ? 1 : 0,
|
||||||
|
input.reason ? normalizeReason(input.reason) : null,
|
||||||
|
);
|
||||||
|
return { checkId, available: input.available, checkedAt: now };
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
recover(input: { serviceId: ExternalServiceId; actorId: string; checkId: string; now?: number }) {
|
||||||
|
const now = input.now ?? this.clock();
|
||||||
|
const result = this.runImmediate(() => {
|
||||||
|
const check = this.database.prepare(`
|
||||||
|
SELECT check_id, period_start, available, expires_at
|
||||||
|
FROM service_recovery_checks
|
||||||
|
WHERE check_id = ? AND service_id = ? AND service_name = 'external_service'
|
||||||
|
`).get(input.checkId, input.serviceId) as { available: number; check_id: string; expires_at: number; period_start: number } | undefined;
|
||||||
|
const currentPeriod = periodStart(requiredPeriods(input.serviceId)[0]!, now);
|
||||||
|
if (!check?.available || check.period_start !== currentPeriod || check.expires_at <= now) {
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { reason: "health_check_required" },
|
||||||
|
beforeSummary: null,
|
||||||
|
operationType: "service_recovery",
|
||||||
|
result: "failed",
|
||||||
|
targetRef: input.serviceId,
|
||||||
|
targetType: "external_service",
|
||||||
|
}, now);
|
||||||
|
return { error: new ExternalServiceUsageError("health_check_required") };
|
||||||
|
}
|
||||||
|
const rows = this.ensureCurrentRows(now, input.serviceId);
|
||||||
|
if (rows.some((row) => row.used_count >= row.hard_limit)) {
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { reason: "quota_exhausted" },
|
||||||
|
beforeSummary: { status: rows[0]?.service_status ?? "paused_quota" },
|
||||||
|
operationType: "service_recovery",
|
||||||
|
result: "failed",
|
||||||
|
targetRef: input.serviceId,
|
||||||
|
targetType: "external_service",
|
||||||
|
}, now);
|
||||||
|
return { error: new ExternalServiceUsageError("quota_exhausted") };
|
||||||
|
}
|
||||||
|
for (const row of rows) {
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE external_service_usage
|
||||||
|
SET service_status = 'active', pause_reason = NULL, updated_at = ?
|
||||||
|
WHERE service_id = ? AND period_type = ? AND period_start = ?
|
||||||
|
`).run(now, row.service_id, row.period_type, row.period_start);
|
||||||
|
}
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { check_id: input.checkId, status: "active" },
|
||||||
|
beforeSummary: { status: rows[0]?.service_status ?? "paused_provider" },
|
||||||
|
operationType: "service_recovery",
|
||||||
|
result: "succeeded",
|
||||||
|
targetRef: input.serviceId,
|
||||||
|
targetType: "external_service",
|
||||||
|
}, now);
|
||||||
|
return { status: "active" as const };
|
||||||
|
});
|
||||||
|
if ("error" in result && result.error) throw result.error;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
setHardLimit(input: {
|
||||||
|
serviceId: ExternalServiceId;
|
||||||
|
periodType: ExternalServicePeriodType;
|
||||||
|
hardLimit: number;
|
||||||
|
actorId: string;
|
||||||
|
now?: number;
|
||||||
|
}) {
|
||||||
|
const now = input.now ?? this.clock();
|
||||||
|
const result = this.runImmediate(() => {
|
||||||
|
const maximum = maximumHardLimits[input.serviceId][input.periodType];
|
||||||
|
const current = this.ensureCurrentRows(now, input.serviceId).find((row) => row.period_type === input.periodType);
|
||||||
|
if (current && input.hardLimit > current.hard_limit) {
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { reason: "hard_limit_increase_forbidden" },
|
||||||
|
beforeSummary: { hard_limit: current.hard_limit },
|
||||||
|
operationType: "service_hard_limit_update",
|
||||||
|
result: "failed",
|
||||||
|
targetRef: `${input.serviceId}:${input.periodType}`,
|
||||||
|
targetType: "external_service_limit",
|
||||||
|
}, now);
|
||||||
|
return { error: new ExternalServiceUsageError("hard_limit_increase_forbidden") };
|
||||||
|
}
|
||||||
|
const valid = maximum !== undefined && Number.isSafeInteger(input.hardLimit) && input.hardLimit >= 1 && input.hardLimit <= maximum;
|
||||||
|
if (!valid || !current) {
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { reason: "hard_limit_invalid" },
|
||||||
|
beforeSummary: current ? { hard_limit: current.hard_limit } : null,
|
||||||
|
operationType: "service_hard_limit_update",
|
||||||
|
result: "failed",
|
||||||
|
targetRef: `${input.serviceId}:${input.periodType}`,
|
||||||
|
targetType: "external_service_limit",
|
||||||
|
}, now);
|
||||||
|
return { error: new ExternalServiceUsageError("hard_limit_invalid") };
|
||||||
|
}
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE external_service_usage
|
||||||
|
SET hard_limit = ?, service_status = CASE
|
||||||
|
WHEN used_count >= ? THEN 'paused_quota'
|
||||||
|
ELSE service_status
|
||||||
|
END, pause_reason = CASE
|
||||||
|
WHEN used_count >= ? THEN 'hard_limit_reached'
|
||||||
|
ELSE pause_reason
|
||||||
|
END, updated_at = ?
|
||||||
|
WHERE service_id = ? AND period_type = ? AND period_start = ?
|
||||||
|
`).run(input.hardLimit, input.hardLimit, input.hardLimit, now, current.service_id, current.period_type, current.period_start);
|
||||||
|
this.recordAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { hard_limit: input.hardLimit },
|
||||||
|
beforeSummary: { hard_limit: current.hard_limit },
|
||||||
|
operationType: "service_hard_limit_update",
|
||||||
|
result: "succeeded",
|
||||||
|
targetRef: `${input.serviceId}:${input.periodType}`,
|
||||||
|
targetType: "external_service_limit",
|
||||||
|
}, now);
|
||||||
|
return this.read(input.serviceId);
|
||||||
|
});
|
||||||
|
if ("error" in result && result.error) throw result.error;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
read(serviceId?: ExternalServiceId) {
|
||||||
|
const rows = (serviceId
|
||||||
|
? this.database.prepare("SELECT * FROM external_service_usage WHERE service_id = ? ORDER BY period_type").all(serviceId)
|
||||||
|
: this.database.prepare("SELECT * FROM external_service_usage ORDER BY service_id, period_type").all()) as RawUsageRow[];
|
||||||
|
return rows.map(toPublic);
|
||||||
|
}
|
||||||
|
|
||||||
|
readCurrent() {
|
||||||
|
const now = this.clock();
|
||||||
|
return this.read().filter((row) => row.periodStart === periodStart(row.periodType, now));
|
||||||
|
}
|
||||||
|
|
||||||
|
readStatus(serviceId: ExternalServiceId) {
|
||||||
|
const rows = this.read(serviceId).filter((row) => row.periodStart >= periodStart(row.periodType, this.clock()));
|
||||||
|
const status = rows.some((row) => row.status === "disabled")
|
||||||
|
? "disabled"
|
||||||
|
: rows.some((row) => row.status === "paused_provider")
|
||||||
|
? "paused_provider"
|
||||||
|
: rows.some((row) => row.status === "paused_quota")
|
||||||
|
? "paused_quota"
|
||||||
|
: "active";
|
||||||
|
return { serviceId, status, rows } as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
private claimWithinTransaction(serviceId: ExternalServiceId, now: number) {
|
||||||
|
const rows = this.ensureCurrentRows(now, serviceId);
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.service_status === "paused_quota") throw new ExternalServiceUsageError("service_paused_quota");
|
||||||
|
if (row.service_status === "paused_provider") throw new ExternalServiceUsageError("service_paused_provider");
|
||||||
|
if (row.service_status === "disabled") throw new ExternalServiceUsageError("service_disabled");
|
||||||
|
if (row.used_count >= row.hard_limit) {
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE external_service_usage
|
||||||
|
SET service_status = 'paused_quota', pause_reason = 'hard_limit_reached', updated_at = ?
|
||||||
|
WHERE service_id = ? AND period_type = ? AND period_start = ?
|
||||||
|
`).run(now, row.service_id, row.period_type, row.period_start);
|
||||||
|
throw new ExternalServiceUsageError("service_paused_quota");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const updated = rows.map((row) => {
|
||||||
|
const usedCount = row.used_count + 1;
|
||||||
|
const status: ExternalServiceStatus = usedCount >= row.hard_limit ? "paused_quota" : "active";
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE external_service_usage
|
||||||
|
SET used_count = ?, service_status = ?, pause_reason = CASE WHEN ? = 'active' THEN NULL ELSE 'hard_limit_reached' END, updated_at = ?
|
||||||
|
WHERE service_id = ? AND period_type = ? AND period_start = ?
|
||||||
|
`).run(usedCount, status, status, now, row.service_id, row.period_type, row.period_start);
|
||||||
|
return { periodType: row.period_type, remaining: Math.max(0, row.hard_limit - usedCount), usedCount };
|
||||||
|
});
|
||||||
|
return { allowed: true as const, serviceId, allocations: updated, remaining: Math.min(...updated.map((item) => item.remaining)) };
|
||||||
|
}
|
||||||
|
|
||||||
|
private ensureCurrentRows(now: number, serviceId: ExternalServiceId) {
|
||||||
|
const periods = requiredPeriods(serviceId);
|
||||||
|
for (const periodType of periods) {
|
||||||
|
const start = periodStart(periodType, now);
|
||||||
|
const current = this.database.prepare(`
|
||||||
|
SELECT * FROM external_service_usage WHERE service_id = ? AND period_type = ? AND period_start = ?
|
||||||
|
`).get(serviceId, periodType, start) as RawUsageRow | undefined;
|
||||||
|
if (current) continue;
|
||||||
|
const previous = this.database.prepare(`
|
||||||
|
SELECT hard_limit FROM external_service_usage
|
||||||
|
WHERE service_id = ? AND period_type = ? ORDER BY period_start DESC LIMIT 1
|
||||||
|
`).get(serviceId, periodType) as { hard_limit: number } | undefined;
|
||||||
|
const maximum = maximumHardLimits[serviceId][periodType];
|
||||||
|
if (maximum === undefined) throw new ExternalServiceUsageError("service_not_found");
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO external_service_usage (
|
||||||
|
service_id, period_type, period_start, hard_limit, used_count,
|
||||||
|
service_status, pause_reason, updated_at
|
||||||
|
) VALUES (?, ?, ?, ?, 0, ?, ?, ?)
|
||||||
|
`).run(serviceId, periodType, start, previous?.hard_limit ?? maximum, previous ? "paused_quota" : "active", previous ? "period_confirmation_required" : null, now);
|
||||||
|
}
|
||||||
|
return this.database.prepare(`
|
||||||
|
SELECT * FROM external_service_usage
|
||||||
|
WHERE service_id = ? AND period_start IN (${periods.map(() => "?").join(",")})
|
||||||
|
ORDER BY period_type
|
||||||
|
`).all(serviceId, ...periods.map((period) => periodStart(period, now))) as RawUsageRow[];
|
||||||
|
}
|
||||||
|
|
||||||
|
private ensureSchema() {
|
||||||
|
this.database.exec(`
|
||||||
|
CREATE TABLE IF NOT EXISTS external_service_usage (
|
||||||
|
service_id TEXT NOT NULL CHECK (service_id IN ('resend_email', 'amap_web_service')),
|
||||||
|
period_type TEXT NOT NULL CHECK (period_type IN ('daily', 'monthly')),
|
||||||
|
period_start INTEGER NOT NULL,
|
||||||
|
hard_limit INTEGER NOT NULL CHECK (hard_limit >= 1),
|
||||||
|
used_count INTEGER NOT NULL CHECK (used_count >= 0 AND used_count <= hard_limit),
|
||||||
|
service_status TEXT NOT NULL CHECK (service_status IN ('active', 'paused_quota', 'paused_provider', 'disabled')),
|
||||||
|
pause_reason TEXT,
|
||||||
|
updated_at INTEGER NOT NULL,
|
||||||
|
PRIMARY KEY (service_id, period_type, period_start)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS service_recovery_checks (
|
||||||
|
check_id TEXT PRIMARY KEY,
|
||||||
|
service_name TEXT NOT NULL DEFAULT 'external_service',
|
||||||
|
target_ref TEXT NOT NULL DEFAULT '',
|
||||||
|
status TEXT NOT NULL DEFAULT 'passed' CHECK (status IN ('passed', 'failed')),
|
||||||
|
checked_at INTEGER NOT NULL DEFAULT 0,
|
||||||
|
expires_at INTEGER NOT NULL DEFAULT 0,
|
||||||
|
details_json TEXT NOT NULL DEFAULT '{}',
|
||||||
|
service_id TEXT CHECK (service_id IS NULL OR service_id IN ('resend_email', 'amap_web_service')),
|
||||||
|
period_start INTEGER,
|
||||||
|
available INTEGER CHECK (available IS NULL OR available IN (0, 1)),
|
||||||
|
check_reason TEXT
|
||||||
|
);
|
||||||
|
`);
|
||||||
|
const columns = new Set((this.database.prepare("PRAGMA table_info(service_recovery_checks)").all() as Array<{ name: string }>).map((column) => column.name));
|
||||||
|
const additions: Array<[string, string]> = [
|
||||||
|
["service_name", "TEXT NOT NULL DEFAULT 'external_service'"],
|
||||||
|
["target_ref", "TEXT NOT NULL DEFAULT ''"],
|
||||||
|
["status", "TEXT NOT NULL DEFAULT 'passed'"],
|
||||||
|
["expires_at", "INTEGER NOT NULL DEFAULT 0"],
|
||||||
|
["details_json", "TEXT NOT NULL DEFAULT '{}'"],
|
||||||
|
["service_id", "TEXT"],
|
||||||
|
["period_start", "INTEGER"],
|
||||||
|
["available", "INTEGER"],
|
||||||
|
["check_reason", "TEXT"],
|
||||||
|
];
|
||||||
|
for (const [name, definition] of additions) {
|
||||||
|
if (!columns.has(name)) this.database.exec(`ALTER TABLE service_recovery_checks ADD COLUMN ${name} ${definition}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private runImmediate<T>(action: () => T): T {
|
||||||
|
const nested = this.database.inTransaction;
|
||||||
|
if (!nested) this.database.exec("BEGIN IMMEDIATE");
|
||||||
|
try {
|
||||||
|
const result = action();
|
||||||
|
if (!nested) this.database.exec("COMMIT");
|
||||||
|
return result;
|
||||||
|
} catch (error) {
|
||||||
|
if (!nested && this.database.inTransaction) this.database.exec("ROLLBACK");
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private recordAudit(input: {
|
||||||
|
actorRef: string;
|
||||||
|
actorType: "system" | "super_admin";
|
||||||
|
afterSummary: Record<string, unknown> | null;
|
||||||
|
beforeSummary: Record<string, unknown> | null;
|
||||||
|
operationType: string;
|
||||||
|
result: "succeeded" | "failed";
|
||||||
|
targetRef: string;
|
||||||
|
targetType: string;
|
||||||
|
}, now: number) {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO admin_operation_logs (
|
||||||
|
log_id, actor_type, actor_ref, operation_type, target_type, target_ref,
|
||||||
|
result, before_summary, after_summary, occurred_at, expires_at
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), input.actorType, input.actorRef, input.operationType, input.targetType, input.targetRef,
|
||||||
|
input.result, serializeAuditSummary(input.beforeSummary), serializeAuditSummary(input.afterSummary), now,
|
||||||
|
now + retentionMilliseconds,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeReason(reason: string) {
|
||||||
|
const normalized = reason.trim().toLowerCase().replace(/[^a-z0-9_.-]/g, "_").slice(0, 120);
|
||||||
|
return normalized || "provider_unavailable";
|
||||||
|
}
|
||||||
@@ -19,7 +19,7 @@ import { dirname, isAbsolute, join, parse, relative, resolve, sep } from "node:p
|
|||||||
const require = createRequire(import.meta.url);
|
const require = createRequire(import.meta.url);
|
||||||
const Database = require("better-sqlite3") as typeof import("better-sqlite3");
|
const Database = require("better-sqlite3") as typeof import("better-sqlite3");
|
||||||
|
|
||||||
const assetIdPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
const assetIdPattern = /^[a-z0-9][a-z0-9_-]{2,119}$/i;
|
||||||
const fixedDirectories = [
|
const fixedDirectories = [
|
||||||
"db",
|
"db",
|
||||||
"content/references",
|
"content/references",
|
||||||
@@ -33,6 +33,12 @@ const fixedDirectories = [
|
|||||||
"logs/supervisor",
|
"logs/supervisor",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
|
export function ensureLocalDataRuntimeDirectories(dataRoot: string) {
|
||||||
|
for (const directory of fixedDirectories) {
|
||||||
|
mkdirSync(join(resolve(dataRoot), directory), { recursive: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export const DATA_TRANSFER_POLICY = {
|
export const DATA_TRANSFER_POLICY = {
|
||||||
allowed_downloads: ["original_generation", "jpg", "png"],
|
allowed_downloads: ["original_generation", "jpg", "png"],
|
||||||
application_backup: false,
|
application_backup: false,
|
||||||
@@ -76,13 +82,21 @@ export function readConfiguredLocalDataRoot(configFile = defaultInstanceConfigPa
|
|||||||
return resolve(candidate);
|
return resolve(candidate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function readConfiguredAssetRoot(configFile = defaultInstanceConfigPath()) {
|
||||||
|
const configuration = JSON.parse(readFileSync(configFile, "utf8")) as Record<string, unknown>;
|
||||||
|
if (typeof configuration.asset_root !== "string" || !isAbsolute(configuration.asset_root)) {
|
||||||
|
throw new Error("asset_root_configuration_invalid");
|
||||||
|
}
|
||||||
|
return resolve(configuration.asset_root);
|
||||||
|
}
|
||||||
|
|
||||||
export interface ValidatedReadOnlyAssetRoot {
|
export interface ValidatedReadOnlyAssetRoot {
|
||||||
absolute_root: string;
|
absolute_root: string;
|
||||||
ok: true;
|
ok: true;
|
||||||
root_ref: string;
|
root_ref: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PublicAssetEntry {
|
export interface PublicAssetEntry {
|
||||||
assetId: string;
|
assetId: string;
|
||||||
mimeType: string;
|
mimeType: string;
|
||||||
relativePath: string;
|
relativePath: string;
|
||||||
@@ -219,9 +233,7 @@ export function initializeLocalDataRoot(input: {
|
|||||||
|
|
||||||
const createdRoot = !existsSync(validation.normalized_path);
|
const createdRoot = !existsSync(validation.normalized_path);
|
||||||
try {
|
try {
|
||||||
for (const directory of fixedDirectories) {
|
ensureLocalDataRuntimeDirectories(validation.normalized_path);
|
||||||
mkdirSync(join(validation.normalized_path, directory), { recursive: true });
|
|
||||||
}
|
|
||||||
openInstanceDatabase(join(validation.normalized_path, "db", "dada.sqlite3"));
|
openInstanceDatabase(join(validation.normalized_path, "db", "dada.sqlite3"));
|
||||||
const configuration: InstanceConfiguration = {
|
const configuration: InstanceConfiguration = {
|
||||||
data_root: validation.normalized_path,
|
data_root: validation.normalized_path,
|
||||||
@@ -313,18 +325,19 @@ export function createPublicAssetResolver(input: {
|
|||||||
const roots = new Map(input.roots.map((root) => [root.root_ref, root.absolute_root]));
|
const roots = new Map(input.roots.map((root) => [root.root_ref, root.absolute_root]));
|
||||||
const entries = new Map<string, PublicAssetEntry>();
|
const entries = new Map<string, PublicAssetEntry>();
|
||||||
for (const entry of input.entries) {
|
for (const entry of input.entries) {
|
||||||
if (!assetIdPattern.test(entry.assetId) || entries.has(entry.assetId)) throw new Error("asset_id_invalid");
|
const key = `${entry.resourceVersion}\u0000${entry.assetId}`;
|
||||||
|
if (!assetIdPattern.test(entry.assetId) || entries.has(key)) throw new Error("asset_id_invalid");
|
||||||
if (!roots.has(entry.rootRef)) throw new Error("asset_root_unvalidated");
|
if (!roots.has(entry.rootRef)) throw new Error("asset_root_unvalidated");
|
||||||
if (!/^[a-z0-9][a-z0-9._-]{0,79}$/i.test(entry.resourceVersion)) throw new Error("resource_version_invalid");
|
if (!/^[a-z0-9][a-z0-9._-]{0,79}$/i.test(entry.resourceVersion)) throw new Error("resource_version_invalid");
|
||||||
if (!/^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*$/i.test(entry.mimeType)) throw new Error("mime_type_invalid");
|
if (!/^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*$/i.test(entry.mimeType)) throw new Error("mime_type_invalid");
|
||||||
entries.set(entry.assetId, { ...entry });
|
entries.set(key, { ...entry });
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
read(resourceVersion, assetId) {
|
read(resourceVersion, assetId) {
|
||||||
if (!assetIdPattern.test(assetId)) return undefined;
|
if (!assetIdPattern.test(assetId)) return undefined;
|
||||||
const entry = entries.get(assetId);
|
const entry = entries.get(`${resourceVersion}\u0000${assetId}`);
|
||||||
if (!entry || entry.resourceVersion !== resourceVersion) return undefined;
|
if (!entry) return undefined;
|
||||||
const root = roots.get(entry.rootRef);
|
const root = roots.get(entry.rootRef);
|
||||||
if (!root) return undefined;
|
if (!root) return undefined;
|
||||||
let path: string;
|
let path: string;
|
||||||
|
|||||||
+65
-5
@@ -5,7 +5,7 @@ import { registrationNotice } from "@dada/shared-contracts";
|
|||||||
|
|
||||||
import { createApp } from "./app.js";
|
import { createApp } from "./app.js";
|
||||||
import { readBrowserSupportRelease } from "./browser-support.js";
|
import { readBrowserSupportRelease } from "./browser-support.js";
|
||||||
import { defaultInstanceConfigPath, readConfiguredLocalDataRoot } from "./local-data-root.js";
|
import { defaultInstanceConfigPath, ensureLocalDataRuntimeDirectories, readConfiguredLocalDataRoot, type PublicAssetResolver } from "./local-data-root.js";
|
||||||
import { ManagedStorage } from "./managed-storage.js";
|
import { ManagedStorage } from "./managed-storage.js";
|
||||||
import { LatestExportService } from "./latest-exports.js";
|
import { LatestExportService } from "./latest-exports.js";
|
||||||
import { CreditService } from "./credits.js";
|
import { CreditService } from "./credits.js";
|
||||||
@@ -16,8 +16,16 @@ import { MockResendAdapter } from "./resend-adapter.js";
|
|||||||
import { readSecureConfigCandidate } from "./secure-config.js";
|
import { readSecureConfigCandidate } from "./secure-config.js";
|
||||||
import { StructuredJsonlLogger } from "./structured-log.js";
|
import { StructuredJsonlLogger } from "./structured-log.js";
|
||||||
import { attachApiSupervisorControl, initializeApiCredentialClients, receiveApiCredentials } from "./supervisor-channel.js";
|
import { attachApiSupervisorControl, initializeApiCredentialClients, receiveApiCredentials } from "./supervisor-channel.js";
|
||||||
import { ModelConfigurationService } from "./model-configuration.js";
|
import { GenerationSubmissionService } from "./generation-submission.js";
|
||||||
import { MockAmapAdapter } from "./amap-adapter.js";
|
import {
|
||||||
|
GenerationModelConfigurationCatalog,
|
||||||
|
ModelConfigurationService,
|
||||||
|
portableRuntimeModelCandidates,
|
||||||
|
} from "./model-configuration.js";
|
||||||
|
import { MockAmapAdapter, type AmapAdapter } from "./amap-adapter.js";
|
||||||
|
import { StickerReleaseService } from "./sticker-releases.js";
|
||||||
|
import { createAdminDiagnosticsProvider, createAdminServicesStorageProvider } from "./admin-state.js";
|
||||||
|
import { loadConfiguredRuntimeAssets, type RuntimeAssetState } from "./runtime-assets.js";
|
||||||
|
|
||||||
const credentialChannelEnabled = process.argv.includes("--dada-credential-stdin");
|
const credentialChannelEnabled = process.argv.includes("--dada-credential-stdin");
|
||||||
let registration: RegistrationService | undefined;
|
let registration: RegistrationService | undefined;
|
||||||
@@ -26,15 +34,31 @@ let credits: CreditService | undefined;
|
|||||||
let storage: ManagedStorage | undefined;
|
let storage: ManagedStorage | undefined;
|
||||||
let latestExports: LatestExportService | undefined;
|
let latestExports: LatestExportService | undefined;
|
||||||
let models: ModelConfigurationService | undefined;
|
let models: ModelConfigurationService | undefined;
|
||||||
|
let generations: GenerationSubmissionService | undefined;
|
||||||
let recentAssets: RecentAssetService | undefined;
|
let recentAssets: RecentAssetService | undefined;
|
||||||
|
let stickers: StickerReleaseService | undefined;
|
||||||
|
let publicAssets: PublicAssetResolver | undefined;
|
||||||
|
let assetRootState: RuntimeAssetState | undefined;
|
||||||
|
let amap: AmapAdapter = new MockAmapAdapter();
|
||||||
|
let localTestAuth = false;
|
||||||
const instanceConfigPath = process.env.DADA_INSTANCE_CONFIG_PATH ?? defaultInstanceConfigPath();
|
const instanceConfigPath = process.env.DADA_INSTANCE_CONFIG_PATH ?? defaultInstanceConfigPath();
|
||||||
if (credentialChannelEnabled) {
|
if (credentialChannelEnabled) {
|
||||||
const clients = initializeApiCredentialClients(await receiveApiCredentials());
|
const clients = initializeApiCredentialClients(await receiveApiCredentials());
|
||||||
try {
|
try {
|
||||||
|
amap = clients.amap;
|
||||||
|
localTestAuth = !clients.resendConfigured;
|
||||||
const derivePepper = (purpose: string) => createHmac("sha256", clients.adminAllowlistPepper)
|
const derivePepper = (purpose: string) => createHmac("sha256", clients.adminAllowlistPepper)
|
||||||
.update(`Dada/P0A/${purpose}/v1`, "utf8")
|
.update(`Dada/P0A/${purpose}/v1`, "utf8")
|
||||||
.digest();
|
.digest();
|
||||||
const dataRoot = readConfiguredLocalDataRoot(instanceConfigPath);
|
const dataRoot = readConfiguredLocalDataRoot(instanceConfigPath);
|
||||||
|
ensureLocalDataRuntimeDirectories(dataRoot);
|
||||||
|
const runtimeAssets = loadConfiguredRuntimeAssets({
|
||||||
|
configFile: instanceConfigPath,
|
||||||
|
dataRoot,
|
||||||
|
trustedManifestPath: resolve("asset-metadata", "manifest.json"),
|
||||||
|
});
|
||||||
|
publicAssets = runtimeAssets.publicAssets;
|
||||||
|
assetRootState = runtimeAssets.state;
|
||||||
const databasePath = join(dataRoot, "db", "dada.sqlite3");
|
const databasePath = join(dataRoot, "db", "dada.sqlite3");
|
||||||
registration = new RegistrationService({
|
registration = new RegistrationService({
|
||||||
adminAllowlistPepper: Buffer.from(clients.adminAllowlistPepper),
|
adminAllowlistPepper: Buffer.from(clients.adminAllowlistPepper),
|
||||||
@@ -48,13 +72,25 @@ if (credentialChannelEnabled) {
|
|||||||
projects = new ProjectService({ databasePath });
|
projects = new ProjectService({ databasePath });
|
||||||
credits = new CreditService({ databasePath });
|
credits = new CreditService({ databasePath });
|
||||||
storage = new ManagedStorage({ dataRoot, databasePath });
|
storage = new ManagedStorage({ dataRoot, databasePath });
|
||||||
|
stickers = new StickerReleaseService({ databasePath, storage });
|
||||||
latestExports = new LatestExportService({ databasePath, storage });
|
latestExports = new LatestExportService({ databasePath, storage });
|
||||||
models = new ModelConfigurationService({ database: registration.database });
|
models = new ModelConfigurationService({ database: registration.database, seedCandidates: portableRuntimeModelCandidates });
|
||||||
|
generations = new GenerationSubmissionService({
|
||||||
|
credits,
|
||||||
|
models: new GenerationModelConfigurationCatalog(models),
|
||||||
|
storage,
|
||||||
|
});
|
||||||
recentAssets = new RecentAssetService({ database: registration.database });
|
recentAssets = new RecentAssetService({ database: registration.database });
|
||||||
registration.applySecureConfig(readSecureConfigCandidate(instanceConfigPath));
|
registration.applySecureConfig(readSecureConfigCandidate(instanceConfigPath));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
amap.dispose?.();
|
||||||
|
amap = new MockAmapAdapter();
|
||||||
|
stickers?.close();
|
||||||
|
stickers = undefined;
|
||||||
latestExports?.close();
|
latestExports?.close();
|
||||||
latestExports = undefined;
|
latestExports = undefined;
|
||||||
|
generations?.close();
|
||||||
|
generations = undefined;
|
||||||
storage?.close();
|
storage?.close();
|
||||||
storage = undefined;
|
storage = undefined;
|
||||||
credits?.close();
|
credits?.close();
|
||||||
@@ -70,15 +106,36 @@ if (credentialChannelEnabled) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const browserSupportRelease = readBrowserSupportRelease(resolve("RELEASE.json"));
|
const browserSupportRelease = readBrowserSupportRelease(resolve("RELEASE.json"));
|
||||||
|
const adminServicesStorage = registration
|
||||||
|
? createAdminServicesStorageProvider({
|
||||||
|
database: registration.database,
|
||||||
|
...(models ? { models } : {}),
|
||||||
|
...(storage ? { storage } : {}),
|
||||||
|
...(assetRootState ? { assetRoot: assetRootState } : {}),
|
||||||
|
})
|
||||||
|
: undefined;
|
||||||
|
const adminDiagnostics = adminServicesStorage
|
||||||
|
? createAdminDiagnosticsProvider({
|
||||||
|
...(browserSupportRelease ? { browserSupportRelease, appVersion: browserSupportRelease.appVersion } : {}),
|
||||||
|
servicesStorage: adminServicesStorage,
|
||||||
|
})
|
||||||
|
: undefined;
|
||||||
const app = await createApp({
|
const app = await createApp({
|
||||||
amap: new MockAmapAdapter(),
|
...(adminServicesStorage ? { adminServicesStorage } : {}),
|
||||||
|
...(adminDiagnostics ? { adminDiagnostics } : {}),
|
||||||
|
amap,
|
||||||
...(browserSupportRelease ? { browserSupportRelease } : {}),
|
...(browserSupportRelease ? { browserSupportRelease } : {}),
|
||||||
...(credits ? { credits } : {}),
|
...(credits ? { credits } : {}),
|
||||||
|
...(generations ? { generations } : {}),
|
||||||
...(latestExports ? { latestExports } : {}),
|
...(latestExports ? { latestExports } : {}),
|
||||||
|
...(registration && localTestAuth ? { localTestAuth: true } : {}),
|
||||||
...(models ? { models } : {}),
|
...(models ? { models } : {}),
|
||||||
...(projects ? { projects } : {}),
|
...(projects ? { projects } : {}),
|
||||||
|
...(publicAssets ? { publicAssets } : {}),
|
||||||
...(registration ? { registration } : {}),
|
...(registration ? { registration } : {}),
|
||||||
...(recentAssets ? { recentAssets } : {}),
|
...(recentAssets ? { recentAssets } : {}),
|
||||||
|
...(stickers ? { stickers } : {}),
|
||||||
|
...(storage ? { storage } : {}),
|
||||||
});
|
});
|
||||||
|
|
||||||
await app.listen({
|
await app.listen({
|
||||||
@@ -92,11 +149,14 @@ if (controlPipeIndex >= 0) {
|
|||||||
if (!controlPipe) throw new Error("Supervisor control pipe name is required.");
|
if (!controlPipe) throw new Error("Supervisor control pipe name is required.");
|
||||||
const control = attachApiSupervisorControl(controlPipe, async () => {
|
const control = attachApiSupervisorControl(controlPipe, async () => {
|
||||||
await app.close();
|
await app.close();
|
||||||
|
amap.dispose?.();
|
||||||
latestExports?.close();
|
latestExports?.close();
|
||||||
|
generations?.close();
|
||||||
credits?.close();
|
credits?.close();
|
||||||
projects?.close();
|
projects?.close();
|
||||||
registration?.close();
|
registration?.close();
|
||||||
storage?.close();
|
storage?.close();
|
||||||
|
stickers?.close();
|
||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
const dataRoot = readConfiguredLocalDataRoot(instanceConfigPath);
|
const dataRoot = readConfiguredLocalDataRoot(instanceConfigPath);
|
||||||
|
|||||||
@@ -75,6 +75,31 @@ interface CleanupQueueRow {
|
|||||||
relative_path: string;
|
relative_path: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface AssetCleanupCandidateView {
|
||||||
|
byte_size: number;
|
||||||
|
file_id: string;
|
||||||
|
file_kind: "original" | "thumbnail";
|
||||||
|
hash_prefix: string;
|
||||||
|
reference_count: 0;
|
||||||
|
resource_version: string;
|
||||||
|
stable_id: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AssetCleanupCandidatesView {
|
||||||
|
candidate_snapshot_version: string;
|
||||||
|
expires_at: string;
|
||||||
|
items: AssetCleanupCandidateView[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AssetCleanupIntentView {
|
||||||
|
confirmation_token: string;
|
||||||
|
expires_at: string;
|
||||||
|
file_count: number;
|
||||||
|
request_id: string;
|
||||||
|
status: "pending_confirmation" | "denied" | "queued" | "completed";
|
||||||
|
total_bytes: number;
|
||||||
|
}
|
||||||
|
|
||||||
export class StorageCapacityError extends Error {
|
export class StorageCapacityError extends Error {
|
||||||
readonly code = "STORAGE_CAPACITY_EXCEEDED";
|
readonly code = "STORAGE_CAPACITY_EXCEEDED";
|
||||||
readonly httpStatus = 507;
|
readonly httpStatus = 507;
|
||||||
@@ -104,6 +129,10 @@ function auditExpiry(occurredAt: number) {
|
|||||||
return occurredAt + auditRetentionMilliseconds;
|
return occurredAt + auditRetentionMilliseconds;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function digest(value: string) {
|
||||||
|
return createHash("sha256").update(value, "utf8").digest("hex");
|
||||||
|
}
|
||||||
|
|
||||||
function validatePositiveBytes(value: number, name: string) {
|
function validatePositiveBytes(value: number, name: string) {
|
||||||
if (!Number.isSafeInteger(value) || value <= 0) throw new Error(`${name}_invalid`);
|
if (!Number.isSafeInteger(value) || value <= 0) throw new Error(`${name}_invalid`);
|
||||||
}
|
}
|
||||||
@@ -255,6 +284,28 @@ export class ManagedStorage {
|
|||||||
FOREIGN KEY (request_id) REFERENCES asset_cleanup_requests(request_id),
|
FOREIGN KEY (request_id) REFERENCES asset_cleanup_requests(request_id),
|
||||||
FOREIGN KEY (managed_file_id) REFERENCES managed_files(file_id)
|
FOREIGN KEY (managed_file_id) REFERENCES managed_files(file_id)
|
||||||
);
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS asset_cleanup_candidate_snapshots (
|
||||||
|
snapshot_version TEXT PRIMARY KEY,
|
||||||
|
items_json TEXT NOT NULL,
|
||||||
|
created_at INTEGER NOT NULL,
|
||||||
|
expires_at INTEGER NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS sticker_managed_file_history (
|
||||||
|
managed_file_id TEXT NOT NULL,
|
||||||
|
stable_id TEXT NOT NULL,
|
||||||
|
resource_version TEXT NOT NULL,
|
||||||
|
file_kind TEXT NOT NULL CHECK (file_kind IN ('original', 'thumbnail')),
|
||||||
|
created_at INTEGER NOT NULL,
|
||||||
|
PRIMARY KEY (managed_file_id, file_kind),
|
||||||
|
FOREIGN KEY (managed_file_id) REFERENCES managed_files(file_id)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS project_sticker_asset_refs (
|
||||||
|
reference_id TEXT PRIMARY KEY,
|
||||||
|
project_id TEXT NOT NULL,
|
||||||
|
stable_id TEXT NOT NULL,
|
||||||
|
resource_version TEXT NOT NULL,
|
||||||
|
created_at INTEGER NOT NULL
|
||||||
|
);
|
||||||
CREATE TABLE IF NOT EXISTS admin_operation_logs (
|
CREATE TABLE IF NOT EXISTS admin_operation_logs (
|
||||||
log_id TEXT PRIMARY KEY,
|
log_id TEXT PRIMARY KEY,
|
||||||
actor_type TEXT NOT NULL CHECK (actor_type IN ('system', 'super_admin')),
|
actor_type TEXT NOT NULL CHECK (actor_type IN ('system', 'super_admin')),
|
||||||
@@ -277,6 +328,49 @@ export class ManagedStorage {
|
|||||||
if (!managedFileColumns.some((column) => column.name === "owner_ref")) {
|
if (!managedFileColumns.some((column) => column.name === "owner_ref")) {
|
||||||
this.database.exec("ALTER TABLE managed_files ADD COLUMN owner_ref TEXT");
|
this.database.exec("ALTER TABLE managed_files ADD COLUMN owner_ref TEXT");
|
||||||
}
|
}
|
||||||
|
if (!managedFileColumns.some((column) => column.name === "cleanup_status")) {
|
||||||
|
this.database.exec("ALTER TABLE managed_files ADD COLUMN cleanup_status TEXT");
|
||||||
|
}
|
||||||
|
const cleanupRequestColumns = this.database.prepare("PRAGMA table_info(asset_cleanup_requests)").all() as Array<{ name: string }>;
|
||||||
|
const cleanupRequestAdditions: Array<[string, string]> = [
|
||||||
|
["created_by", "TEXT"],
|
||||||
|
["confirmed_by", "TEXT"],
|
||||||
|
["snapshot_version", "TEXT"],
|
||||||
|
["expires_at", "INTEGER"],
|
||||||
|
["confirmation_token_digest", "TEXT"],
|
||||||
|
["idempotency_key_digest", "TEXT"],
|
||||||
|
["request_hash", "TEXT"],
|
||||||
|
["file_count", "INTEGER"],
|
||||||
|
["total_bytes", "INTEGER"],
|
||||||
|
["denied_reason", "TEXT"],
|
||||||
|
];
|
||||||
|
for (const [column, type] of cleanupRequestAdditions) {
|
||||||
|
if (!cleanupRequestColumns.some((item) => item.name === column)) {
|
||||||
|
this.database.exec(`ALTER TABLE asset_cleanup_requests ADD COLUMN ${column} ${type}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const cleanupItemColumns = this.database.prepare("PRAGMA table_info(asset_cleanup_request_items)").all() as Array<{ name: string }>;
|
||||||
|
const cleanupItemAdditions: Array<[string, string]> = [
|
||||||
|
["stable_id", "TEXT"],
|
||||||
|
["resource_version", "TEXT"],
|
||||||
|
["file_kind", "TEXT"],
|
||||||
|
["byte_size", "INTEGER"],
|
||||||
|
["sha256_prefix", "TEXT"],
|
||||||
|
];
|
||||||
|
for (const [column, type] of cleanupItemAdditions) {
|
||||||
|
if (!cleanupItemColumns.some((item) => item.name === column)) {
|
||||||
|
this.database.exec(`ALTER TABLE asset_cleanup_request_items ADD COLUMN ${column} ${type}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.database.exec(`
|
||||||
|
CREATE UNIQUE INDEX IF NOT EXISTS asset_cleanup_requests_actor_idempotency
|
||||||
|
ON asset_cleanup_requests (created_by, idempotency_key_digest)
|
||||||
|
WHERE created_by IS NOT NULL AND idempotency_key_digest IS NOT NULL;
|
||||||
|
CREATE INDEX IF NOT EXISTS sticker_managed_file_history_lookup
|
||||||
|
ON sticker_managed_file_history (stable_id, resource_version, file_kind);
|
||||||
|
CREATE INDEX IF NOT EXISTS asset_cleanup_candidate_snapshots_expiry
|
||||||
|
ON asset_cleanup_candidate_snapshots (expires_at);
|
||||||
|
`);
|
||||||
ensureAdminOperationAuditSchema(this.database, Date.now());
|
ensureAdminOperationAuditSchema(this.database, Date.now());
|
||||||
const initial = classifyCapacity(0, 0);
|
const initial = classifyCapacity(0, 0);
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
@@ -299,6 +393,106 @@ export class ManagedStorage {
|
|||||||
return withReservations;
|
return withReservations;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private readAssetCleanupCandidates(): AssetCleanupCandidateView[] {
|
||||||
|
const releaseReferenceClause = this.tableExists("sticker_release_items") ? `
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM sticker_release_items release_items
|
||||||
|
WHERE release_items.original_file_id = mf.file_id OR release_items.thumbnail_file_id = mf.file_id
|
||||||
|
)` : "";
|
||||||
|
return this.database.prepare(`
|
||||||
|
SELECT
|
||||||
|
mf.file_id,
|
||||||
|
mf.byte_size,
|
||||||
|
history.stable_id,
|
||||||
|
history.resource_version,
|
||||||
|
history.file_kind,
|
||||||
|
substr(mf.sha256, 1, 12) AS hash_prefix,
|
||||||
|
0 AS reference_count
|
||||||
|
FROM sticker_managed_file_history history
|
||||||
|
JOIN managed_files mf ON mf.file_id = history.managed_file_id
|
||||||
|
WHERE mf.status = 'committed'
|
||||||
|
AND mf.cleanup_status IS NULL
|
||||||
|
AND mf.file_kind IN ('sticker_original', 'sticker_thumbnail')
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM project_asset_refs refs WHERE refs.managed_file_id = mf.file_id
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM project_sticker_asset_refs project_refs
|
||||||
|
WHERE project_refs.stable_id = history.stable_id
|
||||||
|
AND project_refs.resource_version = history.resource_version
|
||||||
|
)
|
||||||
|
${releaseReferenceClause}
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM asset_cleanup_request_items request_items
|
||||||
|
JOIN asset_cleanup_requests requests ON requests.request_id = request_items.request_id
|
||||||
|
WHERE request_items.managed_file_id = mf.file_id
|
||||||
|
AND requests.status IN ('pending_confirmation', 'queued')
|
||||||
|
)
|
||||||
|
ORDER BY history.stable_id, history.resource_version, history.file_kind, mf.file_id
|
||||||
|
`).all() as AssetCleanupCandidateView[];
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertActiveAdmin(actorId: string) {
|
||||||
|
const admin = this.database.prepare(`
|
||||||
|
SELECT 1 AS allowed FROM users u
|
||||||
|
JOIN admin_access access ON access.user_id = u.user_id
|
||||||
|
WHERE u.user_id = ? AND u.role = 'super_admin' AND u.status = 'active' AND access.allowed = 1
|
||||||
|
`).get(actorId);
|
||||||
|
if (!admin) throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
}
|
||||||
|
|
||||||
|
private assetReferenceCount(fileId: string, requestId: string) {
|
||||||
|
const projectOrRelease = (this.database.prepare(`
|
||||||
|
SELECT COUNT(*) AS count FROM project_asset_refs WHERE managed_file_id = ?
|
||||||
|
`).get(fileId) as { count: number }).count;
|
||||||
|
const releaseItems = this.tableExists("sticker_release_items")
|
||||||
|
? (this.database.prepare(`
|
||||||
|
SELECT COUNT(*) AS count FROM sticker_release_items
|
||||||
|
WHERE original_file_id = ? OR thumbnail_file_id = ?
|
||||||
|
`).get(fileId, fileId) as { count: number }).count
|
||||||
|
: 0;
|
||||||
|
const projectStickerRefs = (this.database.prepare(`
|
||||||
|
SELECT COUNT(*) AS count
|
||||||
|
FROM sticker_managed_file_history history
|
||||||
|
JOIN project_sticker_asset_refs refs
|
||||||
|
ON refs.stable_id = history.stable_id AND refs.resource_version = history.resource_version
|
||||||
|
WHERE history.managed_file_id = ?
|
||||||
|
`).get(fileId) as { count: number }).count;
|
||||||
|
const otherCleanup = (this.database.prepare(`
|
||||||
|
SELECT COUNT(*) AS count FROM asset_cleanup_request_items items
|
||||||
|
JOIN asset_cleanup_requests requests ON requests.request_id = items.request_id
|
||||||
|
WHERE items.managed_file_id = ? AND items.request_id <> ?
|
||||||
|
AND requests.status IN ('pending_confirmation', 'queued')
|
||||||
|
`).get(fileId, requestId) as { count: number }).count;
|
||||||
|
return projectOrRelease + releaseItems + projectStickerRefs + otherCleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
private cleanupConfirmationToken(requestId: string, actorId: string, keyDigest: string) {
|
||||||
|
return digest(`Dada/P0A/asset-cleanup-confirm/v1:${requestId}:${actorId}:${keyDigest}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
private tableExists(name: string) {
|
||||||
|
return Boolean(this.database.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ?").get(name));
|
||||||
|
}
|
||||||
|
|
||||||
|
private insertCleanupAudit(input: {
|
||||||
|
actorRef: string;
|
||||||
|
afterSummary: Record<string, unknown>;
|
||||||
|
operationType: string;
|
||||||
|
requestId: string;
|
||||||
|
result: "failed" | "succeeded";
|
||||||
|
}, occurredAt: number) {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO admin_operation_logs (
|
||||||
|
log_id, actor_type, actor_ref, operation_type, target_type, target_ref,
|
||||||
|
result, before_summary, after_summary, occurred_at, expires_at
|
||||||
|
) VALUES (?, 'super_admin', ?, ?, 'asset_cleanup_request', ?, ?, NULL, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), input.actorRef, input.operationType, input.requestId, input.result,
|
||||||
|
serializeAuditSummary(input.afterSummary), occurredAt, auditExpiry(occurredAt),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private activeReservationBytes(excludingOperationId?: string) {
|
private activeReservationBytes(excludingOperationId?: string) {
|
||||||
const row = this.database.prepare(`
|
const row = this.database.prepare(`
|
||||||
SELECT COALESCE(SUM(projected_bytes), 0) AS bytes
|
SELECT COALESCE(SUM(projected_bytes), 0) AS bytes
|
||||||
@@ -496,9 +690,11 @@ export class ManagedStorage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async stagePrivateImage(input: {
|
async stageManagedImage(input: {
|
||||||
content: Readable;
|
content: Readable;
|
||||||
expectedMimeType: "image/png" | "image/jpeg" | "image/webp";
|
expectedMimeType: "image/png" | "image/jpeg" | "image/webp";
|
||||||
|
expectedSha256?: string;
|
||||||
|
fileKind: ManagedFileKind;
|
||||||
fileName: string;
|
fileName: string;
|
||||||
maximumBytes: number;
|
maximumBytes: number;
|
||||||
operationId: string;
|
operationId: string;
|
||||||
@@ -509,7 +705,7 @@ export class ManagedStorage {
|
|||||||
const destination = this.destination({
|
const destination = this.destination({
|
||||||
content: input.content,
|
content: input.content,
|
||||||
expectedMimeType: input.expectedMimeType,
|
expectedMimeType: input.expectedMimeType,
|
||||||
fileKind: "reference",
|
fileKind: input.fileKind,
|
||||||
fileName: input.fileName,
|
fileName: input.fileName,
|
||||||
operationId: input.operationId,
|
operationId: input.operationId,
|
||||||
ownerRef: input.ownerRef,
|
ownerRef: input.ownerRef,
|
||||||
@@ -537,6 +733,8 @@ export class ManagedStorage {
|
|||||||
await pipeline(input.content, inspect, createWriteStream(stagingPath, { flags: "wx" }));
|
await pipeline(input.content, inspect, createWriteStream(stagingPath, { flags: "wx" }));
|
||||||
validatePositiveBytes(byteSize, "actual_write_bytes");
|
validatePositiveBytes(byteSize, "actual_write_bytes");
|
||||||
if (sniffMime(prefix) !== input.expectedMimeType) throw new Error("content_mime_invalid");
|
if (sniffMime(prefix) !== input.expectedMimeType) throw new Error("content_mime_invalid");
|
||||||
|
const sha256 = hash.digest("hex");
|
||||||
|
if (input.expectedSha256 && sha256.toLowerCase() !== input.expectedSha256.toLowerCase()) throw new Error("content_hash_invalid");
|
||||||
const state = this.getState();
|
const state = this.getState();
|
||||||
const otherReservations = this.activeReservationBytes(input.operationId);
|
const otherReservations = this.activeReservationBytes(input.operationId);
|
||||||
if (state.managed_content_bytes + otherReservations + byteSize > HARD_LIMIT_BYTES) {
|
if (state.managed_content_bytes + otherReservations + byteSize > HARD_LIMIT_BYTES) {
|
||||||
@@ -549,12 +747,12 @@ export class ManagedStorage {
|
|||||||
bytes: byteSize,
|
bytes: byteSize,
|
||||||
destinationPath: destination.absolutePath,
|
destinationPath: destination.absolutePath,
|
||||||
fileId,
|
fileId,
|
||||||
fileKind: "reference",
|
fileKind: input.fileKind,
|
||||||
mimeType: input.expectedMimeType,
|
mimeType: input.expectedMimeType,
|
||||||
operationId: input.operationId,
|
operationId: input.operationId,
|
||||||
ownerRef: input.ownerRef,
|
ownerRef: input.ownerRef,
|
||||||
relativePath: destination.relativePath,
|
relativePath: destination.relativePath,
|
||||||
sha256: hash.digest("hex"),
|
sha256,
|
||||||
stagingDirectory,
|
stagingDirectory,
|
||||||
stagingPath,
|
stagingPath,
|
||||||
};
|
};
|
||||||
@@ -565,6 +763,18 @@ export class ManagedStorage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async stagePrivateImage(input: {
|
||||||
|
content: Readable;
|
||||||
|
expectedMimeType: "image/png" | "image/jpeg" | "image/webp";
|
||||||
|
fileName: string;
|
||||||
|
maximumBytes: number;
|
||||||
|
operationId: string;
|
||||||
|
ownerRef: string;
|
||||||
|
projectedWriteBytes: number;
|
||||||
|
}): Promise<StagedManagedFile> {
|
||||||
|
return this.stageManagedImage({ ...input, fileKind: "reference" });
|
||||||
|
}
|
||||||
|
|
||||||
moveStagedFile(file: StagedManagedFile) {
|
moveStagedFile(file: StagedManagedFile) {
|
||||||
mkdirSync(dirname(file.destinationPath), { recursive: true });
|
mkdirSync(dirname(file.destinationPath), { recursive: true });
|
||||||
renameSync(file.stagingPath, file.destinationPath);
|
renameSync(file.stagingPath, file.destinationPath);
|
||||||
@@ -676,6 +886,203 @@ export class ManagedStorage {
|
|||||||
this.database.prepare("DELETE FROM project_asset_refs WHERE managed_file_id = ?").run(fileId);
|
this.database.prepare("DELETE FROM project_asset_refs WHERE managed_file_id = ?").run(fileId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
listAssetCleanupCandidates(): AssetCleanupCandidatesView {
|
||||||
|
const createdAt = Date.now();
|
||||||
|
const expiresAt = createdAt + 5 * 60 * 1_000;
|
||||||
|
const items = this.readAssetCleanupCandidates();
|
||||||
|
const snapshotVersion = digest(JSON.stringify({
|
||||||
|
created_at: createdAt,
|
||||||
|
nonce: randomUUID(),
|
||||||
|
items: items.map((item) => ({ byte_size: item.byte_size, file_id: item.file_id, hash_prefix: item.hash_prefix })),
|
||||||
|
}));
|
||||||
|
this.database.prepare("DELETE FROM asset_cleanup_candidate_snapshots WHERE expires_at <= ?").run(createdAt);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO asset_cleanup_candidate_snapshots (
|
||||||
|
snapshot_version, items_json, created_at, expires_at
|
||||||
|
) VALUES (?, ?, ?, ?)
|
||||||
|
`).run(snapshotVersion, JSON.stringify(items), createdAt, expiresAt);
|
||||||
|
return {
|
||||||
|
candidate_snapshot_version: snapshotVersion,
|
||||||
|
expires_at: new Date(expiresAt).toISOString(),
|
||||||
|
items,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
createAssetCleanupIntent(input: {
|
||||||
|
actorId: string;
|
||||||
|
fileIds: string[];
|
||||||
|
idempotencyKey: string;
|
||||||
|
snapshotVersion: string;
|
||||||
|
}): AssetCleanupIntentView {
|
||||||
|
if (this.inspectAction("explicit_cleanup") !== "allow") throw new Error("cleanup_uncommitted");
|
||||||
|
const fileIds = [...new Set(input.fileIds)].sort();
|
||||||
|
if (!uuidPattern.test(input.actorId) || fileIds.length === 0 || fileIds.length !== input.fileIds.length
|
||||||
|
|| fileIds.length > 100 || fileIds.some((fileId) => !uuidPattern.test(fileId))
|
||||||
|
|| !/^[A-Za-z0-9_-]{32,200}$/.test(input.idempotencyKey)
|
||||||
|
|| !/^[0-9a-f]{64}$/.test(input.snapshotVersion)) {
|
||||||
|
throw new Error("cleanup_candidates_invalid");
|
||||||
|
}
|
||||||
|
const keyDigest = digest(input.idempotencyKey);
|
||||||
|
const requestHash = digest(JSON.stringify({ file_ids: fileIds, snapshot_version: input.snapshotVersion }));
|
||||||
|
const existing = this.database.prepare(`
|
||||||
|
SELECT request_id, request_hash, expires_at, file_count, total_bytes, status
|
||||||
|
FROM asset_cleanup_requests
|
||||||
|
WHERE created_by = ? AND idempotency_key_digest = ?
|
||||||
|
`).get(input.actorId, keyDigest) as {
|
||||||
|
expires_at: number; file_count: number; request_hash: string; request_id: string; status: AssetCleanupIntentView["status"]; total_bytes: number;
|
||||||
|
} | undefined;
|
||||||
|
if (existing) {
|
||||||
|
if (existing.request_hash !== requestHash) throw new Error("IDEMPOTENCY_KEY_CONFLICT");
|
||||||
|
return {
|
||||||
|
confirmation_token: this.cleanupConfirmationToken(existing.request_id, input.actorId, keyDigest),
|
||||||
|
expires_at: new Date(existing.expires_at).toISOString(),
|
||||||
|
file_count: existing.file_count,
|
||||||
|
request_id: existing.request_id,
|
||||||
|
status: existing.status,
|
||||||
|
total_bytes: existing.total_bytes,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const requestId = randomUUID();
|
||||||
|
const confirmationToken = this.cleanupConfirmationToken(requestId, input.actorId, keyDigest);
|
||||||
|
const createdAt = Date.now();
|
||||||
|
let view!: AssetCleanupIntentView;
|
||||||
|
const transaction = this.database.transaction(() => {
|
||||||
|
this.assertActiveAdmin(input.actorId);
|
||||||
|
const snapshot = this.database.prepare(`
|
||||||
|
SELECT items_json, expires_at FROM asset_cleanup_candidate_snapshots
|
||||||
|
WHERE snapshot_version = ?
|
||||||
|
`).get(input.snapshotVersion) as { expires_at: number; items_json: string } | undefined;
|
||||||
|
if (!snapshot || snapshot.expires_at <= createdAt) throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
const snapshotItems = JSON.parse(snapshot.items_json) as AssetCleanupCandidateView[];
|
||||||
|
const byId = new Map(snapshotItems.map((item) => [item.file_id, item]));
|
||||||
|
const selected = fileIds.map((fileId) => byId.get(fileId));
|
||||||
|
if (selected.some((item) => !item)) throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
const current = new Map(this.readAssetCleanupCandidates().map((item) => [item.file_id, item]));
|
||||||
|
if (fileIds.some((fileId) => !current.has(fileId))) throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
const safeItems = selected as AssetCleanupCandidateView[];
|
||||||
|
const totalBytes = safeItems.reduce((sum, item) => sum + item.byte_size, 0);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO asset_cleanup_requests (
|
||||||
|
request_id, status, created_at, confirmed_at, created_by, confirmed_by,
|
||||||
|
snapshot_version, expires_at, confirmation_token_digest,
|
||||||
|
idempotency_key_digest, request_hash, file_count, total_bytes, denied_reason
|
||||||
|
) VALUES (?, 'pending_confirmation', ?, NULL, ?, NULL, ?, ?, ?, ?, ?, ?, ?, NULL)
|
||||||
|
`).run(
|
||||||
|
requestId, new Date(createdAt).toISOString(), input.actorId, input.snapshotVersion,
|
||||||
|
snapshot.expires_at, digest(confirmationToken), keyDigest, requestHash, safeItems.length, totalBytes,
|
||||||
|
);
|
||||||
|
const insert = this.database.prepare(`
|
||||||
|
INSERT INTO asset_cleanup_request_items (
|
||||||
|
request_id, managed_file_id, stable_id, resource_version, file_kind, byte_size, sha256_prefix
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`);
|
||||||
|
for (const item of safeItems) {
|
||||||
|
insert.run(requestId, item.file_id, item.stable_id, item.resource_version, item.file_kind, item.byte_size, item.hash_prefix);
|
||||||
|
}
|
||||||
|
this.insertCleanupAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
afterSummary: { file_count: safeItems.length, snapshot_version: input.snapshotVersion, total_bytes: totalBytes },
|
||||||
|
operationType: "asset_cleanup_requested",
|
||||||
|
requestId,
|
||||||
|
result: "succeeded",
|
||||||
|
}, createdAt);
|
||||||
|
view = {
|
||||||
|
confirmation_token: confirmationToken,
|
||||||
|
expires_at: new Date(snapshot.expires_at).toISOString(),
|
||||||
|
file_count: safeItems.length,
|
||||||
|
request_id: requestId,
|
||||||
|
status: "pending_confirmation",
|
||||||
|
total_bytes: totalBytes,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
transaction.immediate();
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
confirmAssetCleanupIntent(input: { actorId: string; confirmationToken: string; requestId: string }) {
|
||||||
|
if (this.inspectAction("explicit_cleanup") !== "allow") throw new Error("cleanup_uncommitted");
|
||||||
|
if (!uuidPattern.test(input.actorId) || !uuidPattern.test(input.requestId) || !/^[0-9a-f]{64}$/.test(input.confirmationToken)) {
|
||||||
|
throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
}
|
||||||
|
const confirmedAt = Date.now();
|
||||||
|
const outcome = this.database.transaction(() => {
|
||||||
|
this.assertActiveAdmin(input.actorId);
|
||||||
|
const request = this.database.prepare(`
|
||||||
|
SELECT status, created_by, expires_at, confirmation_token_digest, file_count, total_bytes
|
||||||
|
FROM asset_cleanup_requests WHERE request_id = ?
|
||||||
|
`).get(input.requestId) as {
|
||||||
|
confirmation_token_digest: string | null; created_by: string | null; expires_at: number | null;
|
||||||
|
file_count: number | null; status: string; total_bytes: number | null;
|
||||||
|
} | undefined;
|
||||||
|
if (!request || request.status !== "pending_confirmation" || request.created_by !== input.actorId
|
||||||
|
|| !request.expires_at || request.expires_at <= confirmedAt
|
||||||
|
|| request.confirmation_token_digest !== digest(input.confirmationToken)) {
|
||||||
|
throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
}
|
||||||
|
const files = this.database.prepare(`
|
||||||
|
SELECT mf.file_id, mf.file_kind, mf.relative_path, mf.byte_size, mf.status
|
||||||
|
FROM asset_cleanup_request_items items
|
||||||
|
JOIN managed_files mf ON mf.file_id = items.managed_file_id
|
||||||
|
WHERE items.request_id = ? ORDER BY mf.file_id
|
||||||
|
`).all(input.requestId) as ManagedFileRow[];
|
||||||
|
if (files.length !== request.file_count) throw new Error("ASSET_CLEANUP_CANDIDATE_STALE");
|
||||||
|
const conflicted = files.some((file) => file.status !== "committed"
|
||||||
|
|| !new Set(["sticker_original", "sticker_thumbnail"]).has(file.file_kind)
|
||||||
|
|| this.assetReferenceCount(file.file_id, input.requestId) > 0);
|
||||||
|
if (conflicted) {
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE asset_cleanup_requests
|
||||||
|
SET status = 'denied', confirmed_at = ?, confirmed_by = ?, denied_reason = 'reference_conflict'
|
||||||
|
WHERE request_id = ?
|
||||||
|
`).run(new Date(confirmedAt).toISOString(), input.actorId, input.requestId);
|
||||||
|
this.insertCleanupAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
afterSummary: { file_count: files.length, reason: "reference_conflict", status: "denied" },
|
||||||
|
operationType: "asset_cleanup_reference_denied",
|
||||||
|
requestId: input.requestId,
|
||||||
|
result: "failed",
|
||||||
|
}, confirmedAt);
|
||||||
|
return { conflict: true as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
this.insertCleanupAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
afterSummary: { file_count: files.length, status: "validated" },
|
||||||
|
operationType: "asset_cleanup_validated",
|
||||||
|
requestId: input.requestId,
|
||||||
|
result: "succeeded",
|
||||||
|
}, confirmedAt);
|
||||||
|
for (const file of files) {
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE managed_files SET status = 'purged', purged_at = ?, cleanup_status = 'pending_delete'
|
||||||
|
WHERE file_id = ? AND status = 'committed'
|
||||||
|
`).run(new Date(confirmedAt).toISOString(), file.file_id);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO file_cleanup_queue (
|
||||||
|
cleanup_id, managed_file_id, relative_path, byte_size, counts_toward_managed,
|
||||||
|
reason, status, created_at, completed_at, last_error
|
||||||
|
) VALUES (?, ?, ?, ?, 1, 'purge', 'pending', ?, NULL, NULL)
|
||||||
|
`).run(randomUUID(), file.file_id, file.relative_path, file.byte_size, new Date(confirmedAt).toISOString());
|
||||||
|
}
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE asset_cleanup_requests
|
||||||
|
SET status = 'queued', confirmed_at = ?, confirmed_by = ?
|
||||||
|
WHERE request_id = ?
|
||||||
|
`).run(new Date(confirmedAt).toISOString(), input.actorId, input.requestId);
|
||||||
|
this.insertCleanupAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
afterSummary: { file_count: files.length, status: "queued", total_bytes: request.total_bytes ?? 0 },
|
||||||
|
operationType: "asset_cleanup_scheduled",
|
||||||
|
requestId: input.requestId,
|
||||||
|
result: "succeeded",
|
||||||
|
}, confirmedAt + 1);
|
||||||
|
return { conflict: false as const, file_count: files.length, request_id: input.requestId, status: "queued" as const };
|
||||||
|
}).immediate();
|
||||||
|
if (outcome.conflict) throw new Error("ASSET_HISTORY_REFERENCE_CONFLICT");
|
||||||
|
return outcome;
|
||||||
|
}
|
||||||
|
|
||||||
createCleanupIntent(fileIds: string[]) {
|
createCleanupIntent(fileIds: string[]) {
|
||||||
if (this.inspectAction("explicit_cleanup") !== "allow") throw new Error("cleanup_uncommitted");
|
if (this.inspectAction("explicit_cleanup") !== "allow") throw new Error("cleanup_uncommitted");
|
||||||
if (fileIds.length === 0 || new Set(fileIds).size !== fileIds.length) throw new Error("cleanup_candidates_invalid");
|
if (fileIds.length === 0 || new Set(fileIds).size !== fileIds.length) throw new Error("cleanup_candidates_invalid");
|
||||||
@@ -761,6 +1168,7 @@ export class ManagedStorage {
|
|||||||
this.database.prepare("DELETE FROM project_asset_refs WHERE managed_file_id = ?").run(row.managed_file_id);
|
this.database.prepare("DELETE FROM project_asset_refs WHERE managed_file_id = ?").run(row.managed_file_id);
|
||||||
const requests = this.database.prepare("SELECT request_id FROM asset_cleanup_request_items WHERE managed_file_id = ?").all(row.managed_file_id) as Array<{ request_id: string }>;
|
const requests = this.database.prepare("SELECT request_id FROM asset_cleanup_request_items WHERE managed_file_id = ?").all(row.managed_file_id) as Array<{ request_id: string }>;
|
||||||
this.database.prepare("DELETE FROM asset_cleanup_request_items WHERE managed_file_id = ?").run(row.managed_file_id);
|
this.database.prepare("DELETE FROM asset_cleanup_request_items WHERE managed_file_id = ?").run(row.managed_file_id);
|
||||||
|
this.database.prepare("DELETE FROM sticker_managed_file_history WHERE managed_file_id = ?").run(row.managed_file_id);
|
||||||
this.database.prepare("DELETE FROM managed_files WHERE file_id = ?").run(row.managed_file_id);
|
this.database.prepare("DELETE FROM managed_files WHERE file_id = ?").run(row.managed_file_id);
|
||||||
for (const request of requests) {
|
for (const request of requests) {
|
||||||
const pendingItems = this.database.prepare("SELECT COUNT(*) AS count FROM asset_cleanup_request_items WHERE request_id = ?").get(request.request_id) as { count: number };
|
const pendingItems = this.database.prepare("SELECT COUNT(*) AS count FROM asset_cleanup_request_items WHERE request_id = ?").get(request.request_id) as { count: number };
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import { randomUUID, createHash } from "node:crypto";
|
|||||||
import type BetterSqlite3 from "better-sqlite3";
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
import { serializeAuditSummary, auditRetentionMilliseconds } from "./audit-policy.js";
|
import { serializeAuditSummary, auditRetentionMilliseconds } from "./audit-policy.js";
|
||||||
|
import type { GenerationModelCatalog, GenerationModelSnapshot } from "./generation-submission.js";
|
||||||
|
import { projectRatios } from "./projects.js";
|
||||||
|
|
||||||
export const modelIds = [
|
export const modelIds = [
|
||||||
"gemini-3.1-flash-image-preview",
|
"gemini-3.1-flash-image-preview",
|
||||||
@@ -59,6 +61,45 @@ export interface ModelConfigurationView {
|
|||||||
models: ModelConfigView[];
|
models: ModelConfigView[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ReadableModelConfiguration = Pick<ModelConfigurationService, "read">;
|
||||||
|
|
||||||
|
function generationRuntimeReason(reason: ModelRuntimeReason): GenerationModelSnapshot["runtimeAvailability"]["reason"] {
|
||||||
|
if (reason === "gateway_balance_insufficient") return reason;
|
||||||
|
if (reason === "contract_unverified" || reason === "contract_blocked") return "gateway_contract_invalid";
|
||||||
|
if (reason === "available") return null;
|
||||||
|
return "model_disabled";
|
||||||
|
}
|
||||||
|
|
||||||
|
export class GenerationModelConfigurationCatalog implements GenerationModelCatalog {
|
||||||
|
constructor(private readonly models: ReadableModelConfiguration) {}
|
||||||
|
|
||||||
|
readModel(modelId: string): GenerationModelSnapshot | undefined {
|
||||||
|
const configuration = this.models.read();
|
||||||
|
const model = configuration.models.find((entry) => entry.model_id === modelId);
|
||||||
|
if (!model) return undefined;
|
||||||
|
const supportedRatios = projectRatios.filter((ratio) => model.supported_ratios.includes(ratio));
|
||||||
|
return {
|
||||||
|
configSetVersion: configuration.config_set_version,
|
||||||
|
configVersion: model.config_version,
|
||||||
|
contractValidationStatus: model.contract_validation_status === "verified" ? "verified" : "unverified",
|
||||||
|
creditCost: model.credit_cost,
|
||||||
|
enabled: model.enabled,
|
||||||
|
modelId: model.model_id,
|
||||||
|
promptMaxLength: model.prompt_max_length,
|
||||||
|
referenceLimits: {
|
||||||
|
maxFileBytes: model.reference_limits.max_file_bytes,
|
||||||
|
maxFiles: model.reference_limits.max_files,
|
||||||
|
maxTotalBytes: model.reference_limits.max_total_bytes,
|
||||||
|
},
|
||||||
|
runtimeAvailability: {
|
||||||
|
availableForNewJobs: model.runtime_availability.available_for_new_jobs,
|
||||||
|
reason: generationRuntimeReason(model.runtime_availability.reason),
|
||||||
|
},
|
||||||
|
supportedRatios,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class ModelConfigurationError extends Error {
|
export class ModelConfigurationError extends Error {
|
||||||
constructor(
|
constructor(
|
||||||
readonly code:
|
readonly code:
|
||||||
@@ -111,7 +152,7 @@ const defaultErrorMapping: Record<string, string> = {
|
|||||||
upstream_timeout: "upstream_timeout",
|
upstream_timeout: "upstream_timeout",
|
||||||
};
|
};
|
||||||
|
|
||||||
const seedCandidates: ModelConfigCandidate[] = [
|
const defaultSeedCandidates: ModelConfigCandidate[] = [
|
||||||
{
|
{
|
||||||
model_id: modelIds[0], display_name: "Gemini 3.1 Flash Image Preview", enabled: true, is_default: true,
|
model_id: modelIds[0], display_name: "Gemini 3.1 Flash Image Preview", enabled: true, is_default: true,
|
||||||
recommendation_priority: 1, route_profile: { endpoint: "https://mock.invalid/v1/images", mode: "sync" },
|
recommendation_priority: 1, route_profile: { endpoint: "https://mock.invalid/v1/images", mode: "sync" },
|
||||||
@@ -138,6 +179,42 @@ const seedCandidates: ModelConfigCandidate[] = [
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const portableRuntimeModelCandidates: ModelConfigCandidate[] = [
|
||||||
|
{
|
||||||
|
...defaultSeedCandidates[0]!,
|
||||||
|
display_name: "Gemini 3.1 Flash Image",
|
||||||
|
route_profile: {
|
||||||
|
endpoint: "https://oneapi.intelligrow.cn/v1/chat/completions",
|
||||||
|
mode: "sync",
|
||||||
|
protocol_version: "gemini-openai-chat-v1",
|
||||||
|
provider_model_id: "gemini-3.1-flash-image",
|
||||||
|
},
|
||||||
|
gateway_account_ref: "oneapi-intelligrow-test",
|
||||||
|
contract_validation_status: "verified",
|
||||||
|
contract_evidence_ref: "contract:wp7-02:gemini-3.1-flash-image:v7",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
...defaultSeedCandidates[1]!,
|
||||||
|
enabled: false,
|
||||||
|
route_profile: { endpoint: "https://oneapi.intelligrow.cn/unsupported", mode: "disabled" },
|
||||||
|
gateway_account_ref: "oneapi-intelligrow-test",
|
||||||
|
contract_validation_status: "unverified",
|
||||||
|
contract_evidence_ref: null,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
...defaultSeedCandidates[2]!,
|
||||||
|
route_profile: {
|
||||||
|
endpoint: "https://oneapi.intelligrow.cn/v1/images/generations",
|
||||||
|
mode: "sync",
|
||||||
|
protocol_version: "openai-images-v1",
|
||||||
|
reference_endpoint: "https://oneapi.intelligrow.cn/v1/images/edits",
|
||||||
|
},
|
||||||
|
gateway_account_ref: "oneapi-intelligrow-test",
|
||||||
|
contract_validation_status: "verified",
|
||||||
|
contract_evidence_ref: "contract:wp7-02:gpt-image-2:v2",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
function stableJson(value: unknown): string {
|
function stableJson(value: unknown): string {
|
||||||
if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
|
if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
|
||||||
if (value && typeof value === "object") {
|
if (value && typeof value === "object") {
|
||||||
@@ -207,17 +284,20 @@ export interface ModelConfigurationServiceOptions {
|
|||||||
clock?: () => number;
|
clock?: () => number;
|
||||||
database: BetterSqlite3.Database;
|
database: BetterSqlite3.Database;
|
||||||
onChanged?: (configSetVersion: number) => void;
|
onChanged?: (configSetVersion: number) => void;
|
||||||
|
seedCandidates?: ModelConfigCandidate[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ModelConfigurationService {
|
export class ModelConfigurationService {
|
||||||
readonly database: BetterSqlite3.Database;
|
readonly database: BetterSqlite3.Database;
|
||||||
readonly #clock: () => number;
|
readonly #clock: () => number;
|
||||||
readonly #onChanged: ((configSetVersion: number) => void) | undefined;
|
readonly #onChanged: ((configSetVersion: number) => void) | undefined;
|
||||||
|
readonly #seedCandidates: ModelConfigCandidate[];
|
||||||
|
|
||||||
constructor(options: ModelConfigurationServiceOptions) {
|
constructor(options: ModelConfigurationServiceOptions) {
|
||||||
this.database = options.database;
|
this.database = options.database;
|
||||||
this.#clock = options.clock ?? Date.now;
|
this.#clock = options.clock ?? Date.now;
|
||||||
this.#onChanged = options.onChanged;
|
this.#onChanged = options.onChanged;
|
||||||
|
this.#seedCandidates = structuredClone(options.seedCandidates ?? defaultSeedCandidates);
|
||||||
this.ensureSchema();
|
this.ensureSchema();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -503,7 +583,7 @@ export class ModelConfigurationService {
|
|||||||
const current = this.database.prepare("SELECT config_set_id FROM model_config_current WHERE singleton = 1").get() as { config_set_id: string } | undefined;
|
const current = this.database.prepare("SELECT config_set_id FROM model_config_current WHERE singleton = 1").get() as { config_set_id: string } | undefined;
|
||||||
if (current) return;
|
if (current) return;
|
||||||
const seed = this.database.transaction(() => {
|
const seed = this.database.transaction(() => {
|
||||||
validateModelConfigurationCandidateSet(seedCandidates);
|
validateModelConfigurationCandidateSet(this.#seedCandidates);
|
||||||
const now = this.#clock();
|
const now = this.#clock();
|
||||||
const setId = randomUUID();
|
const setId = randomUUID();
|
||||||
this.database.prepare("INSERT INTO model_config_sets (config_set_id, config_set_version, created_at, created_by) VALUES (?, 1, ?, 'system_seed')")
|
this.database.prepare("INSERT INTO model_config_sets (config_set_id, config_set_version, created_at, created_by) VALUES (?, 1, ?, 'system_seed')")
|
||||||
@@ -520,7 +600,9 @@ export class ModelConfigurationService {
|
|||||||
INSERT INTO model_config_set_members (config_set_id, model_id, config_version, enabled, is_default, recommendation_priority)
|
INSERT INTO model_config_set_members (config_set_id, model_id, config_version, enabled, is_default, recommendation_priority)
|
||||||
VALUES (?, ?, 1, ?, ?, ?)
|
VALUES (?, ?, 1, ?, ?, ?)
|
||||||
`);
|
`);
|
||||||
for (const candidate of seedCandidates) {
|
for (const candidate of this.#seedCandidates) {
|
||||||
|
const contractStatus = candidate.contract_validation_status ?? "unverified";
|
||||||
|
const contractEvidenceRef = contractStatus === "unverified" ? null : candidate.contract_evidence_ref ?? null;
|
||||||
const routeProfileId = profileRef("route", candidate.route_profile);
|
const routeProfileId = profileRef("route", candidate.route_profile);
|
||||||
const errorMappingProfileId = profileRef("error", candidate.error_mapping_profile);
|
const errorMappingProfileId = profileRef("error", candidate.error_mapping_profile);
|
||||||
this.database.prepare("INSERT OR IGNORE INTO gateway_route_profiles (route_profile_id, profile_json, created_at) VALUES (?, ?, ?)")
|
this.database.prepare("INSERT OR IGNORE INTO gateway_route_profiles (route_profile_id, profile_json, created_at) VALUES (?, ?, ?)")
|
||||||
@@ -530,12 +612,14 @@ export class ModelConfigurationService {
|
|||||||
insertVersion.run(candidate.model_id, candidate.display_name, candidate.enabled ? 1 : 0, candidate.is_default ? 1 : 0,
|
insertVersion.run(candidate.model_id, candidate.display_name, candidate.enabled ? 1 : 0, candidate.is_default ? 1 : 0,
|
||||||
candidate.recommendation_priority, routeProfileId, stableJson(candidate.route_profile), candidate.gateway_account_ref,
|
candidate.recommendation_priority, routeProfileId, stableJson(candidate.route_profile), candidate.gateway_account_ref,
|
||||||
errorMappingProfileId, stableJson(candidate.error_mapping_profile), candidate.credit_cost, stableJson(candidate.supported_ratios), stableJson(candidate.reference_limits),
|
errorMappingProfileId, stableJson(candidate.error_mapping_profile), candidate.credit_cost, stableJson(candidate.supported_ratios), stableJson(candidate.reference_limits),
|
||||||
candidate.prompt_max_length, candidate.safety_source, "unverified", null, fingerprint(candidate), now);
|
candidate.prompt_max_length, candidate.safety_source, contractStatus, contractEvidenceRef, fingerprint(candidate), now);
|
||||||
insertMember.run(setId, candidate.model_id, candidate.enabled ? 1 : 0, candidate.is_default ? 1 : 0, candidate.recommendation_priority);
|
insertMember.run(setId, candidate.model_id, candidate.enabled ? 1 : 0, candidate.is_default ? 1 : 0, candidate.recommendation_priority);
|
||||||
|
const available = candidate.enabled && contractStatus === "verified";
|
||||||
|
const runtimeReason = !candidate.enabled ? "configured_disabled" : available ? "available" : "contract_unverified";
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
INSERT INTO model_runtime_availability (model_id, available_for_new_jobs, reason, checked_at, runtime_availability_version)
|
INSERT INTO model_runtime_availability (model_id, available_for_new_jobs, reason, checked_at, runtime_availability_version)
|
||||||
VALUES (?, 0, 'contract_unverified', ?, 0)
|
VALUES (?, ?, ?, ?, 0)
|
||||||
`).run(candidate.model_id, now);
|
`).run(candidate.model_id, available ? 1 : 0, runtimeReason, now);
|
||||||
}
|
}
|
||||||
this.database.prepare("INSERT INTO model_config_current (singleton, config_set_id) VALUES (1, ?)").run(setId);
|
this.database.prepare("INSERT INTO model_config_current (singleton, config_set_id) VALUES (1, ?)").run(setId);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,483 @@
|
|||||||
|
import { createHash, randomUUID } from "node:crypto";
|
||||||
|
|
||||||
|
import type {
|
||||||
|
AssetReleaseManifestItem,
|
||||||
|
AssetReleaseManifestProjection,
|
||||||
|
AssetReleaseReader,
|
||||||
|
} from "@dada/asset-release-manifest";
|
||||||
|
|
||||||
|
import { auditRetentionMilliseconds, serializeAuditSummary } from "./audit-policy.js";
|
||||||
|
import type { RegistrationService } from "./registration.js";
|
||||||
|
|
||||||
|
export type PreviewBatchStatus = "active" | "closed";
|
||||||
|
export type PreviewGrantStatus = "active" | "revoked" | "expired";
|
||||||
|
|
||||||
|
export interface PreviewBatchView {
|
||||||
|
batchId: string;
|
||||||
|
createdAt: number;
|
||||||
|
createdBy: string;
|
||||||
|
name: string;
|
||||||
|
status: PreviewBatchStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PreviewGrantView {
|
||||||
|
batchId: string;
|
||||||
|
expiresAt: number;
|
||||||
|
grantId: string;
|
||||||
|
grantedAt: number;
|
||||||
|
grantedBy: string;
|
||||||
|
status: PreviewGrantStatus;
|
||||||
|
userId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class PreviewGrantError extends Error {
|
||||||
|
constructor(
|
||||||
|
public readonly reason:
|
||||||
|
| "admin_invalid"
|
||||||
|
| "batch_closed"
|
||||||
|
| "batch_not_found"
|
||||||
|
| "grant_not_found"
|
||||||
|
| "invalid_expiry"
|
||||||
|
| "invalid_request"
|
||||||
|
| "resource_not_found"
|
||||||
|
| "user_not_eligible",
|
||||||
|
) {
|
||||||
|
super(reason);
|
||||||
|
this.name = "PreviewGrantError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PreviewGrantServiceOptions {
|
||||||
|
assetReleases: AssetReleaseReader;
|
||||||
|
clock?: () => number;
|
||||||
|
registration: RegistrationService;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PreviewManifestItemMapping {
|
||||||
|
releaseVersion: string;
|
||||||
|
resourceId: string;
|
||||||
|
userId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUuid(value: string) {
|
||||||
|
return /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertText(value: string, name: string) {
|
||||||
|
const normalized = value.trim();
|
||||||
|
if (!normalized || normalized.length > 160) throw new PreviewGrantError("invalid_request");
|
||||||
|
if (name === "batchId" && !isUuid(normalized)) throw new PreviewGrantError("invalid_request");
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
function manifestHash(items: readonly AssetReleaseManifestItem[], releaseVersion: string) {
|
||||||
|
return createHash("sha256")
|
||||||
|
.update(JSON.stringify({
|
||||||
|
items,
|
||||||
|
release_version: releaseVersion,
|
||||||
|
schema_version: "AssetReleaseManifest/v1",
|
||||||
|
}))
|
||||||
|
.digest("hex");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Owns the P0-A preview grant state. Preview URLs are deliberately ephemeral:
|
||||||
|
* the random item id is kept only in this process and every read rechecks the
|
||||||
|
* persisted grant, so revocation and expiry take effect without cache busting.
|
||||||
|
*/
|
||||||
|
export class AssetPreviewGrantService {
|
||||||
|
readonly database: RegistrationService["database"];
|
||||||
|
readonly options: Required<Pick<PreviewGrantServiceOptions, "clock">> & PreviewGrantServiceOptions;
|
||||||
|
private readonly itemMappings = new Map<string, PreviewManifestItemMapping>();
|
||||||
|
|
||||||
|
constructor(options: PreviewGrantServiceOptions) {
|
||||||
|
this.database = options.registration.database;
|
||||||
|
this.options = { ...options, clock: options.clock ?? Date.now };
|
||||||
|
this.migrate();
|
||||||
|
}
|
||||||
|
|
||||||
|
createBatch(input: { adminUserId: string; batchId?: string; name: string }): PreviewBatchView {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
const name = assertText(input.name, "name");
|
||||||
|
const batchId = input.batchId ? assertText(input.batchId, "batchId") : randomUUID();
|
||||||
|
const now = this.options.clock();
|
||||||
|
this.assertAdmin(adminUserId, now);
|
||||||
|
this.immediate(() => {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO test_batches (batch_id, name, status, created_by, created_at, closed_at)
|
||||||
|
VALUES (?, ?, 'active', ?, ?, NULL)
|
||||||
|
`).run(batchId, name, adminUserId, now);
|
||||||
|
this.audit({
|
||||||
|
actorRef: adminUserId,
|
||||||
|
afterSummary: { batch_id: batchId, status: "active" },
|
||||||
|
beforeSummary: null,
|
||||||
|
operationType: "preview_batch_create",
|
||||||
|
targetRef: batchId,
|
||||||
|
targetType: "preview_batch",
|
||||||
|
}, now);
|
||||||
|
});
|
||||||
|
return { batchId, createdAt: now, createdBy: adminUserId, name, status: "active" };
|
||||||
|
}
|
||||||
|
|
||||||
|
closeBatch(input: { adminUserId: string; batchId: string }): PreviewBatchView {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
const batchId = assertText(input.batchId, "batchId");
|
||||||
|
const now = this.options.clock();
|
||||||
|
this.assertAdmin(adminUserId, now);
|
||||||
|
return this.immediate(() => {
|
||||||
|
const batch = this.readBatch(batchId);
|
||||||
|
if (!batch) throw new PreviewGrantError("batch_not_found");
|
||||||
|
if (batch.status === "active") {
|
||||||
|
this.database.prepare("UPDATE test_batches SET status = 'closed', closed_at = ? WHERE batch_id = ?").run(now, batchId);
|
||||||
|
this.audit({
|
||||||
|
actorRef: adminUserId,
|
||||||
|
afterSummary: { batch_id: batchId, status: "closed" },
|
||||||
|
beforeSummary: { batch_id: batchId, status: batch.status },
|
||||||
|
operationType: "preview_batch_close",
|
||||||
|
targetRef: batchId,
|
||||||
|
targetType: "preview_batch",
|
||||||
|
}, now);
|
||||||
|
}
|
||||||
|
return { ...batch, status: "closed" as const };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
addBatchItems(input: {
|
||||||
|
adminUserId: string;
|
||||||
|
batchId: string;
|
||||||
|
releaseVersion: string;
|
||||||
|
resourceIds: readonly string[];
|
||||||
|
}) {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
const batchId = assertText(input.batchId, "batchId");
|
||||||
|
const releaseVersion = assertText(input.releaseVersion, "releaseVersion");
|
||||||
|
const resourceIds = [...new Set(input.resourceIds.map((resourceId) => assertText(resourceId, "resourceId")))];
|
||||||
|
if (resourceIds.length === 0) throw new PreviewGrantError("invalid_request");
|
||||||
|
const now = this.options.clock();
|
||||||
|
this.assertAdmin(adminUserId, now);
|
||||||
|
for (const resourceId of resourceIds) {
|
||||||
|
if (!this.options.assetReleases.read("internal_preview_asset", releaseVersion, resourceId)) {
|
||||||
|
throw new PreviewGrantError("resource_not_found");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.immediate(() => {
|
||||||
|
const batch = this.readBatch(batchId);
|
||||||
|
if (!batch) throw new PreviewGrantError("batch_not_found");
|
||||||
|
if (batch.status !== "active") throw new PreviewGrantError("batch_closed");
|
||||||
|
const insert = this.database.prepare(`
|
||||||
|
INSERT OR IGNORE INTO test_batch_items (test_batch_id, release_version, resource_id)
|
||||||
|
VALUES (?, ?, ?)
|
||||||
|
`);
|
||||||
|
for (const resourceId of resourceIds) insert.run(batchId, releaseVersion, resourceId);
|
||||||
|
this.audit({
|
||||||
|
actorRef: adminUserId,
|
||||||
|
afterSummary: { batch_id: batchId, item_count: resourceIds.length, release_version: releaseVersion },
|
||||||
|
beforeSummary: null,
|
||||||
|
operationType: "preview_batch_items_add",
|
||||||
|
targetRef: batchId,
|
||||||
|
targetType: "preview_batch",
|
||||||
|
}, now);
|
||||||
|
});
|
||||||
|
return { batchId, releaseVersion, resourceIds };
|
||||||
|
}
|
||||||
|
|
||||||
|
grant(input: {
|
||||||
|
adminUserId: string;
|
||||||
|
batchId: string;
|
||||||
|
expiresAt: number;
|
||||||
|
userId: string;
|
||||||
|
}): PreviewGrantView {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
const batchId = assertText(input.batchId, "batchId");
|
||||||
|
const userId = assertText(input.userId, "userId");
|
||||||
|
if (!isUuid(userId)) throw new PreviewGrantError("invalid_request");
|
||||||
|
const now = this.options.clock();
|
||||||
|
if (!Number.isSafeInteger(input.expiresAt) || input.expiresAt <= now) throw new PreviewGrantError("invalid_expiry");
|
||||||
|
this.assertAdmin(adminUserId, now);
|
||||||
|
return this.immediate(() => {
|
||||||
|
const batch = this.readBatch(batchId);
|
||||||
|
if (!batch) throw new PreviewGrantError("batch_not_found");
|
||||||
|
if (batch.status !== "active") throw new PreviewGrantError("batch_closed");
|
||||||
|
const user = this.database.prepare("SELECT role, status FROM users WHERE user_id = ?").get(userId) as { role: string; status: string } | undefined;
|
||||||
|
if (!user || user.role !== "user" || user.status !== "active") throw new PreviewGrantError("user_not_eligible");
|
||||||
|
const grantId = randomUUID();
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO asset_preview_grants (
|
||||||
|
grant_id, user_id, test_batch_id, granted_by, granted_at, expires_at, status
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, 'active')
|
||||||
|
`).run(grantId, userId, batchId, adminUserId, now, input.expiresAt);
|
||||||
|
this.audit({
|
||||||
|
actorRef: adminUserId,
|
||||||
|
afterSummary: { batch_id: batchId, expires_at: input.expiresAt, grant_id: grantId, status: "active", user_id: userId },
|
||||||
|
beforeSummary: null,
|
||||||
|
operationType: "preview_grant_create",
|
||||||
|
targetRef: grantId,
|
||||||
|
targetType: "preview_grant",
|
||||||
|
}, now);
|
||||||
|
return {
|
||||||
|
batchId,
|
||||||
|
expiresAt: input.expiresAt,
|
||||||
|
grantId,
|
||||||
|
grantedAt: now,
|
||||||
|
grantedBy: adminUserId,
|
||||||
|
status: "active" as const,
|
||||||
|
userId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
revoke(input: { adminUserId: string; grantId: string }): PreviewGrantView {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
const grantId = assertText(input.grantId, "grantId");
|
||||||
|
const now = this.options.clock();
|
||||||
|
this.assertAdmin(adminUserId, now);
|
||||||
|
return this.immediate(() => {
|
||||||
|
this.expireDue(now);
|
||||||
|
const grant = this.readGrant(grantId);
|
||||||
|
if (!grant) throw new PreviewGrantError("grant_not_found");
|
||||||
|
if (grant.status === "active") {
|
||||||
|
this.database.prepare("UPDATE asset_preview_grants SET status = 'revoked' WHERE grant_id = ? AND status = 'active'").run(grantId);
|
||||||
|
this.audit({
|
||||||
|
actorRef: adminUserId,
|
||||||
|
afterSummary: { grant_id: grantId, status: "revoked" },
|
||||||
|
beforeSummary: { grant_id: grantId, status: grant.status },
|
||||||
|
operationType: "preview_grant_revoke",
|
||||||
|
targetRef: grantId,
|
||||||
|
targetType: "preview_grant",
|
||||||
|
}, now);
|
||||||
|
}
|
||||||
|
return { ...grant, status: "revoked" as const };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
listBatches(input: { adminUserId: string }): PreviewBatchView[] {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
this.assertAdmin(adminUserId, this.options.clock());
|
||||||
|
return (this.database.prepare(`
|
||||||
|
SELECT batch_id, name, status, created_by, created_at
|
||||||
|
FROM test_batches ORDER BY created_at DESC, batch_id DESC
|
||||||
|
`).all() as Array<{ batch_id: string; created_at: number; created_by: string; name: string; status: PreviewBatchStatus }>).map((row) => ({
|
||||||
|
batchId: row.batch_id,
|
||||||
|
createdAt: row.created_at,
|
||||||
|
createdBy: row.created_by,
|
||||||
|
name: row.name,
|
||||||
|
status: row.status,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
listGrants(input: { adminUserId: string; batchId?: string; userId?: string }): PreviewGrantView[] {
|
||||||
|
const adminUserId = assertText(input.adminUserId, "adminUserId");
|
||||||
|
this.assertAdmin(adminUserId, this.options.clock());
|
||||||
|
const batchId = input.batchId ? assertText(input.batchId, "batchId") : undefined;
|
||||||
|
const userId = input.userId ? assertText(input.userId, "userId") : undefined;
|
||||||
|
const now = this.options.clock();
|
||||||
|
return this.immediate(() => {
|
||||||
|
this.expireDue(now);
|
||||||
|
const rows = this.database.prepare(`
|
||||||
|
SELECT grant_id, user_id, test_batch_id, granted_by, granted_at, expires_at, status
|
||||||
|
FROM asset_preview_grants
|
||||||
|
WHERE (? IS NULL OR test_batch_id = ?) AND (? IS NULL OR user_id = ?)
|
||||||
|
ORDER BY granted_at DESC, grant_id DESC
|
||||||
|
`).all(batchId ?? null, batchId ?? null, userId ?? null, userId ?? null) as Array<{
|
||||||
|
expires_at: number; grant_id: string; granted_at: number; granted_by: string;
|
||||||
|
status: PreviewGrantStatus; test_batch_id: string; user_id: string;
|
||||||
|
}>;
|
||||||
|
return rows.map((row) => ({
|
||||||
|
batchId: row.test_batch_id,
|
||||||
|
expiresAt: row.expires_at,
|
||||||
|
grantId: row.grant_id,
|
||||||
|
grantedAt: row.granted_at,
|
||||||
|
grantedBy: row.granted_by,
|
||||||
|
status: row.status,
|
||||||
|
userId: row.user_id,
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
projectManifest(input: { releaseVersion: string; userId: string }): AssetReleaseManifestProjection | undefined {
|
||||||
|
const releaseVersion = assertText(input.releaseVersion, "releaseVersion");
|
||||||
|
const userId = assertText(input.userId, "userId");
|
||||||
|
const base = this.options.assetReleases.project("internal_preview_asset", releaseVersion);
|
||||||
|
if (!base) return undefined;
|
||||||
|
const authorized = base.items.filter((item) => this.authorizeAsset({ releaseVersion, resourceId: item.resource_id, userId }));
|
||||||
|
if (authorized.length === 0) return undefined;
|
||||||
|
const items = authorized.map((item) => {
|
||||||
|
const manifestItemId = randomUUID();
|
||||||
|
const mapped: AssetReleaseManifestItem = {
|
||||||
|
...item,
|
||||||
|
resource_id: manifestItemId,
|
||||||
|
url: `/api/v1/assets/preview/${releaseVersion}/${manifestItemId}`,
|
||||||
|
};
|
||||||
|
this.itemMappings.set(manifestItemId, {
|
||||||
|
releaseVersion,
|
||||||
|
resourceId: item.resource_id,
|
||||||
|
userId,
|
||||||
|
});
|
||||||
|
return mapped;
|
||||||
|
});
|
||||||
|
return Object.freeze({
|
||||||
|
items: Object.freeze(items.map((item) => Object.freeze(item))),
|
||||||
|
manifest_sha256: manifestHash(items, releaseVersion),
|
||||||
|
release_version: releaseVersion,
|
||||||
|
schema_version: "AssetReleaseManifest/v1" as const,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
authorizeAsset(input: { releaseVersion: string; resourceId: string; userId: string }) {
|
||||||
|
const releaseVersion = assertText(input.releaseVersion, "releaseVersion");
|
||||||
|
const resourceId = assertText(input.resourceId, "resourceId");
|
||||||
|
const userId = assertText(input.userId, "userId");
|
||||||
|
const now = this.options.clock();
|
||||||
|
return this.immediate(() => {
|
||||||
|
this.expireDue(now);
|
||||||
|
const user = this.database.prepare("SELECT role, status FROM users WHERE user_id = ?").get(userId) as { role: string; status: string } | undefined;
|
||||||
|
if (!user || user.role !== "user" || user.status !== "active") return false;
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT 1 AS authorized
|
||||||
|
FROM asset_preview_grants g
|
||||||
|
JOIN test_batch_items i ON i.test_batch_id = g.test_batch_id
|
||||||
|
WHERE g.user_id = ? AND g.status = 'active' AND g.expires_at > ?
|
||||||
|
AND i.release_version = ? AND i.resource_id = ?
|
||||||
|
LIMIT 1
|
||||||
|
`).get(userId, now, releaseVersion, resourceId) as { authorized: 1 } | undefined;
|
||||||
|
return Boolean(row);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
readManifestItem(input: { manifestItemId: string; releaseVersion: string; userId: string }) {
|
||||||
|
const manifestItemId = assertText(input.manifestItemId, "manifestItemId");
|
||||||
|
const releaseVersion = assertText(input.releaseVersion, "releaseVersion");
|
||||||
|
const userId = assertText(input.userId, "userId");
|
||||||
|
const mapping = this.itemMappings.get(manifestItemId);
|
||||||
|
if (!mapping || mapping.releaseVersion !== releaseVersion || mapping.userId !== userId) return undefined;
|
||||||
|
if (!this.authorizeAsset({ releaseVersion, resourceId: mapping.resourceId, userId })) {
|
||||||
|
this.itemMappings.delete(manifestItemId);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const resource = this.options.assetReleases.read("internal_preview_asset", releaseVersion, mapping.resourceId);
|
||||||
|
return resource ? { ...resource, resourceId: manifestItemId } : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
private migrate() {
|
||||||
|
this.database.exec(`
|
||||||
|
CREATE TABLE IF NOT EXISTS test_batches (
|
||||||
|
batch_id TEXT PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL CHECK (length(name) BETWEEN 1 AND 160),
|
||||||
|
status TEXT NOT NULL CHECK (status IN ('active', 'closed')),
|
||||||
|
created_by TEXT NOT NULL REFERENCES users(user_id),
|
||||||
|
created_at INTEGER NOT NULL,
|
||||||
|
closed_at INTEGER
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS test_batch_items (
|
||||||
|
test_batch_id TEXT NOT NULL REFERENCES test_batches(batch_id),
|
||||||
|
release_version TEXT NOT NULL,
|
||||||
|
resource_id TEXT NOT NULL,
|
||||||
|
PRIMARY KEY (test_batch_id, release_version, resource_id)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS asset_preview_grants (
|
||||||
|
grant_id TEXT PRIMARY KEY,
|
||||||
|
user_id TEXT NOT NULL REFERENCES users(user_id),
|
||||||
|
test_batch_id TEXT NOT NULL REFERENCES test_batches(batch_id),
|
||||||
|
granted_by TEXT NOT NULL REFERENCES users(user_id),
|
||||||
|
granted_at INTEGER NOT NULL,
|
||||||
|
expires_at INTEGER NOT NULL CHECK (expires_at > granted_at),
|
||||||
|
status TEXT NOT NULL CHECK (status IN ('active', 'revoked', 'expired'))
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS asset_preview_grants_user_status
|
||||||
|
ON asset_preview_grants(user_id, status, expires_at);
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
|
||||||
|
private immediate<T>(action: () => T): T {
|
||||||
|
this.database.exec("BEGIN IMMEDIATE");
|
||||||
|
try {
|
||||||
|
const value = action();
|
||||||
|
this.database.exec("COMMIT");
|
||||||
|
return value;
|
||||||
|
} catch (error) {
|
||||||
|
if (this.database.inTransaction) this.database.exec("ROLLBACK");
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertAdmin(adminUserId: string, now: number) {
|
||||||
|
const admin = this.database.prepare(`
|
||||||
|
SELECT 1 AS allowed FROM users u JOIN admin_access a ON a.user_id = u.user_id
|
||||||
|
WHERE u.user_id = ? AND u.role = 'super_admin' AND u.status = 'active' AND a.allowed = 1
|
||||||
|
`).get(adminUserId) as { allowed: 1 } | undefined;
|
||||||
|
if (!admin) throw new PreviewGrantError("admin_invalid");
|
||||||
|
void now;
|
||||||
|
}
|
||||||
|
|
||||||
|
private readBatch(batchId: string): PreviewBatchView | undefined {
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT batch_id, name, status, created_by, created_at
|
||||||
|
FROM test_batches WHERE batch_id = ?
|
||||||
|
`).get(batchId) as { batch_id: string; created_at: number; created_by: string; name: string; status: PreviewBatchStatus } | undefined;
|
||||||
|
return row ? {
|
||||||
|
batchId: row.batch_id,
|
||||||
|
createdAt: row.created_at,
|
||||||
|
createdBy: row.created_by,
|
||||||
|
name: row.name,
|
||||||
|
status: row.status,
|
||||||
|
} : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
private readGrant(grantId: string): PreviewGrantView | undefined {
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT grant_id, user_id, test_batch_id, granted_by, granted_at, expires_at, status
|
||||||
|
FROM asset_preview_grants WHERE grant_id = ?
|
||||||
|
`).get(grantId) as {
|
||||||
|
expires_at: number; grant_id: string; granted_at: number; granted_by: string;
|
||||||
|
status: PreviewGrantStatus; test_batch_id: string; user_id: string;
|
||||||
|
} | undefined;
|
||||||
|
return row ? {
|
||||||
|
batchId: row.test_batch_id,
|
||||||
|
expiresAt: row.expires_at,
|
||||||
|
grantId: row.grant_id,
|
||||||
|
grantedAt: row.granted_at,
|
||||||
|
grantedBy: row.granted_by,
|
||||||
|
status: row.status,
|
||||||
|
userId: row.user_id,
|
||||||
|
} : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
private expireDue(now: number) {
|
||||||
|
const rows = this.database.prepare(`
|
||||||
|
SELECT grant_id, user_id, test_batch_id FROM asset_preview_grants
|
||||||
|
WHERE status = 'active' AND expires_at <= ?
|
||||||
|
`).all(now) as Array<{ grant_id: string; test_batch_id: string; user_id: string }>;
|
||||||
|
if (rows.length === 0) return;
|
||||||
|
this.database.prepare("UPDATE asset_preview_grants SET status = 'expired' WHERE status = 'active' AND expires_at <= ?").run(now);
|
||||||
|
for (const row of rows) {
|
||||||
|
this.audit({
|
||||||
|
actorRef: "preview_grant_expiry",
|
||||||
|
afterSummary: { grant_id: row.grant_id, status: "expired" },
|
||||||
|
beforeSummary: { grant_id: row.grant_id, status: "active" },
|
||||||
|
operationType: "preview_grant_expire",
|
||||||
|
targetRef: row.grant_id,
|
||||||
|
targetType: "preview_grant",
|
||||||
|
}, now, "system");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private audit(input: {
|
||||||
|
actorRef: string;
|
||||||
|
afterSummary: Record<string, unknown> | null;
|
||||||
|
beforeSummary: Record<string, unknown> | null;
|
||||||
|
operationType: string;
|
||||||
|
targetRef: string;
|
||||||
|
targetType: string;
|
||||||
|
}, now: number, actorType: "super_admin" | "system" = "super_admin") {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO admin_operation_logs (
|
||||||
|
log_id, actor_type, actor_ref, operation_type, target_type, target_ref,
|
||||||
|
result, before_summary, after_summary, occurred_at, expires_at
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, 'succeeded', ?, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), actorType, input.actorRef, input.operationType, input.targetType, input.targetRef,
|
||||||
|
serializeAuditSummary(input.beforeSummary), serializeAuditSummary(input.afterSummary),
|
||||||
|
now, now + auditRetentionMilliseconds,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,186 @@
|
|||||||
|
import { randomUUID } from "node:crypto";
|
||||||
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
|
import { auditRetentionMilliseconds } from "./audit-policy.js";
|
||||||
|
|
||||||
|
type GenerationStatus = "queued" | "running" | "succeeded" | "failed" | "rejected";
|
||||||
|
|
||||||
|
export class PrivateContentError extends Error {
|
||||||
|
constructor(readonly code: "notice_required" | "notice_version_conflict" | "not_found") {
|
||||||
|
super(code);
|
||||||
|
this.name = "PrivateContentError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function iso(value: number) {
|
||||||
|
return new Date(value).toISOString();
|
||||||
|
}
|
||||||
|
|
||||||
|
function isGenerationTablePresent(database: BetterSqlite3.Database) {
|
||||||
|
return Boolean(database.prepare(
|
||||||
|
"SELECT 1 AS present FROM sqlite_master WHERE type = 'table' AND name = 'generation_jobs'",
|
||||||
|
).get());
|
||||||
|
}
|
||||||
|
|
||||||
|
export class PrivateContentService {
|
||||||
|
constructor(
|
||||||
|
readonly database: BetterSqlite3.Database,
|
||||||
|
readonly currentNoticeVersion: string,
|
||||||
|
private readonly clock: () => number = Date.now,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
currentNotice() {
|
||||||
|
return {
|
||||||
|
version: this.currentNoticeVersion,
|
||||||
|
messageKey: "admin.private_content.notice",
|
||||||
|
} as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
readAcknowledgement(adminUserId: string) {
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT private_content_notice_version, private_content_notice_acknowledged_at
|
||||||
|
FROM user_profiles WHERE user_id = ?
|
||||||
|
`).get(adminUserId) as { private_content_notice_version: string | null; private_content_notice_acknowledged_at: number | null } | undefined;
|
||||||
|
return {
|
||||||
|
version: row?.private_content_notice_version ?? null,
|
||||||
|
acknowledgedAt: row?.private_content_notice_acknowledged_at === null || row?.private_content_notice_acknowledged_at === undefined
|
||||||
|
? null : iso(row.private_content_notice_acknowledged_at),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
isAcknowledged(adminUserId: string) {
|
||||||
|
return this.readAcknowledgement(adminUserId).version === this.currentNoticeVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
requireAcknowledgement(adminUserId: string) {
|
||||||
|
if (!this.isAcknowledged(adminUserId)) throw new PrivateContentError("notice_required");
|
||||||
|
}
|
||||||
|
|
||||||
|
acknowledge(adminUserId: string, expectedNoticeVersion: string) {
|
||||||
|
const now = this.clock();
|
||||||
|
return this.database.transaction(() => {
|
||||||
|
if (expectedNoticeVersion !== this.currentNoticeVersion) {
|
||||||
|
throw new PrivateContentError("notice_version_conflict");
|
||||||
|
}
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO user_profiles (
|
||||||
|
user_id, creator_name, social_id, private_content_notice_version,
|
||||||
|
private_content_notice_acknowledged_at
|
||||||
|
) VALUES (?, '', '', ?, ?)
|
||||||
|
ON CONFLICT(user_id) DO UPDATE SET
|
||||||
|
private_content_notice_version = excluded.private_content_notice_version,
|
||||||
|
private_content_notice_acknowledged_at =
|
||||||
|
CASE WHEN user_profiles.private_content_notice_version = excluded.private_content_notice_version
|
||||||
|
THEN user_profiles.private_content_notice_acknowledged_at ELSE excluded.private_content_notice_acknowledged_at END
|
||||||
|
`).run(adminUserId, this.currentNoticeVersion, now);
|
||||||
|
const acknowledged = this.readAcknowledgement(adminUserId);
|
||||||
|
return {
|
||||||
|
noticeVersion: this.currentNoticeVersion,
|
||||||
|
acknowledgedAt: acknowledged.acknowledgedAt ?? iso(now),
|
||||||
|
};
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
|
||||||
|
listGenerations() {
|
||||||
|
const generatedAt = iso(this.clock());
|
||||||
|
if (!isGenerationTablePresent(this.database)) return { generated_at: generatedAt, items: [] };
|
||||||
|
const rows = this.database.prepare(`
|
||||||
|
SELECT generation_id, owner_id, project_id, model_id, ratio, status,
|
||||||
|
confirmed_credit_cost, reserved_credits, final_credit_state,
|
||||||
|
error_category, created_at, updated_at
|
||||||
|
FROM generation_jobs
|
||||||
|
WHERE submission_ready = 1
|
||||||
|
ORDER BY created_at DESC, generation_id DESC
|
||||||
|
LIMIT 100
|
||||||
|
`).all() as Array<{
|
||||||
|
generation_id: string;
|
||||||
|
owner_id: string;
|
||||||
|
project_id: string;
|
||||||
|
model_id: string;
|
||||||
|
ratio: "3:4" | "1:1" | "4:3" | "9:16";
|
||||||
|
status: GenerationStatus;
|
||||||
|
confirmed_credit_cost: number;
|
||||||
|
reserved_credits: number;
|
||||||
|
final_credit_state: "committed" | "released" | null;
|
||||||
|
error_category: string | null;
|
||||||
|
created_at: number;
|
||||||
|
updated_at: number;
|
||||||
|
}>;
|
||||||
|
return {
|
||||||
|
generated_at: generatedAt,
|
||||||
|
items: rows.map((row) => {
|
||||||
|
const terminal = row.status === "succeeded" || row.status === "failed" || row.status === "rejected";
|
||||||
|
return {
|
||||||
|
generation_id: row.generation_id,
|
||||||
|
owner_ref: row.owner_id,
|
||||||
|
project_id: row.project_id,
|
||||||
|
model_id: row.model_id,
|
||||||
|
ratio: row.ratio,
|
||||||
|
status: row.status,
|
||||||
|
created_at: iso(row.created_at),
|
||||||
|
completed_at: terminal ? iso(row.updated_at) : null,
|
||||||
|
duration_ms: terminal ? Math.max(0, row.updated_at - row.created_at) : null,
|
||||||
|
confirmed_credit_cost: row.confirmed_credit_cost,
|
||||||
|
reserved_credits: row.reserved_credits,
|
||||||
|
final_credit_state: row.final_credit_state,
|
||||||
|
error_category: row.error_category,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private generation(generationId: string) {
|
||||||
|
if (!isGenerationTablePresent(this.database)) throw new PrivateContentError("not_found");
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT generation_id, owner_id, project_id
|
||||||
|
FROM generation_jobs WHERE generation_id = ? AND submission_ready = 1
|
||||||
|
`).get(generationId) as { generation_id: string; owner_id: string; project_id: string } | undefined;
|
||||||
|
if (!row) throw new PrivateContentError("not_found");
|
||||||
|
return row;
|
||||||
|
}
|
||||||
|
|
||||||
|
private recordAccess(input: { adminUserId: string; ownerId: string; generationId: string; contentType: "image" | "prompt" }) {
|
||||||
|
const now = this.clock();
|
||||||
|
// The insert is committed before the caller reads the private value. A failed
|
||||||
|
// constraint therefore cannot accidentally release a private response.
|
||||||
|
this.database.transaction(() => {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO private_content_access_logs (
|
||||||
|
log_id, actor_ref, subject_ref, target_ref, content_type, occurred_at, expires_at
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), input.adminUserId, input.ownerId, input.generationId,
|
||||||
|
input.contentType, now, now + auditRetentionMilliseconds,
|
||||||
|
);
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
|
||||||
|
recordPrivateAssetAccess(adminUserId: string, ownerId: string, resourceId: string) {
|
||||||
|
this.recordAccess({ adminUserId, ownerId, generationId: resourceId, contentType: "image" });
|
||||||
|
}
|
||||||
|
|
||||||
|
readPrompt(adminUserId: string, generationId: string) {
|
||||||
|
this.requireAcknowledgement(adminUserId);
|
||||||
|
const row = this.generation(generationId);
|
||||||
|
this.recordAccess({ adminUserId, ownerId: row.owner_id, generationId: row.generation_id, contentType: "prompt" });
|
||||||
|
const content = this.database.prepare(
|
||||||
|
"SELECT prompt FROM generation_jobs WHERE generation_id = ? AND submission_ready = 1",
|
||||||
|
).get(row.generation_id) as { prompt: string } | undefined;
|
||||||
|
if (!content) throw new PrivateContentError("not_found");
|
||||||
|
return { generationId: row.generation_id, prompt: content.prompt };
|
||||||
|
}
|
||||||
|
|
||||||
|
readImageTarget(adminUserId: string, generationId: string) {
|
||||||
|
this.requireAcknowledgement(adminUserId);
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT g.generation_id, g.owner_id, g.project_id, pi.image_id
|
||||||
|
FROM generation_jobs g
|
||||||
|
JOIN project_images pi ON pi.project_id = g.project_id AND pi.generation_id = g.generation_id
|
||||||
|
WHERE g.generation_id = ? AND g.status = 'succeeded'
|
||||||
|
ORDER BY pi.created_at DESC LIMIT 1
|
||||||
|
`).get(generationId) as { generation_id: string; owner_id: string; project_id: string; image_id: string } | undefined;
|
||||||
|
if (!row) throw new PrivateContentError("not_found");
|
||||||
|
this.recordAccess({ adminUserId, ownerId: row.owner_id, generationId: row.generation_id, contentType: "image" });
|
||||||
|
return { projectId: row.project_id, imageId: row.image_id, ownerId: row.owner_id };
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -366,6 +366,7 @@ export class ProjectService {
|
|||||||
throw new ProjectError("project_state_conflict", latest);
|
throw new ProjectError("project_state_conflict", latest);
|
||||||
}
|
}
|
||||||
this.insertProjectState({ canvasState: canvas, name, projectId: input.projectId, stateVersion: nextVersion }, now);
|
this.insertProjectState({ canvasState: canvas, name, projectId: input.projectId, stateVersion: nextVersion }, now);
|
||||||
|
this.rebuildProjectStickerReferences(input.projectId, canvas, now);
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
INSERT INTO project_state_idempotency (
|
INSERT INTO project_state_idempotency (
|
||||||
owner_id, project_id, idempotency_key, request_hash, response_state_version, created_at
|
owner_id, project_id, idempotency_key, request_hash, response_state_version, created_at
|
||||||
@@ -377,6 +378,25 @@ export class ProjectService {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private rebuildProjectStickerReferences(projectId: string, canvas: CanvasState, now: number) {
|
||||||
|
if (!this.tableExists("project_sticker_asset_refs")) return;
|
||||||
|
this.database.prepare("DELETE FROM project_sticker_asset_refs WHERE project_id = ?").run(projectId);
|
||||||
|
const insert = this.database.prepare(`
|
||||||
|
INSERT INTO project_sticker_asset_refs (reference_id, project_id, stable_id, resource_version, created_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?)
|
||||||
|
`);
|
||||||
|
for (const element of canvas.elements) {
|
||||||
|
if (element.type !== "static_sticker") continue;
|
||||||
|
insert.run(
|
||||||
|
`project:${projectId}:sticker:${element.element_id}`,
|
||||||
|
projectId,
|
||||||
|
element.template_or_asset_id,
|
||||||
|
element.resource_version,
|
||||||
|
now,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
trashFailedEmpty(ownerId: string, projectIds: string[]) {
|
trashFailedEmpty(ownerId: string, projectIds: string[]) {
|
||||||
const uniqueIds = [...new Set(projectIds)];
|
const uniqueIds = [...new Set(projectIds)];
|
||||||
if (uniqueIds.length === 0 || uniqueIds.length > projectLimit) throw new ProjectError("generation_state_invalid");
|
if (uniqueIds.length === 0 || uniqueIds.length > projectLimit) throw new ProjectError("generation_state_invalid");
|
||||||
@@ -774,6 +794,16 @@ export class ProjectService {
|
|||||||
FOREIGN KEY (project_id) REFERENCES projects(project_id) ON DELETE CASCADE
|
FOREIGN KEY (project_id) REFERENCES projects(project_id) ON DELETE CASCADE
|
||||||
);
|
);
|
||||||
CREATE INDEX IF NOT EXISTS project_resource_files_managed ON project_resource_files(managed_file_id, project_id);
|
CREATE INDEX IF NOT EXISTS project_resource_files_managed ON project_resource_files(managed_file_id, project_id);
|
||||||
|
CREATE TABLE IF NOT EXISTS project_sticker_asset_refs (
|
||||||
|
reference_id TEXT PRIMARY KEY,
|
||||||
|
project_id TEXT NOT NULL,
|
||||||
|
stable_id TEXT NOT NULL,
|
||||||
|
resource_version TEXT NOT NULL,
|
||||||
|
created_at INTEGER NOT NULL,
|
||||||
|
FOREIGN KEY (project_id) REFERENCES projects(project_id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS project_sticker_asset_refs_lookup
|
||||||
|
ON project_sticker_asset_refs (stable_id, resource_version);
|
||||||
CREATE TABLE IF NOT EXISTS latest_exports (
|
CREATE TABLE IF NOT EXISTS latest_exports (
|
||||||
project_id TEXT NOT NULL,
|
project_id TEXT NOT NULL,
|
||||||
format TEXT NOT NULL CHECK (format IN ('jpg', 'png')),
|
format TEXT NOT NULL CHECK (format IN ('jpg', 'png')),
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { createRequire } from "node:module";
|
|||||||
import type BetterSqlite3 from "better-sqlite3";
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
auditRetentionMilliseconds,
|
||||||
ensureAdminOperationAuditSchema,
|
ensureAdminOperationAuditSchema,
|
||||||
ensurePrivateAccessAuditSchema,
|
ensurePrivateAccessAuditSchema,
|
||||||
isSafeAuditRef,
|
isSafeAuditRef,
|
||||||
@@ -11,6 +12,7 @@ import {
|
|||||||
serializeAuditSummary,
|
serializeAuditSummary,
|
||||||
} from "./audit-policy.js";
|
} from "./audit-policy.js";
|
||||||
import type { ResendAdapter } from "./resend-adapter.js";
|
import type { ResendAdapter } from "./resend-adapter.js";
|
||||||
|
import { ExternalServiceUsage } from "./external-service-usage.js";
|
||||||
import {
|
import {
|
||||||
RegistrationError,
|
RegistrationError,
|
||||||
type RegistrationErrorReason,
|
type RegistrationErrorReason,
|
||||||
@@ -36,6 +38,7 @@ export interface RegistrationTransactionEvent {
|
|||||||
| "registration_send"
|
| "registration_send"
|
||||||
| "registration_complete"
|
| "registration_complete"
|
||||||
| "registration_send_compensation"
|
| "registration_send_compensation"
|
||||||
|
| "local_test_session"
|
||||||
| "login_send"
|
| "login_send"
|
||||||
| "login_complete"
|
| "login_complete"
|
||||||
| "admin_login_send"
|
| "admin_login_send"
|
||||||
@@ -226,6 +229,7 @@ function constantTimeTextEqual(left: string, right: string) {
|
|||||||
|
|
||||||
export class RegistrationService {
|
export class RegistrationService {
|
||||||
readonly database: BetterSqlite3.Database;
|
readonly database: BetterSqlite3.Database;
|
||||||
|
readonly serviceUsage: ExternalServiceUsage;
|
||||||
readonly options: Required<Pick<RegistrationServiceOptions, "clock" | "codeGenerator" | "inviteCodeGenerator">> & RegistrationServiceOptions;
|
readonly options: Required<Pick<RegistrationServiceOptions, "clock" | "codeGenerator" | "inviteCodeGenerator">> & RegistrationServiceOptions;
|
||||||
private adminAllowlistHashes = new Set<string>();
|
private adminAllowlistHashes = new Set<string>();
|
||||||
private privacyPurgeActive = false;
|
private privacyPurgeActive = false;
|
||||||
@@ -254,6 +258,7 @@ export class RegistrationService {
|
|||||||
this.database.function("dada_allow_retention_purge", { deterministic: false }, () => 0);
|
this.database.function("dada_allow_retention_purge", { deterministic: false }, () => 0);
|
||||||
this.database.function("dada_retention_purge_now", { deterministic: false }, () => 0);
|
this.database.function("dada_retention_purge_now", { deterministic: false }, () => 0);
|
||||||
this.migrate();
|
this.migrate();
|
||||||
|
this.serviceUsage = new ExternalServiceUsage({ database: this.database, clock: this.options.clock });
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
@@ -278,6 +283,39 @@ export class RegistrationService {
|
|||||||
return { code, inviteId };
|
return { code, inviteId };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
createAdminInvite(input: { actorId: string; expiresAt: number; maxUses: number }) {
|
||||||
|
if (!Number.isSafeInteger(input.expiresAt) || !Number.isSafeInteger(input.maxUses) || input.maxUses < 1) {
|
||||||
|
throw new Error("Invite request is invalid.");
|
||||||
|
}
|
||||||
|
const code = this.options.inviteCodeGenerator();
|
||||||
|
const inviteId = randomUUID();
|
||||||
|
const now = this.options.clock();
|
||||||
|
this.runImmediate("invite_create", () => {
|
||||||
|
const admin = this.database.prepare(`
|
||||||
|
SELECT u.user_id FROM users u JOIN admin_access a ON a.user_id = u.user_id
|
||||||
|
WHERE u.user_id = ? AND u.role = 'super_admin' AND u.status = 'active' AND a.allowed = 1
|
||||||
|
`).get(input.actorId);
|
||||||
|
if (!admin) throw new RegistrationError("AUTH_SESSION_INVALID", "session_invalid");
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO invite_codes (
|
||||||
|
invite_id, code_hmac, max_uses, used_count, expires_at, status, created_at
|
||||||
|
) VALUES (?, ?, ?, 0, ?, 'enabled', ?)
|
||||||
|
`).run(inviteId, this.inviteHmac(code), input.maxUses, input.expiresAt, now);
|
||||||
|
this.recordAdminAudit({
|
||||||
|
actorRef: input.actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { max_uses: input.maxUses, status: "enabled" },
|
||||||
|
beforeSummary: null,
|
||||||
|
operationType: "invite_create",
|
||||||
|
result: "succeeded",
|
||||||
|
targetRef: inviteId,
|
||||||
|
targetType: "invite",
|
||||||
|
}, now);
|
||||||
|
return { outcome: "committed", value: undefined };
|
||||||
|
});
|
||||||
|
return { code, inviteId };
|
||||||
|
}
|
||||||
|
|
||||||
async sendRegistrationCode(input: { email: string; inviteCode: string }): Promise<RegistrationSendResult> {
|
async sendRegistrationCode(input: { email: string; inviteCode: string }): Promise<RegistrationSendResult> {
|
||||||
const email = normalizeEmail(input.email);
|
const email = normalizeEmail(input.email);
|
||||||
const inviteCode = normalizeProfileValue(input.inviteCode, 160);
|
const inviteCode = normalizeProfileValue(input.inviteCode, 160);
|
||||||
@@ -299,6 +337,7 @@ export class RegistrationService {
|
|||||||
if (existing) throw new RegistrationError("AUTH_ENTRY_REJECTED", "registration_login_required");
|
if (existing) throw new RegistrationError("AUTH_ENTRY_REJECTED", "registration_login_required");
|
||||||
this.assertChallengeSendAllowed(email, "register", "registration", now);
|
this.assertChallengeSendAllowed(email, "register", "registration", now);
|
||||||
this.recordRateSend(email, "registration", now);
|
this.recordRateSend(email, "registration", now);
|
||||||
|
this.serviceUsage.claimResendWithinTransaction(now);
|
||||||
|
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
INSERT INTO email_challenges (
|
INSERT INTO email_challenges (
|
||||||
@@ -328,6 +367,7 @@ export class RegistrationService {
|
|||||||
try {
|
try {
|
||||||
await this.options.resend.sendVerificationCode({ challengeId, code, email, purpose: "register" });
|
await this.options.resend.sendVerificationCode({ challengeId, code, email, purpose: "register" });
|
||||||
} catch {
|
} catch {
|
||||||
|
this.serviceUsage.markProviderFailure({ serviceId: "resend_email", reason: "provider_unavailable", now });
|
||||||
this.runImmediate("registration_send_compensation", () => {
|
this.runImmediate("registration_send_compensation", () => {
|
||||||
this.database.prepare("DELETE FROM email_challenges WHERE challenge_id = ? AND consumed_at IS NULL").run(challengeId);
|
this.database.prepare("DELETE FROM email_challenges WHERE challenge_id = ? AND consumed_at IS NULL").run(challengeId);
|
||||||
return { outcome: "committed", value: undefined };
|
return { outcome: "committed", value: undefined };
|
||||||
@@ -355,6 +395,7 @@ export class RegistrationService {
|
|||||||
if (user.role !== "user") throw new RegistrationError("AUTH_ENTRY_REJECTED", "login_admin_required");
|
if (user.role !== "user") throw new RegistrationError("AUTH_ENTRY_REJECTED", "login_admin_required");
|
||||||
this.assertChallengeSendAllowed(email, "login", clientKey, now);
|
this.assertChallengeSendAllowed(email, "login", clientKey, now);
|
||||||
this.recordRateSend(email, clientKey, now);
|
this.recordRateSend(email, clientKey, now);
|
||||||
|
this.serviceUsage.claimResendWithinTransaction(now);
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
INSERT INTO email_challenges (
|
INSERT INTO email_challenges (
|
||||||
challenge_id, email, invite_id, code_hmac, purpose, expires_at,
|
challenge_id, email, invite_id, code_hmac, purpose, expires_at,
|
||||||
@@ -382,6 +423,7 @@ export class RegistrationService {
|
|||||||
try {
|
try {
|
||||||
await this.options.resend.sendVerificationCode({ challengeId, code, email, purpose: "login" });
|
await this.options.resend.sendVerificationCode({ challengeId, code, email, purpose: "login" });
|
||||||
} catch {
|
} catch {
|
||||||
|
this.serviceUsage.markProviderFailure({ serviceId: "resend_email", reason: "provider_unavailable", now });
|
||||||
this.runImmediate("registration_send_compensation", () => {
|
this.runImmediate("registration_send_compensation", () => {
|
||||||
this.database.prepare("DELETE FROM email_challenges WHERE challenge_id = ? AND consumed_at IS NULL").run(challengeId);
|
this.database.prepare("DELETE FROM email_challenges WHERE challenge_id = ? AND consumed_at IS NULL").run(challengeId);
|
||||||
return { outcome: "committed", value: undefined };
|
return { outcome: "committed", value: undefined };
|
||||||
@@ -613,6 +655,60 @@ export class RegistrationService {
|
|||||||
return outcome;
|
return outcome;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
createLocalTestSession(): LoginCompleteResult {
|
||||||
|
const now = this.options.clock();
|
||||||
|
return this.runImmediate("local_test_session", () => {
|
||||||
|
const registrationId = "local-test-user-v1";
|
||||||
|
const existing = this.database.prepare(`
|
||||||
|
SELECT user_id, role, status FROM users WHERE registration_id = ?
|
||||||
|
`).get(registrationId) as {
|
||||||
|
role: "user" | "super_admin";
|
||||||
|
status: "active" | "suspended" | "deleted";
|
||||||
|
user_id: string;
|
||||||
|
} | undefined;
|
||||||
|
|
||||||
|
if (existing) {
|
||||||
|
if (existing.role !== "user" || existing.status !== "active") {
|
||||||
|
throw new RegistrationError("AUTH_ENTRY_REJECTED", "account_suspended");
|
||||||
|
}
|
||||||
|
const session = this.insertSession(existing.user_id, "user", now);
|
||||||
|
return {
|
||||||
|
outcome: "committed",
|
||||||
|
value: this.loginResult(this.readCompletedRegistration(existing.user_id, session.sessionId)),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const userId = randomUUID();
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO users (
|
||||||
|
user_id, normalized_email, role, status, counts_toward_stage_limit,
|
||||||
|
registration_id, created_at
|
||||||
|
) VALUES (?, 'local-test-user@dada.invalid', 'user', 'active', 0, ?, ?)
|
||||||
|
`).run(userId, registrationId, now);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO user_profiles (
|
||||||
|
user_id, creator_name, social_id, private_content_notice_version,
|
||||||
|
private_content_notice_acknowledged_at
|
||||||
|
) VALUES (?, '本机测试用户', '@dada_local_test', NULL, NULL)
|
||||||
|
`).run(userId);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO credit_accounts (user_id, available_balance, reserved_balance, updated_at)
|
||||||
|
VALUES (?, 10, 0, ?)
|
||||||
|
`).run(userId, now);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO credit_ledger (
|
||||||
|
ledger_id, user_id, operation_key, entry_type, amount,
|
||||||
|
available_before, available_after, reserved_before, reserved_after, created_at
|
||||||
|
) VALUES (?, ?, 'local-test-registration:v1', 'registration_grant', 10, 0, 10, 0, 0, ?)
|
||||||
|
`).run(randomUUID(), userId, now);
|
||||||
|
const session = this.insertSession(userId, "user", now);
|
||||||
|
return {
|
||||||
|
outcome: "committed",
|
||||||
|
value: this.loginResult(this.readCompletedRegistration(userId, session.sessionId)),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
applySecureConfig(candidate: SecureConfigCandidate) {
|
applySecureConfig(candidate: SecureConfigCandidate) {
|
||||||
const now = this.options.clock();
|
const now = this.options.clock();
|
||||||
const fail = (reason: string): never => {
|
const fail = (reason: string): never => {
|
||||||
@@ -768,6 +864,7 @@ export class RegistrationService {
|
|||||||
}
|
}
|
||||||
this.assertChallengeSendAllowed(email, "admin_login", clientKey, now);
|
this.assertChallengeSendAllowed(email, "admin_login", clientKey, now);
|
||||||
this.recordRateSend(email, clientKey, now);
|
this.recordRateSend(email, clientKey, now);
|
||||||
|
this.serviceUsage.claimResendWithinTransaction(now);
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
INSERT INTO email_challenges (
|
INSERT INTO email_challenges (
|
||||||
challenge_id, email, invite_id, code_hmac, purpose, expires_at,
|
challenge_id, email, invite_id, code_hmac, purpose, expires_at,
|
||||||
@@ -795,6 +892,7 @@ export class RegistrationService {
|
|||||||
try {
|
try {
|
||||||
await this.options.resend.sendVerificationCode({ challengeId, code, email, purpose: "admin_login" });
|
await this.options.resend.sendVerificationCode({ challengeId, code, email, purpose: "admin_login" });
|
||||||
} catch {
|
} catch {
|
||||||
|
this.serviceUsage.markProviderFailure({ serviceId: "resend_email", reason: "provider_unavailable", now });
|
||||||
this.runImmediate("registration_send_compensation", () => {
|
this.runImmediate("registration_send_compensation", () => {
|
||||||
this.database.prepare("DELETE FROM email_challenges WHERE challenge_id = ? AND consumed_at IS NULL").run(challengeId);
|
this.database.prepare("DELETE FROM email_challenges WHERE challenge_id = ? AND consumed_at IS NULL").run(challengeId);
|
||||||
this.recordAdminLoginRejection("service_unavailable", now);
|
this.recordAdminLoginRejection("service_unavailable", now);
|
||||||
@@ -1097,6 +1195,7 @@ export class RegistrationService {
|
|||||||
now + resendDelayMilliseconds,
|
now + resendDelayMilliseconds,
|
||||||
now,
|
now,
|
||||||
);
|
);
|
||||||
|
this.serviceUsage.claimResendWithinTransaction(now);
|
||||||
return {
|
return {
|
||||||
outcome: "committed",
|
outcome: "committed",
|
||||||
value: {
|
value: {
|
||||||
@@ -1116,6 +1215,7 @@ export class RegistrationService {
|
|||||||
purpose: "account_delete",
|
purpose: "account_delete",
|
||||||
});
|
});
|
||||||
} catch {
|
} catch {
|
||||||
|
this.serviceUsage.markProviderFailure({ serviceId: "resend_email", reason: "provider_unavailable", now });
|
||||||
this.runImmediate("registration_send_compensation", () => {
|
this.runImmediate("registration_send_compensation", () => {
|
||||||
this.database.prepare("DELETE FROM account_deletion_challenges WHERE deletion_id = ? AND consumed_at IS NULL").run(deletionId);
|
this.database.prepare("DELETE FROM account_deletion_challenges WHERE deletion_id = ? AND consumed_at IS NULL").run(deletionId);
|
||||||
return { outcome: "committed", value: undefined };
|
return { outcome: "committed", value: undefined };
|
||||||
@@ -1230,14 +1330,35 @@ export class RegistrationService {
|
|||||||
return outcome;
|
return outcome;
|
||||||
}
|
}
|
||||||
|
|
||||||
changeUserStatus(userId: string, status: "suspended" | "deleted") {
|
changeUserStatus(userId: string, status: "suspended" | "deleted", actorId?: string) {
|
||||||
const now = this.options.clock();
|
const now = this.options.clock();
|
||||||
this.runImmediate("session_revoke", () => {
|
this.runImmediate("session_revoke", () => {
|
||||||
|
if (actorId) {
|
||||||
|
const admin = this.database.prepare(`
|
||||||
|
SELECT u.user_id FROM users u JOIN admin_access a ON a.user_id = u.user_id
|
||||||
|
WHERE u.user_id = ? AND u.role = 'super_admin' AND u.status = 'active' AND a.allowed = 1
|
||||||
|
`).get(actorId);
|
||||||
|
if (!admin) throw new RegistrationError("AUTH_SESSION_INVALID", "session_invalid");
|
||||||
|
}
|
||||||
|
const before = this.database.prepare("SELECT status FROM users WHERE user_id = ? AND role = 'user'")
|
||||||
|
.get(userId) as { status: "active" | "suspended" | "deleted" } | undefined;
|
||||||
const changed = this.database.prepare("UPDATE users SET status = ? WHERE user_id = ? AND role = 'user'")
|
const changed = this.database.prepare("UPDATE users SET status = ? WHERE user_id = ? AND role = 'user'")
|
||||||
.run(status, userId);
|
.run(status, userId);
|
||||||
if (changed.changes !== 1) throw new RegistrationError("AUTH_SESSION_INVALID", "session_invalid");
|
if (changed.changes !== 1) throw new RegistrationError("AUTH_SESSION_INVALID", "session_invalid");
|
||||||
this.database.prepare("UPDATE sessions SET revoked_at = ? WHERE user_id = ? AND revoked_at IS NULL")
|
this.database.prepare("UPDATE sessions SET revoked_at = ? WHERE user_id = ? AND revoked_at IS NULL")
|
||||||
.run(now, userId);
|
.run(now, userId);
|
||||||
|
if (actorId) {
|
||||||
|
this.recordAdminAudit({
|
||||||
|
actorRef: actorId,
|
||||||
|
actorType: "super_admin",
|
||||||
|
afterSummary: { status },
|
||||||
|
beforeSummary: { status: before?.status ?? "unknown" },
|
||||||
|
operationType: "user_status_change",
|
||||||
|
result: "succeeded",
|
||||||
|
targetRef: userId,
|
||||||
|
targetType: "user_account",
|
||||||
|
}, now);
|
||||||
|
}
|
||||||
return { outcome: "committed", value: undefined };
|
return { outcome: "committed", value: undefined };
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1761,7 +1882,7 @@ export class RegistrationService {
|
|||||||
serializeAuditSummary(input.beforeSummary),
|
serializeAuditSummary(input.beforeSummary),
|
||||||
serializeAuditSummary(input.afterSummary),
|
serializeAuditSummary(input.afterSummary),
|
||||||
now,
|
now,
|
||||||
now + 180 * 24 * 60 * 60 * 1_000,
|
now + auditRetentionMilliseconds,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { existsSync, readFileSync } from "node:fs";
|
||||||
|
|
||||||
|
import {
|
||||||
|
createPublicAssetResolver,
|
||||||
|
readConfiguredAssetRoot,
|
||||||
|
validateReadOnlyAssetRoot,
|
||||||
|
type PublicAssetEntry,
|
||||||
|
type PublicAssetResolver,
|
||||||
|
} from "./local-data-root.js";
|
||||||
|
|
||||||
|
const rootRef = "p0a_runtime_assets";
|
||||||
|
const schemaVersion = "DadaRuntimeAssets/v1";
|
||||||
|
const assetIdPattern = /^[a-z0-9][a-z0-9_-]{2,119}$/i;
|
||||||
|
const releasePattern = /^[a-z0-9][a-z0-9._-]{0,79}$/i;
|
||||||
|
const shaPattern = /^[a-f0-9]{64}$/i;
|
||||||
|
|
||||||
|
export interface RuntimeAssetState {
|
||||||
|
checked_at: string;
|
||||||
|
configured: boolean;
|
||||||
|
pause_reason: "asset_manifest_invalid" | "asset_root_missing" | "asset_root_state_missing" | null;
|
||||||
|
status: "active" | "unavailable";
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LoadedRuntimeAssets {
|
||||||
|
publicAssets?: PublicAssetResolver;
|
||||||
|
state: RuntimeAssetState;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseRuntimeManifest(bytes: Buffer): PublicAssetEntry[] {
|
||||||
|
const value = JSON.parse(bytes.toString("utf8")) as Record<string, unknown>;
|
||||||
|
if (value.schema_version !== schemaVersion || value.source !== "external_read_only" || value.root_ref !== rootRef) {
|
||||||
|
throw new Error("runtime_asset_manifest_invalid");
|
||||||
|
}
|
||||||
|
if (!Array.isArray(value.entries) || value.entries.length === 0) throw new Error("runtime_asset_manifest_invalid");
|
||||||
|
return value.entries.map((candidate) => {
|
||||||
|
if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) throw new Error("runtime_asset_manifest_invalid");
|
||||||
|
const entry = candidate as Record<string, unknown>;
|
||||||
|
if (
|
||||||
|
typeof entry.assetId !== "string" || !assetIdPattern.test(entry.assetId)
|
||||||
|
|| typeof entry.mimeType !== "string" || !/^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*$/i.test(entry.mimeType)
|
||||||
|
|| typeof entry.relativePath !== "string" || entry.relativePath.includes("\\") || entry.relativePath.split("/").includes("..")
|
||||||
|
|| typeof entry.resourceVersion !== "string" || !releasePattern.test(entry.resourceVersion)
|
||||||
|
|| entry.rootRef !== rootRef
|
||||||
|
|| typeof entry.sha256 !== "string" || !shaPattern.test(entry.sha256)
|
||||||
|
) throw new Error("runtime_asset_manifest_invalid");
|
||||||
|
return entry as unknown as PublicAssetEntry;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function unavailable(
|
||||||
|
configured: boolean,
|
||||||
|
pauseReason: Exclude<RuntimeAssetState["pause_reason"], null>,
|
||||||
|
checkedAt: string,
|
||||||
|
): LoadedRuntimeAssets {
|
||||||
|
return { state: { checked_at: checkedAt, configured, pause_reason: pauseReason, status: "unavailable" } };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function loadConfiguredRuntimeAssets(input: {
|
||||||
|
configFile: string;
|
||||||
|
dataRoot: string;
|
||||||
|
trustedManifestPath: string;
|
||||||
|
clock?: () => number;
|
||||||
|
}): LoadedRuntimeAssets {
|
||||||
|
const checkedAt = new Date((input.clock ?? Date.now)()).toISOString();
|
||||||
|
let assetRoot: string;
|
||||||
|
try {
|
||||||
|
assetRoot = readConfiguredAssetRoot(input.configFile);
|
||||||
|
} catch {
|
||||||
|
return unavailable(false, "asset_root_state_missing", checkedAt);
|
||||||
|
}
|
||||||
|
if (!existsSync(input.trustedManifestPath)) return unavailable(true, "asset_manifest_invalid", checkedAt);
|
||||||
|
try {
|
||||||
|
const trustedBytes = readFileSync(input.trustedManifestPath);
|
||||||
|
const entries = parseRuntimeManifest(trustedBytes);
|
||||||
|
const validatedRoot = validateReadOnlyAssetRoot({
|
||||||
|
dataRoot: input.dataRoot,
|
||||||
|
expectedSha256: createHash("sha256").update(trustedBytes).digest("hex"),
|
||||||
|
manifestRelativePath: "manifest.json",
|
||||||
|
root: assetRoot,
|
||||||
|
rootRef,
|
||||||
|
});
|
||||||
|
if (!validatedRoot.ok) {
|
||||||
|
return unavailable(true, validatedRoot.reason === "asset_root_missing" ? "asset_root_missing" : "asset_manifest_invalid", checkedAt);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
publicAssets: createPublicAssetResolver({ entries, roots: [validatedRoot] }),
|
||||||
|
state: { checked_at: checkedAt, configured: true, pause_reason: null, status: "active" },
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return unavailable(true, "asset_manifest_invalid", checkedAt);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
export class StickerReleaseError extends Error {
|
||||||
|
readonly httpStatus: number;
|
||||||
|
|
||||||
|
constructor(readonly reason: string, httpStatus = 400) {
|
||||||
|
super(reason);
|
||||||
|
this.httpStatus = httpStatus;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,602 @@
|
|||||||
|
import { createHash, randomUUID } from "node:crypto";
|
||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
import { createRequire } from "node:module";
|
||||||
|
import { basename, extname } from "node:path";
|
||||||
|
import { Readable } from "node:stream";
|
||||||
|
|
||||||
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
import sharp, { type Metadata } from "sharp";
|
||||||
|
|
||||||
|
import type { StaticStickerCatalogItem } from "@dada/static-sticker-catalog";
|
||||||
|
|
||||||
|
import {
|
||||||
|
auditRetentionMilliseconds,
|
||||||
|
isSafeAuditRef,
|
||||||
|
isSafeAuditSummaryJson,
|
||||||
|
serializeAuditSummary,
|
||||||
|
} from "./audit-policy.js";
|
||||||
|
import { ManagedStorage, type StagedManagedFile } from "./managed-storage.js";
|
||||||
|
import { StickerReleaseError } from "./sticker-release-errors.js";
|
||||||
|
import { classifyCapacity } from "./storage-policy.js";
|
||||||
|
|
||||||
|
export { StickerReleaseError } from "./sticker-release-errors.js";
|
||||||
|
|
||||||
|
const require = createRequire(import.meta.url);
|
||||||
|
const Database = require("better-sqlite3") as typeof BetterSqlite3;
|
||||||
|
const stableIdPattern = /^STK([0-9]{4,})$/;
|
||||||
|
const idempotencyPattern = /^[A-Za-z0-9_-]{32,200}$/;
|
||||||
|
const sha256Pattern = /^[0-9a-f]{64}$/i;
|
||||||
|
const maximumOriginalBytes = 20 * 1024 * 1024;
|
||||||
|
const maximumDimension = 8_192;
|
||||||
|
const bundledPartCounts = [203, 36, 27, 48, 38, 75, 37, 67, 48, 24, 40, 30, 27, 51, 62, 19, 36, 45, 92, 53, 69, 31, 36, 30, 183] as const;
|
||||||
|
|
||||||
|
type StickerMime = "image/png" | "image/webp";
|
||||||
|
type StickerVariant = "original" | "thumbnail";
|
||||||
|
|
||||||
|
interface StickerItemRow {
|
||||||
|
enabled: 0 | 1;
|
||||||
|
height: number;
|
||||||
|
mime_type: StickerMime;
|
||||||
|
order_index: number;
|
||||||
|
original_byte_size: number;
|
||||||
|
original_file_id: string;
|
||||||
|
original_filename: string;
|
||||||
|
original_relative_path: string;
|
||||||
|
original_sha256: string;
|
||||||
|
part: number;
|
||||||
|
release_version: string;
|
||||||
|
stable_id: string;
|
||||||
|
thumbnail_byte_size: number;
|
||||||
|
thumbnail_file_id: string;
|
||||||
|
thumbnail_relative_path: string;
|
||||||
|
thumbnail_sha256: string;
|
||||||
|
width: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StickerUploadInput {
|
||||||
|
actorId: string;
|
||||||
|
content: Readable;
|
||||||
|
enabled: boolean;
|
||||||
|
expectedByteSize: number;
|
||||||
|
expectedMimeType: StickerMime;
|
||||||
|
expectedSha256: string;
|
||||||
|
fileName: string;
|
||||||
|
idempotencyKey: string;
|
||||||
|
order: number;
|
||||||
|
part: number;
|
||||||
|
stableId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function digest(value: string) {
|
||||||
|
return createHash("sha256").update(value, "utf8").digest("hex");
|
||||||
|
}
|
||||||
|
|
||||||
|
function stableJson(value: unknown): string {
|
||||||
|
if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
|
||||||
|
if (value && typeof value === "object") {
|
||||||
|
return `{${Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => `${JSON.stringify(key)}:${stableJson(item)}`).join(",")}}`;
|
||||||
|
}
|
||||||
|
return JSON.stringify(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function iso(timestamp: number) {
|
||||||
|
return new Date(timestamp).toISOString();
|
||||||
|
}
|
||||||
|
|
||||||
|
function itemView(row: StickerItemRow): StaticStickerCatalogItem {
|
||||||
|
const originalReference = `/api/v1/assets/public/${encodeURIComponent(row.release_version)}/${encodeURIComponent(row.stable_id)}`;
|
||||||
|
return {
|
||||||
|
enabled: row.enabled === 1,
|
||||||
|
height: row.height,
|
||||||
|
mime: row.mime_type,
|
||||||
|
mime_type: row.mime_type,
|
||||||
|
order: row.order_index,
|
||||||
|
original_filename: row.original_filename,
|
||||||
|
original_reference: originalReference,
|
||||||
|
origin: "admin_uploaded",
|
||||||
|
part: row.part,
|
||||||
|
relative_path: `static-stickers/${row.stable_id}${row.mime_type === "image/png" ? ".png" : ".webp"}`,
|
||||||
|
resource_version: row.release_version,
|
||||||
|
sha256: row.original_sha256,
|
||||||
|
stable_id: row.stable_id,
|
||||||
|
thumbnail_reference: {
|
||||||
|
media: "thumbnail",
|
||||||
|
resource_id: row.stable_id,
|
||||||
|
resource_version: row.release_version,
|
||||||
|
url: `${originalReference}?variant=thumbnail`,
|
||||||
|
},
|
||||||
|
width: row.width,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export class StickerReleaseService {
|
||||||
|
private readonly clock: () => number;
|
||||||
|
private readonly database: BetterSqlite3.Database;
|
||||||
|
private readonly storage: ManagedStorage;
|
||||||
|
|
||||||
|
constructor(input: { clock?: () => number; databasePath: string; storage: ManagedStorage }) {
|
||||||
|
this.clock = input.clock ?? Date.now;
|
||||||
|
const nativeBinding = process.env.DADA_SQLITE_NATIVE_BINDING;
|
||||||
|
this.database = new Database(input.databasePath, nativeBinding ? { nativeBinding } : undefined);
|
||||||
|
this.database.pragma("journal_mode = WAL");
|
||||||
|
this.database.pragma("foreign_keys = ON");
|
||||||
|
this.database.pragma("busy_timeout = 5000");
|
||||||
|
this.database.function("dada_audit_ref_is_safe", { deterministic: true }, isSafeAuditRef);
|
||||||
|
this.database.function("dada_audit_summary_is_safe", { deterministic: true }, isSafeAuditSummaryJson);
|
||||||
|
this.database.function("dada_allow_privacy_purge", { deterministic: false }, () => 0);
|
||||||
|
this.database.function("dada_privacy_purge_subject", { deterministic: false }, () => "");
|
||||||
|
this.database.function("dada_allow_retention_purge", { deterministic: false }, () => 0);
|
||||||
|
this.database.function("dada_retention_purge_now", { deterministic: false }, () => 0);
|
||||||
|
this.storage = input.storage;
|
||||||
|
this.migrate();
|
||||||
|
}
|
||||||
|
|
||||||
|
close() {
|
||||||
|
this.database.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
async upload(input: StickerUploadInput) {
|
||||||
|
this.validateUpload(input);
|
||||||
|
const requestHash = digest(stableJson({
|
||||||
|
enabled: input.enabled,
|
||||||
|
expected_byte_size: input.expectedByteSize,
|
||||||
|
expected_mime_type: input.expectedMimeType,
|
||||||
|
expected_sha256: input.expectedSha256.toLowerCase(),
|
||||||
|
order: input.order,
|
||||||
|
part: input.part,
|
||||||
|
stable_id: input.stableId,
|
||||||
|
}));
|
||||||
|
const keyDigest = digest(input.idempotencyKey);
|
||||||
|
const receipt = this.database.prepare(`
|
||||||
|
SELECT request_hash, release_version FROM sticker_upload_receipts
|
||||||
|
WHERE actor_id = ? AND idempotency_key_digest = ?
|
||||||
|
`).get(input.actorId, keyDigest) as { release_version: string; request_hash: string } | undefined;
|
||||||
|
if (receipt) {
|
||||||
|
input.content.destroy();
|
||||||
|
if (receipt.request_hash !== requestHash) throw new StickerReleaseError("sticker_idempotency_conflict", 409);
|
||||||
|
return this.uploadResult(receipt.release_version, input.stableId, false);
|
||||||
|
}
|
||||||
|
this.assertNewPosition(input.stableId, input.part, input.order);
|
||||||
|
|
||||||
|
const staged: StagedManagedFile[] = [];
|
||||||
|
try {
|
||||||
|
const original = await this.storage.stageManagedImage({
|
||||||
|
content: input.content,
|
||||||
|
expectedMimeType: input.expectedMimeType,
|
||||||
|
expectedSha256: input.expectedSha256,
|
||||||
|
fileKind: "sticker_original",
|
||||||
|
fileName: `${input.stableId}${input.expectedMimeType === "image/png" ? ".png" : ".webp"}`,
|
||||||
|
maximumBytes: maximumOriginalBytes,
|
||||||
|
operationId: randomUUID(),
|
||||||
|
ownerRef: input.actorId,
|
||||||
|
projectedWriteBytes: input.expectedByteSize,
|
||||||
|
});
|
||||||
|
staged.push(original);
|
||||||
|
if (original.bytes !== input.expectedByteSize) throw new StickerReleaseError("content_size_invalid");
|
||||||
|
|
||||||
|
let metadata: Metadata;
|
||||||
|
let thumbnail: Buffer;
|
||||||
|
const decoder = sharp(readFileSync(original.stagingPath), { failOn: "warning", limitInputPixels: maximumDimension * maximumDimension });
|
||||||
|
try {
|
||||||
|
metadata = await decoder.metadata();
|
||||||
|
if (metadata.format !== (input.expectedMimeType === "image/png" ? "png" : "webp")
|
||||||
|
|| !metadata.width || !metadata.height || metadata.width > maximumDimension || metadata.height > maximumDimension) {
|
||||||
|
throw new Error("content_decode_invalid");
|
||||||
|
}
|
||||||
|
thumbnail = await decoder
|
||||||
|
.rotate()
|
||||||
|
.resize({ fit: "inside", height: 256, width: 256, withoutEnlargement: true })
|
||||||
|
.png({ adaptiveFiltering: true, compressionLevel: 9 })
|
||||||
|
.toBuffer();
|
||||||
|
} catch {
|
||||||
|
throw new StickerReleaseError("content_decode_invalid");
|
||||||
|
} finally {
|
||||||
|
decoder.destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
const thumbnailStaged = await this.storage.stageManagedImage({
|
||||||
|
content: Readable.from(thumbnail),
|
||||||
|
expectedMimeType: "image/png",
|
||||||
|
fileKind: "sticker_thumbnail",
|
||||||
|
fileName: `${input.stableId}-thumbnail.png`,
|
||||||
|
maximumBytes: maximumOriginalBytes,
|
||||||
|
operationId: randomUUID(),
|
||||||
|
ownerRef: input.actorId,
|
||||||
|
projectedWriteBytes: thumbnail.byteLength,
|
||||||
|
});
|
||||||
|
staged.push(thumbnailStaged);
|
||||||
|
const releaseVersion = this.immediate(() => this.commitUpload({
|
||||||
|
...input,
|
||||||
|
height: metadata.height!,
|
||||||
|
keyDigest,
|
||||||
|
original,
|
||||||
|
requestHash,
|
||||||
|
thumbnail: thumbnailStaged,
|
||||||
|
width: metadata.width!,
|
||||||
|
}));
|
||||||
|
return this.uploadResult(releaseVersion, input.stableId, true);
|
||||||
|
} catch (error) {
|
||||||
|
for (const file of staged) this.storage.abandonStagedFile(file);
|
||||||
|
if (!(error instanceof StickerReleaseError) && error instanceof Error
|
||||||
|
&& new Set(["content_hash_invalid", "content_mime_invalid", "content_size_invalid", "file_name_invalid"]).has(error.message)) {
|
||||||
|
throw new StickerReleaseError("sticker_upload_invalid");
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
update(input: { actorId: string; enabled?: boolean; order?: number; part?: number; stableId: string }) {
|
||||||
|
const current = this.currentVersion();
|
||||||
|
if (!current) throw new StickerReleaseError("sticker_not_found", 404);
|
||||||
|
const existing = this.readItem(current, input.stableId);
|
||||||
|
if (!existing) throw new StickerReleaseError("sticker_not_found", 404);
|
||||||
|
const part = input.part ?? existing.part;
|
||||||
|
const order = input.order ?? existing.order_index;
|
||||||
|
this.validatePosition(input.stableId, part, order);
|
||||||
|
const releaseVersion = this.immediate(() => {
|
||||||
|
const version = this.nextReleaseVersion();
|
||||||
|
this.copyRelease(current, version);
|
||||||
|
const conflict = this.database.prepare(`
|
||||||
|
SELECT stable_id FROM sticker_release_items
|
||||||
|
WHERE release_version = ? AND part = ? AND order_index = ? AND stable_id <> ?
|
||||||
|
`).get(version, part, order, input.stableId);
|
||||||
|
if (conflict) throw new StickerReleaseError("sticker_order_conflict", 409);
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE sticker_release_items SET enabled = ?, part = ?, order_index = ?
|
||||||
|
WHERE release_version = ? AND stable_id = ?
|
||||||
|
`).run((input.enabled ?? existing.enabled === 1) ? 1 : 0, part, order, version, input.stableId);
|
||||||
|
this.finalizeRelease(version, current, input.actorId);
|
||||||
|
this.insertReleaseAudit({
|
||||||
|
actorId: input.actorId,
|
||||||
|
afterSummary: { enabled: input.enabled ?? existing.enabled === 1, order, part, stable_id: input.stableId },
|
||||||
|
beforeSummary: { enabled: existing.enabled === 1, order: existing.order_index, part: existing.part, stable_id: input.stableId },
|
||||||
|
operationType: "sticker_release_update",
|
||||||
|
releaseVersion: version,
|
||||||
|
});
|
||||||
|
return version;
|
||||||
|
});
|
||||||
|
return { item: itemView(this.readItem(releaseVersion, input.stableId)!), release_version: releaseVersion };
|
||||||
|
}
|
||||||
|
|
||||||
|
listPublic(releaseVersion = this.currentVersion()) {
|
||||||
|
if (!releaseVersion) return { count: 0, items: [], release_version: null };
|
||||||
|
const exists = this.database.prepare("SELECT 1 FROM sticker_releases WHERE release_version = ?").get(releaseVersion);
|
||||||
|
if (!exists) return { count: 0, items: [], release_version: null };
|
||||||
|
const items = (this.database.prepare(`
|
||||||
|
SELECT * FROM sticker_release_items WHERE release_version = ? AND enabled = 1
|
||||||
|
ORDER BY part, order_index, stable_id
|
||||||
|
`).all(releaseVersion) as StickerItemRow[]).map(itemView);
|
||||||
|
return { count: items.length, items, release_version: releaseVersion };
|
||||||
|
}
|
||||||
|
|
||||||
|
adminView() {
|
||||||
|
const releaseVersion = this.currentVersion();
|
||||||
|
const items = releaseVersion
|
||||||
|
? (this.database.prepare("SELECT * FROM sticker_release_items WHERE release_version = ? ORDER BY part, order_index, stable_id").all(releaseVersion) as StickerItemRow[])
|
||||||
|
: [];
|
||||||
|
return {
|
||||||
|
count: items.length,
|
||||||
|
items: items.map((row) => ({
|
||||||
|
...itemView(row),
|
||||||
|
file_state: "committed" as const,
|
||||||
|
original_byte_size: row.original_byte_size,
|
||||||
|
thumbnail_byte_size: row.thumbnail_byte_size,
|
||||||
|
})),
|
||||||
|
release_version: releaseVersion,
|
||||||
|
storage: this.storage.getState(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
readPublicAsset(releaseVersion: string, stableId: string, variant: StickerVariant) {
|
||||||
|
const row = this.readItem(releaseVersion, stableId);
|
||||||
|
if (!row || row.enabled !== 1) return undefined;
|
||||||
|
const fileId = variant === "thumbnail" ? row.thumbnail_file_id : row.original_file_id;
|
||||||
|
const path = this.storage.resolveManagedFile(fileId);
|
||||||
|
if (!path) return undefined;
|
||||||
|
return {
|
||||||
|
bytes: readFileSync(path),
|
||||||
|
mimeType: variant === "thumbnail" ? "image/png" as const : row.mime_type,
|
||||||
|
sha256: variant === "thumbnail" ? row.thumbnail_sha256 : row.original_sha256,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
inspectCounts() {
|
||||||
|
const count = (table: string) => (this.database.prepare(`SELECT COUNT(*) AS count FROM ${table}`).get() as { count: number }).count;
|
||||||
|
return { items: count("sticker_release_items"), releases: count("sticker_releases"), upload_receipts: count("sticker_upload_receipts") };
|
||||||
|
}
|
||||||
|
|
||||||
|
private uploadResult(releaseVersion: string, stableId: string, created: boolean) {
|
||||||
|
const row = this.readItem(releaseVersion, stableId);
|
||||||
|
if (!row) throw new StickerReleaseError("sticker_not_found", 404);
|
||||||
|
return {
|
||||||
|
created,
|
||||||
|
item: itemView(row),
|
||||||
|
original: { byte_size: row.original_byte_size, file_id: row.original_file_id, sha256: row.original_sha256 },
|
||||||
|
release_version: releaseVersion,
|
||||||
|
thumbnail: { byte_size: row.thumbnail_byte_size, file_id: row.thumbnail_file_id, sha256: row.thumbnail_sha256 },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private commitUpload(input: StickerUploadInput & {
|
||||||
|
height: number;
|
||||||
|
keyDigest: string;
|
||||||
|
original: StagedManagedFile;
|
||||||
|
requestHash: string;
|
||||||
|
thumbnail: StagedManagedFile;
|
||||||
|
width: number;
|
||||||
|
}) {
|
||||||
|
this.assertNewPosition(input.stableId, input.part, input.order);
|
||||||
|
const previous = this.currentVersion();
|
||||||
|
const releaseVersion = this.nextReleaseVersion();
|
||||||
|
if (previous) this.copyRelease(previous, releaseVersion);
|
||||||
|
for (const file of [input.original, input.thumbnail]) {
|
||||||
|
this.storage.moveStagedFile(file);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO managed_files (file_id, file_kind, owner_ref, relative_path, byte_size, mime_type, sha256, status, created_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?, ?, 'committed', ?)
|
||||||
|
`).run(file.fileId, file.fileKind, file.ownerRef, file.relativePath, file.bytes, file.mimeType, file.sha256, iso(this.clock()));
|
||||||
|
}
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO sticker_release_items (
|
||||||
|
release_version, stable_id, part, order_index, original_filename, original_relative_path,
|
||||||
|
width, height, mime_type, original_sha256, original_file_id, original_byte_size,
|
||||||
|
thumbnail_file_id, thumbnail_relative_path, thumbnail_sha256, thumbnail_byte_size, enabled
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
releaseVersion, input.stableId, input.part, input.order, input.fileName, input.original.relativePath,
|
||||||
|
input.width, input.height, input.expectedMimeType, input.original.sha256, input.original.fileId, input.original.bytes,
|
||||||
|
input.thumbnail.fileId, input.thumbnail.relativePath, input.thumbnail.sha256, input.thumbnail.bytes, input.enabled ? 1 : 0,
|
||||||
|
);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT OR IGNORE INTO sticker_managed_file_history (
|
||||||
|
managed_file_id, stable_id, resource_version, file_kind, created_at
|
||||||
|
) VALUES (?, ?, ?, 'original', ?), (?, ?, ?, 'thumbnail', ?)
|
||||||
|
`).run(
|
||||||
|
input.original.fileId, input.stableId, releaseVersion, this.clock(),
|
||||||
|
input.thumbnail.fileId, input.stableId, releaseVersion, this.clock(),
|
||||||
|
);
|
||||||
|
this.consumeStagedStorage([input.original, input.thumbnail]);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO sticker_upload_receipts (actor_id, idempotency_key_digest, request_hash, release_version, stable_id, created_at)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?)
|
||||||
|
`).run(input.actorId, input.keyDigest, input.requestHash, releaseVersion, input.stableId, iso(this.clock()));
|
||||||
|
this.finalizeRelease(releaseVersion, previous, input.actorId);
|
||||||
|
this.insertReleaseAudit({
|
||||||
|
actorId: input.actorId,
|
||||||
|
afterSummary: { enabled: input.enabled, order: input.order, part: input.part, stable_id: input.stableId },
|
||||||
|
beforeSummary: previous ? { release_version: previous } : null,
|
||||||
|
operationType: "sticker_release_publish",
|
||||||
|
releaseVersion,
|
||||||
|
});
|
||||||
|
return releaseVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
private insertReleaseAudit(input: {
|
||||||
|
actorId: string;
|
||||||
|
afterSummary: Record<string, unknown>;
|
||||||
|
beforeSummary: Record<string, unknown> | null;
|
||||||
|
operationType: "sticker_release_publish" | "sticker_release_update";
|
||||||
|
releaseVersion: string;
|
||||||
|
}) {
|
||||||
|
const occurredAt = this.clock();
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO admin_operation_logs (
|
||||||
|
log_id, actor_type, actor_ref, operation_type, target_type, target_ref,
|
||||||
|
result, before_summary, after_summary, occurred_at, expires_at
|
||||||
|
) VALUES (?, 'super_admin', ?, ?, 'sticker_release', ?, 'succeeded', ?, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), input.actorId, input.operationType, input.releaseVersion,
|
||||||
|
serializeAuditSummary(input.beforeSummary), serializeAuditSummary(input.afterSummary),
|
||||||
|
occurredAt, occurredAt + auditRetentionMilliseconds,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private finalizeRelease(releaseVersion: string, previous: string | null, actorId: string) {
|
||||||
|
const rows = this.database.prepare(`
|
||||||
|
SELECT stable_id, part, order_index, original_sha256, thumbnail_sha256, enabled
|
||||||
|
FROM sticker_release_items WHERE release_version = ? ORDER BY stable_id
|
||||||
|
`).all(releaseVersion);
|
||||||
|
const manifestSha256 = digest(stableJson(rows));
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO sticker_releases (release_version, previous_release_version, manifest_sha256, published_at, published_by)
|
||||||
|
VALUES (?, ?, ?, ?, ?)
|
||||||
|
`).run(releaseVersion, previous, manifestSha256, iso(this.clock()), actorId);
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO current_sticker_release (singleton, release_version) VALUES (1, ?)
|
||||||
|
ON CONFLICT(singleton) DO UPDATE SET release_version = excluded.release_version
|
||||||
|
`).run(releaseVersion);
|
||||||
|
const files = this.database.prepare(`
|
||||||
|
SELECT original_file_id AS file_id FROM sticker_release_items WHERE release_version = ?
|
||||||
|
UNION SELECT thumbnail_file_id AS file_id FROM sticker_release_items WHERE release_version = ?
|
||||||
|
`).all(releaseVersion, releaseVersion) as Array<{ file_id: string }>;
|
||||||
|
for (const file of files) {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO project_asset_refs (reference_id, managed_file_id, reference_type, created_at)
|
||||||
|
VALUES (?, ?, 'release', ?)
|
||||||
|
`).run(`release:${releaseVersion}:${file.file_id}`, file.file_id, iso(this.clock()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private copyRelease(from: string, to: string) {
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO sticker_release_items (
|
||||||
|
release_version, stable_id, part, order_index, original_filename, original_relative_path,
|
||||||
|
width, height, mime_type, original_sha256, original_file_id, original_byte_size,
|
||||||
|
thumbnail_file_id, thumbnail_relative_path, thumbnail_sha256, thumbnail_byte_size, enabled
|
||||||
|
)
|
||||||
|
SELECT ?, stable_id, part, order_index, original_filename, original_relative_path,
|
||||||
|
width, height, mime_type, original_sha256, original_file_id, original_byte_size,
|
||||||
|
thumbnail_file_id, thumbnail_relative_path, thumbnail_sha256, thumbnail_byte_size, enabled
|
||||||
|
FROM sticker_release_items WHERE release_version = ?
|
||||||
|
`).run(to, from);
|
||||||
|
}
|
||||||
|
|
||||||
|
private consumeStagedStorage(files: StagedManagedFile[]) {
|
||||||
|
const timestamp = iso(this.clock());
|
||||||
|
for (const file of files) {
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE storage_reservations SET status = 'consumed', resolved_at = ?
|
||||||
|
WHERE operation_id = ? AND status = 'active'
|
||||||
|
`).run(timestamp, file.operationId);
|
||||||
|
}
|
||||||
|
const total = files.reduce((sum, file) => sum + file.bytes, 0);
|
||||||
|
const state = this.database.prepare("SELECT managed_content_bytes FROM local_backend_storage_state WHERE singleton = 1").get() as { managed_content_bytes: number };
|
||||||
|
const active = this.database.prepare("SELECT COALESCE(SUM(projected_bytes), 0) AS bytes FROM storage_reservations WHERE status = 'active'").get() as { bytes: number };
|
||||||
|
const nextBytes = state.managed_content_bytes + total;
|
||||||
|
const classification = classifyCapacity(nextBytes, active.bytes);
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE local_backend_storage_state
|
||||||
|
SET managed_content_bytes = ?, capacity_notice_level = ?, storage_status = ?, measured_at = ?, version = version + 1
|
||||||
|
WHERE singleton = 1
|
||||||
|
`).run(nextBytes, classification.capacity_notice_level, classification.storage_status, timestamp);
|
||||||
|
}
|
||||||
|
|
||||||
|
private currentVersion() {
|
||||||
|
return (this.database.prepare("SELECT release_version FROM current_sticker_release WHERE singleton = 1").get() as { release_version: string } | undefined)?.release_version ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private nextReleaseVersion() {
|
||||||
|
const date = new Date(this.clock()).toISOString().slice(0, 10).replaceAll("-", "");
|
||||||
|
const row = this.database.prepare("SELECT next_sequence FROM sticker_release_sequences WHERE release_date = ?").get(date) as { next_sequence: number } | undefined;
|
||||||
|
const sequence = row?.next_sequence ?? 1;
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO sticker_release_sequences (release_date, next_sequence) VALUES (?, ?)
|
||||||
|
ON CONFLICT(release_date) DO UPDATE SET next_sequence = excluded.next_sequence
|
||||||
|
`).run(date, sequence + 1);
|
||||||
|
return `asset-${date}.${sequence}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private readItem(releaseVersion: string, stableId: string) {
|
||||||
|
return this.database.prepare("SELECT * FROM sticker_release_items WHERE release_version = ? AND stable_id = ?")
|
||||||
|
.get(releaseVersion, stableId) as StickerItemRow | undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertNewPosition(stableId: string, part: number, order: number) {
|
||||||
|
this.validatePosition(stableId, part, order);
|
||||||
|
const current = this.currentVersion();
|
||||||
|
if (!current) return;
|
||||||
|
if (this.readItem(current, stableId)) throw new StickerReleaseError("sticker_stable_id_conflict", 409);
|
||||||
|
const conflict = this.database.prepare(`
|
||||||
|
SELECT stable_id FROM sticker_release_items WHERE release_version = ? AND part = ? AND order_index = ?
|
||||||
|
`).get(current, part, order);
|
||||||
|
if (conflict) throw new StickerReleaseError("sticker_order_conflict", 409);
|
||||||
|
}
|
||||||
|
|
||||||
|
private validatePosition(stableId: string, part: number, order: number) {
|
||||||
|
const matched = stableId.match(stableIdPattern);
|
||||||
|
const numericId = matched ? Number(matched[1]) : Number.NaN;
|
||||||
|
if (!matched || !Number.isSafeInteger(numericId) || numericId <= 1_407) throw new StickerReleaseError("sticker_stable_id_invalid");
|
||||||
|
if (!Number.isSafeInteger(part) || part < 1 || part > bundledPartCounts.length
|
||||||
|
|| !Number.isSafeInteger(order) || order <= bundledPartCounts[part - 1]!) {
|
||||||
|
throw new StickerReleaseError("sticker_part_order_invalid");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private validateUpload(input: StickerUploadInput) {
|
||||||
|
this.validatePosition(input.stableId, input.part, input.order);
|
||||||
|
if (!/^[0-9a-f-]{36}$/i.test(input.actorId) || !idempotencyPattern.test(input.idempotencyKey)
|
||||||
|
|| !sha256Pattern.test(input.expectedSha256) || !Number.isSafeInteger(input.expectedByteSize)
|
||||||
|
|| input.expectedByteSize <= 0 || input.expectedByteSize > maximumOriginalBytes
|
||||||
|
|| !new Set(["image/png", "image/webp"]).has(input.expectedMimeType)) {
|
||||||
|
throw new StickerReleaseError("sticker_upload_invalid");
|
||||||
|
}
|
||||||
|
const expectedExtension = input.expectedMimeType === "image/png" ? ".png" : ".webp";
|
||||||
|
if (input.fileName.length > 255 || basename(input.fileName) !== input.fileName || /[\u0000-\u001f]/.test(input.fileName)
|
||||||
|
|| extname(input.fileName).toLowerCase() !== expectedExtension) throw new StickerReleaseError("sticker_upload_invalid");
|
||||||
|
}
|
||||||
|
|
||||||
|
private immediate<T>(action: () => T) {
|
||||||
|
this.database.exec("BEGIN IMMEDIATE");
|
||||||
|
try {
|
||||||
|
const result = action();
|
||||||
|
this.database.exec("COMMIT");
|
||||||
|
return result;
|
||||||
|
} catch (error) {
|
||||||
|
if (this.database.inTransaction) this.database.exec("ROLLBACK");
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private migrate() {
|
||||||
|
this.database.exec(`
|
||||||
|
CREATE TABLE IF NOT EXISTS sticker_release_sequences (
|
||||||
|
release_date TEXT PRIMARY KEY,
|
||||||
|
next_sequence INTEGER NOT NULL CHECK (next_sequence >= 1)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS sticker_releases (
|
||||||
|
release_version TEXT PRIMARY KEY,
|
||||||
|
previous_release_version TEXT,
|
||||||
|
manifest_sha256 TEXT NOT NULL CHECK (length(manifest_sha256) = 64),
|
||||||
|
published_at TEXT NOT NULL,
|
||||||
|
published_by TEXT NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS sticker_release_items (
|
||||||
|
release_version TEXT NOT NULL,
|
||||||
|
stable_id TEXT NOT NULL,
|
||||||
|
part INTEGER NOT NULL CHECK (part BETWEEN 1 AND 25),
|
||||||
|
order_index INTEGER NOT NULL CHECK (order_index > 0),
|
||||||
|
original_filename TEXT NOT NULL,
|
||||||
|
original_relative_path TEXT NOT NULL,
|
||||||
|
width INTEGER NOT NULL CHECK (width > 0),
|
||||||
|
height INTEGER NOT NULL CHECK (height > 0),
|
||||||
|
mime_type TEXT NOT NULL CHECK (mime_type IN ('image/png', 'image/webp')),
|
||||||
|
original_sha256 TEXT NOT NULL CHECK (length(original_sha256) = 64),
|
||||||
|
original_file_id TEXT NOT NULL REFERENCES managed_files(file_id),
|
||||||
|
original_byte_size INTEGER NOT NULL CHECK (original_byte_size > 0),
|
||||||
|
thumbnail_file_id TEXT NOT NULL REFERENCES managed_files(file_id),
|
||||||
|
thumbnail_relative_path TEXT NOT NULL,
|
||||||
|
thumbnail_sha256 TEXT NOT NULL CHECK (length(thumbnail_sha256) = 64),
|
||||||
|
thumbnail_byte_size INTEGER NOT NULL CHECK (thumbnail_byte_size > 0),
|
||||||
|
enabled INTEGER NOT NULL CHECK (enabled IN (0, 1)),
|
||||||
|
PRIMARY KEY (release_version, stable_id),
|
||||||
|
UNIQUE (release_version, part, order_index)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS current_sticker_release (
|
||||||
|
singleton INTEGER PRIMARY KEY CHECK (singleton = 1),
|
||||||
|
release_version TEXT NOT NULL
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS sticker_upload_receipts (
|
||||||
|
actor_id TEXT NOT NULL,
|
||||||
|
idempotency_key_digest TEXT NOT NULL CHECK (length(idempotency_key_digest) = 64),
|
||||||
|
request_hash TEXT NOT NULL CHECK (length(request_hash) = 64),
|
||||||
|
release_version TEXT NOT NULL,
|
||||||
|
stable_id TEXT NOT NULL,
|
||||||
|
created_at TEXT NOT NULL,
|
||||||
|
PRIMARY KEY (actor_id, idempotency_key_digest)
|
||||||
|
);
|
||||||
|
CREATE TABLE IF NOT EXISTS sticker_managed_file_history (
|
||||||
|
managed_file_id TEXT NOT NULL,
|
||||||
|
stable_id TEXT NOT NULL,
|
||||||
|
resource_version TEXT NOT NULL,
|
||||||
|
file_kind TEXT NOT NULL CHECK (file_kind IN ('original', 'thumbnail')),
|
||||||
|
created_at INTEGER NOT NULL,
|
||||||
|
PRIMARY KEY (managed_file_id, file_kind),
|
||||||
|
FOREIGN KEY (managed_file_id) REFERENCES managed_files(file_id)
|
||||||
|
);
|
||||||
|
CREATE TRIGGER IF NOT EXISTS sticker_releases_no_update
|
||||||
|
BEFORE UPDATE ON sticker_releases BEGIN SELECT RAISE(ABORT, 'sticker_releases_immutable'); END;
|
||||||
|
CREATE TRIGGER IF NOT EXISTS sticker_releases_no_delete
|
||||||
|
BEFORE DELETE ON sticker_releases BEGIN SELECT RAISE(ABORT, 'sticker_releases_immutable'); END;
|
||||||
|
CREATE TRIGGER IF NOT EXISTS sticker_release_items_no_update
|
||||||
|
BEFORE UPDATE ON sticker_release_items
|
||||||
|
WHEN EXISTS (SELECT 1 FROM sticker_releases WHERE release_version = OLD.release_version)
|
||||||
|
BEGIN SELECT RAISE(ABORT, 'sticker_release_items_immutable'); END;
|
||||||
|
CREATE TRIGGER IF NOT EXISTS sticker_release_items_no_delete
|
||||||
|
BEFORE DELETE ON sticker_release_items
|
||||||
|
WHEN EXISTS (SELECT 1 FROM sticker_releases WHERE release_version = OLD.release_version)
|
||||||
|
BEGIN SELECT RAISE(ABORT, 'sticker_release_items_immutable'); END;
|
||||||
|
`);
|
||||||
|
this.database.exec(`
|
||||||
|
INSERT OR IGNORE INTO sticker_managed_file_history (
|
||||||
|
managed_file_id, stable_id, resource_version, file_kind, created_at
|
||||||
|
)
|
||||||
|
SELECT original_file_id, stable_id, release_version, 'original', strftime('%s', 'now') * 1000
|
||||||
|
FROM sticker_release_items;
|
||||||
|
INSERT OR IGNORE INTO sticker_managed_file_history (
|
||||||
|
managed_file_id, stable_id, resource_version, file_kind, created_at
|
||||||
|
)
|
||||||
|
SELECT thumbnail_file_id, stable_id, release_version, 'thumbnail', strftime('%s', 'now') * 1000
|
||||||
|
FROM sticker_release_items;
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
import { createConnection } from "node:net";
|
import { createConnection } from "node:net";
|
||||||
|
|
||||||
|
import { MockAmapAdapter, RealAmapAdapter } from "./amap-adapter.js";
|
||||||
|
|
||||||
const API_CREDENTIALS = ["Dada/P0A/api/resend", "Dada/P0A/api/amap", "Dada/P0A/admin/pepper"] as const;
|
const API_CREDENTIALS = ["Dada/P0A/api/resend", "Dada/P0A/api/amap", "Dada/P0A/admin/pepper"] as const;
|
||||||
|
|
||||||
export async function receiveApiCredentials(input: NodeJS.ReadableStream = process.stdin) {
|
export async function receiveApiCredentials(input: NodeJS.ReadableStream = process.stdin) {
|
||||||
@@ -13,7 +15,7 @@ export async function receiveApiCredentials(input: NodeJS.ReadableStream = proce
|
|||||||
if (names.length !== expected.length || names.some((name, index) => name !== expected[index])) {
|
if (names.length !== expected.length || names.some((name, index) => name !== expected[index])) {
|
||||||
throw new Error("API credential channel contains an unexpected credential scope.");
|
throw new Error("API credential channel contains an unexpected credential scope.");
|
||||||
}
|
}
|
||||||
if (expected.some((name) => typeof parsed[name] !== "string" || parsed[name] === "")) {
|
if (expected.some((name) => typeof parsed[name] !== "string")) {
|
||||||
throw new Error("API credential channel contains an invalid credential value.");
|
throw new Error("API credential channel contains an invalid credential value.");
|
||||||
}
|
}
|
||||||
return parsed as Record<(typeof API_CREDENTIALS)[number], string>;
|
return parsed as Record<(typeof API_CREDENTIALS)[number], string>;
|
||||||
@@ -25,11 +27,17 @@ export async function receiveApiCredentials(input: NodeJS.ReadableStream = proce
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function initializeApiCredentialClients(credentials: Record<(typeof API_CREDENTIALS)[number], string>) {
|
export function initializeApiCredentialClients(credentials: Record<(typeof API_CREDENTIALS)[number], string>) {
|
||||||
const configured = API_CREDENTIALS.every((name) => credentials[name].length > 0);
|
try {
|
||||||
const adminPepperValue = credentials["Dada/P0A/admin/pepper"];
|
const adminPepper = credentials["Dada/P0A/admin/pepper"];
|
||||||
for (const name of API_CREDENTIALS) credentials[name] = "";
|
if (!adminPepper) throw new Error("admin_pepper_not_configured");
|
||||||
if (!configured) throw new Error("API credential client initialization failed.");
|
return {
|
||||||
return { adminAllowlistPepper: Buffer.from(adminPepperValue, "utf8") };
|
adminAllowlistPepper: Buffer.from(adminPepper, "utf8"),
|
||||||
|
amap: credentials["Dada/P0A/api/amap"] ? new RealAmapAdapter(credentials["Dada/P0A/api/amap"]) : new MockAmapAdapter(),
|
||||||
|
resendConfigured: Boolean(credentials["Dada/P0A/api/resend"]),
|
||||||
|
};
|
||||||
|
} finally {
|
||||||
|
for (const name of API_CREDENTIALS) credentials[name] = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function attachApiSupervisorControl(pipeName: string, shutdown: () => Promise<void>) {
|
export function attachApiSupervisorControl(pipeName: string, shutdown: () => Promise<void>) {
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
.admin-assets-page { min-height: 100vh; color: #111111; background: #f6f6f4; }
|
||||||
|
.admin-assets-page > main { width: min(1360px, calc(100% - 64px)); margin: 0 auto; padding: 36px 0 80px; }
|
||||||
|
.admin-assets-heading { display: flex; align-items: end; justify-content: space-between; gap: 24px; padding-bottom: 18px; border-bottom: 1px solid #999993; }
|
||||||
|
.admin-assets-heading p { margin: 0 0 4px; font: 700 11px Consolas, monospace; }
|
||||||
|
.admin-assets-heading h1 { margin: 0; font-size: 34px; }
|
||||||
|
.admin-assets-heading > strong { font: 700 13px Consolas, monospace; }
|
||||||
|
.admin-assets-summary { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); margin: 22px 0; border-block: 1px solid #8c8c86; background: #ffffff; }
|
||||||
|
.admin-assets-summary > span { display: grid; min-width: 0; gap: 6px; padding: 17px 18px; border-right: 1px solid #c1c1ba; color: #65655f; font-size: 12px; }
|
||||||
|
.admin-assets-summary > span:last-child { border-right: 0; }
|
||||||
|
.admin-assets-summary strong { color: #111111; font-size: 15px; overflow-wrap: anywhere; }
|
||||||
|
.admin-assets-summary .is-active { color: #1f6639; }
|
||||||
|
.admin-assets-summary .is-full,
|
||||||
|
.admin-assets-summary .is-unavailable { color: #9b2c23; }
|
||||||
|
.admin-assets-upload,
|
||||||
|
.admin-assets-list { margin-top: 22px; border-block: 1px solid #8c8c86; background: #ffffff; }
|
||||||
|
.admin-assets-upload > header,
|
||||||
|
.admin-assets-list > header { display: flex; align-items: center; justify-content: space-between; min-height: 54px; padding: 0 16px; border-bottom: 1px solid #c1c1ba; background: #e7e7e2; }
|
||||||
|
.admin-assets-upload h2,
|
||||||
|
.admin-assets-list h2 { margin: 0; font-size: 16px; }
|
||||||
|
.admin-assets-upload header span,
|
||||||
|
.admin-assets-list header span { font: 700 11px Consolas, monospace; }
|
||||||
|
.admin-assets-form { display: grid; grid-template-columns: minmax(230px, 2fr) minmax(130px, 1fr) 84px 92px 130px auto; align-items: end; gap: 12px; padding: 18px 16px; }
|
||||||
|
.admin-assets-form label { display: grid; gap: 6px; min-width: 0; color: #4c4c47; font-size: 11px; font-weight: 800; }
|
||||||
|
.admin-assets-form input { width: 100%; min-height: 40px; padding: 7px 9px; border: 1px solid #777770; border-radius: 0; background: #ffffff; }
|
||||||
|
.admin-assets-form input[type="file"] { padding: 7px; }
|
||||||
|
.admin-assets-form .admin-assets-enabled { display: flex; min-height: 40px; align-items: center; gap: 8px; color: #111111; }
|
||||||
|
.admin-assets-enabled input { width: 18px; min-height: 18px; }
|
||||||
|
.admin-assets-form button,
|
||||||
|
.admin-assets-alert button { min-height: 42px; padding: 9px 14px; border: 1px solid #111111; border-radius: 0; background: #f2f500; font-weight: 900; }
|
||||||
|
.admin-assets-form button:disabled { color: #777770; background: #dfdfda; cursor: not-allowed; }
|
||||||
|
.admin-assets-blocked { margin: 0; padding: 12px 16px; border-top: 1px solid #e2b8b3; color: #812219; background: #fff1ef; font-weight: 700; }
|
||||||
|
.admin-assets-table-wrap { overflow-x: auto; }
|
||||||
|
.admin-assets-table-wrap table { width: 100%; min-width: 1120px; border-collapse: collapse; table-layout: fixed; }
|
||||||
|
.admin-assets-table-wrap th,
|
||||||
|
.admin-assets-table-wrap td { padding: 12px 10px; border-right: 1px solid #d0d0ca; border-bottom: 1px solid #d0d0ca; text-align: left; vertical-align: middle; font-size: 12px; }
|
||||||
|
.admin-assets-table-wrap thead th { background: #f1f1ed; font-weight: 900; }
|
||||||
|
.admin-assets-table-wrap th:first-child { width: 78px; }
|
||||||
|
.admin-assets-table-wrap th:nth-child(2) { width: 150px; }
|
||||||
|
.admin-assets-table-wrap th:nth-child(3) { width: 140px; }
|
||||||
|
.admin-assets-table-wrap th:nth-child(4) { width: 210px; }
|
||||||
|
.admin-assets-table-wrap th:nth-child(5) { width: 92px; }
|
||||||
|
.admin-assets-table-wrap th:nth-child(6),
|
||||||
|
.admin-assets-table-wrap th:nth-child(7) { width: 92px; }
|
||||||
|
.admin-assets-table-wrap th:last-child { width: 180px; }
|
||||||
|
.admin-assets-table-wrap img { display: block; width: 48px; height: 48px; object-fit: contain; border: 1px solid #c1c1ba; background: #f6f6f4; }
|
||||||
|
.admin-assets-table-wrap strong,
|
||||||
|
.admin-assets-table-wrap small { display: block; }
|
||||||
|
.admin-assets-table-wrap small { margin-top: 4px; color: #65655f; font-size: 10px; overflow-wrap: anywhere; }
|
||||||
|
.admin-assets-table-wrap input[type="number"] { width: 70px; min-height: 34px; margin-top: 5px; padding: 5px 7px; border: 1px solid #777770; border-radius: 0; }
|
||||||
|
.admin-assets-table-wrap td:last-child { display: flex; gap: 6px; }
|
||||||
|
.admin-assets-table-wrap button { min-height: 34px; padding: 6px 8px; border: 1px solid #555550; border-radius: 0; background: #ffffff; font-weight: 800; }
|
||||||
|
.admin-assets-table-wrap button:disabled { color: #8a8a84; background: #ecece8; }
|
||||||
|
.admin-assets-table-wrap .is-enabled { color: #1f6639; font-weight: 800; }
|
||||||
|
.admin-assets-table-wrap .is-disabled { color: #812219; font-weight: 800; }
|
||||||
|
.admin-assets-empty { margin: 0; padding: 34px 16px; color: #65655f; }
|
||||||
|
.admin-assets-notice { margin: 16px 0 0; padding: 13px 16px; border-left: 4px solid #287b45; background: #edf8f0; font-weight: 800; }
|
||||||
|
.admin-assets-alert { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-top: 24px; padding: 16px; border-left: 5px solid #d14a3b; background: #fff1ef; }
|
||||||
|
.admin-assets-loading { display: grid; gap: 10px; margin-top: 24px; }
|
||||||
|
.admin-assets-loading span { display: block; height: 62px; background: #dfdfda; }
|
||||||
|
@media (max-width: 900px) {
|
||||||
|
.admin-assets-page > main { width: 100%; padding-right: 16px; padding-left: 16px; }
|
||||||
|
.admin-assets-summary { grid-template-columns: 1fr; }
|
||||||
|
.admin-assets-summary > span { border-right: 0; border-bottom: 1px solid #c1c1ba; }
|
||||||
|
.admin-assets-form { grid-template-columns: 1fr 1fr; }
|
||||||
|
}
|
||||||
|
@media (max-width: 580px) {
|
||||||
|
.admin-product-header { padding: 0 12px; overflow-x: auto; }
|
||||||
|
.admin-product-header nav a { min-width: 66px; }
|
||||||
|
.admin-assets-form { grid-template-columns: 1fr; }
|
||||||
|
.admin-assets-heading { align-items: start; flex-direction: column; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
import { useEffect, useMemo, useState } from "react";
|
||||||
|
|
||||||
|
import "./admin-assets.css";
|
||||||
|
|
||||||
|
interface AdminSession { csrf_token: string }
|
||||||
|
interface StorageState {
|
||||||
|
capacity_notice_level: "normal" | "warning" | "critical";
|
||||||
|
hard_limit_bytes: number;
|
||||||
|
managed_content_bytes: number;
|
||||||
|
storage_status: "active" | "full" | "unavailable";
|
||||||
|
}
|
||||||
|
interface AdminSticker {
|
||||||
|
enabled: boolean;
|
||||||
|
file_state: "committed";
|
||||||
|
height: number;
|
||||||
|
mime_type: "image/png" | "image/webp";
|
||||||
|
order: number;
|
||||||
|
original_byte_size: number;
|
||||||
|
original_filename: string;
|
||||||
|
part: number;
|
||||||
|
resource_version: string;
|
||||||
|
stable_id: string;
|
||||||
|
thumbnail_byte_size: number;
|
||||||
|
thumbnail_reference: { url: string };
|
||||||
|
width: number;
|
||||||
|
}
|
||||||
|
interface AdminAssetsResponse {
|
||||||
|
count: number;
|
||||||
|
items: AdminSticker[];
|
||||||
|
release_version: string | null;
|
||||||
|
storage: StorageState;
|
||||||
|
}
|
||||||
|
|
||||||
|
function idempotencyKey() {
|
||||||
|
return crypto.randomUUID().replaceAll("-", "") + crypto.randomUUID().replaceAll("-", "");
|
||||||
|
}
|
||||||
|
|
||||||
|
function bytesLabel(bytes: number) {
|
||||||
|
return new Intl.NumberFormat("zh-CN", { maximumFractionDigits: 2, minimumFractionDigits: 2 }).format(bytes / (1024 ** 3));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadJson<T>(url: string, init?: RequestInit) {
|
||||||
|
const response = await fetch(url, { credentials: "same-origin", ...init });
|
||||||
|
const body = response.headers.get("content-type")?.includes("application/json") ? await response.json() as T : undefined;
|
||||||
|
return { body, response };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AdminAssetsPage() {
|
||||||
|
const [session, setSession] = useState<AdminSession>();
|
||||||
|
const [assets, setAssets] = useState<AdminAssetsResponse>();
|
||||||
|
const [loadingFailed, setLoadingFailed] = useState(false);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [notice, setNotice] = useState("");
|
||||||
|
const [file, setFile] = useState<File>();
|
||||||
|
const [stableId, setStableId] = useState("STK1408");
|
||||||
|
const [part, setPart] = useState(25);
|
||||||
|
const [order, setOrder] = useState(184);
|
||||||
|
const [enabled, setEnabled] = useState(true);
|
||||||
|
const [orderDrafts, setOrderDrafts] = useState<Record<string, number>>({});
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
setLoadingFailed(false);
|
||||||
|
try {
|
||||||
|
const [sessionResult, assetsResult] = await Promise.all([
|
||||||
|
loadJson<AdminSession>("/api/v1/admin-auth/session"),
|
||||||
|
loadJson<AdminAssetsResponse>("/api/v1/admin/assets/static-stickers"),
|
||||||
|
]);
|
||||||
|
if (!sessionResult.response.ok || !assetsResult.response.ok || !sessionResult.body || !assetsResult.body) throw new Error("load_failed");
|
||||||
|
setSession(sessionResult.body);
|
||||||
|
setAssets(assetsResult.body);
|
||||||
|
setOrderDrafts(Object.fromEntries(assetsResult.body.items.map((item) => [item.stable_id, item.order])));
|
||||||
|
const numericIds = assetsResult.body.items.map((item) => Number(item.stable_id.slice(3))).filter(Number.isFinite);
|
||||||
|
setStableId(`STK${Math.max(1407, ...numericIds) + 1}`);
|
||||||
|
setOrder(Math.max(183, ...assetsResult.body.items.filter((item) => item.part === 25).map((item) => item.order)) + 1);
|
||||||
|
setNotice("");
|
||||||
|
} catch {
|
||||||
|
setLoadingFailed(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => { void load(); }, []);
|
||||||
|
|
||||||
|
const uploadBlocked = !assets || assets.storage.storage_status !== "active";
|
||||||
|
const formValid = useMemo(() => Boolean(
|
||||||
|
file && /^(image\/png|image\/webp)$/.test(file.type) && /^STK[0-9]{4,}$/.test(stableId)
|
||||||
|
&& Number.isSafeInteger(part) && part >= 1 && part <= 25 && Number.isSafeInteger(order) && order > 0,
|
||||||
|
), [file, order, part, stableId]);
|
||||||
|
|
||||||
|
async function upload() {
|
||||||
|
if (!file || !session || !formValid || uploadBlocked || busy) return;
|
||||||
|
setBusy(true);
|
||||||
|
setNotice("");
|
||||||
|
try {
|
||||||
|
const sha256 = Array.from(new Uint8Array(await crypto.subtle.digest("SHA-256", await file.arrayBuffer())))
|
||||||
|
.map((byte) => byte.toString(16).padStart(2, "0")).join("");
|
||||||
|
const form = new FormData();
|
||||||
|
form.append("stable_id", stableId);
|
||||||
|
form.append("part", String(part));
|
||||||
|
form.append("order", String(order));
|
||||||
|
form.append("enabled", String(enabled));
|
||||||
|
form.append("original_byte_size", String(file.size));
|
||||||
|
form.append("original_sha256", sha256);
|
||||||
|
form.append("sticker_file", file, file.name);
|
||||||
|
const response = await fetch("/api/v1/admin/assets/static-stickers", {
|
||||||
|
body: form,
|
||||||
|
credentials: "same-origin",
|
||||||
|
headers: { "Idempotency-Key": idempotencyKey(), "X-CSRF-Token": session.csrf_token },
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
setNotice(response.status === 507 ? "存储容量已满或暂不可用,未写入任何文件。" : response.status === 409 ? "稳定 ID 或 part 顺序已存在。" : "文件格式、内容或字段校验未通过。");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setFile(undefined);
|
||||||
|
await load();
|
||||||
|
setNotice("贴纸已生成缩略图并发布新资源版本。");
|
||||||
|
} catch {
|
||||||
|
setNotice("上传未完成,未发布新资源版本。");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function update(item: AdminSticker, change: { enabled?: boolean; order?: number }) {
|
||||||
|
if (!session || busy) return;
|
||||||
|
setBusy(true);
|
||||||
|
setNotice("");
|
||||||
|
try {
|
||||||
|
const { response } = await loadJson(`/api/v1/admin/assets/static-stickers/${encodeURIComponent(item.stable_id)}`, {
|
||||||
|
body: JSON.stringify(change),
|
||||||
|
headers: { "Content-Type": "application/json", "X-CSRF-Token": session.csrf_token },
|
||||||
|
method: "PATCH",
|
||||||
|
});
|
||||||
|
if (!response.ok) throw new Error("update_failed");
|
||||||
|
await load();
|
||||||
|
setNotice(change.enabled === false ? "贴纸已停用,新项目目录不再显示。" : change.enabled === true ? "贴纸已重新启用。" : "part 顺序已发布到新资源版本。");
|
||||||
|
} catch {
|
||||||
|
setNotice("素材状态未更新。");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return <div className="admin-assets-page">
|
||||||
|
<header className="admin-product-header">
|
||||||
|
<a href="/admin">DADA ADMIN</a>
|
||||||
|
<nav aria-label="后台导航"><a href="/admin/users">用户</a><a href="/admin/models">模型</a><a aria-current="page" href="/admin/assets">素材</a><a href="/admin/audit">审计</a></nav>
|
||||||
|
</header>
|
||||||
|
<main>
|
||||||
|
<header className="admin-assets-heading"><div><p>ASSET OPERATIONS</p><h1>普通贴纸</h1></div><strong>{assets?.release_version ?? "尚未发布"}</strong></header>
|
||||||
|
{!assets && !loadingFailed ? <div aria-label="贴纸素材加载中" className="admin-assets-loading"><span /><span /><span /></div> : null}
|
||||||
|
{loadingFailed ? <p className="admin-assets-alert" role="alert">素材状态暂时无法读取。<button onClick={() => void load()} type="button">重试</button></p> : null}
|
||||||
|
{assets ? <>
|
||||||
|
<div className="admin-assets-summary" aria-label="素材存储摘要">
|
||||||
|
<span>后台贴纸<strong>{assets.count}</strong></span>
|
||||||
|
<span>受管内容<strong>{bytesLabel(assets.storage.managed_content_bytes)} / {bytesLabel(assets.storage.hard_limit_bytes)} GB</strong></span>
|
||||||
|
<span>存储状态<strong className={`is-${assets.storage.storage_status}`}>{assets.storage.storage_status}</strong></span>
|
||||||
|
</div>
|
||||||
|
<section className="admin-assets-upload" aria-labelledby="asset-upload-title">
|
||||||
|
<header><h2 id="asset-upload-title">上传并发布</h2><span>PNG / WebP</span></header>
|
||||||
|
<div className="admin-assets-form">
|
||||||
|
<label>文件<input accept="image/png,image/webp" aria-label="贴纸文件" disabled={uploadBlocked || busy} key={file?.name ?? "empty"} onChange={(event) => setFile(event.target.files?.[0])} type="file" /></label>
|
||||||
|
<label>稳定 ID<input aria-label="稳定 ID" disabled={uploadBlocked || busy} onChange={(event) => setStableId(event.target.value.toUpperCase())} value={stableId} /></label>
|
||||||
|
<label>Part<input aria-label="Part" disabled={uploadBlocked || busy} max="25" min="1" onChange={(event) => setPart(Number(event.target.value))} type="number" value={part} /></label>
|
||||||
|
<label>顺序<input aria-label="顺序" disabled={uploadBlocked || busy} min="1" onChange={(event) => setOrder(Number(event.target.value))} type="number" value={order} /></label>
|
||||||
|
<label className="admin-assets-enabled"><input checked={enabled} disabled={uploadBlocked || busy} onChange={(event) => setEnabled(event.target.checked)} type="checkbox" />发布后启用</label>
|
||||||
|
<button disabled={!formValid || uploadBlocked || busy} onClick={() => void upload()} type="button">{busy ? "处理中" : "上传并发布"}</button>
|
||||||
|
</div>
|
||||||
|
{uploadBlocked ? <p className="admin-assets-blocked" role="status">当前存储状态禁止新增原图和缩略图。</p> : null}
|
||||||
|
</section>
|
||||||
|
<section className="admin-assets-list" aria-labelledby="asset-list-title">
|
||||||
|
<header><h2 id="asset-list-title">当前版本</h2><span>{assets.count} 项</span></header>
|
||||||
|
{assets.items.length === 0 ? <p className="admin-assets-empty">当前没有后台上传的普通贴纸。</p> : <div className="admin-assets-table-wrap"><table>
|
||||||
|
<thead><tr><th>预览</th><th>稳定 ID</th><th>Part / 顺序</th><th>原文件</th><th>尺寸</th><th>文件状态</th><th>发布状态</th><th>操作</th></tr></thead>
|
||||||
|
<tbody>{assets.items.map((item) => <tr key={item.stable_id}>
|
||||||
|
<td><img alt="" src={item.thumbnail_reference.url} /></td>
|
||||||
|
<th scope="row"><strong>{item.stable_id}</strong><small>{item.resource_version}</small></th>
|
||||||
|
<td><span>part{item.part}</span><input aria-label={`${item.stable_id} 顺序`} min="1" onChange={(event) => setOrderDrafts((current) => ({ ...current, [item.stable_id]: Number(event.target.value) }))} type="number" value={orderDrafts[item.stable_id] ?? item.order} /></td>
|
||||||
|
<td><span>{item.original_filename}</span><small>{item.mime_type} · {item.original_byte_size.toLocaleString("zh-CN")} B</small></td>
|
||||||
|
<td>{item.width} x {item.height}</td>
|
||||||
|
<td>{item.file_state}</td>
|
||||||
|
<td><span className={item.enabled ? "is-enabled" : "is-disabled"}>{item.enabled ? "已启用" : "已停用"}</span></td>
|
||||||
|
<td><button disabled={busy || (orderDrafts[item.stable_id] ?? item.order) === item.order} onClick={() => void update(item, { order: orderDrafts[item.stable_id] ?? item.order })} type="button">更新顺序</button><button disabled={busy} onClick={() => void update(item, { enabled: !item.enabled })} type="button">{item.enabled ? "停用" : "启用"}</button></td>
|
||||||
|
</tr>)}</tbody>
|
||||||
|
</table></div>}
|
||||||
|
</section>
|
||||||
|
{notice ? <p className="admin-assets-notice" role="status">{notice}</p> : null}
|
||||||
|
</> : null}
|
||||||
|
</main>
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
.admin-audit-page {
|
||||||
|
width: min(100% - 48px, 1440px);
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 28px 0 40px;
|
||||||
|
color: #1a1a18;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-heading {
|
||||||
|
display: flex;
|
||||||
|
min-height: 72px;
|
||||||
|
align-items: flex-end;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 24px;
|
||||||
|
border-bottom: 2px solid #1a1a18;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-heading p,
|
||||||
|
.admin-audit-heading h2 {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-heading p {
|
||||||
|
color: #686861;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-heading h2 {
|
||||||
|
padding: 4px 0 12px;
|
||||||
|
font-size: 28px;
|
||||||
|
line-height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-heading time {
|
||||||
|
padding-bottom: 14px;
|
||||||
|
color: #686861;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-tabs {
|
||||||
|
display: flex;
|
||||||
|
gap: 0;
|
||||||
|
margin-top: 24px;
|
||||||
|
border-bottom: 1px solid #a9a9a2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-tabs button {
|
||||||
|
min-height: 40px;
|
||||||
|
padding: 0 18px;
|
||||||
|
border: 0;
|
||||||
|
border-bottom: 3px solid transparent;
|
||||||
|
color: #4f4f49;
|
||||||
|
background: transparent;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-tabs button[aria-selected="true"] {
|
||||||
|
border-bottom-color: #1a1a18;
|
||||||
|
color: #1a1a18;
|
||||||
|
background: #f4df32;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-failure {
|
||||||
|
display: flex;
|
||||||
|
min-height: 44px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 16px;
|
||||||
|
margin-top: 16px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-left: 4px solid #c92a24;
|
||||||
|
background: #fff1ef;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-failure button,
|
||||||
|
.admin-audit-pagination button {
|
||||||
|
min-height: 36px;
|
||||||
|
padding: 0 14px;
|
||||||
|
border: 1px solid #1a1a18;
|
||||||
|
background: #fff;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-status {
|
||||||
|
margin: 0;
|
||||||
|
padding: 48px 16px;
|
||||||
|
color: #686861;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-table-scroll {
|
||||||
|
overflow-x: auto;
|
||||||
|
border-bottom: 1px solid #a9a9a2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page table {
|
||||||
|
width: 100%;
|
||||||
|
min-width: 1120px;
|
||||||
|
border-collapse: collapse;
|
||||||
|
table-layout: fixed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page th,
|
||||||
|
.admin-audit-page td {
|
||||||
|
min-height: 40px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-bottom: 1px solid #d7d7d1;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
text-align: left;
|
||||||
|
vertical-align: top;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page th {
|
||||||
|
color: #55554f;
|
||||||
|
background: #efefeb;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page th:nth-child(1) { width: 132px; }
|
||||||
|
.admin-audit-page th:nth-child(2) { width: 210px; }
|
||||||
|
.admin-audit-page th:nth-child(3) { width: 180px; }
|
||||||
|
.admin-audit-page th:nth-child(5) { width: 100px; }
|
||||||
|
.admin-audit-page th:nth-child(6) { width: 210px; }
|
||||||
|
|
||||||
|
.admin-audit-page td small {
|
||||||
|
display: block;
|
||||||
|
margin-top: 4px;
|
||||||
|
color: #686861;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page td strong {
|
||||||
|
color: #16794b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page td strong.is-failed {
|
||||||
|
color: #c92a24;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-pagination {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding-top: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-retention {
|
||||||
|
margin: 24px 0 0;
|
||||||
|
padding-top: 12px;
|
||||||
|
border-top: 1px solid #d7d7d1;
|
||||||
|
color: #686861;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-audit-page :focus-visible {
|
||||||
|
outline: 2px solid #005fcc;
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 700px) {
|
||||||
|
.admin-audit-page { width: calc(100% - 24px); }
|
||||||
|
.admin-audit-heading { align-items: flex-start; flex-direction: column; gap: 4px; }
|
||||||
|
.admin-audit-heading time { padding-bottom: 12px; }
|
||||||
|
.admin-audit-tabs { display: grid; grid-template-columns: 1fr 1fr; }
|
||||||
|
.admin-audit-tabs button { min-width: 0; padding: 8px; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
import type {
|
||||||
|
AdminOperationAuditItem,
|
||||||
|
AdminOperationAuditResponse,
|
||||||
|
PrivateContentAccessAuditItem,
|
||||||
|
PrivateContentAccessAuditResponse,
|
||||||
|
} from "@dada/shared-contracts";
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import "./admin-audit.css";
|
||||||
|
|
||||||
|
type AuditTab = "operations" | "private-content";
|
||||||
|
|
||||||
|
interface AuditPageState<Item> {
|
||||||
|
failed: boolean;
|
||||||
|
generatedAt: string | null;
|
||||||
|
items: Item[];
|
||||||
|
loading: boolean;
|
||||||
|
nextCursor: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const emptyState = <Item,>(): AuditPageState<Item> => ({
|
||||||
|
failed: false,
|
||||||
|
generatedAt: null,
|
||||||
|
items: [],
|
||||||
|
loading: false,
|
||||||
|
nextCursor: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
function formatTime(value: string) {
|
||||||
|
return new Intl.DateTimeFormat("zh-CN", {
|
||||||
|
day: "2-digit",
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
month: "2-digit",
|
||||||
|
second: "2-digit",
|
||||||
|
}).format(new Date(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
function operationSummary(item: AdminOperationAuditItem) {
|
||||||
|
if (item.after_summary) return item.after_summary;
|
||||||
|
if (item.before_summary) return item.before_summary;
|
||||||
|
return "无变更摘要";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AdminAuditPage() {
|
||||||
|
const [tab, setTab] = useState<AuditTab>("operations");
|
||||||
|
const [operations, setOperations] = useState<AuditPageState<AdminOperationAuditItem>>(emptyState);
|
||||||
|
const [privateAccess, setPrivateAccess] = useState<AuditPageState<PrivateContentAccessAuditItem>>(emptyState);
|
||||||
|
|
||||||
|
const loadOperations = useCallback(async (cursor?: string, append = false) => {
|
||||||
|
setOperations((current) => ({ ...current, failed: false, loading: true }));
|
||||||
|
try {
|
||||||
|
const query = new URLSearchParams({ limit: "50" });
|
||||||
|
if (cursor) query.set("cursor", cursor);
|
||||||
|
const response = await fetch(`/api/v1/admin/audit/operations?${query}`, { credentials: "same-origin" });
|
||||||
|
if (response.status === 401) {
|
||||||
|
window.dispatchEvent(new Event("dada:session-invalid"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!response.ok) throw new Error("admin_operation_audit_unavailable");
|
||||||
|
const body = await response.json() as AdminOperationAuditResponse;
|
||||||
|
setOperations((current) => ({
|
||||||
|
failed: false,
|
||||||
|
generatedAt: body.generated_at,
|
||||||
|
items: append ? [...current.items, ...body.items] : body.items,
|
||||||
|
loading: false,
|
||||||
|
nextCursor: body.next_cursor,
|
||||||
|
}));
|
||||||
|
} catch {
|
||||||
|
setOperations((current) => ({ ...current, failed: true, loading: false }));
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const loadPrivateAccess = useCallback(async (cursor?: string, append = false) => {
|
||||||
|
setPrivateAccess((current) => ({ ...current, failed: false, loading: true }));
|
||||||
|
try {
|
||||||
|
const query = new URLSearchParams({ limit: "50" });
|
||||||
|
if (cursor) query.set("cursor", cursor);
|
||||||
|
const response = await fetch(`/api/v1/admin/audit/private-content?${query}`, { credentials: "same-origin" });
|
||||||
|
if (response.status === 401) {
|
||||||
|
window.dispatchEvent(new Event("dada:session-invalid"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!response.ok) throw new Error("private_content_audit_unavailable");
|
||||||
|
const body = await response.json() as PrivateContentAccessAuditResponse;
|
||||||
|
setPrivateAccess((current) => ({
|
||||||
|
failed: false,
|
||||||
|
generatedAt: body.generated_at,
|
||||||
|
items: append ? [...current.items, ...body.items] : body.items,
|
||||||
|
loading: false,
|
||||||
|
nextCursor: body.next_cursor,
|
||||||
|
}));
|
||||||
|
} catch {
|
||||||
|
setPrivateAccess((current) => ({ ...current, failed: true, loading: false }));
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => { void loadOperations(); }, [loadOperations]);
|
||||||
|
|
||||||
|
function selectTab(next: AuditTab) {
|
||||||
|
setTab(next);
|
||||||
|
if (next === "private-content" && !privateAccess.generatedAt && !privateAccess.loading) void loadPrivateAccess();
|
||||||
|
}
|
||||||
|
|
||||||
|
const state = tab === "operations" ? operations : privateAccess;
|
||||||
|
const reload = tab === "operations" ? loadOperations : loadPrivateAccess;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="admin-audit-page" id="admin-main">
|
||||||
|
<header className="admin-audit-heading">
|
||||||
|
<div><p>IMMUTABLE / 180 DAYS</p><h2>审计</h2></div>
|
||||||
|
{state.generatedAt ? <time dateTime={state.generatedAt}>读取于 {formatTime(state.generatedAt)}</time> : null}
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div aria-label="审计类型" className="admin-audit-tabs" role="tablist">
|
||||||
|
<button aria-controls="operation-audit-panel" aria-selected={tab === "operations"} id="operation-audit-tab" onClick={() => selectTab("operations")} role="tab" type="button">后台操作审计</button>
|
||||||
|
<button aria-controls="private-audit-panel" aria-selected={tab === "private-content"} id="private-audit-tab" onClick={() => selectTab("private-content")} role="tab" type="button">私有内容访问审计</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{state.failed ? (
|
||||||
|
<div className="admin-audit-failure" role="alert">
|
||||||
|
<span>审计记录暂时无法读取{state.generatedAt ? ",已保留上次结果" : ""}。</span>
|
||||||
|
<button disabled={state.loading} onClick={() => void reload()} type="button">重试</button>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
{tab === "operations" ? (
|
||||||
|
<section aria-labelledby="operation-audit-tab" id="operation-audit-panel" role="tabpanel">
|
||||||
|
{operations.loading && operations.items.length === 0 ? <p aria-live="polite" className="admin-audit-status">正在读取后台操作审计</p> : null}
|
||||||
|
{!operations.loading && !operations.failed && operations.items.length === 0 ? <p className="admin-audit-status">当前没有后台操作审计记录。</p> : null}
|
||||||
|
{operations.items.length > 0 ? (
|
||||||
|
<div className="admin-audit-table-scroll">
|
||||||
|
<table>
|
||||||
|
<thead><tr><th>时间</th><th>管理员</th><th>操作类型</th><th>对象安全摘要</th><th>结果</th><th>Operation ID</th></tr></thead>
|
||||||
|
<tbody>{operations.items.map((item) => (
|
||||||
|
<tr key={item.log_id}>
|
||||||
|
<td><time dateTime={item.occurred_at}>{formatTime(item.occurred_at)}</time></td>
|
||||||
|
<td><code>{item.actor_ref}</code><small>{item.actor_type}</small></td>
|
||||||
|
<td><code>{item.operation_type}</code></td>
|
||||||
|
<td><code>{item.target_type}:{item.target_ref}</code><small>{operationSummary(item)}</small></td>
|
||||||
|
<td><strong className={`is-${item.result}`}>{item.result}</strong></td>
|
||||||
|
<td><code>{item.log_id}</code></td>
|
||||||
|
</tr>
|
||||||
|
))}</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
</section>
|
||||||
|
) : (
|
||||||
|
<section aria-labelledby="private-audit-tab" id="private-audit-panel" role="tabpanel">
|
||||||
|
{privateAccess.loading && privateAccess.items.length === 0 ? <p aria-live="polite" className="admin-audit-status">正在读取私有内容访问审计</p> : null}
|
||||||
|
{!privateAccess.loading && !privateAccess.failed && privateAccess.items.length === 0 ? <p className="admin-audit-status">当前没有私有内容访问审计记录。</p> : null}
|
||||||
|
{privateAccess.items.length > 0 ? (
|
||||||
|
<div className="admin-audit-table-scroll">
|
||||||
|
<table>
|
||||||
|
<thead><tr><th>时间</th><th>管理员</th><th>安全目标标识</th><th>内容类型</th><th>到期时间</th><th>Access ID</th></tr></thead>
|
||||||
|
<tbody>{privateAccess.items.map((item) => (
|
||||||
|
<tr key={item.log_id}>
|
||||||
|
<td><time dateTime={item.occurred_at}>{formatTime(item.occurred_at)}</time></td>
|
||||||
|
<td><code>{item.actor_ref}</code></td>
|
||||||
|
<td><code>{item.target_ref}</code></td>
|
||||||
|
<td>{item.content_type}</td>
|
||||||
|
<td><time dateTime={item.expires_at}>{formatTime(item.expires_at)}</time></td>
|
||||||
|
<td><code>{item.log_id}</code></td>
|
||||||
|
</tr>
|
||||||
|
))}</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{state.nextCursor ? (
|
||||||
|
<div className="admin-audit-pagination">
|
||||||
|
<button disabled={state.loading} onClick={() => void reload(state.nextCursor!, true)} type="button">{state.loading ? "正在读取" : "下一页"}</button>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
<p className="admin-audit-retention">记录保留 180 天。此页面不提供编辑、删除或清空能力。</p>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
.admin-generations { display: grid; gap: 20px; }
|
||||||
|
.admin-generations-refresh { align-self: start; }
|
||||||
|
.admin-generations-notice-panel { display: grid; gap: 14px; max-width: 760px; padding: 24px; border: 1px solid #d5b36a; background: #fffaf0; }
|
||||||
|
.admin-generations-notice-panel p { margin: 0; }
|
||||||
|
.admin-generations-notice-panel button { justify-self: start; }
|
||||||
|
.admin-generations-error, .admin-generations-notice { padding: 12px 16px; border: 1px solid #d46a6a; background: #fff4f4; }
|
||||||
|
.admin-generations-error button { margin-left: 12px; }
|
||||||
|
.admin-generations-table-wrap { overflow-x: auto; border: 1px solid #d9dde5; background: #fff; }
|
||||||
|
.admin-generations-table-wrap table { width: 100%; min-width: 1050px; border-collapse: collapse; }
|
||||||
|
.admin-generations-table-wrap th, .admin-generations-table-wrap td { padding: 12px 14px; border-bottom: 1px solid #e9ebef; text-align: left; vertical-align: top; }
|
||||||
|
.admin-generations-table-wrap th { background: #f5f6f8; color: #4d5664; font-size: 12px; }
|
||||||
|
.admin-generations-table-wrap small { color: #6c7481; }
|
||||||
|
.admin-generations-status { display: inline-block; padding: 3px 7px; border-radius: 4px; background: #edf0f4; }
|
||||||
|
.admin-generations-status.is-succeeded { color: #23623d; background: #e6f4ea; }
|
||||||
|
.admin-generations-status.is-failed, .admin-generations-status.is-rejected { color: #8b2b2b; background: #fff0f0; }
|
||||||
|
.admin-generations-status.is-running { color: #7a5a10; background: #fff5d8; }
|
||||||
|
.admin-generations-actions { display: grid; gap: 8px; min-width: 190px; }
|
||||||
|
.admin-generations-actions button { white-space: normal; }
|
||||||
|
.admin-generations-empty { margin: 0; padding: 28px; color: #6c7481; }
|
||||||
|
.admin-generations-opened { display: grid; gap: 10px; padding: 18px; border: 1px solid #cbd2dd; background: #fff; }
|
||||||
|
.admin-generations-opened header { display: flex; align-items: center; justify-content: space-between; }
|
||||||
|
.admin-generations-opened h3 { margin: 0; }
|
||||||
|
.admin-generations-opened pre { max-height: 360px; overflow: auto; margin: 0; padding: 14px; white-space: pre-wrap; background: #f6f7f9; }
|
||||||
|
.admin-generations-opened img { max-width: 100%; max-height: 620px; object-fit: contain; }
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import "./admin-generations.css";
|
||||||
|
|
||||||
|
interface AdminSession {
|
||||||
|
acknowledged_private_content_notice_version: string | null;
|
||||||
|
current_private_content_notice_version: string | null;
|
||||||
|
csrf_token: string;
|
||||||
|
notice_acknowledged: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface GenerationRecord {
|
||||||
|
generation_id: string;
|
||||||
|
owner_ref: string;
|
||||||
|
project_id: string;
|
||||||
|
model_id: string;
|
||||||
|
ratio: string;
|
||||||
|
status: "queued" | "running" | "succeeded" | "failed" | "rejected";
|
||||||
|
created_at: string;
|
||||||
|
completed_at: string | null;
|
||||||
|
duration_ms: number | null;
|
||||||
|
confirmed_credit_cost: number;
|
||||||
|
reserved_credits: number;
|
||||||
|
final_credit_state: "committed" | "released" | null;
|
||||||
|
error_category: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface GenerationResponse { generated_at: string; items: GenerationRecord[] }
|
||||||
|
interface OpenedPrompt { generation_id: string; prompt: string }
|
||||||
|
|
||||||
|
function idempotencyKey() {
|
||||||
|
return `${crypto.randomUUID().replaceAll("-", "")}${crypto.randomUUID().replaceAll("-", "")}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function compactId(value: string) { return `${value.slice(0, 8)}...${value.slice(-4)}`; }
|
||||||
|
function formatTime(value: string | null) { return value ? new Intl.DateTimeFormat("zh-CN", { dateStyle: "short", timeStyle: "medium" }).format(new Date(value)) : "未完成"; }
|
||||||
|
function statusLabel(value: GenerationRecord["status"]) { return { queued: "排队", running: "运行中", succeeded: "成功", failed: "失败", rejected: "已拒绝" }[value]; }
|
||||||
|
|
||||||
|
export function AdminGenerationsPage() {
|
||||||
|
const [session, setSession] = useState<AdminSession>();
|
||||||
|
const [records, setRecords] = useState<GenerationRecord[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [failed, setFailed] = useState(false);
|
||||||
|
const [acknowledging, setAcknowledging] = useState(false);
|
||||||
|
const [notice, setNotice] = useState("");
|
||||||
|
const [openedPrompt, setOpenedPrompt] = useState<OpenedPrompt>();
|
||||||
|
const [openedImage, setOpenedImage] = useState<{ generationId: string; url: string }>();
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
setLoading(true);
|
||||||
|
setFailed(false);
|
||||||
|
try {
|
||||||
|
const sessionResponse = await fetch("/api/v1/admin-auth/session", { credentials: "same-origin" });
|
||||||
|
if (sessionResponse.status === 401) throw new Error("session_invalid");
|
||||||
|
if (!sessionResponse.ok) throw new Error("session_unavailable");
|
||||||
|
const current = await sessionResponse.json() as AdminSession;
|
||||||
|
setSession(current);
|
||||||
|
setNotice("");
|
||||||
|
if (!current.notice_acknowledged) {
|
||||||
|
setRecords([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const listResponse = await fetch("/api/v1/admin/generations", { credentials: "same-origin" });
|
||||||
|
if (!listResponse.ok) throw new Error("generation_list_unavailable");
|
||||||
|
setRecords((await listResponse.json() as GenerationResponse).items);
|
||||||
|
} catch {
|
||||||
|
setFailed(true);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => { void load(); }, []);
|
||||||
|
useEffect(() => () => { if (openedImage) URL.revokeObjectURL(openedImage.url); }, [openedImage]);
|
||||||
|
|
||||||
|
async function acknowledge() {
|
||||||
|
if (!session?.current_private_content_notice_version || acknowledging) return;
|
||||||
|
setAcknowledging(true);
|
||||||
|
setNotice("");
|
||||||
|
try {
|
||||||
|
const response = await fetch("/api/v1/admin/private-content-notice/ack", {
|
||||||
|
body: JSON.stringify({ expected_notice_version: session.current_private_content_notice_version }),
|
||||||
|
credentials: "same-origin",
|
||||||
|
headers: { "Content-Type": "application/json", "Idempotency-Key": idempotencyKey(), "X-CSRF-Token": session.csrf_token },
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
if (!response.ok) throw new Error("notice_ack_failed");
|
||||||
|
await load();
|
||||||
|
} catch {
|
||||||
|
setNotice("告知版本已变化或确认未完成,请重新读取。 ");
|
||||||
|
} finally {
|
||||||
|
setAcknowledging(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openPrompt(generationId: string) {
|
||||||
|
setNotice("");
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/v1/admin/private-content/generations/${generationId}/prompt`, { credentials: "same-origin" });
|
||||||
|
if (!response.ok) throw new Error("prompt_unavailable");
|
||||||
|
setOpenedPrompt(await response.json() as OpenedPrompt);
|
||||||
|
} catch {
|
||||||
|
setNotice("内容读取未完成,访问审计未成功时不会返回内容。 ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openImage(generationId: string) {
|
||||||
|
setNotice("");
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/v1/admin/private-content/generations/${generationId}/image`, { credentials: "same-origin" });
|
||||||
|
if (!response.ok) throw new Error("image_unavailable");
|
||||||
|
const url = URL.createObjectURL(await response.blob());
|
||||||
|
setOpenedImage((previous) => {
|
||||||
|
if (previous) URL.revokeObjectURL(previous.url);
|
||||||
|
return { generationId, url };
|
||||||
|
});
|
||||||
|
} catch {
|
||||||
|
setNotice("内容读取未完成,访问审计未成功时不会返回内容。 ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="admin-generations" id="admin-main">
|
||||||
|
<header className="admin-page-heading"><div><p>OPERATIONS / GENERATION RECORDS</p><h2>生成记录</h2></div><button className="admin-generations-refresh" onClick={() => void load()} type="button">重新读取</button></header>
|
||||||
|
{loading ? <p aria-live="polite">正在读取生成记录</p> : null}
|
||||||
|
{failed ? <div className="admin-generations-error" role="alert">后台生成记录暂时无法读取。<button onClick={() => void load()} type="button">重试</button></div> : null}
|
||||||
|
{notice ? <p className="admin-generations-notice" role="alert">{notice}</p> : null}
|
||||||
|
{session && !session.notice_acknowledged ? (
|
||||||
|
<section aria-labelledby="private-content-notice-title" className="admin-generations-notice-panel">
|
||||||
|
<p>PRIVATE CONTENT ACCESS</p>
|
||||||
|
<h3 id="private-content-notice-title">查看私有内容前,请确认当前规则告知</h3>
|
||||||
|
<p>生成记录默认只显示安全元数据。打开图片或完整提示词时,系统会自动记录本次管理员、目标和内容类型访问审计。</p>
|
||||||
|
<button disabled={acknowledging} onClick={() => void acknowledge()} type="button">{acknowledging ? "确认中" : "确认并进入记录"}</button>
|
||||||
|
</section>
|
||||||
|
) : null}
|
||||||
|
{session?.notice_acknowledged ? (
|
||||||
|
<section aria-label="生成记录元数据" className="admin-generations-table-wrap">
|
||||||
|
<table><thead><tr><th>任务</th><th>用户标识</th><th>模型 / 比例</th><th>状态</th><th>创建 / 完成</th><th>点数</th><th>私有内容</th></tr></thead><tbody>
|
||||||
|
{records.map((record) => <tr key={record.generation_id}>
|
||||||
|
<td><code>{compactId(record.generation_id)}</code></td>
|
||||||
|
<td><code>{compactId(record.owner_ref)}</code></td>
|
||||||
|
<td>{record.model_id}<br /><small>{record.ratio}</small></td>
|
||||||
|
<td><span className={`admin-generations-status is-${record.status}`}>{statusLabel(record.status)}</span>{record.error_category ? <small>{record.error_category}</small> : null}</td>
|
||||||
|
<td><time dateTime={record.created_at}>{formatTime(record.created_at)}</time><br /><small>{formatTime(record.completed_at)}</small></td>
|
||||||
|
<td>{record.confirmed_credit_cost} / {record.final_credit_state ?? "冻结"}</td>
|
||||||
|
<td className="admin-generations-actions"><button onClick={() => void openPrompt(record.generation_id)} type="button">打开提示词并记录审计</button><button disabled={record.status !== "succeeded"} onClick={() => void openImage(record.generation_id)} type="button">打开图片并记录审计</button></td>
|
||||||
|
</tr>)}
|
||||||
|
</tbody></table>
|
||||||
|
{!records.length && !loading ? <p className="admin-generations-empty">当前无生成记录</p> : null}
|
||||||
|
</section>
|
||||||
|
) : null}
|
||||||
|
{openedPrompt ? <section aria-label="已审计的完整提示词" className="admin-generations-opened"><header><h3>已记录审计的完整提示词</h3><button onClick={() => setOpenedPrompt(undefined)} type="button">关闭</button></header><p><code>{compactId(openedPrompt.generation_id)}</code></p><pre>{openedPrompt.prompt}</pre></section> : null}
|
||||||
|
{openedImage ? <section aria-label="已审计的生成图片" className="admin-generations-opened"><header><h3>已记录审计的生成图片</h3><button onClick={() => { URL.revokeObjectURL(openedImage.url); setOpenedImage(undefined); }} type="button">关闭</button></header><img alt="已记录审计的生成图片" src={openedImage.url} /></section> : null}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
|
||||||
import "./admin-models.css";
|
import "./admin-models.css";
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ export function AdminModelsPage() {
|
|||||||
const priorityRefs = useRef<Record<string, HTMLInputElement | null>>({});
|
const priorityRefs = useRef<Record<string, HTMLInputElement | null>>({});
|
||||||
const defaultRefs = useRef<Record<string, HTMLInputElement | null>>({});
|
const defaultRefs = useRef<Record<string, HTMLInputElement | null>>({});
|
||||||
|
|
||||||
async function load() {
|
const load = useCallback(async () => {
|
||||||
setLoadingFailed(false);
|
setLoadingFailed(false);
|
||||||
setConflicted(false);
|
setConflicted(false);
|
||||||
try {
|
try {
|
||||||
@@ -80,9 +80,16 @@ export function AdminModelsPage() {
|
|||||||
} catch {
|
} catch {
|
||||||
setLoadingFailed(true);
|
setLoadingFailed(true);
|
||||||
}
|
}
|
||||||
}
|
}, []);
|
||||||
|
|
||||||
useEffect(() => { void load(); }, []);
|
useEffect(() => { void load(); }, [load]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (typeof EventSource === "undefined") return undefined;
|
||||||
|
const source = new EventSource("/api/v1/events");
|
||||||
|
source.onmessage = () => { void load(); };
|
||||||
|
return () => source.close();
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
const validation = useMemo(() => {
|
const validation = useMemo(() => {
|
||||||
if (!draft) return { valid: false, message: "" };
|
if (!draft) return { valid: false, message: "" };
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
.admin-services-storage { max-width: 1180px; }
|
||||||
|
.admin-services-heading { align-items: end; }
|
||||||
|
.admin-services-heading-actions { align-items: center; display: flex; gap: 16px; }
|
||||||
|
.admin-services-heading-actions button, .admin-diagnostics-section button { background: #111827; border: 0; color: #fff; cursor: pointer; font: inherit; padding: 10px 14px; }
|
||||||
|
.admin-health-section { border-top: 1px solid #d9dde5; margin-top: 26px; padding-top: 22px; }
|
||||||
|
.admin-health-section > header { align-items: center; display: flex; justify-content: space-between; margin-bottom: 18px; }
|
||||||
|
.admin-health-section h3 { margin: 4px 0 0; }
|
||||||
|
.admin-health-section header p { color: #7b8493; font-size: 11px; letter-spacing: .12em; margin: 0; }
|
||||||
|
.admin-safe-note { color: #667085; font-size: 13px; }
|
||||||
|
.admin-service-grid { display: grid; gap: 12px; grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
||||||
|
.admin-service-card { background: #fff; border: 1px solid #e1e5ea; min-height: 160px; padding: 18px; }
|
||||||
|
.admin-service-card.is-degraded, .admin-service-card.is-paused_quota, .admin-service-card.is-paused_provider, .admin-service-card.is-unavailable { border-color: #e5b6b6; }
|
||||||
|
.admin-service-card-heading { align-items: center; display: flex; justify-content: space-between; }
|
||||||
|
.admin-service-card-heading span, .admin-storage-state { color: #147a50; font-size: 13px; }
|
||||||
|
.admin-service-card.is-degraded .admin-service-card-heading span, .admin-service-card.is-paused_quota .admin-service-card-heading span, .admin-service-card.is-paused_provider .admin-service-card-heading span, .admin-service-card.is-unavailable .admin-service-card-heading span { color: #b42318; }
|
||||||
|
.admin-service-card dl, .admin-storage-details { display: grid; gap: 10px; margin: 18px 0 0; }
|
||||||
|
.admin-service-card dl div, .admin-storage-details div { align-items: baseline; display: flex; justify-content: space-between; }
|
||||||
|
.admin-service-card dt, .admin-storage-details dt { color: #667085; font-size: 12px; }
|
||||||
|
.admin-service-card dd, .admin-storage-details dd { margin: 0; text-align: right; }
|
||||||
|
.admin-storage-state.is-full, .admin-storage-state.is-unavailable { color: #b42318; }
|
||||||
|
.admin-storage-metrics { display: grid; gap: 16px; grid-template-columns: repeat(4, minmax(0, 1fr)); }
|
||||||
|
.admin-storage-metrics div { background: #f7f8fa; padding: 14px 16px; }
|
||||||
|
.admin-storage-metrics span { color: #667085; display: block; font-size: 12px; }
|
||||||
|
.admin-storage-metrics strong { display: block; font-size: 20px; margin-top: 6px; }
|
||||||
|
.admin-storage-progress { background: #e5e7eb; height: 8px; margin-top: 18px; overflow: hidden; }
|
||||||
|
.admin-storage-progress span { background: #147a50; display: block; height: 100%; }
|
||||||
|
.admin-storage-description { color: #667085; font-size: 13px; line-height: 1.7; max-width: 780px; }
|
||||||
|
.admin-storage-description code { color: #344054; }
|
||||||
|
.admin-diagnostics-section > header button:disabled { background: #98a2b3; cursor: not-allowed; }
|
||||||
|
.admin-diagnostics-section > p { color: #667085; font-size: 13px; }
|
||||||
|
.admin-diagnostics-section pre { background: #111827; color: #d1fadf; font: 12px/1.65 ui-monospace, SFMono-Regular, Consolas, monospace; margin: 16px 0 0; max-height: 280px; overflow: auto; padding: 16px; white-space: pre-wrap; }
|
||||||
|
.admin-services-loading { display: grid; gap: 12px; grid-template-columns: repeat(3, 1fr); }
|
||||||
|
.admin-services-loading span, .admin-diagnostics-placeholder { background: #eef1f4; display: block; height: 160px; }
|
||||||
|
.admin-services-failure { align-items: center; background: #fff4f2; color: #b42318; display: flex; gap: 16px; justify-content: space-between; padding: 14px 16px; }
|
||||||
|
.admin-services-failure button { background: transparent; border: 1px solid #b42318; color: #b42318; cursor: pointer; padding: 6px 12px; }
|
||||||
|
@media (max-width: 900px) { .admin-service-grid, .admin-storage-metrics { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
|
||||||
|
@media (max-width: 620px) { .admin-service-grid, .admin-storage-metrics { grid-template-columns: 1fr; } .admin-services-heading-actions { align-items: flex-end; flex-direction: column; gap: 8px; } }
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import type { AdminDiagnosticsResponse, AdminServicesStorageResponse } from "@dada/shared-contracts";
|
||||||
|
|
||||||
|
import "./admin-services-storage.css";
|
||||||
|
|
||||||
|
const serviceLabels: Record<AdminServicesStorageResponse["services"][number]["service_id"], string> = {
|
||||||
|
ai_gateway: "AI 网关",
|
||||||
|
amap: "高德",
|
||||||
|
api: "API",
|
||||||
|
asset_root: "素材根",
|
||||||
|
resend: "Resend",
|
||||||
|
worker: "Worker",
|
||||||
|
};
|
||||||
|
|
||||||
|
const statusLabels: Record<AdminServicesStorageResponse["services"][number]["status"], string> = {
|
||||||
|
active: "正常",
|
||||||
|
degraded: "有异常",
|
||||||
|
disabled: "已停用",
|
||||||
|
paused_provider: "供应商暂停",
|
||||||
|
paused_quota: "额度暂停",
|
||||||
|
unavailable: "不可用",
|
||||||
|
};
|
||||||
|
|
||||||
|
const impactLabels: Record<AdminServicesStorageResponse["services"][number]["impact_scope"], string> = {
|
||||||
|
account: "账户模型",
|
||||||
|
api: "后台接口",
|
||||||
|
authentication: "认证",
|
||||||
|
generation: "生成",
|
||||||
|
location: "定位",
|
||||||
|
model: "单模型",
|
||||||
|
none: "无",
|
||||||
|
storage: "存储",
|
||||||
|
unknown: "未知范围",
|
||||||
|
};
|
||||||
|
|
||||||
|
function formatTime(value: string | null) {
|
||||||
|
if (!value) return "未记录";
|
||||||
|
return new Intl.DateTimeFormat("zh-CN", { dateStyle: "short", timeStyle: "short" }).format(new Date(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getJson<T>(url: string) {
|
||||||
|
const response = await fetch(url, { credentials: "same-origin" });
|
||||||
|
if (response.status === 401) window.dispatchEvent(new Event("dada:session-invalid"));
|
||||||
|
if (!response.ok) throw new Error("admin_state_unavailable");
|
||||||
|
return await response.json() as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AdminServicesStoragePage() {
|
||||||
|
const [state, setState] = useState<AdminServicesStorageResponse>();
|
||||||
|
const [diagnostics, setDiagnostics] = useState<AdminDiagnosticsResponse>();
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [failed, setFailed] = useState(false);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
|
||||||
|
const load = useCallback(async () => {
|
||||||
|
setLoading(true);
|
||||||
|
setFailed(false);
|
||||||
|
try {
|
||||||
|
const [nextState, nextDiagnostics] = await Promise.all([
|
||||||
|
getJson<AdminServicesStorageResponse>("/api/v1/admin/services-storage"),
|
||||||
|
getJson<AdminDiagnosticsResponse>("/api/v1/admin/diagnostics"),
|
||||||
|
]);
|
||||||
|
setState(nextState);
|
||||||
|
setDiagnostics(nextDiagnostics);
|
||||||
|
} catch {
|
||||||
|
setFailed(true);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => { void load(); }, [load]);
|
||||||
|
|
||||||
|
async function copyDiagnostics() {
|
||||||
|
if (!diagnostics) return;
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(diagnostics.diagnostic_text);
|
||||||
|
setCopied(true);
|
||||||
|
window.setTimeout(() => setCopied(false), 1800);
|
||||||
|
} catch {
|
||||||
|
setCopied(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="admin-services-storage" id="admin-main">
|
||||||
|
<header className="admin-page-heading admin-services-heading">
|
||||||
|
<div><p>OPERATIONS / HEALTH</p><h2>服务与存储</h2></div>
|
||||||
|
<div className="admin-services-heading-actions">
|
||||||
|
{state ? <time dateTime={state.generated_at}>更新于 {formatTime(state.generated_at)}</time> : null}
|
||||||
|
<button aria-label="重新读取服务与存储状态" onClick={() => void load()} type="button">重新读取</button>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
{loading && !state ? <div aria-label="服务与存储状态加载中" className="admin-services-loading"><span /><span /><span /><span /></div> : null}
|
||||||
|
{failed ? <div className="admin-services-failure" role="alert"><span>状态暂时无法读取{state ? `,保留 ${formatTime(state.generated_at)} 的结果` : ""}。</span><button onClick={() => void load()} type="button">重试</button></div> : null}
|
||||||
|
{state ? (
|
||||||
|
<>
|
||||||
|
<section aria-labelledby="admin-services-list-heading" className="admin-health-section">
|
||||||
|
<header><div><p>SERVICE STATUS</p><h3 id="admin-services-list-heading">外部服务与本机组件</h3></div><span className="admin-safe-note">仅显示脱敏状态</span></header>
|
||||||
|
<div className="admin-service-grid">
|
||||||
|
{state.services.map((service) => (
|
||||||
|
<article className={`admin-service-card is-${service.status}`} key={service.service_id}>
|
||||||
|
<div className="admin-service-card-heading"><strong>{serviceLabels[service.service_id]}</strong><span>{statusLabels[service.status]}</span></div>
|
||||||
|
<dl>
|
||||||
|
<div><dt>配置状态</dt><dd>{service.configured ? "已配置" : "未配置"}</dd></div>
|
||||||
|
<div><dt>影响范围</dt><dd>{impactLabels[service.impact_scope]}</dd></div>
|
||||||
|
<div><dt>最近检查</dt><dd>{formatTime(service.checked_at)}</dd></div>
|
||||||
|
{service.pause_reason ? <div><dt>安全原因</dt><dd>{service.pause_reason}</dd></div> : null}
|
||||||
|
</dl>
|
||||||
|
</article>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<section aria-labelledby="admin-storage-heading" className="admin-health-section">
|
||||||
|
<header><div><p>LOCAL DATA ROOT</p><h3 id="admin-storage-heading">本机内容容量</h3></div><span className={`admin-storage-state is-${state.storage.status}`}>{state.storage.status === "active" ? "可写" : state.storage.status === "full" ? "已满" : "不可用"}</span></header>
|
||||||
|
<div className="admin-storage-metrics">
|
||||||
|
<div><span>已用内容</span><strong>{(state.storage.managed_content_bytes / 1024 / 1024 / 1024).toFixed(2)} GB</strong></div>
|
||||||
|
<div><span>固定上限</span><strong>{(state.storage.hard_limit_bytes / 1024 / 1024 / 1024).toFixed(2)} GB</strong></div>
|
||||||
|
<div><span>容量提醒</span><strong>{state.storage.capacity_notice_level}</strong></div>
|
||||||
|
<div><span>清理队列</span><strong>{state.storage.cleanup_pending_count}</strong></div>
|
||||||
|
</div>
|
||||||
|
<div className="admin-storage-progress" aria-label={`本机内容容量 ${(state.storage.managed_content_bytes / state.storage.hard_limit_bytes * 100).toFixed(1)}%`}><span style={{ width: `${Math.min(100, state.storage.managed_content_bytes / state.storage.hard_limit_bytes * 100)}%` }} /></div>
|
||||||
|
<p className="admin-storage-description">测试数据仅保存在本机,不自动备份,也不会迁移到正式系统。当前 Windows 用户的 Dada 本机数据目录引用:<code>{state.storage.data_root_ref}</code>。只读规范素材库不计入 5 GB 内容额度。</p>
|
||||||
|
<dl className="admin-storage-details"><div><dt>最后计量</dt><dd>{formatTime(state.storage.last_measured_at)}</dd></div><div><dt>重新计量</dt><dd>{state.storage.remeasurement_required ? "需要完成" : "无需等待"}</dd></div></dl>
|
||||||
|
</section>
|
||||||
|
<section aria-labelledby="admin-diagnostics-heading" className="admin-health-section admin-diagnostics-section">
|
||||||
|
<header><div><p>DIAGNOSTICS</p><h3 id="admin-diagnostics-heading">脱敏诊断</h3></div><button disabled={!diagnostics} onClick={() => void copyDiagnostics()} type="button">{copied ? "已复制" : "复制诊断"}</button></header>
|
||||||
|
<p>诊断内容只包含固定版本、组件状态、逻辑位置和容量计量,不包含密钥、邮箱、绝对路径、提示词、图片或供应商原文。</p>
|
||||||
|
{diagnostics ? <pre aria-label="脱敏诊断内容">{diagnostics.diagnostic_text}</pre> : <div aria-label="诊断加载中" className="admin-diagnostics-placeholder" />}
|
||||||
|
</section>
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,13 +1,8 @@
|
|||||||
import { useEffect, useRef } from "react";
|
import { useEffect, useRef } from "react";
|
||||||
|
|
||||||
import { P0A_COLOR_CARDS, createColorCardElement, drawColorCard, type ColorCardDefinition } from "./palette-provider.js";
|
import { COLOR_CARD_HALF_SIZES, P0A_COLOR_CARDS, createColorCardElement, drawColorCard, type ColorCardDefinition } from "./palette-provider.js";
|
||||||
|
|
||||||
const previewPalette = ["#04D960", "#0ABF58", "#5FD994", "#A0F2C4", "#D5F2E2"] as const;
|
const previewPalette = ["#04D960", "#0ABF58", "#5FD994", "#A0F2C4", "#D5F2E2"] as const;
|
||||||
const previewHalfSize = {
|
|
||||||
style_01: { height: 76, width: 26 }, style_02: { height: 77, width: 18 },
|
|
||||||
style_08: { height: 10, width: 73 }, style_16: { height: 9, width: 78 },
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
function ColorCardPreview({ definition }: { definition: ColorCardDefinition }) {
|
function ColorCardPreview({ definition }: { definition: ColorCardDefinition }) {
|
||||||
const ref = useRef<HTMLCanvasElement>(null);
|
const ref = useRef<HTMLCanvasElement>(null);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -18,7 +13,8 @@ function ColorCardPreview({ definition }: { definition: ColorCardDefinition }) {
|
|||||||
context.clearRect(0, 0, canvas.width, canvas.height);
|
context.clearRect(0, 0, canvas.width, canvas.height);
|
||||||
context.fillStyle = "#30343b";
|
context.fillStyle = "#30343b";
|
||||||
context.fillRect(0, 0, canvas.width, canvas.height);
|
context.fillRect(0, 0, canvas.width, canvas.height);
|
||||||
const half = previewHalfSize[definition.styleId];
|
const half = COLOR_CARD_HALF_SIZES[definition.styleId];
|
||||||
|
if (!half) return;
|
||||||
const scale = Math.min(1, 146 / (half.width * 2), 62 / (half.height * 2));
|
const scale = Math.min(1, 146 / (half.width * 2), 62 / (half.height * 2));
|
||||||
context.translate(canvas.width / 2, canvas.height / 2);
|
context.translate(canvas.width / 2, canvas.height / 2);
|
||||||
context.scale(scale, scale);
|
context.scale(scale, scale);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { P0A_DYNAMIC_STICKER_IDS } from "@dada/template-registry";
|
|||||||
|
|
||||||
import { DYNAMIC_RESOURCE_VERSION } from "./dynamic-render-models.js";
|
import { DYNAMIC_RESOURCE_VERSION } from "./dynamic-render-models.js";
|
||||||
import type { CanvasElementIdentity } from "./editor-elements.js";
|
import type { CanvasElementIdentity } from "./editor-elements.js";
|
||||||
|
import complexAssetCatalog from "./generated/complex-assets.json";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
@@ -45,23 +46,17 @@ export function dyn012DisplayParts(element: CanvasElement) {
|
|||||||
} as const;
|
} as const;
|
||||||
}
|
}
|
||||||
|
|
||||||
const dynamicDefinitions: readonly DynamicStickerDefinition[] = [
|
const dynamicCatalogById = new Map(complexAssetCatalog.dynamic_stickers.map((item) => [item.template_id, item]));
|
||||||
{ category: "location", displayName: "地点标题", requiresLocationConsent: false, templateId: "DYN001" },
|
|
||||||
{ category: "location", displayName: "英文地点", requiresLocationConsent: false, templateId: "DYN002" },
|
|
||||||
{ category: "location", displayName: "城市地点", requiresLocationConsent: false, templateId: "DYN003" },
|
|
||||||
{ category: "location", displayName: "经纬地点", requiresLocationConsent: true, templateId: "DYN004" },
|
|
||||||
{ category: "other", displayName: "用户名组合", requiresLocationConsent: false, templateId: "DYN007" },
|
|
||||||
{ category: "time", displayName: "月与时间", requiresLocationConsent: false, templateId: "DYN008" },
|
|
||||||
{ category: "time", displayName: "完整日期", requiresLocationConsent: false, templateId: "DYN011" },
|
|
||||||
{ category: "time", displayName: "数字时间", requiresLocationConsent: false, templateId: "DYN012" },
|
|
||||||
{ category: "identity", displayName: "创作署名", requiresLocationConsent: false, templateId: "DYN015" },
|
|
||||||
{ category: "identity", displayName: "社交 ID", requiresLocationConsent: false, templateId: "DYN016" },
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const P0A_DYNAMIC_STICKERS: readonly DynamicStickerDefinition[] = P0A_DYNAMIC_STICKER_IDS.map((templateId) => {
|
export const P0A_DYNAMIC_STICKERS: readonly DynamicStickerDefinition[] = P0A_DYNAMIC_STICKER_IDS.map((templateId) => {
|
||||||
const definition = dynamicDefinitions.find((item) => item.templateId === templateId);
|
const item = dynamicCatalogById.get(templateId);
|
||||||
if (!definition) throw new Error(`missing dynamic sticker definition ${templateId}`);
|
if (!item) throw new Error(`missing dynamic sticker definition ${templateId}`);
|
||||||
return definition;
|
return {
|
||||||
|
category: item.category as DynamicCategory,
|
||||||
|
displayName: item.display_name,
|
||||||
|
requiresLocationConsent: item.requires_location_consent,
|
||||||
|
templateId,
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
function twoDigits(value: number) {
|
function twoDigits(value: number) {
|
||||||
@@ -96,7 +91,29 @@ function snapshotFor(templateId: DynamicTemplateId, context: DynamicProviderCont
|
|||||||
if (templateId === "DYN011") return { fields: { day, month, year }, value: `${year}.${month}.${day}` };
|
if (templateId === "DYN011") return { fields: { day, month, year }, value: `${year}.${month}.${day}` };
|
||||||
if (templateId === "DYN012") return { fields: { font_substitution: "FONT081", hour, minute }, value: `${hour}:${minute}` };
|
if (templateId === "DYN012") return { fields: { font_substitution: "FONT081", hour, minute }, value: `${hour}:${minute}` };
|
||||||
if (templateId === "DYN015") return { fields: { nickname: context.profile.creatorName }, value: context.profile.creatorName };
|
if (templateId === "DYN015") return { fields: { nickname: context.profile.creatorName }, value: context.profile.creatorName };
|
||||||
return { fields: { nickname: normalizeSocialId(context.profile.socialId) }, value: normalizeSocialId(context.profile.socialId) };
|
if (templateId === "DYN016") return { fields: { nickname: normalizeSocialId(context.profile.socialId) }, value: normalizeSocialId(context.profile.socialId) };
|
||||||
|
|
||||||
|
const definition = dynamicCatalogById.get(templateId);
|
||||||
|
if (!definition) throw new Error("dynamic_template_unavailable");
|
||||||
|
const location = context.location?.formattedValue ?? "输入地点";
|
||||||
|
const values: Record<string, string | number> = {
|
||||||
|
city: location,
|
||||||
|
city_en: location.toUpperCase(),
|
||||||
|
day,
|
||||||
|
hour,
|
||||||
|
latitude: context.location?.latitude ?? 0,
|
||||||
|
longitude: context.location?.longitude ?? 0,
|
||||||
|
minute,
|
||||||
|
month,
|
||||||
|
nickname: normalizeSocialId(context.profile.socialId),
|
||||||
|
title: location,
|
||||||
|
year,
|
||||||
|
};
|
||||||
|
const fields = Object.fromEntries(definition.required_fields.map((field) => [field, values[field] ?? ""]));
|
||||||
|
if (definition.category === "identity") return { fields, value: normalizeSocialId(context.profile.socialId) };
|
||||||
|
if (definition.category === "location") return { fields, value: location };
|
||||||
|
if (definition.category === "time") return { fields, value: `${year}.${month}.${day} ${hour}:${minute}` };
|
||||||
|
return { fields, value: context.profile.creatorName };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createDynamicStickerElement(
|
export function createDynamicStickerElement(
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
import type { CanvasState } from "@dada/shared-contracts";
|
import type { CanvasState } from "@dada/shared-contracts";
|
||||||
|
import { P0A_COMPLEX_RELEASE_VERSION, P0A_DYNAMIC_STICKER_IDS } from "@dada/template-registry";
|
||||||
|
|
||||||
import { fontOption, type FontOption } from "./text-assets.js";
|
import { fontOption, type FontOption } from "./text-assets.js";
|
||||||
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
||||||
|
import complexAssetCatalog from "./generated/complex-assets.json";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
@@ -46,7 +48,7 @@ export interface DynamicRenderModel {
|
|||||||
textLayers: readonly DynamicTextLayer[];
|
textLayers: readonly DynamicTextLayer[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DYNAMIC_RESOURCE_VERSION = "wp4-dynamic-source-v1";
|
export const DYNAMIC_RESOURCE_VERSION = P0A_COMPLEX_RELEASE_VERSION;
|
||||||
|
|
||||||
const dynamicFont = (fontId: string): FontOption => ({
|
const dynamicFont = (fontId: string): FontOption => ({
|
||||||
displayName: fontId,
|
displayName: fontId,
|
||||||
@@ -54,17 +56,13 @@ const dynamicFont = (fontId: string): FontOption => ({
|
|||||||
url: `/api/v1/assets/public/${DYNAMIC_RESOURCE_VERSION}/${fontId}`,
|
url: `/api/v1/assets/public/${DYNAMIC_RESOURCE_VERSION}/${fontId}`,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const DYNAMIC_FONT_OPTIONS: readonly FontOption[] = [
|
const dynamicFontIds = [...new Set(complexAssetCatalog.dynamic_stickers.flatMap((item) => item.font_ids))]
|
||||||
dynamicFont("15974853bc3294ef68e7e6d58fe74fd7"),
|
.filter((fontId) => fontId !== "FONT081")
|
||||||
dynamicFont("46f8336813e4c48d06a1aef294fdccf6"),
|
.toSorted();
|
||||||
dynamicFont("53ca6b704728520da50c145eabb2e635"),
|
|
||||||
dynamicFont("cca5efc0e02fb1bf62349bd68ef30fc1"),
|
|
||||||
dynamicFont("dd25b35dcb7ba4476cbaa9a9592e39e2"),
|
|
||||||
dynamicFont("e4210c9872f0c279b35273f230809821"),
|
|
||||||
dynamicFont("f4bfd4132df2d6be97ceabadf3853505"),
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export const DYNAMIC_RENDER_MODELS: Readonly<Record<DynamicTemplateId, DynamicRenderModel>> = {
|
export const DYNAMIC_FONT_OPTIONS: readonly FontOption[] = dynamicFontIds.map(dynamicFont);
|
||||||
|
|
||||||
|
const EXACT_DYNAMIC_RENDER_MODELS: Readonly<Record<string, DynamicRenderModel>> = {
|
||||||
DYN001: {
|
DYN001: {
|
||||||
halfSize: { height: 42, width: 130 },
|
halfSize: { height: 42, width: 130 },
|
||||||
imageLayers: [{ assetId: "DYN001-image28", height: 67, width: 219, x: -17.562, y: 2.203 }],
|
imageLayers: [{ assetId: "DYN001-image28", height: 67, width: 219, x: -17.562, y: 2.203 }],
|
||||||
@@ -144,6 +142,38 @@ export const DYNAMIC_RENDER_MODELS: Readonly<Record<DynamicTemplateId, DynamicRe
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const dynamicCatalogById = new Map(complexAssetCatalog.dynamic_stickers.map((item) => [item.template_id, item]));
|
||||||
|
|
||||||
|
function genericTextValue(item: (typeof complexAssetCatalog.dynamic_stickers)[number]): DynamicTextValue {
|
||||||
|
if (item.category === "identity") return "nickname";
|
||||||
|
if (item.category === "location") return item.required_fields.includes("title") ? "title" : "city";
|
||||||
|
if (item.category === "time") return item.required_fields.includes("hour") && item.required_fields.includes("minute") ? "time" : "day";
|
||||||
|
return "nickname";
|
||||||
|
}
|
||||||
|
|
||||||
|
function genericDynamicModel(templateId: string): DynamicRenderModel {
|
||||||
|
const item = dynamicCatalogById.get(templateId);
|
||||||
|
if (!item) throw new Error(`missing dynamic render model ${templateId}`);
|
||||||
|
return {
|
||||||
|
halfSize: { height: 42, width: 170 },
|
||||||
|
imageLayers: [],
|
||||||
|
sourceCandidateId: item.source_candidate_id,
|
||||||
|
textLayers: [{
|
||||||
|
align: "center",
|
||||||
|
color: "#FFFFFF",
|
||||||
|
fontId: item.font_ids[0] ?? "FONT081",
|
||||||
|
fontSize: 34,
|
||||||
|
value: genericTextValue(item),
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
}],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DYNAMIC_RENDER_MODELS: Readonly<Record<DynamicTemplateId, DynamicRenderModel>> = Object.fromEntries(
|
||||||
|
P0A_DYNAMIC_STICKER_IDS.map((templateId) => [templateId, EXACT_DYNAMIC_RENDER_MODELS[templateId] ?? genericDynamicModel(templateId)]),
|
||||||
|
);
|
||||||
|
|
||||||
export function dynamicFontOptionsFor(templateId: string) {
|
export function dynamicFontOptionsFor(templateId: string) {
|
||||||
if (templateId === "DYN012") {
|
if (templateId === "DYN012") {
|
||||||
const replacement = fontOption("FONT081");
|
const replacement = fontOption("FONT081");
|
||||||
@@ -152,7 +182,8 @@ export function dynamicFontOptionsFor(templateId: string) {
|
|||||||
const model = DYNAMIC_RENDER_MODELS[templateId as DynamicTemplateId];
|
const model = DYNAMIC_RENDER_MODELS[templateId as DynamicTemplateId];
|
||||||
if (!model) return [];
|
if (!model) return [];
|
||||||
const ids = new Set(model.textLayers.map((layer) => layer.fontId));
|
const ids = new Set(model.textLayers.map((layer) => layer.fontId));
|
||||||
return DYNAMIC_FONT_OPTIONS.filter((option) => ids.has(option.fontId));
|
return [...ids].map((fontId) => fontOption(fontId) ?? DYNAMIC_FONT_OPTIONS.find((option) => option.fontId === fontId))
|
||||||
|
.filter((option): option is FontOption => option !== undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function dynamicImageUrl(resourceVersion: string, assetId: string) {
|
export function dynamicImageUrl(resourceVersion: string, assetId: string) {
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ function DynamicPreview(props: { fontStatuses: Readonly<Record<string, ArchivedF
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
const model = DYNAMIC_RENDER_MODELS[props.templateId];
|
const model = DYNAMIC_RENDER_MODELS[props.templateId];
|
||||||
|
if (!model) return () => { active = false; };
|
||||||
const element = createDynamicStickerElement(props.templateId, {
|
const element = createDynamicStickerElement(props.templateId, {
|
||||||
location: { formattedValue: "温州", latitude: 27.9943, longitude: 120.6994 },
|
location: { formattedValue: "温州", latitude: 27.9943, longitude: 120.6994 },
|
||||||
now: new Date("2026-08-03T09:07:00+08:00"), profile: { creatorName: "Dada Creator", socialId: "@dada" },
|
now: new Date("2026-08-03T09:07:00+08:00"), profile: { creatorName: "Dada Creator", socialId: "@dada" },
|
||||||
|
|||||||
@@ -2,6 +2,27 @@ import { isCanvasState, type CanvasState } from "@dada/shared-contracts";
|
|||||||
|
|
||||||
export type BackgroundAdjustments = CanvasState["background"]["adjustments"];
|
export type BackgroundAdjustments = CanvasState["background"]["adjustments"];
|
||||||
|
|
||||||
|
interface CanvasSize {
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CanvasRect {
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BackgroundDrawPlan {
|
||||||
|
destination: CanvasRect;
|
||||||
|
source: CanvasRect;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clamp(value: number, minimum: number, maximum: number) {
|
||||||
|
return Math.min(maximum, Math.max(minimum, value));
|
||||||
|
}
|
||||||
|
|
||||||
const elementKeys = new Set([
|
const elementKeys = new Set([
|
||||||
"colors", "content", "coordinates", "created_at", "dynamic_fields", "element_id", "font_override", "font_size",
|
"colors", "content", "coordinates", "created_at", "dynamic_fields", "element_id", "font_override", "font_size",
|
||||||
"formatted_value", "opacity", "position", "resource_version", "rotation", "scale", "style_id", "style_parameters",
|
"formatted_value", "opacity", "position", "resource_version", "rotation", "scale", "style_id", "style_parameters",
|
||||||
@@ -106,7 +127,99 @@ export function deserializeFabricCanvas(input: unknown): CanvasState | undefined
|
|||||||
return isCanvasState(candidate) ? structuredClone(candidate) : undefined;
|
return isCanvasState(candidate) ? structuredClone(candidate) : undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function backgroundDrawPlan(
|
||||||
|
image: CanvasSize,
|
||||||
|
canvas: CanvasSize,
|
||||||
|
adjustments: BackgroundAdjustments,
|
||||||
|
): BackgroundDrawPlan {
|
||||||
|
if (image.width <= 0 || image.height <= 0 || canvas.width <= 0 || canvas.height <= 0) {
|
||||||
|
throw new Error("background_dimensions_invalid");
|
||||||
|
}
|
||||||
|
const crop = adjustments.crop;
|
||||||
|
const normalizedX = crop ? clamp(crop.x, 0, 1) : 0;
|
||||||
|
const normalizedY = crop ? clamp(crop.y, 0, 1) : 0;
|
||||||
|
const normalizedWidth = crop ? Math.min(crop.width, 1 - normalizedX) : 1;
|
||||||
|
const normalizedHeight = crop ? Math.min(crop.height, 1 - normalizedY) : 1;
|
||||||
|
const source = normalizedWidth > 0 && normalizedHeight > 0
|
||||||
|
? {
|
||||||
|
height: image.height * normalizedHeight,
|
||||||
|
width: image.width * normalizedWidth,
|
||||||
|
x: image.width * normalizedX,
|
||||||
|
y: image.height * normalizedY,
|
||||||
|
}
|
||||||
|
: { height: image.height, width: image.width, x: 0, y: 0 };
|
||||||
|
|
||||||
|
if (adjustments.fit === "fill") {
|
||||||
|
return { destination: { height: canvas.height, width: canvas.width, x: 0, y: 0 }, source };
|
||||||
|
}
|
||||||
|
if (adjustments.fit === "fit") {
|
||||||
|
const scale = Math.min(canvas.width / source.width, canvas.height / source.height);
|
||||||
|
const width = source.width * scale;
|
||||||
|
const height = source.height * scale;
|
||||||
|
return {
|
||||||
|
destination: { height, width, x: (canvas.width - width) / 2, y: (canvas.height - height) / 2 },
|
||||||
|
source,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const sourceAspect = source.width / source.height;
|
||||||
|
const canvasAspect = canvas.width / canvas.height;
|
||||||
|
if (sourceAspect > canvasAspect) {
|
||||||
|
const width = source.height * canvasAspect;
|
||||||
|
source.x += (source.width - width) / 2;
|
||||||
|
source.width = width;
|
||||||
|
} else if (sourceAspect < canvasAspect) {
|
||||||
|
const height = source.width / canvasAspect;
|
||||||
|
source.y += (source.height - height) / 2;
|
||||||
|
source.height = height;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
destination: { height: canvas.height, width: canvas.width, x: 0, y: 0 },
|
||||||
|
source,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function adjustBackgroundPixels(
|
||||||
|
pixels: Uint8ClampedArray,
|
||||||
|
width: number,
|
||||||
|
height: number,
|
||||||
|
adjustments: Pick<BackgroundAdjustments, "sharpness" | "temperature">,
|
||||||
|
) {
|
||||||
|
if (!Number.isInteger(width) || !Number.isInteger(height) || width <= 0 || height <= 0 || pixels.length !== width * height * 4) {
|
||||||
|
throw new Error("background_pixel_buffer_invalid");
|
||||||
|
}
|
||||||
|
const source = new Uint8ClampedArray(pixels);
|
||||||
|
const output = new Uint8ClampedArray(source);
|
||||||
|
const sharpness = clamp(adjustments.sharpness, 0, 100) / 100;
|
||||||
|
const temperature = clamp(adjustments.temperature, -100, 100) / 100;
|
||||||
|
const channelOffsets = [35 * temperature, 8 * temperature, -35 * temperature];
|
||||||
|
|
||||||
|
for (let y = 0; y < height; y += 1) {
|
||||||
|
for (let x = 0; x < width; x += 1) {
|
||||||
|
const index = (y * width + x) * 4;
|
||||||
|
for (let channel = 0; channel < 3; channel += 1) {
|
||||||
|
let value = source[index + channel]!;
|
||||||
|
if (sharpness > 0 && x > 0 && x < width - 1 && y > 0 && y < height - 1) {
|
||||||
|
const left = source[index + channel - 4]!;
|
||||||
|
const right = source[index + channel + 4]!;
|
||||||
|
const above = source[index + channel - width * 4]!;
|
||||||
|
const below = source[index + channel + width * 4]!;
|
||||||
|
value = value * (1 + 4 * sharpness) - (left + right + above + below) * sharpness;
|
||||||
|
}
|
||||||
|
output[index + channel] = value + channelOffsets[channel]!;
|
||||||
|
}
|
||||||
|
output[index + 3] = source[index + 3]!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
export function cssFilterForBackground(adjustments: BackgroundAdjustments) {
|
export function cssFilterForBackground(adjustments: BackgroundAdjustments) {
|
||||||
const filter = adjustments.filter === "grayscale" ? "grayscale(1)" : adjustments.filter === "sepia" ? "sepia(0.75)" : "none";
|
const filters: string[] = [];
|
||||||
return `${filter} brightness(${100 + adjustments.brightness}%) contrast(${100 + adjustments.contrast}%) saturate(${100 + adjustments.saturation}%)`;
|
if (adjustments.filter === "grayscale") filters.push("grayscale(1)");
|
||||||
|
else if (adjustments.filter === "sepia") filters.push("sepia(0.75)");
|
||||||
|
if (adjustments.brightness !== 0) filters.push(`brightness(${100 + adjustments.brightness}%)`);
|
||||||
|
if (adjustments.contrast !== 0) filters.push(`contrast(${100 + adjustments.contrast}%)`);
|
||||||
|
if (adjustments.saturation !== 0) filters.push(`saturate(${100 + adjustments.saturation}%)`);
|
||||||
|
return filters.length > 0 ? filters.join(" ") : "none";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { isCanvasState, type CanvasState } from "@dada/shared-contracts";
|
|||||||
|
|
||||||
import { DYNAMIC_RENDER_MODELS } from "./dynamic-render-models.js";
|
import { DYNAMIC_RENDER_MODELS } from "./dynamic-render-models.js";
|
||||||
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
||||||
|
import { textTemplateById } from "./text-assets.js";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
@@ -76,9 +77,10 @@ export function elementHalfExtents(state: CanvasState, element: CanvasElement):
|
|||||||
const longestCharacterCount = Math.max(1, ...lines.map((line) => Array.from(line).length));
|
const longestCharacterCount = Math.max(1, ...lines.map((line) => Array.from(line).length));
|
||||||
const widthPixels = longestLine * fontSize + (longestCharacterCount - 1) * letterSpacing + 32 + strokeWidth * 2;
|
const widthPixels = longestLine * fontSize + (longestCharacterCount - 1) * letterSpacing + 32 + strokeWidth * 2;
|
||||||
const heightPixels = Math.max(1, lines.length) * fontSize * lineHeight + 32 + strokeWidth * 2;
|
const heightPixels = Math.max(1, lines.length) * fontSize * lineHeight + 32 + strokeWidth * 2;
|
||||||
|
const template = textTemplateById(element.template_or_asset_id);
|
||||||
return {
|
return {
|
||||||
x: Math.max(hitHalfExtent, widthPixels / state.pixel_width / 2) * element.scale.x,
|
x: Math.max(hitHalfExtent, widthPixels / state.pixel_width / 2, (template?.renderModel.halfSize.width ?? 0) / state.pixel_width) * element.scale.x,
|
||||||
y: Math.max(hitHalfExtent, heightPixels / state.pixel_height / 2) * element.scale.y,
|
y: Math.max(hitHalfExtent, heightPixels / state.pixel_height / 2, (template?.renderModel.halfSize.height ?? 0) / state.pixel_height) * element.scale.y,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,7 +189,7 @@ export class CanvasElementController {
|
|||||||
.map((element) => structuredClone(element));
|
.map((element) => structuredClone(element));
|
||||||
}
|
}
|
||||||
|
|
||||||
selectAt(point: CanvasPoint, options: { append?: boolean } = {}) {
|
selectAt(point: CanvasPoint, options: { append?: boolean; preserveSelection?: boolean } = {}) {
|
||||||
const candidates = this.candidatesAt(point);
|
const candidates = this.candidatesAt(point);
|
||||||
if (candidates.length === 0) {
|
if (candidates.length === 0) {
|
||||||
if (!options.append) this.selection = [];
|
if (!options.append) this.selection = [];
|
||||||
@@ -196,7 +198,9 @@ export class CanvasElementController {
|
|||||||
}
|
}
|
||||||
if (options.append) {
|
if (options.append) {
|
||||||
this.pointerMoved();
|
this.pointerMoved();
|
||||||
return this.selectById(candidates[0]!.element_id, true);
|
const elementId = candidates[0]!.element_id;
|
||||||
|
if (options.preserveSelection && this.selection.includes(elementId)) return this.selectedIds;
|
||||||
|
return this.selectById(elementId, true);
|
||||||
}
|
}
|
||||||
const signature = candidates.map((candidate) => candidate.element_id).join("|");
|
const signature = candidates.map((candidate) => candidate.element_id).join("|");
|
||||||
if (samePoint(this.cyclePoint, point) && signature === this.cycleSignature) this.cycleIndex = (this.cycleIndex + 1) % candidates.length;
|
if (samePoint(this.cyclePoint, point) && signature === this.cycleSignature) this.cycleIndex = (this.cycleIndex + 1) % candidates.length;
|
||||||
@@ -255,7 +259,8 @@ export class CanvasElementController {
|
|||||||
|
|
||||||
moveSelected(delta: CanvasPoint, options: { snap?: boolean } = {}) {
|
moveSelected(delta: CanvasPoint, options: { snap?: boolean } = {}) {
|
||||||
const selected = new Set(this.selection);
|
const selected = new Set(this.selection);
|
||||||
const primary = this.current.elements.find((element) => selected.has(element.element_id));
|
const selectedElements = this.current.elements.filter((element) => selected.has(element.element_id));
|
||||||
|
const primary = selectedElements[0];
|
||||||
if (!primary) return { guides: [] as string[], state: this.value };
|
if (!primary) return { guides: [] as string[], state: this.value };
|
||||||
let nextX = primary.position.x + delta.x;
|
let nextX = primary.position.x + delta.x;
|
||||||
let nextY = primary.position.y + delta.y;
|
let nextY = primary.position.y + delta.y;
|
||||||
@@ -278,10 +283,20 @@ export class CanvasElementController {
|
|||||||
nextX = snapAxis(nextX, "x");
|
nextX = snapAxis(nextX, "x");
|
||||||
nextY = snapAxis(nextY, "y");
|
nextY = snapAxis(nextY, "y");
|
||||||
}
|
}
|
||||||
const adjusted = { x: nextX - primary.position.x, y: nextY - primary.position.y };
|
const minimumX = Math.min(...selectedElements.map((element) => element.position.x));
|
||||||
|
const maximumX = Math.max(...selectedElements.map((element) => element.position.x));
|
||||||
|
const minimumY = Math.min(...selectedElements.map((element) => element.position.y));
|
||||||
|
const maximumY = Math.max(...selectedElements.map((element) => element.position.y));
|
||||||
|
const adjusted = {
|
||||||
|
x: clamp(nextX - primary.position.x, -minimumX, 1 - maximumX),
|
||||||
|
y: clamp(nextY - primary.position.y, -minimumY, 1 - maximumY),
|
||||||
|
};
|
||||||
const state = this.updateSelected((element) => ({
|
const state = this.updateSelected((element) => ({
|
||||||
...element,
|
...element,
|
||||||
position: { x: clamp(element.position.x + adjusted.x, 0, 1), y: clamp(element.position.y + adjusted.y, 0, 1) },
|
position: {
|
||||||
|
x: clamp(Number((element.position.x + adjusted.x).toFixed(12)), 0, 1),
|
||||||
|
y: clamp(Number((element.position.y + adjusted.y).toFixed(12)), 0, 1),
|
||||||
|
},
|
||||||
}));
|
}));
|
||||||
return { guides, state };
|
return { guides, state };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
.editor-page-shell {
|
.editor-page-shell {
|
||||||
min-height: 100vh;
|
height: 100vh;
|
||||||
|
height: 100dvh;
|
||||||
|
min-height: 0;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: 56px minmax(0, 1fr) 32px;
|
grid-template-rows: 56px minmax(0, 1fr) 32px;
|
||||||
background: #e8e8e5;
|
background: #e8e8e5;
|
||||||
color: #111111;
|
color: #111111;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editor-page-shell :focus-visible {
|
.editor-page-shell :focus-visible {
|
||||||
@@ -124,6 +127,7 @@
|
|||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 280px minmax(0, 1fr) 320px;
|
grid-template-columns: 280px minmax(0, 1fr) 320px;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editor-assets-panel,
|
.editor-assets-panel,
|
||||||
@@ -395,6 +399,8 @@
|
|||||||
.editor-template-grid button:disabled { border-style: dashed; background: #e8e8e5; color: #62625d; cursor: not-allowed; }
|
.editor-template-grid button:disabled { border-style: dashed; background: #e8e8e5; color: #62625d; cursor: not-allowed; }
|
||||||
.editor-template-grid strong { overflow: hidden; font-family: Consolas, monospace; font-size: 10px; text-overflow: ellipsis; }
|
.editor-template-grid strong { overflow: hidden; font-family: Consolas, monospace; font-size: 10px; text-overflow: ellipsis; }
|
||||||
.editor-template-grid small { color: #8f1d14; font-size: 9px; }
|
.editor-template-grid small { color: #8f1d14; font-size: 9px; }
|
||||||
|
.editor-template-preview { width: 100%; height: 44px; object-fit: contain; border: 1px solid #111111; background: #30343b; }
|
||||||
|
.editor-template-live-preview { display: grid; width: 100%; height: 44px; place-items: center; overflow: hidden; border: 1px solid #111111; background: #30343b; white-space: nowrap; }
|
||||||
.editor-template-mark { display: grid; width: 100%; height: 44px; place-items: center; border: 1px solid #111111; background: #f2f400; font-size: 18px; font-weight: 800; }
|
.editor-template-mark { display: grid; width: 100%; height: 44px; place-items: center; border: 1px solid #111111; background: #f2f400; font-size: 18px; font-weight: 800; }
|
||||||
.editor-template-mark.title { background: #111111; color: #ffffff; }
|
.editor-template-mark.title { background: #111111; color: #ffffff; }
|
||||||
.editor-template-mark.tag { background: #dbeafe; }
|
.editor-template-mark.tag { background: #dbeafe; }
|
||||||
@@ -542,13 +548,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 760px) {
|
@media (max-width: 760px) {
|
||||||
.editor-page-shell { grid-template-rows: auto minmax(0, 1fr) auto; }
|
.editor-page-shell { height: auto; min-height: 100dvh; grid-template-rows: auto minmax(0, 1fr) auto; overflow: visible; }
|
||||||
.editor-toolbar { display: flex; min-height: 56px; flex-wrap: wrap; gap: 8px; padding: 8px 10px; }
|
.editor-toolbar { display: flex; min-height: 56px; flex-wrap: wrap; gap: 8px; padding: 8px 10px; }
|
||||||
.editor-title { min-width: 0; flex: 1 1 calc(100% - 56px); }
|
.editor-title { min-width: 0; flex: 1 1 calc(100% - 56px); }
|
||||||
.editor-history-actions { order: 3; }
|
.editor-history-actions { order: 3; }
|
||||||
.editor-save-status { order: 4; flex: 1 1 128px; }
|
.editor-save-status { order: 4; flex: 1 1 128px; }
|
||||||
.editor-toolbar-controls > button { display: block; order: 5; }
|
.editor-toolbar-controls > button { display: block; order: 5; }
|
||||||
.editor-layout { grid-template-columns: 1fr; }
|
.editor-layout { grid-template-columns: 1fr; overflow: visible; }
|
||||||
.editor-assets-panel, .editor-inspector { border: 0; }
|
.editor-assets-panel, .editor-inspector { border: 0; }
|
||||||
.editor-assets-panel { order: 2; }
|
.editor-assets-panel { order: 2; }
|
||||||
.editor-inspector { order: 3; }
|
.editor-inspector { order: 3; }
|
||||||
|
|||||||
+186
-60
@@ -32,6 +32,7 @@ import {
|
|||||||
P0A_TEXT_TEMPLATES,
|
P0A_TEXT_TEMPLATES,
|
||||||
TextEditSession,
|
TextEditSession,
|
||||||
createTextTemplateElement,
|
createTextTemplateElement,
|
||||||
|
textTemplateFontOptions,
|
||||||
type TextStylePatch,
|
type TextStylePatch,
|
||||||
type TextTemplateCategory,
|
type TextTemplateCategory,
|
||||||
type TextTemplateDefinition,
|
type TextTemplateDefinition,
|
||||||
@@ -49,7 +50,7 @@ import {
|
|||||||
type DynamicTemplateId,
|
type DynamicTemplateId,
|
||||||
} from "./dynamic-provider.js";
|
} from "./dynamic-provider.js";
|
||||||
import { dynamicFontOptionsFor } from "./dynamic-render-models.js";
|
import { dynamicFontOptionsFor } from "./dynamic-render-models.js";
|
||||||
import { P0A_STATIC_STICKER_CATALOG, P0A_STATIC_STICKER_COUNT, stickerWindow } from "./static-sticker-catalog.js";
|
import { P0A_STATIC_STICKER_CATALOG, stickerWindow, type StaticStickerCatalogItem } from "./static-sticker-catalog.js";
|
||||||
import {
|
import {
|
||||||
createColorCardElement,
|
createColorCardElement,
|
||||||
extractPaletteFromImage,
|
extractPaletteFromImage,
|
||||||
@@ -86,6 +87,14 @@ interface EditorExportResult {
|
|||||||
status: ExportFlowStatus;
|
status: ExportFlowStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function withTextDraft(canvasState: CanvasState, textEdit: TextEditState | undefined) {
|
||||||
|
if (!textEdit) return canvasState;
|
||||||
|
return {
|
||||||
|
...canvasState,
|
||||||
|
elements: canvasState.elements.map((element) => element.element_id === textEdit.elementId ? textEdit.draft : element),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
interface EditorProject {
|
interface EditorProject {
|
||||||
canvas_state?: CanvasState;
|
canvas_state?: CanvasState;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
@@ -136,6 +145,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const [notice, setNotice] = useState("");
|
const [notice, setNotice] = useState("");
|
||||||
const [activePanel, setActivePanel] = useState<EditorAssetPanel>("background");
|
const [activePanel, setActivePanel] = useState<EditorAssetPanel>("background");
|
||||||
const [stickerScrollTop, setStickerScrollTop] = useState(0);
|
const [stickerScrollTop, setStickerScrollTop] = useState(0);
|
||||||
|
const [stickerCatalog, setStickerCatalog] = useState<StaticStickerCatalogItem[]>(P0A_STATIC_STICKER_CATALOG);
|
||||||
const [selectedIds, setSelectedIds] = useState<string[]>([]);
|
const [selectedIds, setSelectedIds] = useState<string[]>([]);
|
||||||
const [guides, setGuides] = useState<string[]>([]);
|
const [guides, setGuides] = useState<string[]>([]);
|
||||||
const [multiMode, setMultiMode] = useState(false);
|
const [multiMode, setMultiMode] = useState(false);
|
||||||
@@ -154,11 +164,26 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const elementControllerRef = useRef<CanvasElementController | undefined>(undefined);
|
const elementControllerRef = useRef<CanvasElementController | undefined>(undefined);
|
||||||
const dragRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
const dragRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
||||||
const opacityGestureRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
const opacityGestureRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
|
||||||
|
const textHistoryRef = useRef<{ base: CanvasState; elementId: string; last: CanvasState } | undefined>(undefined);
|
||||||
const clipboardRef = useRef<CanvasElement[]>([]);
|
const clipboardRef = useRef<CanvasElement[]>([]);
|
||||||
const fontLoaderRef = useRef<ArchivedFontLoader | undefined>(undefined);
|
const fontLoaderRef = useRef<ArchivedFontLoader | undefined>(undefined);
|
||||||
const conflictExportGuardRef = useRef(new ConflictExportGuard());
|
const conflictExportGuardRef = useRef(new ConflictExportGuard());
|
||||||
const candidateMenuRef = useRef<HTMLDivElement | null>(null);
|
const candidateMenuRef = useRef<HTMLDivElement | null>(null);
|
||||||
const candidateTriggerRef = useRef<HTMLButtonElement | null>(null);
|
const candidateTriggerRef = useRef<HTMLButtonElement | null>(null);
|
||||||
|
const noticeTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
|
||||||
|
|
||||||
|
function showNotice(message: string) {
|
||||||
|
if (noticeTimerRef.current) clearTimeout(noticeTimerRef.current);
|
||||||
|
setNotice(message);
|
||||||
|
noticeTimerRef.current = setTimeout(() => {
|
||||||
|
setNotice("");
|
||||||
|
noticeTimerRef.current = undefined;
|
||||||
|
}, 3_000);
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => () => {
|
||||||
|
if (noticeTimerRef.current) clearTimeout(noticeTimerRef.current);
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
@@ -174,7 +199,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
setDraftAdjustments(initial.background.adjustments);
|
setDraftAdjustments(initial.background.adjustments);
|
||||||
historyRef.current = new CanvasEditHistory(initial);
|
historyRef.current = new CanvasEditHistory(initial);
|
||||||
elementControllerRef.current = new CanvasElementController(initial);
|
elementControllerRef.current = new CanvasElementController(initial);
|
||||||
}).catch(() => { if (active) setNotice("编辑器暂时无法读取项目"); });
|
}).catch(() => { if (active) showNotice("编辑器暂时无法读取项目"); });
|
||||||
return () => { active = false; };
|
return () => { active = false; };
|
||||||
}, [projectId]);
|
}, [projectId]);
|
||||||
|
|
||||||
@@ -187,6 +212,18 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
return () => { active = false; };
|
return () => { active = false; };
|
||||||
}, [session?.user.user_id]);
|
}, [session?.user.user_id]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let active = true;
|
||||||
|
readEditorJson<{ items: StaticStickerCatalogItem[] }>("/api/v1/static-stickers/current")
|
||||||
|
.then((response) => {
|
||||||
|
if (!active) return;
|
||||||
|
const uploaded = response.items.filter((item) => item.enabled && item.origin === "admin_uploaded");
|
||||||
|
setStickerCatalog([...P0A_STATIC_STICKER_CATALOG, ...uploaded].sort((left, right) => left.part - right.part || left.order - right.order || left.stable_id.localeCompare(right.stable_id)));
|
||||||
|
})
|
||||||
|
.catch(() => { if (active) setStickerCatalog(P0A_STATIC_STICKER_CATALOG); });
|
||||||
|
return () => { active = false; };
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!project || !session || !canvasState) return undefined;
|
if (!project || !session || !canvasState) return undefined;
|
||||||
const queue = new ProjectAutoSaveQueue({
|
const queue = new ProjectAutoSaveQueue({
|
||||||
@@ -215,12 +252,14 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!canvasState) return;
|
if (!canvasState) return;
|
||||||
for (const element of canvasState.elements) {
|
const options = canvasState.elements.flatMap((element) => element.type === "text_template"
|
||||||
const options = element.type === "text_template"
|
? [...textTemplateFontOptions(element.template_or_asset_id), ...[fontIdForTextElement(element)]
|
||||||
? [fontIdForTextElement(element)].map((fontId) => fontId ? fontOption(fontId) : undefined).filter((option) => option !== undefined)
|
.map((fontId) => fontId ? fontOption(fontId) : undefined).filter((option) => option !== undefined)]
|
||||||
: element.type === "dynamic_sticker" ? dynamicFontOptionsFor(element.template_or_asset_id) : [];
|
: element.type === "dynamic_sticker" ? dynamicFontOptionsFor(element.template_or_asset_id) : []);
|
||||||
for (const option of options) void ensureFont(option.fontId, option.url);
|
const unique = [...new Map(options.map((option) => [option.fontId, option])).values()];
|
||||||
}
|
void (async () => {
|
||||||
|
for (const option of unique) await ensureFont(option.fontId, option.url);
|
||||||
|
})();
|
||||||
}, [canvasState?.elements.map((element) => `${element.element_id}:${element.font_override ?? ""}:${element.template_or_asset_id}`).join("|")]);
|
}, [canvasState?.elements.map((element) => `${element.element_id}:${element.font_override ?? ""}:${element.template_or_asset_id}`).join("|")]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -248,6 +287,10 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
});
|
});
|
||||||
}, [canvasState, selectedIds.join("|")]);
|
}, [canvasState, selectedIds.join("|")]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (textEdit) commitTextDraftAutomatically(textEdit);
|
||||||
|
}, [textEdit?.draft]);
|
||||||
|
|
||||||
async function ensureFont(fontId: string, url: string, retry = false) {
|
async function ensureFont(fontId: string, url: string, retry = false) {
|
||||||
const current = fontStatuses[fontId];
|
const current = fontStatuses[fontId];
|
||||||
if (current === "ready" || (current === "unavailable" && !retry)) return current;
|
if (current === "ready" || (current === "unavailable" && !retry)) return current;
|
||||||
@@ -260,28 +303,51 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function retryTextFonts() {
|
async function retryTextFonts() {
|
||||||
const available = P0A_TEXT_TEMPLATES.filter((template) => template.available && template.fontUrl);
|
const failed = [...new Set(P0A_TEXT_TEMPLATES
|
||||||
await Promise.all(available.map((template) => ensureFont(template.defaultFontId, template.fontUrl!, true)));
|
.filter((template) => fontStatuses[template.defaultFontId] === "unavailable")
|
||||||
|
.map((template) => template.defaultFontId))];
|
||||||
|
for (const fontId of failed) {
|
||||||
|
const option = fontOption(fontId);
|
||||||
|
if (option) await ensureFont(option.fontId, option.url, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function commitCanvas(next: CanvasState) {
|
async function ensureTemplateFonts(template: TextTemplateDefinition) {
|
||||||
|
for (const option of textTemplateFontOptions(template.templateId)) {
|
||||||
|
const status = await ensureFont(option.fontId, option.url, fontStatuses[option.fontId] === "unavailable");
|
||||||
|
if (status !== "ready") return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function finalizeTextHistory() {
|
||||||
|
const pending = textHistoryRef.current;
|
||||||
|
if (!pending) return undefined;
|
||||||
|
textHistoryRef.current = undefined;
|
||||||
|
historyRef.current?.commit(pending.last);
|
||||||
|
return pending.last;
|
||||||
|
}
|
||||||
|
|
||||||
|
function commitCanvas(next: CanvasState, options: { preserveTextEdit?: boolean } = {}) {
|
||||||
if (!project || saveStatus === "conflicted") return;
|
if (!project || saveStatus === "conflicted") return;
|
||||||
historyRef.current?.commit(next);
|
const finalizedText = finalizeTextHistory();
|
||||||
|
if (!finalizedText || JSON.stringify(finalizedText) !== JSON.stringify(next)) historyRef.current?.commit(next);
|
||||||
elementControllerRef.current?.replaceState(next);
|
elementControllerRef.current?.replaceState(next);
|
||||||
setSelectedIds(elementControllerRef.current?.selectedIds ?? []);
|
setSelectedIds(elementControllerRef.current?.selectedIds ?? []);
|
||||||
setCanvasState(next);
|
setCanvasState(next);
|
||||||
setDraftAdjustments(next.background.adjustments);
|
setDraftAdjustments(next.background.adjustments);
|
||||||
queueRef.current?.commit({ canvas_state: next, name: project.name });
|
queueRef.current?.commit({ canvas_state: next, name: project.name });
|
||||||
setTextEdit(undefined);
|
if (!options.preserveTextEdit) setTextEdit(undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
function applyPreview() {
|
function applyPreview() {
|
||||||
if (!canvasState) return;
|
if (!canvasState) return;
|
||||||
commitCanvas(updateBackgroundAdjustments(canvasState, draftAdjustments));
|
commitCanvas(updateBackgroundAdjustments(canvasState, draftAdjustments));
|
||||||
setNotice("底图调整已提交");
|
showNotice("底图调整已提交");
|
||||||
}
|
}
|
||||||
|
|
||||||
function undo() {
|
function undo() {
|
||||||
|
finalizeTextHistory();
|
||||||
const previous = historyRef.current?.undo();
|
const previous = historyRef.current?.undo();
|
||||||
if (previous) {
|
if (previous) {
|
||||||
elementControllerRef.current?.replaceState(previous);
|
elementControllerRef.current?.replaceState(previous);
|
||||||
@@ -294,6 +360,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function redo() {
|
function redo() {
|
||||||
|
finalizeTextHistory();
|
||||||
const next = historyRef.current?.redo();
|
const next = historyRef.current?.redo();
|
||||||
if (next) {
|
if (next) {
|
||||||
elementControllerRef.current?.replaceState(next);
|
elementControllerRef.current?.replaceState(next);
|
||||||
@@ -321,9 +388,9 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const palette = await paletteForAsset(pendingBackground);
|
const palette = await paletteForAsset(pendingBackground);
|
||||||
commitCanvas(switchBackground(canvasState, pendingBackground, palette));
|
commitCanvas(switchBackground(canvasState, pendingBackground, palette));
|
||||||
setPendingBackground(undefined);
|
setPendingBackground(undefined);
|
||||||
setNotice("已更换底图,覆盖元素保留,底图处理已重置");
|
showNotice("已更换底图,覆盖元素保留,底图处理已重置");
|
||||||
} catch {
|
} catch {
|
||||||
setNotice("新底图无法读取,未更换底图或刷新色卡");
|
showNotice("新底图无法读取,未更换底图或刷新色卡");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -340,24 +407,24 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
commitCanvas(next);
|
commitCanvas(next);
|
||||||
setGuides([]);
|
setGuides([]);
|
||||||
setCandidateMenu(undefined);
|
setCandidateMenu(undefined);
|
||||||
setNotice(message);
|
showNotice(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addSticker(assetId: string) {
|
function addSticker(sticker: StaticStickerCatalogItem) {
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller || !canvasState) return;
|
if (!controller || !canvasState) return;
|
||||||
try {
|
try {
|
||||||
controller.add(createStaticStickerElement({
|
controller.add(createStaticStickerElement({
|
||||||
assetId,
|
assetId: sticker.stable_id,
|
||||||
identity: newElementIdentity(),
|
identity: newElementIdentity(),
|
||||||
position: { x: 0.5, y: 0.5 },
|
position: { x: 0.5, y: 0.5 },
|
||||||
resourceVersion: "fixture-v1",
|
resourceVersion: sticker.resource_version,
|
||||||
zIndex: canvasState.elements.length,
|
zIndex: canvasState.elements.length,
|
||||||
}));
|
}));
|
||||||
commitElementOperation(controller, "贴纸已加入画布");
|
commitElementOperation(controller, "贴纸已加入画布");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("贴纸未能加入画布");
|
else showNotice("贴纸未能加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -370,8 +437,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
controller.add(createColorCardElement(definition, palette, newElementIdentity(), canvasState.elements.length));
|
controller.add(createColorCardElement(definition, palette, newElementIdentity(), canvasState.elements.length));
|
||||||
commitElementOperation(controller, "色卡已按原始底图加入画布");
|
commitElementOperation(controller, "色卡已按原始底图加入画布");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("无法从原始底图稳定提取五色,色卡未加入画布");
|
else showNotice("无法从原始底图稳定提取五色,色卡未加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -381,7 +448,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
if (templateId === "DYN012") {
|
if (templateId === "DYN012") {
|
||||||
const font = fontOption("FONT081");
|
const font = fontOption("FONT081");
|
||||||
if (!font || await ensureFont(font.fontId, font.url) !== "ready") {
|
if (!font || await ensureFont(font.fontId, font.url) !== "ready") {
|
||||||
setNotice("DYN012 的 FONT081 替代字体不可用,未使用系统字体替代。");
|
showNotice("DYN012 的 FONT081 替代字体不可用,未使用系统字体替代。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -394,8 +461,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
commitElementOperation(controller, "动态值已确认并加入画布");
|
commitElementOperation(controller, "动态值已确认并加入画布");
|
||||||
setLocationDialog(undefined);
|
setLocationDialog(undefined);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("动态贴纸未能加入画布");
|
else showNotice("动态贴纸未能加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,7 +510,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
controller.replaceElement(overrideDynamicStickerValue(element, value));
|
controller.replaceElement(overrideDynamicStickerValue(element, value));
|
||||||
commitElementOperation(controller, "动态贴纸显示文字已更新");
|
commitElementOperation(controller, "动态贴纸显示文字已更新");
|
||||||
} catch {
|
} catch {
|
||||||
setNotice("动态贴纸显示文字不能为空");
|
showNotice("动态贴纸显示文字不能为空");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -465,9 +532,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
|
|
||||||
async function addTextTemplate(template: TextTemplateDefinition) {
|
async function addTextTemplate(template: TextTemplateDefinition) {
|
||||||
if (!template.fontUrl || !canvasState) return;
|
if (!template.fontUrl || !canvasState) return;
|
||||||
const status = await ensureFont(template.defaultFontId, template.fontUrl);
|
if (!await ensureTemplateFonts(template)) {
|
||||||
if (status !== "ready") {
|
showNotice("素材暂不可用,未使用系统字体替代。");
|
||||||
setNotice("素材暂不可用,未使用系统字体替代。");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
@@ -477,8 +543,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
commitElementOperation(controller, "文字模板已加入画布");
|
commitElementOperation(controller, "文字模板已加入画布");
|
||||||
void recordRecentTextTemplate(template.templateId, template.resourceVersion);
|
void recordRecentTextTemplate(template.templateId, template.resourceVersion);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("文字模板未能加入画布");
|
else showNotice("文字模板未能加入画布");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -490,18 +556,48 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
action(edit);
|
action(edit);
|
||||||
return { ...current, draft: edit.value };
|
return { ...current, draft: edit.value };
|
||||||
} catch {
|
} catch {
|
||||||
setNotice("文字参数不在允许范围内");
|
showNotice("文字参数不在允许范围内");
|
||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function commitTextDraftAutomatically(editState: TextEditState) {
|
||||||
|
if (!canvasState || !project || saveStatus === "conflicted") return;
|
||||||
|
const index = canvasState.elements.findIndex((element) => element.element_id === editState.elementId);
|
||||||
|
if (index < 0 || JSON.stringify(canvasState.elements[index]) === JSON.stringify(editState.draft)) return;
|
||||||
|
try {
|
||||||
|
const complete = new TextEditSession(editState.draft, P0A_TEXT_TEMPLATES).complete();
|
||||||
|
const next = structuredClone(canvasState);
|
||||||
|
next.elements[index] = complete;
|
||||||
|
const history = textHistoryRef.current;
|
||||||
|
if (!history || history.elementId !== editState.elementId) {
|
||||||
|
if (history) finalizeTextHistory();
|
||||||
|
textHistoryRef.current = { base: canvasState, elementId: editState.elementId, last: next };
|
||||||
|
} else {
|
||||||
|
history.last = next;
|
||||||
|
}
|
||||||
|
elementControllerRef.current?.replaceState(next);
|
||||||
|
setCanvasState(next);
|
||||||
|
queueRef.current?.commit({ canvas_state: next, name: project.name });
|
||||||
|
if (complete.template_or_asset_id !== editState.originalTemplateId) {
|
||||||
|
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
|
||||||
|
}
|
||||||
|
setTextEdit((current) => current?.elementId === editState.elementId ? {
|
||||||
|
...current,
|
||||||
|
draft: complete,
|
||||||
|
originalTemplateId: complete.template_or_asset_id,
|
||||||
|
} : current);
|
||||||
|
} catch (error) {
|
||||||
|
if (!(error instanceof Error && error.message === "text_content_required")) showNotice("文字编辑未能自动保存");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function changeTextTemplate(templateId: string) {
|
async function changeTextTemplate(templateId: string) {
|
||||||
const template = P0A_TEXT_TEMPLATES.find((candidate) => candidate.templateId === templateId);
|
const template = P0A_TEXT_TEMPLATES.find((candidate) => candidate.templateId === templateId);
|
||||||
if (!template?.fontUrl) return;
|
if (!template?.fontUrl) return;
|
||||||
const status = await ensureFont(template.defaultFontId, template.fontUrl);
|
if (!await ensureTemplateFonts(template)) {
|
||||||
if (status !== "ready") {
|
showNotice("素材暂不可用,未使用系统字体替代。");
|
||||||
setNotice("素材暂不可用,未使用系统字体替代。");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
updateTextDraft((edit) => edit.switchTemplate(templateId));
|
updateTextDraft((edit) => edit.switchTemplate(templateId));
|
||||||
@@ -514,7 +610,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
const option = fontOption(fontId);
|
const option = fontOption(fontId);
|
||||||
if (!option || await ensureFont(option.fontId, option.url) !== "ready") {
|
if (!option || await ensureFont(option.fontId, option.url) !== "ready") {
|
||||||
setNotice("字体素材暂不可用,未使用系统字体替代。");
|
showNotice("字体素材暂不可用,未使用系统字体替代。");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
updateTextDraft((edit) => edit.setStyle({ fontOverride: fontId }));
|
updateTextDraft((edit) => edit.setStyle({ fontOverride: fontId }));
|
||||||
@@ -522,6 +618,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
|
|
||||||
function completeTextEdit() {
|
function completeTextEdit() {
|
||||||
if (!textEdit) return;
|
if (!textEdit) return;
|
||||||
|
if (!pendingTextDraft()) {
|
||||||
|
finalizeTextHistory();
|
||||||
|
showNotice("文字修改已进入自动保存");
|
||||||
|
return;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const edit = new TextEditSession(textEdit.draft, P0A_TEXT_TEMPLATES);
|
const edit = new TextEditSession(textEdit.draft, P0A_TEXT_TEMPLATES);
|
||||||
const complete = edit.complete();
|
const complete = edit.complete();
|
||||||
@@ -533,17 +634,25 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
|
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "text_content_required") setNotice("请输入文字内容或删除该元素。");
|
if (error instanceof Error && error.message === "text_content_required") showNotice("请输入文字内容或删除该元素。");
|
||||||
else setNotice("文字编辑未能完成");
|
else showNotice("文字编辑未能完成");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function cancelTextEdit() {
|
function cancelTextEdit() {
|
||||||
|
const pendingHistory = textHistoryRef.current;
|
||||||
|
if (pendingHistory && project) {
|
||||||
|
textHistoryRef.current = undefined;
|
||||||
|
elementControllerRef.current?.replaceState(pendingHistory.base);
|
||||||
|
setCanvasState(pendingHistory.base);
|
||||||
|
queueRef.current?.commit({ canvas_state: pendingHistory.base, name: project.name });
|
||||||
|
}
|
||||||
if (canvasState && textEdit) {
|
if (canvasState && textEdit) {
|
||||||
const current = canvasState.elements.find((element) => element.element_id === textEdit.elementId);
|
const source = pendingHistory?.base ?? canvasState;
|
||||||
|
const current = source.elements.find((element) => element.element_id === textEdit.elementId);
|
||||||
if (current) setTextEdit({ draft: structuredClone(current), elementId: current.element_id, originalTemplateId: current.template_or_asset_id });
|
if (current) setTextEdit({ draft: structuredClone(current), elementId: current.element_id, originalTemplateId: current.template_or_asset_id });
|
||||||
}
|
}
|
||||||
setNotice("已取消未提交的文字修改");
|
showNotice("已取消未提交的文字修改");
|
||||||
}
|
}
|
||||||
|
|
||||||
function pendingTextDraft() {
|
function pendingTextDraft() {
|
||||||
@@ -611,7 +720,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const ran = await conflictExportGuardRef.current.run(() => executeExport(options));
|
const ran = await conflictExportGuardRef.current.run(() => executeExport(options));
|
||||||
if (!ran) setNotice("版本冲突时仅允许导出本页版本一次");
|
if (!ran) showNotice("版本冲突时仅允许导出本页版本一次");
|
||||||
}
|
}
|
||||||
|
|
||||||
async function retryExportDownload() {
|
async function retryExportDownload() {
|
||||||
@@ -626,8 +735,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
action(controller);
|
action(controller);
|
||||||
commitElementOperation(controller, message);
|
commitElementOperation(controller, message);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
else setNotice("对象操作未完成");
|
else showNotice("对象操作未完成");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -655,7 +764,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
opacityGestureRef.current = undefined;
|
opacityGestureRef.current = undefined;
|
||||||
if (gesture.last === gesture.base) return;
|
if (gesture.last === gesture.base) return;
|
||||||
commitCanvas(gesture.last);
|
commitCanvas(gesture.last);
|
||||||
setNotice("贴纸透明度已提交");
|
showNotice("贴纸透明度已提交");
|
||||||
}
|
}
|
||||||
|
|
||||||
function duplicateSelection() {
|
function duplicateSelection() {
|
||||||
@@ -675,7 +784,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller || selectedIds.length === 0) return;
|
if (!controller || selectedIds.length === 0) return;
|
||||||
clipboardRef.current = controller.copySelected();
|
clipboardRef.current = controller.copySelected();
|
||||||
setNotice("已复制到画布剪贴板");
|
showNotice("已复制到画布剪贴板");
|
||||||
}
|
}
|
||||||
|
|
||||||
function pasteSelection() {
|
function pasteSelection() {
|
||||||
@@ -685,18 +794,23 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
controller.pasteElements(clipboardRef.current, () => newElementIdentity());
|
controller.pasteElements(clipboardRef.current, () => newElementIdentity());
|
||||||
commitElementOperation(controller, "已粘贴画布对象");
|
commitElementOperation(controller, "已粘贴画布对象");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。");
|
if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectAt(point: CanvasPoint, append: boolean) {
|
function selectAt(point: CanvasPoint, append: boolean) {
|
||||||
|
finalizeTextHistory();
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller || !canvasState) return false;
|
if (!controller || !canvasState) return false;
|
||||||
const candidates = controller.candidatesAt(point);
|
const candidates = controller.candidatesAt(point);
|
||||||
const selection = controller.selectAt(point, { append: append || multiMode });
|
const selection = controller.selectAt(point, {
|
||||||
|
append: append || multiMode,
|
||||||
|
preserveSelection: multiMode && !append,
|
||||||
|
});
|
||||||
setSelectedIds(selection);
|
setSelectedIds(selection);
|
||||||
setCandidateMenu(undefined);
|
setCandidateMenu(undefined);
|
||||||
dragRef.current = { base: canvasState, last: canvasState, selectedIds: selection };
|
const dragBase = withTextDraft(canvasState, textEdit);
|
||||||
|
dragRef.current = { base: dragBase, last: dragBase, selectedIds: selection };
|
||||||
return candidates.length > 0;
|
return candidates.length > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -708,19 +822,25 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
const preview = previewController.moveSelected(delta);
|
const preview = previewController.moveSelected(delta);
|
||||||
drag.last = preview.state;
|
drag.last = preview.state;
|
||||||
setCanvasState(preview.state);
|
setCanvasState(preview.state);
|
||||||
|
setTextEdit((current) => {
|
||||||
|
if (!current || !drag.selectedIds.includes(current.elementId)) return current;
|
||||||
|
const movedDraft = preview.state.elements.find((element) => element.element_id === current.elementId);
|
||||||
|
return movedDraft ? { ...current, draft: movedDraft } : current;
|
||||||
|
});
|
||||||
setGuides(preview.guides);
|
setGuides(preview.guides);
|
||||||
}
|
}
|
||||||
|
|
||||||
function commitMove() {
|
function commitMove() {
|
||||||
const drag = dragRef.current;
|
const drag = dragRef.current;
|
||||||
if (!drag) return;
|
if (!drag) return;
|
||||||
commitCanvas(drag.last);
|
commitCanvas(drag.last, { preserveTextEdit: true });
|
||||||
setNotice("对象位置已提交");
|
showNotice("对象位置已提交");
|
||||||
setGuides([]);
|
setGuides([]);
|
||||||
dragRef.current = undefined;
|
dragRef.current = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
function marqueeSelect(rectangle: CanvasRect, append: boolean) {
|
function marqueeSelect(rectangle: CanvasRect, append: boolean) {
|
||||||
|
finalizeTextHistory();
|
||||||
const controller = controllerForCurrent();
|
const controller = controllerForCurrent();
|
||||||
if (!controller) return;
|
if (!controller) return;
|
||||||
setSelectedIds(controller.marqueeSelect(rectangle, append || multiMode));
|
setSelectedIds(controller.marqueeSelect(rectangle, append || multiMode));
|
||||||
@@ -769,6 +889,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearSelection() {
|
function clearSelection() {
|
||||||
|
finalizeTextHistory();
|
||||||
elementControllerRef.current?.clearSelection();
|
elementControllerRef.current?.clearSelection();
|
||||||
setSelectedIds([]);
|
setSelectedIds([]);
|
||||||
setCandidateMenu(undefined);
|
setCandidateMenu(undefined);
|
||||||
@@ -776,10 +897,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!project || !canvasState) return <main className="editor-loading" aria-live="polite">正在加载编辑器</main>;
|
if (!project || !canvasState) return <main className="editor-loading" aria-live="polite">正在加载编辑器</main>;
|
||||||
const renderedCanvasState = textEdit ? {
|
const backgroundPreviewState: CanvasState = {
|
||||||
...canvasState,
|
...canvasState,
|
||||||
elements: canvasState.elements.map((element) => element.element_id === textEdit.elementId ? textEdit.draft : element),
|
background: { ...canvasState.background, adjustments: draftAdjustments },
|
||||||
} : canvasState;
|
};
|
||||||
|
const renderedCanvasState = withTextDraft(backgroundPreviewState, textEdit);
|
||||||
const imageUrl = `/api/v1/private-assets/projects/${projectId}/images/${canvasState.background.asset_id ?? project.current_image_id ?? ""}`;
|
const imageUrl = `/api/v1/private-assets/projects/${projectId}/images/${canvasState.background.asset_id ?? project.current_image_id ?? ""}`;
|
||||||
const canEdit = saveStatus !== "conflicted";
|
const canEdit = saveStatus !== "conflicted";
|
||||||
const selectedElements = renderedCanvasState.elements.filter((element) => selectedIds.includes(element.element_id));
|
const selectedElements = renderedCanvasState.elements.filter((element) => selectedIds.includes(element.element_id));
|
||||||
@@ -824,6 +946,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
fontStatuses={fontStatuses}
|
fontStatuses={fontStatuses}
|
||||||
onAdd={(template) => { void addTextTemplate(template); }}
|
onAdd={(template) => { void addTextTemplate(template); }}
|
||||||
onCategory={setTemplateCategory}
|
onCategory={setTemplateCategory}
|
||||||
|
onEnsure={(template) => { void ensureTemplateFonts(template); }}
|
||||||
onQuery={setTemplateQuery}
|
onQuery={setTemplateQuery}
|
||||||
onRetry={() => { void retryTextFonts(); }}
|
onRetry={() => { void retryTextFonts(); }}
|
||||||
query={templateQuery}
|
query={templateQuery}
|
||||||
@@ -832,11 +955,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
{...(templateCategory ? { category: templateCategory } : {})}
|
{...(templateCategory ? { category: templateCategory } : {})}
|
||||||
/> : null}
|
/> : null}
|
||||||
{activePanel === "stickers" ? (() => {
|
{activePanel === "stickers" ? (() => {
|
||||||
const visibleStickers = stickerWindow(P0A_STATIC_STICKER_CATALOG, stickerScrollTop, 280);
|
const visibleStickers = stickerWindow(stickerCatalog, stickerScrollTop, 280);
|
||||||
return <section><h2>普通贴纸</h2><p aria-live="polite" className="editor-sticker-count">共 {P0A_STATIC_STICKER_COUNT.toLocaleString("zh-CN")} 张</p><div className="editor-sticker-virtual-list" data-testid="static-sticker-list" onScroll={(event) => setStickerScrollTop(event.currentTarget.scrollTop)} role="list">
|
return <section><h2>普通贴纸</h2><p aria-live="polite" className="editor-sticker-count">共 {stickerCatalog.length.toLocaleString("zh-CN")} 张</p><div className="editor-sticker-virtual-list" data-testid="static-sticker-list" onScroll={(event) => setStickerScrollTop(event.currentTarget.scrollTop)} role="list">
|
||||||
<div style={{ paddingTop: visibleStickers.top_spacer_px, paddingBottom: visibleStickers.bottom_spacer_px }}>
|
<div style={{ paddingTop: visibleStickers.top_spacer_px, paddingBottom: visibleStickers.bottom_spacer_px }}>
|
||||||
<div className="editor-sticker-grid">
|
<div className="editor-sticker-grid">
|
||||||
{visibleStickers.items.map((sticker) => <button aria-label={`添加贴纸 ${sticker.stable_id}`} data-sticker-id={sticker.stable_id} disabled={!canEdit || canvasState.elements.length >= 50} key={sticker.stable_id} onClick={() => addSticker(sticker.stable_id)} type="button"><img alt="" className="editor-sticker-preview" decoding="async" loading="lazy" src={sticker.thumbnail_reference.url} /><strong>{sticker.stable_id}</strong><span>part{sticker.part} · {sticker.order}</span></button>)}
|
{visibleStickers.items.map((sticker) => <button aria-label={`添加贴纸 ${sticker.stable_id}`} data-sticker-id={sticker.stable_id} disabled={!canEdit || canvasState.elements.length >= 50} key={sticker.stable_id} onClick={() => addSticker(sticker)} type="button"><img alt="" className="editor-sticker-preview" decoding="async" loading="lazy" src={sticker.thumbnail_reference.url} /><strong>{sticker.stable_id}</strong><span>part{sticker.part} · {sticker.order}</span></button>)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>{canvasState.elements.length >= 50 ? <p className="editor-limit" role="status">画布最多 50 个元素,请先删除现有元素。</p> : null}</section>;
|
</div>{canvasState.elements.length >= 50 ? <p className="editor-limit" role="status">画布最多 50 个元素,请先删除现有元素。</p> : null}</section>;
|
||||||
@@ -851,9 +974,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
<button disabled={selectedElements.length === 0 || !canEdit} onClick={copySelection} title="复制" type="button">复制</button>
|
<button disabled={selectedElements.length === 0 || !canEdit} onClick={copySelection} title="复制" type="button">复制</button>
|
||||||
<button disabled={clipboardRef.current.length === 0 || !canEdit} onClick={pasteSelection} title="粘贴" type="button">粘贴</button>
|
<button disabled={clipboardRef.current.length === 0 || !canEdit} onClick={pasteSelection} title="粘贴" type="button">粘贴</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="editor-canvas-frame" style={{ aspectRatio: `${canvasState.pixel_width} / ${canvasState.pixel_height}` }}>
|
<div className="editor-canvas-frame" style={{
|
||||||
|
aspectRatio: `${canvasState.pixel_width} / ${canvasState.pixel_height}`,
|
||||||
|
maxWidth: `min(720px, calc(${(canvasState.pixel_width / canvasState.pixel_height * 100).toFixed(4)}vh - ${(canvasState.pixel_width / canvasState.pixel_height * 168).toFixed(4)}px))`,
|
||||||
|
}}>
|
||||||
<EditorStage
|
<EditorStage
|
||||||
assetId={canvasState.background.asset_id}
|
|
||||||
canvasState={renderedCanvasState}
|
canvasState={renderedCanvasState}
|
||||||
fontStatuses={fontStatuses}
|
fontStatuses={fontStatuses}
|
||||||
guides={guides}
|
guides={guides}
|
||||||
@@ -861,6 +986,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
|||||||
onClearSelection={clearSelection}
|
onClearSelection={clearSelection}
|
||||||
onCopy={copySelection}
|
onCopy={copySelection}
|
||||||
onDelete={deleteSelection}
|
onDelete={deleteSelection}
|
||||||
|
onDragStart={() => setCandidateMenu(undefined)}
|
||||||
onMarquee={marqueeSelect}
|
onMarquee={marqueeSelect}
|
||||||
onMoveCommit={commitMove}
|
onMoveCommit={commitMove}
|
||||||
onMovePreview={previewMove}
|
onMovePreview={previewMove}
|
||||||
|
|||||||
+627
-74
@@ -1,25 +1,41 @@
|
|||||||
import { useEffect, useRef, useState, type KeyboardEvent, type PointerEvent } from "react";
|
import { useEffect, useRef, useState, type KeyboardEvent, type PointerEvent } from "react";
|
||||||
import type { CanvasState } from "@dada/shared-contracts";
|
import type { CanvasState } from "@dada/shared-contracts";
|
||||||
|
|
||||||
import { cssFilterForBackground } from "./editor-canvas.js";
|
import { adjustBackgroundPixels, backgroundDrawPlan, cssFilterForBackground } from "./editor-canvas.js";
|
||||||
import { DYN012_RENDER_LAYOUT, dyn012DisplayParts } from "./dynamic-provider.js";
|
import { DYN012_RENDER_LAYOUT, dyn012DisplayParts } from "./dynamic-provider.js";
|
||||||
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
||||||
import { DYNAMIC_RENDER_MODELS, dynamicFontOptionsFor, dynamicImageUrl, dynamicTextValue } from "./dynamic-render-models.js";
|
import { DYNAMIC_RENDER_MODELS, dynamicFontOptionsFor, dynamicImageUrl, dynamicTextValue } from "./dynamic-render-models.js";
|
||||||
import type { CanvasPoint, CanvasRect } from "./editor-elements.js";
|
import type { CanvasPoint, CanvasRect } from "./editor-elements.js";
|
||||||
import { fontFamilyName, type ArchivedFontStatus } from "./text-font-loader.js";
|
import { fontFamilyName, type ArchivedFontStatus } from "./text-font-loader.js";
|
||||||
import { fontIdForTextElement } from "./text-assets.js";
|
import {
|
||||||
import { drawColorCard } from "./palette-provider.js";
|
fontIdForTextElement,
|
||||||
|
textTemplateById,
|
||||||
|
textTemplateFontOptions,
|
||||||
|
textTemplateImageUrls,
|
||||||
|
type TextTemplateImageLayer,
|
||||||
|
type TextTemplateFillTextureLayout,
|
||||||
|
type TextTemplateNinePatch,
|
||||||
|
type TextTemplateParticleLayer,
|
||||||
|
type TextTemplateTextLayer,
|
||||||
|
type TextTemplateTextPath,
|
||||||
|
type TextVerticalAlign,
|
||||||
|
} from "./text-assets.js";
|
||||||
|
import { COLOR_CARD_HALF_SIZES, drawColorCard } from "./palette-provider.js";
|
||||||
|
|
||||||
interface Gesture {
|
interface Gesture {
|
||||||
append: boolean;
|
append: boolean;
|
||||||
|
bounds: DOMRect;
|
||||||
hit: boolean;
|
hit: boolean;
|
||||||
longPressOpened: boolean;
|
longPressOpened: boolean;
|
||||||
|
moved: boolean;
|
||||||
pointerId: number;
|
pointerId: number;
|
||||||
start: CanvasPoint;
|
start: CanvasPoint;
|
||||||
|
startClient: CanvasPoint;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const DRAG_THRESHOLD_PX = 4;
|
||||||
|
|
||||||
interface EditorStageProps {
|
interface EditorStageProps {
|
||||||
assetId: string | null;
|
|
||||||
canvasState: CanvasState;
|
canvasState: CanvasState;
|
||||||
guides: readonly string[];
|
guides: readonly string[];
|
||||||
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>;
|
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>;
|
||||||
@@ -27,6 +43,7 @@ interface EditorStageProps {
|
|||||||
onClearSelection: () => void;
|
onClearSelection: () => void;
|
||||||
onCopy: () => void;
|
onCopy: () => void;
|
||||||
onDelete: () => void;
|
onDelete: () => void;
|
||||||
|
onDragStart: () => void;
|
||||||
onMarquee: (rectangle: CanvasRect, append: boolean) => void;
|
onMarquee: (rectangle: CanvasRect, append: boolean) => void;
|
||||||
onMoveCommit: () => void;
|
onMoveCommit: () => void;
|
||||||
onMovePreview: (delta: CanvasPoint) => void;
|
onMovePreview: (delta: CanvasPoint) => void;
|
||||||
@@ -38,11 +55,10 @@ interface EditorStageProps {
|
|||||||
selectedIds: readonly string[];
|
selectedIds: readonly string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
function pointFromEvent(event: PointerEvent<HTMLCanvasElement>): CanvasPoint {
|
function pointFromClient(clientX: number, clientY: number, bounds: DOMRect): CanvasPoint {
|
||||||
const bounds = event.currentTarget.getBoundingClientRect();
|
|
||||||
return {
|
return {
|
||||||
x: Math.max(0, Math.min(1, (event.clientX - bounds.left) / bounds.width)),
|
x: Math.max(0, Math.min(1, (clientX - bounds.left) / bounds.width)),
|
||||||
y: Math.max(0, Math.min(1, (event.clientY - bounds.top) / bounds.height)),
|
y: Math.max(0, Math.min(1, (clientY - bounds.top) / bounds.height)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,6 +72,47 @@ interface TextPixelGeometry {
|
|||||||
width: number;
|
width: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface NinePatchRectangle { height: number; width: number; x: number; y: number }
|
||||||
|
export interface NinePatchSlice { destination: NinePatchRectangle; source: NinePatchRectangle }
|
||||||
|
|
||||||
|
function destinationEdges(size: number, first: number, last: number) {
|
||||||
|
const fixed = first + last;
|
||||||
|
if (fixed <= size || fixed === 0) return [first, last] as const;
|
||||||
|
const ratio = size / fixed;
|
||||||
|
return [first * ratio, last * ratio] as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ninePatchSlices(
|
||||||
|
width: number,
|
||||||
|
height: number,
|
||||||
|
patch: TextTemplateNinePatch,
|
||||||
|
bitmapSize: { height: number; width: number } = { height: patch.sourceHeight, width: patch.sourceWidth },
|
||||||
|
): NinePatchSlice[] {
|
||||||
|
const [left, right] = destinationEdges(width, patch.left, patch.right);
|
||||||
|
const [top, bottom] = destinationEdges(height, patch.top, patch.bottom);
|
||||||
|
const sourceScaleX = bitmapSize.width / patch.sourceWidth;
|
||||||
|
const sourceScaleY = bitmapSize.height / patch.sourceHeight;
|
||||||
|
const sourceColumns = [0, patch.left * sourceScaleX, bitmapSize.width - patch.right * sourceScaleX, bitmapSize.width];
|
||||||
|
const sourceRows = [0, patch.top * sourceScaleY, bitmapSize.height - patch.bottom * sourceScaleY, bitmapSize.height];
|
||||||
|
const destinationColumns = [0, left, width - right, width];
|
||||||
|
const destinationRows = [0, top, height - bottom, height];
|
||||||
|
const slices: NinePatchSlice[] = [];
|
||||||
|
for (let row = 0; row < 3; row += 1) {
|
||||||
|
for (let column = 0; column < 3; column += 1) {
|
||||||
|
const source = {
|
||||||
|
height: sourceRows[row + 1]! - sourceRows[row]!, width: sourceColumns[column + 1]! - sourceColumns[column]!,
|
||||||
|
x: sourceColumns[column]!, y: sourceRows[row]!,
|
||||||
|
};
|
||||||
|
const destination = {
|
||||||
|
height: destinationRows[row + 1]! - destinationRows[row]!, width: destinationColumns[column + 1]! - destinationColumns[column]!,
|
||||||
|
x: destinationColumns[column]!, y: destinationRows[row]!,
|
||||||
|
};
|
||||||
|
if (source.width > 0 && source.height > 0 && destination.width > 0 && destination.height > 0) slices.push({ destination, source });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return slices;
|
||||||
|
}
|
||||||
|
|
||||||
function prepareTextContext(context: CanvasRenderingContext2D, element: CanvasState["elements"][number], fontId: string) {
|
function prepareTextContext(context: CanvasRenderingContext2D, element: CanvasState["elements"][number], fontId: string) {
|
||||||
const fontSize = element.font_size ?? 48;
|
const fontSize = element.font_size ?? 48;
|
||||||
const letterSpacing = styleValue(element, "letter_spacing", 1);
|
const letterSpacing = styleValue(element, "letter_spacing", 1);
|
||||||
@@ -77,47 +134,447 @@ function measureTextElement(context: CanvasRenderingContext2D, element: CanvasSt
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function drawTextElement(context: CanvasRenderingContext2D, element: CanvasState["elements"][number], fontStatuses: Readonly<Record<string, ArchivedFontStatus>>) {
|
function drawTemplateImageLayer(
|
||||||
const fontId = fontIdForTextElement(element);
|
context: CanvasRenderingContext2D,
|
||||||
if (!fontId || fontStatuses[fontId] !== "ready") {
|
layer: TextTemplateImageLayer,
|
||||||
context.fillStyle = "#e5e7eb";
|
resourceImages: Readonly<Record<string, HTMLImageElement>>,
|
||||||
context.fillRect(-110, -34, 220, 68);
|
) {
|
||||||
context.fillStyle = "#9f1d1d";
|
const image = resourceImages[layer.assetId];
|
||||||
context.font = "600 22px Microsoft YaHei UI, sans-serif";
|
if (!image) return;
|
||||||
context.textAlign = "center";
|
context.save();
|
||||||
context.fillText("字体不可用", 0, 8);
|
context.globalAlpha *= layer.alpha;
|
||||||
return;
|
context.translate(layer.x, layer.y);
|
||||||
|
context.rotate(layer.rotation * Math.PI / 180);
|
||||||
|
context.scale(layer.scaleX, layer.scaleY);
|
||||||
|
const left = -layer.anchorX * layer.width;
|
||||||
|
const top = -layer.anchorY * layer.height;
|
||||||
|
if (layer.ninePatch) {
|
||||||
|
for (const slice of ninePatchSlices(
|
||||||
|
layer.width,
|
||||||
|
layer.height,
|
||||||
|
layer.ninePatch,
|
||||||
|
{ height: image.naturalHeight, width: image.naturalWidth },
|
||||||
|
)) {
|
||||||
|
context.drawImage(
|
||||||
|
image, slice.source.x, slice.source.y, slice.source.width, slice.source.height,
|
||||||
|
left + slice.destination.x, top + slice.destination.y, slice.destination.width, slice.destination.height,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else context.drawImage(image, left, top, layer.width, layer.height);
|
||||||
|
context.restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
function deterministicUnit(index: number, salt: number) {
|
||||||
|
const value = Math.sin(index * 12.9898 + salt * 78.233) * 43_758.5453;
|
||||||
|
return value - Math.floor(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawTemplateParticles(
|
||||||
|
context: CanvasRenderingContext2D,
|
||||||
|
layer: TextTemplateParticleLayer,
|
||||||
|
resourceImages: Readonly<Record<string, HTMLImageElement>>,
|
||||||
|
) {
|
||||||
|
const image = resourceImages[layer.assetId];
|
||||||
|
if (!image) return;
|
||||||
|
const columns = Math.max(1, Math.floor(layer.atlasColumns));
|
||||||
|
const rows = Math.max(1, Math.floor(layer.atlasRows));
|
||||||
|
const sourceWidth = image.naturalWidth / columns;
|
||||||
|
const sourceHeight = image.naturalHeight / rows;
|
||||||
|
const count = Math.max(6, Math.min(80, Math.round((layer.width + layer.height) / 18 * layer.density)));
|
||||||
|
context.save();
|
||||||
|
context.globalAlpha *= layer.alpha;
|
||||||
|
for (let index = 0; index < count; index += 1) {
|
||||||
|
const progress = index / count;
|
||||||
|
const angle = progress * Math.PI * 2;
|
||||||
|
const jitter = (deterministicUnit(index, 1) - 0.5) * layer.randomizePosition * 18;
|
||||||
|
const x = layer.x + Math.cos(angle) * (layer.width / 2 + jitter);
|
||||||
|
const y = layer.y + Math.sin(angle) * (layer.height / 2 + jitter);
|
||||||
|
const cell = index % (columns * rows);
|
||||||
|
const sourceX = (cell % columns) * sourceWidth;
|
||||||
|
const sourceY = Math.floor(cell / columns) * sourceHeight;
|
||||||
|
context.save();
|
||||||
|
context.translate(x, y);
|
||||||
|
context.rotate((layer.rotation + (deterministicUnit(index, 2) - 0.5) * layer.randomizeAngle * 360) * Math.PI / 180);
|
||||||
|
context.drawImage(
|
||||||
|
image, sourceX, sourceY, sourceWidth, sourceHeight,
|
||||||
|
-layer.particleWidth / 2, -layer.particleHeight / 2, layer.particleWidth, layer.particleHeight,
|
||||||
|
);
|
||||||
|
context.restore();
|
||||||
}
|
}
|
||||||
const fontSize = element.font_size ?? 48;
|
context.restore();
|
||||||
const lineHeight = styleValue(element, "line_height", 1.2);
|
}
|
||||||
const letterSpacing = styleValue(element, "letter_spacing", 1);
|
|
||||||
const align = styleValue(element, "text_align", "center") as CanvasTextAlign;
|
interface TextTemplateBoxLayoutInput {
|
||||||
const lines = (element.content ?? "").split("\n");
|
align: "center" | "left" | "right";
|
||||||
prepareTextContext(context, element, fontId);
|
anchorX: number;
|
||||||
|
anchorY: number;
|
||||||
|
boxHeight: number;
|
||||||
|
boxWidth: number;
|
||||||
|
fontSize: number;
|
||||||
|
lineCount: number;
|
||||||
|
lineHeight: number;
|
||||||
|
verticalAlign: TextVerticalAlign;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function textTemplateBoxLayout(input: TextTemplateBoxLayoutInput) {
|
||||||
|
const boxLeft = -input.anchorX * input.boxWidth;
|
||||||
|
const boxTop = -input.anchorY * input.boxHeight;
|
||||||
|
const lineAdvance = input.fontSize * input.lineHeight;
|
||||||
|
const blockHeight = input.fontSize + Math.max(0, input.lineCount - 1) * lineAdvance;
|
||||||
|
const x = input.align === "left" ? boxLeft
|
||||||
|
: input.align === "right" ? boxLeft + input.boxWidth
|
||||||
|
: boxLeft + input.boxWidth / 2;
|
||||||
|
const firstY = input.verticalAlign === "top" ? boxTop + input.fontSize / 2
|
||||||
|
: input.verticalAlign === "bottom" ? boxTop + input.boxHeight - blockHeight + input.fontSize / 2
|
||||||
|
: boxTop + (input.boxHeight - blockHeight) / 2 + input.fontSize / 2;
|
||||||
|
return { blockHeight, firstY, lineAdvance, x };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function boundedTextTemplateWidth(measuredWidth: number, boxWidth: number) {
|
||||||
|
return Math.max(1, Math.min(measuredWidth, boxWidth));
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TemplatePathPoint { x: number; y: number }
|
||||||
|
|
||||||
|
function mixPathPoint(from: TemplatePathPoint, to: TemplatePathPoint, amount: number): TemplatePathPoint {
|
||||||
|
return { x: from.x + (to.x - from.x) * amount, y: from.y + (to.y - from.y) * amount };
|
||||||
|
}
|
||||||
|
|
||||||
|
function quadraticPathPoint(from: TemplatePathPoint, control: TemplatePathPoint, to: TemplatePathPoint, amount: number) {
|
||||||
|
const inverse = 1 - amount;
|
||||||
|
return {
|
||||||
|
x: inverse * inverse * from.x + 2 * inverse * amount * control.x + amount * amount * to.x,
|
||||||
|
y: inverse * inverse * from.y + 2 * inverse * amount * control.y + amount * amount * to.y,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function conicPathPoint(from: TemplatePathPoint, control: TemplatePathPoint, to: TemplatePathPoint, weight: number, amount: number) {
|
||||||
|
const inverse = 1 - amount;
|
||||||
|
const denominator = inverse * inverse + 2 * weight * inverse * amount + amount * amount;
|
||||||
|
return {
|
||||||
|
x: (inverse * inverse * from.x + 2 * weight * inverse * amount * control.x + amount * amount * to.x) / denominator,
|
||||||
|
y: (inverse * inverse * from.y + 2 * weight * inverse * amount * control.y + amount * amount * to.y) / denominator,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function cubicPathPoint(from: TemplatePathPoint, first: TemplatePathPoint, second: TemplatePathPoint, to: TemplatePathPoint, amount: number) {
|
||||||
|
const inverse = 1 - amount;
|
||||||
|
return {
|
||||||
|
x: inverse ** 3 * from.x + 3 * inverse * inverse * amount * first.x + 3 * inverse * amount * amount * second.x + amount ** 3 * to.x,
|
||||||
|
y: inverse ** 3 * from.y + 3 * inverse * inverse * amount * first.y + 3 * inverse * amount * amount * second.y + amount ** 3 * to.y,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sampleTemplateTextPath(path: TextTemplateTextPath, steps = 28): TemplatePathPoint[] {
|
||||||
|
const first = path.points[0];
|
||||||
|
if (!first) return [];
|
||||||
|
const sampled: TemplatePathPoint[] = [first];
|
||||||
|
let current = first;
|
||||||
|
let pointIndex = 1;
|
||||||
|
let conicIndex = 0;
|
||||||
|
for (const verb of path.verbs.slice(1)) {
|
||||||
|
const appendCurve = (factory: (amount: number) => TemplatePathPoint) => {
|
||||||
|
for (let step = 1; step <= steps; step += 1) sampled.push(factory(step / steps));
|
||||||
|
current = sampled.at(-1)!;
|
||||||
|
};
|
||||||
|
if (verb === 1) {
|
||||||
|
const to = path.points[pointIndex++];
|
||||||
|
if (to) appendCurve((amount) => mixPathPoint(current, to, amount));
|
||||||
|
} else if (verb === 2) {
|
||||||
|
const control = path.points[pointIndex++];
|
||||||
|
const to = path.points[pointIndex++];
|
||||||
|
if (control && to) appendCurve((amount) => quadraticPathPoint(current, control, to, amount));
|
||||||
|
} else if (verb === 3) {
|
||||||
|
const control = path.points[pointIndex++];
|
||||||
|
const to = path.points[pointIndex++];
|
||||||
|
const weight = path.conicWeights[conicIndex++] ?? 1;
|
||||||
|
if (control && to) appendCurve((amount) => conicPathPoint(current, control, to, weight, amount));
|
||||||
|
} else if (verb === 4) {
|
||||||
|
const controlA = path.points[pointIndex++];
|
||||||
|
const controlB = path.points[pointIndex++];
|
||||||
|
const to = path.points[pointIndex++];
|
||||||
|
if (controlA && controlB && to) appendCurve((amount) => cubicPathPoint(current, controlA, controlB, to, amount));
|
||||||
|
} else if (verb === 5) appendCurve((amount) => mixPathPoint(current, first, amount));
|
||||||
|
}
|
||||||
|
return path.reversed ? sampled.reverse() : sampled;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pathLengths(points: readonly TemplatePathPoint[]) {
|
||||||
|
const lengths = [0];
|
||||||
|
for (let index = 1; index < points.length; index += 1) {
|
||||||
|
const previous = points[index - 1]!;
|
||||||
|
const current = points[index]!;
|
||||||
|
lengths.push(lengths[index - 1]! + Math.hypot(current.x - previous.x, current.y - previous.y));
|
||||||
|
}
|
||||||
|
return lengths;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pointOnSampledPath(points: readonly TemplatePathPoint[], lengths: readonly number[], distance: number) {
|
||||||
|
const total = lengths.at(-1) ?? 0;
|
||||||
|
const target = Math.max(0, Math.min(total, distance));
|
||||||
|
let index = 1;
|
||||||
|
while (index < lengths.length && lengths[index]! < target) index += 1;
|
||||||
|
const current = points[Math.min(index, points.length - 1)]!;
|
||||||
|
const previous = points[Math.max(0, index - 1)]!;
|
||||||
|
const start = lengths[Math.max(0, index - 1)] ?? 0;
|
||||||
|
const end = lengths[Math.min(index, lengths.length - 1)] ?? start;
|
||||||
|
const amount = end > start ? (target - start) / (end - start) : 0;
|
||||||
|
return {
|
||||||
|
angle: Math.atan2(current.y - previous.y, current.x - previous.x),
|
||||||
|
...mixPathPoint(previous, current, amount),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function pathMargin(value: number, length: number) {
|
||||||
|
return Math.abs(value) <= 1 ? value * length : value;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function textTextureCell(layout: TextTemplateFillTextureLayout, glyphIndex: number) {
|
||||||
|
const columns = Math.max(1, Math.trunc(layout.columns));
|
||||||
|
const rows = Math.max(1, Math.trunc(layout.rows));
|
||||||
|
const ids = layout.idList.length > 0 ? layout.idList : [0];
|
||||||
|
const rawId = Math.trunc(ids[Math.max(0, glyphIndex) % ids.length] ?? 0);
|
||||||
|
const cellId = ((rawId % (columns * rows)) + columns * rows) % (columns * rows);
|
||||||
|
return { column: cellId % columns, row: Math.floor(cellId / columns) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function setGlyphTextureFill(
|
||||||
|
context: CanvasRenderingContext2D,
|
||||||
|
image: HTMLImageElement,
|
||||||
|
layout: TextTemplateFillTextureLayout,
|
||||||
|
glyphIndex: number,
|
||||||
|
bounds: { height: number; left: number; top: number; width: number },
|
||||||
|
) {
|
||||||
|
const sourceWidth = image.naturalWidth || image.width;
|
||||||
|
const sourceHeight = image.naturalHeight || image.height;
|
||||||
|
const pattern = sourceWidth > 0 && sourceHeight > 0 ? context.createPattern(image, "no-repeat") : null;
|
||||||
|
if (!pattern) return false;
|
||||||
|
const cell = textTextureCell(layout, glyphIndex);
|
||||||
|
const cellWidth = sourceWidth / Math.max(1, layout.columns);
|
||||||
|
const cellHeight = sourceHeight / Math.max(1, layout.rows);
|
||||||
|
const scaleX = Math.max(1, bounds.width) / cellWidth;
|
||||||
|
const scaleY = Math.max(1, bounds.height) / cellHeight;
|
||||||
|
pattern.setTransform({
|
||||||
|
a: scaleX,
|
||||||
|
b: 0,
|
||||||
|
c: 0,
|
||||||
|
d: scaleY,
|
||||||
|
e: bounds.left - cell.column * cellWidth * scaleX,
|
||||||
|
f: bounds.top - cell.row * cellHeight * scaleY,
|
||||||
|
});
|
||||||
|
context.fillStyle = pattern;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawTextOnTemplatePath(
|
||||||
|
context: CanvasRenderingContext2D,
|
||||||
|
text: string,
|
||||||
|
path: TextTemplateTextPath,
|
||||||
|
letterSpacing: number,
|
||||||
|
stroke: boolean,
|
||||||
|
fillGlyph?: (character: string, glyphIndex: number, width: number) => void,
|
||||||
|
) {
|
||||||
|
const sampled = sampleTemplateTextPath(path);
|
||||||
|
const lengths = pathLengths(sampled);
|
||||||
|
const total = lengths.at(-1) ?? 0;
|
||||||
|
if (sampled.length < 2 || total <= 0) return;
|
||||||
|
const glyphs = Array.from(text.replaceAll("\n", " ")).map((character) => ({ character, width: context.measureText(character).width }));
|
||||||
|
const textLength = glyphs.reduce((sum, glyph, index) => sum + glyph.width + (index === 0 ? 0 : letterSpacing), 0);
|
||||||
|
const firstMargin = Math.max(0, pathMargin(path.firstMargin, total));
|
||||||
|
const lastMargin = Math.max(0, pathMargin(path.lastMargin, total));
|
||||||
|
const available = Math.max(0, total - firstMargin - lastMargin);
|
||||||
|
let cursor = firstMargin + (path.forceAlignment || path.circle ? Math.max(0, available - textLength) / 2 : 0);
|
||||||
|
let textureGlyphIndex = 0;
|
||||||
|
for (const glyph of glyphs) {
|
||||||
|
const center = cursor + glyph.width / 2;
|
||||||
|
if (center > total - lastMargin) break;
|
||||||
|
const point = pointOnSampledPath(sampled, lengths, center);
|
||||||
|
context.save();
|
||||||
|
context.translate(point.x, point.y);
|
||||||
|
if (path.perpendicular) context.rotate(point.angle);
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
if (stroke) context.strokeText(glyph.character, 0, 0);
|
||||||
|
if (fillGlyph && !/\s/u.test(glyph.character)) fillGlyph(glyph.character, textureGlyphIndex++, glyph.width);
|
||||||
|
else context.fillText(glyph.character, 0, 0);
|
||||||
|
context.restore();
|
||||||
|
cursor += glyph.width + letterSpacing;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawStyledTemplateLine(
|
||||||
|
context: CanvasRenderingContext2D,
|
||||||
|
line: string,
|
||||||
|
align: TextTemplateTextLayer["align"],
|
||||||
|
letterSpacing: number,
|
||||||
|
stroke: boolean,
|
||||||
|
patternImage: HTMLImageElement | undefined,
|
||||||
|
textureLayout: TextTemplateFillTextureLayout | undefined,
|
||||||
|
glyphColors: readonly string[] | undefined,
|
||||||
|
firstGlyphIndex: number,
|
||||||
|
) {
|
||||||
|
const glyphs = Array.from(line).map((character) => ({ character, width: context.measureText(character).width }));
|
||||||
|
const lineWidth = glyphs.reduce((sum, glyph, index) => sum + glyph.width + (index === 0 ? 0 : letterSpacing), 0);
|
||||||
|
let cursor = align === "left" ? 0 : align === "right" ? -lineWidth : -lineWidth / 2;
|
||||||
|
let textureGlyphIndex = firstGlyphIndex;
|
||||||
|
const fallbackFill = context.fillStyle;
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
for (const glyph of glyphs) {
|
||||||
|
const center = cursor + glyph.width / 2;
|
||||||
|
if (stroke) context.strokeText(glyph.character, center, 0);
|
||||||
|
if (!/\s/u.test(glyph.character)) {
|
||||||
|
context.fillStyle = fallbackFill;
|
||||||
|
const glyphColor = glyphColors?.[textureGlyphIndex];
|
||||||
|
if (glyphColor) {
|
||||||
|
context.fillStyle = glyphColor;
|
||||||
|
} else if (patternImage && textureLayout) {
|
||||||
|
setGlyphTextureFill(context, patternImage, textureLayout, textureGlyphIndex, {
|
||||||
|
height: Math.max(1, Number.parseFloat(context.font) || 1),
|
||||||
|
left: cursor,
|
||||||
|
top: -(Number.parseFloat(context.font) || 1) / 2,
|
||||||
|
width: glyph.width,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
textureGlyphIndex += 1;
|
||||||
|
}
|
||||||
|
context.fillText(glyph.character, center, 0);
|
||||||
|
cursor += glyph.width + letterSpacing;
|
||||||
|
}
|
||||||
|
context.fillStyle = fallbackFill;
|
||||||
|
return textureGlyphIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawTemplateTextLayer(
|
||||||
|
context: CanvasRenderingContext2D,
|
||||||
|
element: CanvasState["elements"][number],
|
||||||
|
layer: TextTemplateTextLayer,
|
||||||
|
resourceImages: Readonly<Record<string, HTMLImageElement>>,
|
||||||
|
) {
|
||||||
|
const editable = layer.editable;
|
||||||
|
const fontId = editable ? fontIdForTextElement(element) ?? layer.fontId : layer.fontId;
|
||||||
|
const fontSize = editable ? element.font_size ?? layer.fontSize : layer.fontSize;
|
||||||
|
const lineHeight = editable ? styleValue(element, "line_height", layer.lineHeight) : layer.lineHeight;
|
||||||
|
const letterSpacing = editable ? styleValue(element, "letter_spacing", layer.letterSpacing) : layer.letterSpacing;
|
||||||
|
const align = (editable ? styleValue(element, "text_align", layer.align) : layer.align) as TextTemplateTextLayer["align"];
|
||||||
|
const lines = (layer.contentLinked ? element.content ?? layer.text : layer.text).split("\n");
|
||||||
|
context.save();
|
||||||
|
context.globalAlpha *= layer.alpha;
|
||||||
|
context.translate(layer.x, layer.y);
|
||||||
|
context.rotate(layer.rotation * Math.PI / 180);
|
||||||
|
context.scale(layer.scaleX, layer.scaleY);
|
||||||
|
context.transform(1, Math.tan(-layer.skewX * Math.PI / 180), Math.tan(-layer.skewY * Math.PI / 180), 1, 0, 0);
|
||||||
|
context.font = `${fontSize}px "${fontFamilyName(fontId)}"`;
|
||||||
|
(context as CanvasRenderingContext2D & { letterSpacing: string }).letterSpacing = `${letterSpacing}px`;
|
||||||
context.textAlign = align;
|
context.textAlign = align;
|
||||||
context.textBaseline = "middle";
|
context.textBaseline = "middle";
|
||||||
const widths = lines.map((line) => context.measureText(line).width + Math.max(0, line.length - 1) * letterSpacing);
|
const widths = lines.map((line) => context.measureText(line).width + Math.max(0, Array.from(line).length - 1) * letterSpacing);
|
||||||
const textWidth = Math.max(1, ...widths);
|
const textWidth = boundedTextTemplateWidth(Math.max(1, ...widths), layer.width);
|
||||||
const textHeight = Math.max(fontSize * lineHeight, lines.length * fontSize * lineHeight);
|
const layout = textTemplateBoxLayout({
|
||||||
const padding = 16;
|
align,
|
||||||
const backgroundEnabled = styleValue(element, "background_enabled", false);
|
anchorX: layer.anchorX,
|
||||||
if (backgroundEnabled) {
|
anchorY: layer.anchorY,
|
||||||
const elementOpacity = context.globalAlpha;
|
boxHeight: layer.height,
|
||||||
context.globalAlpha = elementOpacity * styleValue(element, "background_opacity", 1);
|
boxWidth: layer.width,
|
||||||
context.fillStyle = styleValue(element, "background_color", "#FFE62C");
|
fontSize,
|
||||||
context.fillRect(-textWidth / 2 - padding, -textHeight / 2 - padding, textWidth + padding * 2, textHeight + padding * 2);
|
lineCount: lines.length,
|
||||||
context.globalAlpha = elementOpacity;
|
lineHeight,
|
||||||
}
|
verticalAlign: layer.verticalAlign,
|
||||||
const firstY = -((lines.length - 1) * fontSize * lineHeight) / 2;
|
|
||||||
const anchorX = align === "left" ? -textWidth / 2 : align === "right" ? textWidth / 2 : 0;
|
|
||||||
context.fillStyle = styleValue(element, "fill_color", "#111111");
|
|
||||||
context.strokeStyle = styleValue(element, "stroke_color", "#000000");
|
|
||||||
context.lineWidth = styleValue(element, "stroke_width", 0);
|
|
||||||
lines.forEach((line, index) => {
|
|
||||||
const y = firstY + index * fontSize * lineHeight;
|
|
||||||
if (styleValue(element, "stroke_enabled", false) && context.lineWidth > 0) context.strokeText(line, anchorX, y);
|
|
||||||
context.fillText(line, anchorX, y);
|
|
||||||
});
|
});
|
||||||
|
if (editable && styleValue(element, "background_enabled", false)) {
|
||||||
|
const alpha = context.globalAlpha;
|
||||||
|
context.globalAlpha = alpha * styleValue(element, "background_opacity", 1);
|
||||||
|
context.fillStyle = styleValue(element, "background_color", "#FFE62C");
|
||||||
|
const backgroundLeft = align === "left" ? layout.x : align === "right" ? layout.x - textWidth : layout.x - textWidth / 2;
|
||||||
|
context.fillRect(backgroundLeft - 16, layout.firstY - fontSize / 2 - 16, textWidth + 32, layout.blockHeight + 32);
|
||||||
|
context.globalAlpha = alpha;
|
||||||
|
}
|
||||||
|
context.shadowColor = layer.shadowColor;
|
||||||
|
context.shadowBlur = layer.shadowBlur;
|
||||||
|
context.shadowOffsetX = layer.shadowOffsetX;
|
||||||
|
context.shadowOffsetY = layer.shadowOffsetY;
|
||||||
|
const fillOverridden = editable && styleValue(element, "template_fill_overridden", false);
|
||||||
|
const patternImage = !fillOverridden && layer.fillPatternAssetId ? resourceImages[layer.fillPatternAssetId] : undefined;
|
||||||
|
const gradient = !fillOverridden && layer.fillGradient
|
||||||
|
? context.createLinearGradient(0, -layer.anchorY * layer.height, 0, (1 - layer.anchorY) * layer.height)
|
||||||
|
: undefined;
|
||||||
|
if (gradient && layer.fillGradient) {
|
||||||
|
gradient.addColorStop(0, layer.fillGradient.top);
|
||||||
|
gradient.addColorStop(1, layer.fillGradient.bottom);
|
||||||
|
}
|
||||||
|
const baseFill = editable ? styleValue(element, "fill_color", layer.fillColor) : layer.fillColor;
|
||||||
|
context.fillStyle = patternImage && !layer.fillTextureLayout ? context.createPattern(patternImage, "repeat") ?? baseFill
|
||||||
|
: gradient ?? baseFill;
|
||||||
|
context.strokeStyle = editable ? styleValue(element, "stroke_color", layer.strokeColor) : layer.strokeColor;
|
||||||
|
context.lineWidth = editable ? styleValue(element, "stroke_width", layer.strokeWidth) : layer.strokeWidth;
|
||||||
|
const stroke = (editable ? styleValue(element, "stroke_enabled", layer.strokeWidth > 0) : layer.strokeWidth > 0) && context.lineWidth > 0;
|
||||||
|
if (layer.textPath) {
|
||||||
|
(context as CanvasRenderingContext2D & { letterSpacing: string }).letterSpacing = "0px";
|
||||||
|
const fallbackFill = context.fillStyle;
|
||||||
|
drawTextOnTemplatePath(context, lines.join(" "), layer.textPath, letterSpacing, stroke,
|
||||||
|
(patternImage && layer.fillTextureLayout) || (!fillOverridden && layer.glyphColors)
|
||||||
|
? (character, glyphIndex, width) => {
|
||||||
|
context.fillStyle = fallbackFill;
|
||||||
|
const glyphColor = layer.glyphColors?.[glyphIndex];
|
||||||
|
if (glyphColor) {
|
||||||
|
context.fillStyle = glyphColor;
|
||||||
|
} else if (patternImage && layer.fillTextureLayout) {
|
||||||
|
setGlyphTextureFill(context, patternImage, layer.fillTextureLayout, glyphIndex, {
|
||||||
|
height: fontSize, left: -width / 2, top: -fontSize / 2, width,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
context.fillText(character, 0, 0);
|
||||||
|
}
|
||||||
|
: undefined);
|
||||||
|
context.restore();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ((patternImage && layer.fillTextureLayout) || (!fillOverridden && layer.glyphColors)) {
|
||||||
|
(context as CanvasRenderingContext2D & { letterSpacing: string }).letterSpacing = "0px";
|
||||||
|
let glyphIndex = 0;
|
||||||
|
lines.forEach((line, index) => {
|
||||||
|
const y = layout.firstY + index * layout.lineAdvance;
|
||||||
|
const naturalWidth = context.measureText(line).width + Math.max(0, Array.from(line).length - 1) * letterSpacing;
|
||||||
|
const horizontalScale = Math.min(1, layer.width / Math.max(1, naturalWidth));
|
||||||
|
context.save();
|
||||||
|
context.translate(layout.x, y);
|
||||||
|
context.scale(horizontalScale, 1);
|
||||||
|
glyphIndex = drawStyledTemplateLine(context, line, align, letterSpacing, stroke,
|
||||||
|
patternImage, layer.fillTextureLayout, fillOverridden ? undefined : layer.glyphColors, glyphIndex);
|
||||||
|
context.restore();
|
||||||
|
});
|
||||||
|
context.restore();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lines.forEach((line, index) => {
|
||||||
|
const y = layout.firstY + index * layout.lineAdvance;
|
||||||
|
if (stroke) context.strokeText(line, layout.x, y, layer.width);
|
||||||
|
context.fillText(line, layout.x, y, layer.width);
|
||||||
|
});
|
||||||
|
context.restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawTextTemplate(
|
||||||
|
context: CanvasRenderingContext2D,
|
||||||
|
element: CanvasState["elements"][number],
|
||||||
|
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>,
|
||||||
|
resourceImages: Readonly<Record<string, HTMLImageElement>>,
|
||||||
|
) {
|
||||||
|
const template = textTemplateById(element.template_or_asset_id);
|
||||||
|
if (!template || textTemplateFontOptions(template.templateId).some((font) => fontStatuses[font.fontId] !== "ready")) {
|
||||||
|
drawDynamicUnavailable(context, "原版字体不可用");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const layers = [
|
||||||
|
...template.renderModel.imageLayers.map((layer) => ({ kind: "image" as const, layer })),
|
||||||
|
...template.renderModel.particleLayers.map((layer) => ({ kind: "particles" as const, layer })),
|
||||||
|
...template.renderModel.textLayers.map((layer) => ({ kind: "text" as const, layer })),
|
||||||
|
].toSorted((left, right) => left.layer.order - right.layer.order);
|
||||||
|
for (const item of layers) {
|
||||||
|
if (item.kind === "image") drawTemplateImageLayer(context, item.layer, resourceImages);
|
||||||
|
else if (item.kind === "particles") drawTemplateParticles(context, item.layer, resourceImages);
|
||||||
|
else drawTemplateTextLayer(context, element, item.layer, resourceImages);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function drawDynamicUnavailable(context: CanvasRenderingContext2D, message: string) {
|
function drawDynamicUnavailable(context: CanvasRenderingContext2D, message: string) {
|
||||||
@@ -182,22 +639,24 @@ function elementSelectionHalfSize(
|
|||||||
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>,
|
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>,
|
||||||
) {
|
) {
|
||||||
if (element.type === "color_card") {
|
if (element.type === "color_card") {
|
||||||
if (element.style_id === "style_01") return { height: 76 * element.scale.y, width: 26 * element.scale.x };
|
const half = COLOR_CARD_HALF_SIZES[element.style_id ?? ""] ?? { height: 24, width: 78 };
|
||||||
if (element.style_id === "style_02") return { height: 77 * element.scale.y, width: 18 * element.scale.x };
|
return { height: half.height * element.scale.y, width: half.width * element.scale.x };
|
||||||
if (element.style_id === "style_08") return { height: 10 * element.scale.y, width: 73 * element.scale.x };
|
|
||||||
return { height: 9 * element.scale.y, width: 78 * element.scale.x };
|
|
||||||
}
|
}
|
||||||
if (element.type === "dynamic_sticker") {
|
if (element.type === "dynamic_sticker") {
|
||||||
const model = DYNAMIC_RENDER_MODELS[element.template_or_asset_id as DynamicTemplateId];
|
const model = DYNAMIC_RENDER_MODELS[element.template_or_asset_id as DynamicTemplateId];
|
||||||
return { height: (model?.halfSize.height ?? 62) * element.scale.y, width: (model?.halfSize.width ?? 170) * element.scale.x };
|
return { height: (model?.halfSize.height ?? 62) * element.scale.y, width: (model?.halfSize.width ?? 170) * element.scale.x };
|
||||||
}
|
}
|
||||||
if (element.type !== "text_template") return { height: 78 * element.scale.y, width: 78 * element.scale.x };
|
if (element.type !== "text_template") return { height: 78 * element.scale.y, width: 78 * element.scale.x };
|
||||||
|
const template = textTemplateById(element.template_or_asset_id);
|
||||||
const fontId = fontIdForTextElement(element);
|
const fontId = fontIdForTextElement(element);
|
||||||
if (!fontId || fontStatuses[fontId] !== "ready") return { height: 34 * element.scale.y, width: 110 * element.scale.x };
|
if (!fontId || fontStatuses[fontId] !== "ready") return { height: 34 * element.scale.y, width: 110 * element.scale.x };
|
||||||
context.save();
|
context.save();
|
||||||
const geometry = measureTextElement(context, element, fontId);
|
const geometry = measureTextElement(context, element, fontId);
|
||||||
context.restore();
|
context.restore();
|
||||||
return { height: geometry.height * element.scale.y / 2, width: geometry.width * element.scale.x / 2 };
|
return {
|
||||||
|
height: Math.max(geometry.height / 2, template?.renderModel.halfSize.height ?? 0) * element.scale.y,
|
||||||
|
width: Math.max(geometry.width / 2, template?.renderModel.halfSize.width ?? 0) * element.scale.x,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function drawElement(
|
function drawElement(
|
||||||
@@ -226,7 +685,7 @@ function drawElement(
|
|||||||
const height = image.naturalHeight * scale;
|
const height = image.naturalHeight * scale;
|
||||||
context.drawImage(image, -width / 2, -height / 2, width, height);
|
context.drawImage(image, -width / 2, -height / 2, width, height);
|
||||||
}
|
}
|
||||||
} else if (element.type === "text_template") drawTextElement(context, element, fontStatuses);
|
} else if (element.type === "text_template") drawTextTemplate(context, element, fontStatuses, resourceImages);
|
||||||
else if (element.type === "dynamic_sticker") drawDynamicSticker(context, element, fontStatuses, resourceImages);
|
else if (element.type === "dynamic_sticker") drawDynamicSticker(context, element, fontStatuses, resourceImages);
|
||||||
context.restore();
|
context.restore();
|
||||||
}
|
}
|
||||||
@@ -240,6 +699,27 @@ function loadCanvasImage(url: string) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CanvasImageLoader = (url: string) => Promise<HTMLImageElement | undefined>;
|
||||||
|
|
||||||
|
interface SceneResources {
|
||||||
|
background: HTMLImageElement | undefined;
|
||||||
|
resourceImages: Readonly<Record<string, HTMLImageElement>>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createCachedCanvasImageLoader(): CanvasImageLoader {
|
||||||
|
const cache = new Map<string, Promise<HTMLImageElement | undefined>>();
|
||||||
|
return (url) => {
|
||||||
|
const cached = cache.get(url);
|
||||||
|
if (cached) return cached;
|
||||||
|
const pending = loadCanvasImage(url).then((image) => {
|
||||||
|
if (!image) cache.delete(url);
|
||||||
|
return image;
|
||||||
|
});
|
||||||
|
cache.set(url, pending);
|
||||||
|
return pending;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function resourceUrlsForCanvas(canvasState: CanvasState) {
|
function resourceUrlsForCanvas(canvasState: CanvasState) {
|
||||||
const imageReferences = new Map<string, string>();
|
const imageReferences = new Map<string, string>();
|
||||||
for (const element of canvasState.elements) {
|
for (const element of canvasState.elements) {
|
||||||
@@ -248,15 +728,26 @@ function resourceUrlsForCanvas(canvasState: CanvasState) {
|
|||||||
const model = DYNAMIC_RENDER_MODELS[element.template_or_asset_id as DynamicTemplateId];
|
const model = DYNAMIC_RENDER_MODELS[element.template_or_asset_id as DynamicTemplateId];
|
||||||
for (const layer of model?.imageLayers ?? []) imageReferences.set(layer.assetId, dynamicImageUrl(element.resource_version, layer.assetId));
|
for (const layer of model?.imageLayers ?? []) imageReferences.set(layer.assetId, dynamicImageUrl(element.resource_version, layer.assetId));
|
||||||
}
|
}
|
||||||
|
if (element.type === "text_template") {
|
||||||
|
for (const [assetId, url] of textTemplateImageUrls(element.template_or_asset_id, element.resource_version)) imageReferences.set(assetId, url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return imageReferences;
|
return imageReferences;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadSceneResources(canvasState: CanvasState, projectId: string) {
|
function sceneResourceKey(canvasState: CanvasState, projectId: string) {
|
||||||
const background = canvasState.background.asset_id
|
const background = canvasState.background.asset_id
|
||||||
? loadCanvasImage(`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`)
|
? `/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`
|
||||||
|
: null;
|
||||||
|
const resources = [...resourceUrlsForCanvas(canvasState)].toSorted(([left], [right]) => left.localeCompare(right));
|
||||||
|
return JSON.stringify({ background, projectId, resources });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSceneResources(canvasState: CanvasState, projectId: string, loadImage: CanvasImageLoader = loadCanvasImage): Promise<SceneResources> {
|
||||||
|
const background = canvasState.background.asset_id
|
||||||
|
? loadImage(`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`)
|
||||||
: Promise.resolve(undefined);
|
: Promise.resolve(undefined);
|
||||||
const resources = Promise.all([...resourceUrlsForCanvas(canvasState)].map(async ([assetId, url]) => [assetId, await loadCanvasImage(url)] as const));
|
const resources = Promise.all([...resourceUrlsForCanvas(canvasState)].map(async ([assetId, url]) => [assetId, await loadImage(url)] as const));
|
||||||
const [image, loaded] = await Promise.all([background, resources]);
|
const [image, loaded] = await Promise.all([background, resources]);
|
||||||
return {
|
return {
|
||||||
background: image,
|
background: image,
|
||||||
@@ -274,9 +765,41 @@ function renderEditorScene(
|
|||||||
context.clearRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
context.clearRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
||||||
context.fillStyle = "#ffffff";
|
context.fillStyle = "#ffffff";
|
||||||
context.fillRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
context.fillRect(0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
||||||
context.filter = cssFilterForBackground(canvasState.background.adjustments);
|
if (background) {
|
||||||
if (background) context.drawImage(background, 0, 0, canvasState.pixel_width, canvasState.pixel_height);
|
const plan = backgroundDrawPlan(
|
||||||
context.filter = "none";
|
{ height: background.naturalHeight || background.height, width: background.naturalWidth || background.width },
|
||||||
|
{ height: canvasState.pixel_height, width: canvasState.pixel_width },
|
||||||
|
canvasState.background.adjustments,
|
||||||
|
);
|
||||||
|
context.save();
|
||||||
|
context.filter = cssFilterForBackground(canvasState.background.adjustments);
|
||||||
|
context.drawImage(
|
||||||
|
background,
|
||||||
|
plan.source.x,
|
||||||
|
plan.source.y,
|
||||||
|
plan.source.width,
|
||||||
|
plan.source.height,
|
||||||
|
plan.destination.x,
|
||||||
|
plan.destination.y,
|
||||||
|
plan.destination.width,
|
||||||
|
plan.destination.height,
|
||||||
|
);
|
||||||
|
context.restore();
|
||||||
|
|
||||||
|
if (canvasState.background.adjustments.temperature !== 0 || canvasState.background.adjustments.sharpness !== 0) {
|
||||||
|
const x = Math.max(0, Math.floor(plan.destination.x));
|
||||||
|
const y = Math.max(0, Math.floor(plan.destination.y));
|
||||||
|
const right = Math.min(canvasState.pixel_width, Math.ceil(plan.destination.x + plan.destination.width));
|
||||||
|
const bottom = Math.min(canvasState.pixel_height, Math.ceil(plan.destination.y + plan.destination.height));
|
||||||
|
const width = right - x;
|
||||||
|
const height = bottom - y;
|
||||||
|
if (width > 0 && height > 0) {
|
||||||
|
const imageData = context.getImageData(x, y, width, height);
|
||||||
|
imageData.data.set(adjustBackgroundPixels(imageData.data, width, height, canvasState.background.adjustments));
|
||||||
|
context.putImageData(imageData, x, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (const element of [...canvasState.elements].sort((left, right) => left.z_index - right.z_index)) {
|
for (const element of [...canvasState.elements].sort((left, right) => left.z_index - right.z_index)) {
|
||||||
drawElement(context, element, canvasState.pixel_width, canvasState.pixel_height, fontStatuses, resourceImages);
|
drawElement(context, element, canvasState.pixel_width, canvasState.pixel_height, fontStatuses, resourceImages);
|
||||||
}
|
}
|
||||||
@@ -284,7 +807,10 @@ function renderEditorScene(
|
|||||||
|
|
||||||
function requiredFontIds(canvasState: CanvasState) {
|
function requiredFontIds(canvasState: CanvasState) {
|
||||||
return canvasState.elements.flatMap((element) => {
|
return canvasState.elements.flatMap((element) => {
|
||||||
if (element.type === "text_template") return [fontIdForTextElement(element)].filter((fontId): fontId is string => Boolean(fontId));
|
if (element.type === "text_template") return [...new Set([
|
||||||
|
...textTemplateFontOptions(element.template_or_asset_id).map((font) => font.fontId),
|
||||||
|
...[fontIdForTextElement(element)].filter((fontId): fontId is string => Boolean(fontId)),
|
||||||
|
])];
|
||||||
if (element.type === "dynamic_sticker") return dynamicFontOptionsFor(element.template_or_asset_id).map((font) => font.fontId);
|
if (element.type === "dynamic_sticker") return dynamicFontOptionsFor(element.template_or_asset_id).map((font) => font.fontId);
|
||||||
return [];
|
return [];
|
||||||
});
|
});
|
||||||
@@ -314,16 +840,29 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
const canvasRef = useRef<HTMLCanvasElement>(null);
|
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||||
const gestureRef = useRef<Gesture | undefined>(undefined);
|
const gestureRef = useRef<Gesture | undefined>(undefined);
|
||||||
const longPressRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
|
const longPressRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
|
||||||
|
const imageLoaderRef = useRef<CanvasImageLoader | undefined>(undefined);
|
||||||
|
const [sceneResources, setSceneResources] = useState<{ key: string; resources: SceneResources }>();
|
||||||
const [marquee, setMarquee] = useState<CanvasRect>();
|
const [marquee, setMarquee] = useState<CanvasRect>();
|
||||||
|
const resourceKey = sceneResourceKey(props.canvasState, props.projectId);
|
||||||
|
|
||||||
|
if (!imageLoaderRef.current) imageLoaderRef.current = createCachedCanvasImageLoader();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
|
void loadSceneResources(props.canvasState, props.projectId, imageLoaderRef.current).then((resources) => {
|
||||||
|
if (active) setSceneResources({ key: resourceKey, resources });
|
||||||
|
});
|
||||||
|
return () => { active = false; };
|
||||||
|
}, [props.projectId, resourceKey]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
const canvas = canvasRef.current;
|
const canvas = canvasRef.current;
|
||||||
if (!canvas) return undefined;
|
if (!canvas) return undefined;
|
||||||
canvas.width = props.canvasState.pixel_width;
|
if (canvas.width !== props.canvasState.pixel_width) canvas.width = props.canvasState.pixel_width;
|
||||||
canvas.height = props.canvasState.pixel_height;
|
if (canvas.height !== props.canvasState.pixel_height) canvas.height = props.canvasState.pixel_height;
|
||||||
const context = canvas.getContext("2d");
|
const context = canvas.getContext("2d");
|
||||||
if (!context) return undefined;
|
if (!context) return undefined;
|
||||||
|
if (!sceneResources || sceneResources.key !== resourceKey) return undefined;
|
||||||
const render = (image: HTMLImageElement | undefined, resourceImages: Readonly<Record<string, HTMLImageElement>>) => {
|
const render = (image: HTMLImageElement | undefined, resourceImages: Readonly<Record<string, HTMLImageElement>>) => {
|
||||||
renderEditorScene(context, props.canvasState, props.fontStatuses, image, resourceImages);
|
renderEditorScene(context, props.canvasState, props.fontStatuses, image, resourceImages);
|
||||||
context.lineWidth = 4;
|
context.lineWidth = 4;
|
||||||
@@ -345,21 +884,22 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
if (marquee) context.strokeRect(marquee.x * canvas.width, marquee.y * canvas.height, marquee.width * canvas.width, marquee.height * canvas.height);
|
if (marquee) context.strokeRect(marquee.x * canvas.width, marquee.y * canvas.height, marquee.width * canvas.width, marquee.height * canvas.height);
|
||||||
context.restore();
|
context.restore();
|
||||||
};
|
};
|
||||||
void loadSceneResources(props.canvasState, props.projectId).then(({ background, resourceImages }) => {
|
render(sceneResources.resources.background, sceneResources.resources.resourceImages);
|
||||||
if (!active) return;
|
return undefined;
|
||||||
render(background, resourceImages);
|
}, [marquee, props.canvasState, props.fontStatuses, props.guides, props.selectedIds, resourceKey, sceneResources]);
|
||||||
});
|
|
||||||
return () => { active = false; };
|
|
||||||
}, [marquee, props.assetId, props.canvasState, props.fontStatuses, props.guides, props.projectId, props.selectedIds]);
|
|
||||||
|
|
||||||
useEffect(() => () => { if (longPressRef.current) clearTimeout(longPressRef.current); }, []);
|
useEffect(() => () => { if (longPressRef.current) clearTimeout(longPressRef.current); }, []);
|
||||||
|
|
||||||
function handlePointerDown(event: PointerEvent<HTMLCanvasElement>) {
|
function handlePointerDown(event: PointerEvent<HTMLCanvasElement>) {
|
||||||
if (event.button !== 0) return;
|
if (event.button !== 0) return;
|
||||||
const start = pointFromEvent(event);
|
const bounds = event.currentTarget.getBoundingClientRect();
|
||||||
|
const start = pointFromClient(event.clientX, event.clientY, bounds);
|
||||||
const append = event.shiftKey;
|
const append = event.shiftKey;
|
||||||
const hit = props.onSelect(start, append);
|
const hit = props.onSelect(start, append);
|
||||||
gestureRef.current = { append, hit, longPressOpened: false, pointerId: event.pointerId, start };
|
gestureRef.current = {
|
||||||
|
append, bounds, hit, longPressOpened: false, moved: false, pointerId: event.pointerId, start,
|
||||||
|
startClient: { x: event.clientX, y: event.clientY },
|
||||||
|
};
|
||||||
event.currentTarget.setPointerCapture(event.pointerId);
|
event.currentTarget.setPointerCapture(event.pointerId);
|
||||||
longPressRef.current = setTimeout(() => {
|
longPressRef.current = setTimeout(() => {
|
||||||
const gesture = gestureRef.current;
|
const gesture = gestureRef.current;
|
||||||
@@ -375,9 +915,15 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
props.onPointerMoved();
|
props.onPointerMoved();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const point = pointFromEvent(event);
|
const clientDistance = Math.hypot(event.clientX - gesture.startClient.x, event.clientY - gesture.startClient.y);
|
||||||
|
if (!gesture.moved) {
|
||||||
|
if (clientDistance < DRAG_THRESHOLD_PX) return;
|
||||||
|
gesture.moved = true;
|
||||||
|
gesture.longPressOpened = false;
|
||||||
|
props.onDragStart();
|
||||||
|
}
|
||||||
|
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
|
||||||
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
||||||
if (Math.abs(delta.x) + Math.abs(delta.y) < 0.003) return;
|
|
||||||
if (longPressRef.current) clearTimeout(longPressRef.current);
|
if (longPressRef.current) clearTimeout(longPressRef.current);
|
||||||
props.onPointerMoved();
|
props.onPointerMoved();
|
||||||
if (gesture.hit && !gesture.longPressOpened) props.onMovePreview(delta);
|
if (gesture.hit && !gesture.longPressOpened) props.onMovePreview(delta);
|
||||||
@@ -388,11 +934,18 @@ export function EditorStage(props: EditorStageProps) {
|
|||||||
const gesture = gestureRef.current;
|
const gesture = gestureRef.current;
|
||||||
if (!gesture || gesture.pointerId !== event.pointerId) return;
|
if (!gesture || gesture.pointerId !== event.pointerId) return;
|
||||||
if (longPressRef.current) clearTimeout(longPressRef.current);
|
if (longPressRef.current) clearTimeout(longPressRef.current);
|
||||||
const point = pointFromEvent(event);
|
const clientDistance = Math.hypot(event.clientX - gesture.startClient.x, event.clientY - gesture.startClient.y);
|
||||||
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
const moved = gesture.moved || clientDistance >= DRAG_THRESHOLD_PX;
|
||||||
const moved = Math.abs(delta.x) + Math.abs(delta.y) >= 0.003;
|
if (moved && !gesture.moved && !gesture.longPressOpened) {
|
||||||
|
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
|
||||||
|
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
|
||||||
|
if (gesture.hit) props.onMovePreview(delta);
|
||||||
|
}
|
||||||
if (gesture.hit && moved && !gesture.longPressOpened) props.onMoveCommit();
|
if (gesture.hit && moved && !gesture.longPressOpened) props.onMoveCommit();
|
||||||
else if (!gesture.hit && moved) props.onMarquee({ height: delta.y, width: delta.x, x: gesture.start.x, y: gesture.start.y }, gesture.append);
|
else if (!gesture.hit && moved) {
|
||||||
|
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
|
||||||
|
props.onMarquee({ height: point.y - gesture.start.y, width: point.x - gesture.start.x, x: gesture.start.x, y: gesture.start.y }, gesture.append);
|
||||||
|
}
|
||||||
setMarquee(undefined);
|
setMarquee(undefined);
|
||||||
gestureRef.current = undefined;
|
gestureRef.current = undefined;
|
||||||
event.currentTarget.releasePointerCapture(event.pointerId);
|
event.currentTarget.releasePointerCapture(event.pointerId);
|
||||||
|
|||||||
@@ -1,9 +1,18 @@
|
|||||||
// Generated from openapi/openapi.json. Do not edit by hand.
|
// Generated from openapi/openapi.json. Do not edit by hand.
|
||||||
|
|
||||||
import type { CreditAdjustmentResponse, CreditAdjustmentRequest, BrowserSupportSuccess, BrowserSupportRequest, AccountDeletionResponse, AccountDeletionCompleteRequest, AdminLoginCompleteResponse, AdminLoginCompleteRequest, LoginCompleteResponse, LoginCompleteRequest, RegistrationCompleteResponse, RegistrationCompleteRequest, GenerationCreateResponse, AccountSettingsResponse, AdminOverviewResponse, AdminSessionResponse, CreditBalanceResponse, BootstrapResponse, GenerationTaskResponse, SseEvent, ModelConfig, ModelConfigurationResponse, CreditLedgerResponse, ProjectDetailResponse, UserSessionResponse, ProjectListResponse, RecentAssetListResponse, LogoutResponse, ProjectPurgeResponse, RecentAssetRecordResponse, RecentAssetRecordRequest, ProjectRenameResponse, ProjectRenameRequest, ModelConfigUpdateRequest, ProjectRestoreResponse, ReverseGeocodeResponse, ReverseGeocodeRequest, LatestExportSaveResponse, ProjectStateSaveResponse, ProjectEditableState, AccountDeletionSendResponse, RegistrationSendResponse, AdminLoginSendRequest, LoginSendRequest, RegistrationSendRequest, FailedEmptyTrashResponse, FailedEmptyTrashRequest, ProjectTrashResponse, AccountProfileUpdateResponse, AccountProfileUpdateRequest } from "./types.gen.js";
|
import type { PrivateContentNoticeAckResponse, PrivateContentNoticeAckRequest, CreditAdjustmentResponse, CreditAdjustmentRequest, AdminServiceHealthCheckRequest, BrowserSupportSuccess, BrowserSupportRequest, AccountDeletionResponse, AccountDeletionCompleteRequest, AdminLoginCompleteResponse, AdminLoginCompleteRequest, LoginCompleteResponse, LoginCompleteRequest, RegistrationCompleteResponse, RegistrationCompleteRequest, GenerationCreateResponse, AccountSettingsResponse, AdminDiagnosticsResponse, AdminOperationAuditResponse, AdminOverviewResponse, AdminServicesResponse, AdminServicesStorageResponse, AdminSessionResponse, CreditBalanceResponse, BootstrapResponse, GenerationTaskResponse, SseEvent, ModelConfig, ModelConfigurationResponse, CreditLedgerResponse, PrivateContentAccessAuditResponse, ProjectDetailResponse, UserSessionResponse, AdminGenerationListResponse, ProjectListResponse, RecentAssetListResponse, LogoutResponse, PrivateContentPromptResponse, ProjectPurgeResponse, RecentAssetRecordResponse, RecentAssetRecordRequest, AdminServiceRecoveryRequest, ProjectRenameResponse, ProjectRenameRequest, ModelConfigUpdateRequest, ProjectRestoreResponse, ReverseGeocodeResponse, ReverseGeocodeRequest, LatestExportSaveResponse, ProjectStateSaveResponse, ProjectEditableState, AccountDeletionSendResponse, RegistrationSendResponse, AdminLoginSendRequest, LoginSendRequest, RegistrationSendRequest, FailedEmptyTrashResponse, FailedEmptyTrashRequest, ProjectTrashResponse, AccountProfileUpdateResponse, AccountProfileUpdateRequest, AdminServiceLimitRequest } from "./types.gen.js";
|
||||||
|
|
||||||
export interface ClientOptions { baseUrl?: string; fetch?: typeof globalThis.fetch; headers?: HeadersInit; }
|
export interface ClientOptions { baseUrl?: string; fetch?: typeof globalThis.fetch; headers?: HeadersInit; }
|
||||||
|
|
||||||
|
export async function ackPrivateContentNotice(body: PrivateContentNoticeAckRequest, options: ClientOptions = {}): Promise<PrivateContentNoticeAckResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const headers = new Headers(options.headers);
|
||||||
|
headers.set("Content-Type", "application/json");
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/private-content-notice/ack`, { body: JSON.stringify(body), method: "POST", headers });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<PrivateContentNoticeAckResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function adjustAdminUserCredits(body: CreditAdjustmentRequest, options: ClientOptions = {}): Promise<CreditAdjustmentResponse> {
|
export async function adjustAdminUserCredits(body: CreditAdjustmentRequest, options: ClientOptions = {}): Promise<CreditAdjustmentResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const headers = new Headers(options.headers);
|
const headers = new Headers(options.headers);
|
||||||
@@ -13,6 +22,23 @@ export async function adjustAdminUserCredits(body: CreditAdjustmentRequest, opti
|
|||||||
return response.json() as Promise<CreditAdjustmentResponse>;
|
return response.json() as Promise<CreditAdjustmentResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function checkAdminServiceHealth(body: AdminServiceHealthCheckRequest, options: ClientOptions = {}): Promise<{
|
||||||
|
"available": boolean;
|
||||||
|
"check_id": string;
|
||||||
|
"checked_at": string;
|
||||||
|
}> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const headers = new Headers(options.headers);
|
||||||
|
headers.set("Content-Type", "application/json");
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/services/{service_id}/health-check`, { body: JSON.stringify(body), method: "POST", headers });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<{
|
||||||
|
"available": boolean;
|
||||||
|
"check_id": string;
|
||||||
|
"checked_at": string;
|
||||||
|
}>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function checkBrowserSupport(body: BrowserSupportRequest, options: ClientOptions = {}): Promise<BrowserSupportSuccess> {
|
export async function checkBrowserSupport(body: BrowserSupportRequest, options: ClientOptions = {}): Promise<BrowserSupportSuccess> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const headers = new Headers(options.headers);
|
const headers = new Headers(options.headers);
|
||||||
@@ -87,6 +113,20 @@ export async function getAccountSettings(options: ClientOptions = {}): Promise<A
|
|||||||
return response.json() as Promise<AccountSettingsResponse>;
|
return response.json() as Promise<AccountSettingsResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getAdminDiagnostics(options: ClientOptions = {}): Promise<AdminDiagnosticsResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/diagnostics`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<AdminDiagnosticsResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getAdminOperationAudit(options: ClientOptions = {}): Promise<AdminOperationAuditResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/audit/operations`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<AdminOperationAuditResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function getAdminOverview(options: ClientOptions = {}): Promise<AdminOverviewResponse> {
|
export async function getAdminOverview(options: ClientOptions = {}): Promise<AdminOverviewResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/overview`, { method: "GET", headers: options.headers ?? {} });
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/overview`, { method: "GET", headers: options.headers ?? {} });
|
||||||
@@ -94,6 +134,20 @@ export async function getAdminOverview(options: ClientOptions = {}): Promise<Adm
|
|||||||
return response.json() as Promise<AdminOverviewResponse>;
|
return response.json() as Promise<AdminOverviewResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getAdminServices(options: ClientOptions = {}): Promise<AdminServicesResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/services`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<AdminServicesResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getAdminServicesStorage(options: ClientOptions = {}): Promise<AdminServicesStorageResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/services-storage`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<AdminServicesStorageResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function getAdminSession(options: ClientOptions = {}): Promise<AdminSessionResponse> {
|
export async function getAdminSession(options: ClientOptions = {}): Promise<AdminSessionResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin-auth/session`, { method: "GET", headers: options.headers ?? {} });
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin-auth/session`, { method: "GET", headers: options.headers ?? {} });
|
||||||
@@ -161,6 +215,13 @@ export async function getMyCredits(options: ClientOptions = {}): Promise<CreditB
|
|||||||
return response.json() as Promise<CreditBalanceResponse>;
|
return response.json() as Promise<CreditBalanceResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getPrivateContentAccessAudit(options: ClientOptions = {}): Promise<PrivateContentAccessAuditResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/audit/private-content`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<PrivateContentAccessAuditResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function getProject(options: ClientOptions = {}): Promise<ProjectDetailResponse> {
|
export async function getProject(options: ClientOptions = {}): Promise<ProjectDetailResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects/{projectId}`, { method: "GET", headers: options.headers ?? {} });
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects/{projectId}`, { method: "GET", headers: options.headers ?? {} });
|
||||||
@@ -175,6 +236,13 @@ export async function getUserSession(options: ClientOptions = {}): Promise<UserS
|
|||||||
return response.json() as Promise<UserSessionResponse>;
|
return response.json() as Promise<UserSessionResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function listAdminGenerations(options: ClientOptions = {}): Promise<AdminGenerationListResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/generations`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<AdminGenerationListResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function listProjects(options: ClientOptions = {}): Promise<ProjectListResponse> {
|
export async function listProjects(options: ClientOptions = {}): Promise<ProjectListResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects`, { method: "GET", headers: options.headers ?? {} });
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects`, { method: "GET", headers: options.headers ?? {} });
|
||||||
@@ -196,6 +264,20 @@ export async function logoutUser(options: ClientOptions = {}): Promise<LogoutRes
|
|||||||
return response.json() as Promise<LogoutResponse>;
|
return response.json() as Promise<LogoutResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function openAdminGenerationImage(options: ClientOptions = {}): Promise<Blob> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/private-content/generations/{generationId}/image`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.blob() as Promise<Blob>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function openAdminGenerationPrompt(options: ClientOptions = {}): Promise<PrivateContentPromptResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/private-content/generations/{generationId}/prompt`, { method: "GET", headers: options.headers ?? {} });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<PrivateContentPromptResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function purgeProject(options: ClientOptions = {}): Promise<ProjectPurgeResponse> {
|
export async function purgeProject(options: ClientOptions = {}): Promise<ProjectPurgeResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects/{projectId}/purge`, { method: "POST", headers: options.headers ?? {} });
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects/{projectId}/purge`, { method: "POST", headers: options.headers ?? {} });
|
||||||
@@ -212,6 +294,19 @@ export async function recordRecentAsset(body: RecentAssetRecordRequest, options:
|
|||||||
return response.json() as Promise<RecentAssetRecordResponse>;
|
return response.json() as Promise<RecentAssetRecordResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function recoverAdminService(body: AdminServiceRecoveryRequest, options: ClientOptions = {}): Promise<{
|
||||||
|
"status": "active";
|
||||||
|
}> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const headers = new Headers(options.headers);
|
||||||
|
headers.set("Content-Type", "application/json");
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/services/{service_id}/recover`, { body: JSON.stringify(body), method: "POST", headers });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<{
|
||||||
|
"status": "active";
|
||||||
|
}>;
|
||||||
|
}
|
||||||
|
|
||||||
export async function renameProject(body: ProjectRenameRequest, options: ClientOptions = {}): Promise<ProjectRenameResponse> {
|
export async function renameProject(body: ProjectRenameRequest, options: ClientOptions = {}): Promise<ProjectRenameResponse> {
|
||||||
const request = options.fetch ?? globalThis.fetch;
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
const headers = new Headers(options.headers);
|
const headers = new Headers(options.headers);
|
||||||
@@ -321,3 +416,12 @@ export async function updateAccountProfile(body: AccountProfileUpdateRequest, op
|
|||||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
return response.json() as Promise<AccountProfileUpdateResponse>;
|
return response.json() as Promise<AccountProfileUpdateResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function updateAdminServiceHardLimit(body: AdminServiceLimitRequest, options: ClientOptions = {}): Promise<AdminServicesResponse> {
|
||||||
|
const request = options.fetch ?? globalThis.fetch;
|
||||||
|
const headers = new Headers(options.headers);
|
||||||
|
headers.set("Content-Type", "application/json");
|
||||||
|
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/services/{service_id}/limits`, { body: JSON.stringify(body), method: "PATCH", headers });
|
||||||
|
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||||
|
return response.json() as Promise<AdminServicesResponse>;
|
||||||
|
}
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ export type AccountSettingsResponse = {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type AdminAuditQuery = {
|
||||||
|
"cursor"?: string;
|
||||||
|
"limit"?: number;
|
||||||
|
};
|
||||||
|
|
||||||
export type AdminAuthenticatedUser = {
|
export type AdminAuthenticatedUser = {
|
||||||
"role": "super_admin";
|
"role": "super_admin";
|
||||||
"status": "active";
|
"status": "active";
|
||||||
@@ -60,6 +65,42 @@ export type AdminCreditParams = {
|
|||||||
"userId": string;
|
"userId": string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type AdminDiagnosticsResponse = {
|
||||||
|
"diagnostic_text": string;
|
||||||
|
"generated_at": string;
|
||||||
|
"services": AdminServicesStorageResponse;
|
||||||
|
"system": {
|
||||||
|
"api_status": "ready" | "degraded" | "unavailable";
|
||||||
|
"app_version": string;
|
||||||
|
"browser_support": Array<{
|
||||||
|
"brand": "Google Chrome" | "Microsoft Edge";
|
||||||
|
"major": number;
|
||||||
|
}>;
|
||||||
|
"worker_status": "ready" | "degraded" | "unavailable";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminGenerationListResponse = {
|
||||||
|
"generated_at": string;
|
||||||
|
"items": Array<AdminGenerationRecord>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminGenerationRecord = {
|
||||||
|
"completed_at": string | null;
|
||||||
|
"confirmed_credit_cost": number;
|
||||||
|
"created_at": string;
|
||||||
|
"duration_ms": number | null;
|
||||||
|
"error_category": "upstream_timeout" | "upstream_failed" | "safety_rejected" | "model_disabled" | "gateway_balance_insufficient" | "gateway_contract_invalid" | "reference_invalid" | "unknown_retryable" | "unknown_non_retryable" | null;
|
||||||
|
"final_credit_state": "committed" | "released" | null;
|
||||||
|
"generation_id": string;
|
||||||
|
"model_id": string;
|
||||||
|
"owner_ref": string;
|
||||||
|
"project_id": string;
|
||||||
|
"ratio": "3:4" | "1:1" | "4:3" | "9:16";
|
||||||
|
"reserved_credits": number;
|
||||||
|
"status": "queued" | "running" | "succeeded" | "failed" | "rejected";
|
||||||
|
};
|
||||||
|
|
||||||
export type AdminLoginCompleteRequest = {
|
export type AdminLoginCompleteRequest = {
|
||||||
"registration_id": string;
|
"registration_id": string;
|
||||||
"verification_code": string;
|
"verification_code": string;
|
||||||
@@ -76,6 +117,26 @@ export type AdminLoginSendRequest = {
|
|||||||
"email": string;
|
"email": string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type AdminOperationAuditItem = {
|
||||||
|
"actor_ref": string;
|
||||||
|
"actor_type": "system" | "super_admin";
|
||||||
|
"after_summary": string | null;
|
||||||
|
"before_summary": string | null;
|
||||||
|
"expires_at": string;
|
||||||
|
"log_id": string;
|
||||||
|
"occurred_at": string;
|
||||||
|
"operation_type": string;
|
||||||
|
"result": "succeeded" | "failed";
|
||||||
|
"target_ref": string;
|
||||||
|
"target_type": string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminOperationAuditResponse = {
|
||||||
|
"generated_at": string;
|
||||||
|
"items": Array<AdminOperationAuditItem>;
|
||||||
|
"next_cursor": string | null;
|
||||||
|
};
|
||||||
|
|
||||||
export type AdminOverviewResponse = {
|
export type AdminOverviewResponse = {
|
||||||
"asset_cleanup": {
|
"asset_cleanup": {
|
||||||
"pending_jobs": number;
|
"pending_jobs": number;
|
||||||
@@ -117,12 +178,58 @@ export type AdminOverviewResponse = {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type AdminServiceHealthCheckRequest = {
|
||||||
|
"available": boolean;
|
||||||
|
"reason"?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminServiceLimitRequest = {
|
||||||
|
"hard_limit": number;
|
||||||
|
"period_type": ExternalServicePeriodType;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminServiceParams = {
|
||||||
|
"service_id": ExternalServiceId;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminServiceRecoveryRequest = {
|
||||||
|
"check_id": string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminServicesResponse = {
|
||||||
|
"services": Array<ExternalServiceUsage>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AdminServicesStorageResponse = {
|
||||||
|
"generated_at": string;
|
||||||
|
"services": Array<{
|
||||||
|
"checked_at": string | null;
|
||||||
|
"configured": boolean;
|
||||||
|
"impact_scope": "none" | "authentication" | "location" | "generation" | "storage" | "api" | "model" | "account" | "unknown";
|
||||||
|
"pause_reason": string | null;
|
||||||
|
"service_id": "resend" | "amap" | "ai_gateway" | "worker" | "api" | "asset_root";
|
||||||
|
"status": "active" | "paused_quota" | "paused_provider" | "disabled" | "degraded" | "unavailable";
|
||||||
|
}>;
|
||||||
|
"storage": {
|
||||||
|
"capacity_notice_level": "normal" | "warning" | "critical";
|
||||||
|
"cleanup_pending_count": number;
|
||||||
|
"data_root_ref": "configured_local_data_root";
|
||||||
|
"hard_limit_bytes": number;
|
||||||
|
"last_measured_at": string | null;
|
||||||
|
"managed_content_bytes": number;
|
||||||
|
"remeasurement_required": boolean;
|
||||||
|
"status": "active" | "full" | "unavailable";
|
||||||
|
"storage_backend": "local_filesystem";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export type AdminSessionResponse = {
|
export type AdminSessionResponse = {
|
||||||
"acknowledged_private_content_notice_version": string | null;
|
"acknowledged_private_content_notice_version": string | null;
|
||||||
"admin": AdminAuthenticatedUser;
|
"admin": AdminAuthenticatedUser;
|
||||||
"audience": "admin";
|
"audience": "admin";
|
||||||
"authenticated": true;
|
"authenticated": true;
|
||||||
"csrf_token": string;
|
"csrf_token": string;
|
||||||
|
"current_private_content_notice_message_key"?: string;
|
||||||
"current_private_content_notice_version": string | null;
|
"current_private_content_notice_version": string | null;
|
||||||
"expires_at": string;
|
"expires_at": string;
|
||||||
"notice_acknowledged": boolean;
|
"notice_acknowledged": boolean;
|
||||||
@@ -356,6 +463,23 @@ export type ErrorEnvelope = {
|
|||||||
|
|
||||||
export type ExportFormat = "jpg" | "png";
|
export type ExportFormat = "jpg" | "png";
|
||||||
|
|
||||||
|
export type ExternalServiceId = "resend_email" | "amap_web_service";
|
||||||
|
|
||||||
|
export type ExternalServicePeriodType = "daily" | "monthly";
|
||||||
|
|
||||||
|
export type ExternalServiceStatus = "active" | "paused_quota" | "paused_provider" | "disabled";
|
||||||
|
|
||||||
|
export type ExternalServiceUsage = {
|
||||||
|
"hard_limit": number;
|
||||||
|
"pause_reason": string | null;
|
||||||
|
"period_start": string;
|
||||||
|
"period_type": ExternalServicePeriodType;
|
||||||
|
"service_id": ExternalServiceId;
|
||||||
|
"service_status": ExternalServiceStatus;
|
||||||
|
"updated_at": string;
|
||||||
|
"used_count": number;
|
||||||
|
};
|
||||||
|
|
||||||
export type FailedEmptyTrashRequest = {
|
export type FailedEmptyTrashRequest = {
|
||||||
"project_ids": Array<ProjectId>;
|
"project_ids": Array<ProjectId>;
|
||||||
};
|
};
|
||||||
@@ -582,6 +706,41 @@ export type ModelRuntimeSseEvent = {
|
|||||||
"runtime_availability_version": number;
|
"runtime_availability_version": number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type PrivateContentAccessAuditItem = {
|
||||||
|
"actor_ref": string;
|
||||||
|
"content_type": "image" | "prompt";
|
||||||
|
"expires_at": string;
|
||||||
|
"log_id": string;
|
||||||
|
"occurred_at": string;
|
||||||
|
"target_ref": string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PrivateContentAccessAuditResponse = {
|
||||||
|
"generated_at": string;
|
||||||
|
"items": Array<PrivateContentAccessAuditItem>;
|
||||||
|
"next_cursor": string | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PrivateContentGenerationParams = {
|
||||||
|
"generationId": string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PrivateContentNoticeAckRequest = {
|
||||||
|
"expected_notice_version": string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PrivateContentNoticeAckResponse = {
|
||||||
|
"acknowledged_at": string;
|
||||||
|
"notice_version": string;
|
||||||
|
"status": "acknowledged";
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PrivateContentPromptResponse = {
|
||||||
|
"content_type": "prompt";
|
||||||
|
"generation_id": string;
|
||||||
|
"prompt": string;
|
||||||
|
};
|
||||||
|
|
||||||
export type ProjectDetailResponse = {
|
export type ProjectDetailResponse = {
|
||||||
"canvas_state": CanvasState;
|
"canvas_state": CanvasState;
|
||||||
"created_at": string;
|
"created_at": string;
|
||||||
@@ -763,7 +922,7 @@ export type ReverseGeocodeRequest = {
|
|||||||
|
|
||||||
export type ReverseGeocodeResponse = {
|
export type ReverseGeocodeResponse = {
|
||||||
"formatted_value": string;
|
"formatted_value": string;
|
||||||
"service_mode": "mock";
|
"service_mode": "mock" | "real";
|
||||||
"status": "resolved";
|
"status": "resolved";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,155 @@
|
|||||||
|
:root {
|
||||||
|
--dada-interaction-duration: 120ms;
|
||||||
|
--dada-interaction-easing: cubic-bezier(0.2, 0.8, 0.2, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(button:not(:disabled), a[href], label:has(input:not(:disabled))) {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(button:not(:disabled), a[href]) {
|
||||||
|
transition:
|
||||||
|
transform var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
box-shadow var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
border-color var(--dada-interaction-duration) ease,
|
||||||
|
background-color var(--dada-interaction-duration) ease,
|
||||||
|
color var(--dada-interaction-duration) ease,
|
||||||
|
opacity var(--dada-interaction-duration) ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(input:not(:disabled), select:not(:disabled), textarea:not(:disabled)) {
|
||||||
|
transition:
|
||||||
|
border-color var(--dada-interaction-duration) ease,
|
||||||
|
box-shadow var(--dada-interaction-duration) ease,
|
||||||
|
background-color var(--dada-interaction-duration) ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(.product-page, .product-loading) :focus-visible {
|
||||||
|
outline: 2px solid #005fcc;
|
||||||
|
outline-offset: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(input:not(:disabled), select:not(:disabled), textarea:not(:disabled)):focus-visible {
|
||||||
|
border-color: #005fcc;
|
||||||
|
box-shadow: 0 0 0 3px rgb(0 95 204 / 16%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-card,
|
||||||
|
.project-preview img,
|
||||||
|
.ratio-control span,
|
||||||
|
.reference-input,
|
||||||
|
.editor-sticker-preview,
|
||||||
|
.editor-template-mark,
|
||||||
|
.editor-template-preview,
|
||||||
|
.editor-color-card-preview,
|
||||||
|
.editor-dynamic-preview,
|
||||||
|
.editor-source-preview-canvas,
|
||||||
|
.editor-thumb {
|
||||||
|
transition:
|
||||||
|
transform var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
box-shadow var(--dada-interaction-duration) var(--dada-interaction-easing),
|
||||||
|
border-color var(--dada-interaction-duration) ease,
|
||||||
|
background-color var(--dada-interaction-duration) ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (hover: hover) and (pointer: fine) {
|
||||||
|
:where(button:not(:disabled)):hover {
|
||||||
|
border-color: #111111;
|
||||||
|
box-shadow: 0 2px 0 rgb(17 17 17 / 35%);
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(a[href]):hover {
|
||||||
|
color: #005fcc;
|
||||||
|
opacity: 0.78;
|
||||||
|
text-decoration-thickness: 2px;
|
||||||
|
text-underline-offset: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.product-header nav a:hover {
|
||||||
|
color: #111111;
|
||||||
|
background: #e9e9e5;
|
||||||
|
box-shadow: inset 0 -3px #111111;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.product-header nav a[aria-current="page"]:hover {
|
||||||
|
background: #f2f500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ratio-control label:hover span,
|
||||||
|
.reference-input:hover {
|
||||||
|
border-color: #111111;
|
||||||
|
background: #ffffd6;
|
||||||
|
box-shadow: inset 0 -3px #111111;
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-card:hover {
|
||||||
|
border-color: #111111;
|
||||||
|
box-shadow: 0 3px 0 rgb(17 17 17 / 22%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-asset-tabs button:not(:disabled):hover,
|
||||||
|
.editor-source:hover,
|
||||||
|
.editor-sticker-grid button:not(:disabled):hover,
|
||||||
|
.editor-template-categories button:not(:disabled):hover,
|
||||||
|
.editor-template-grid button:not(:disabled):hover,
|
||||||
|
.editor-provider-grid button:not(:disabled):hover,
|
||||||
|
.editor-candidates button:not(:disabled):hover {
|
||||||
|
border-color: #111111;
|
||||||
|
background: #ffffd6;
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(input:not(:disabled), select:not(:disabled), textarea:not(:disabled)):hover {
|
||||||
|
border-color: #111111;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference) {
|
||||||
|
:where(button:not(:disabled), a[href]):hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-card:hover .project-preview img,
|
||||||
|
.editor-sticker-grid button:not(:disabled):hover .editor-sticker-preview {
|
||||||
|
transform: scale(1.02);
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-template-grid button:not(:disabled):hover .editor-template-mark,
|
||||||
|
.editor-template-grid button:not(:disabled):hover .editor-template-preview,
|
||||||
|
.editor-provider-grid button:not(:disabled):hover > :first-child {
|
||||||
|
transform: scale(1.03);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: no-preference) {
|
||||||
|
:where(button:not(:disabled), a[href]):active {
|
||||||
|
transform: translateY(1px);
|
||||||
|
transition-duration: 45ms;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(button:not(:disabled)):active {
|
||||||
|
box-shadow: inset 0 2px 0 rgb(17 17 17 / 24%);
|
||||||
|
}
|
||||||
|
|
||||||
|
:where(a[href]):active {
|
||||||
|
opacity: 0.58;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
:where(button, a[href], input, select, textarea),
|
||||||
|
.project-card,
|
||||||
|
.project-preview img,
|
||||||
|
.ratio-control span,
|
||||||
|
.reference-input,
|
||||||
|
.editor-sticker-preview,
|
||||||
|
.editor-template-mark,
|
||||||
|
.editor-template-preview,
|
||||||
|
.editor-color-card-preview,
|
||||||
|
.editor-dynamic-preview,
|
||||||
|
.editor-source-preview-canvas,
|
||||||
|
.editor-thumb {
|
||||||
|
animation-duration: 0s !important;
|
||||||
|
transition-duration: 0s !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
+10
-4
@@ -7,11 +7,17 @@ import { UserAuthPage } from "./user-auth.js";
|
|||||||
import { AccountSettingsPage } from "./account-settings.js";
|
import { AccountSettingsPage } from "./account-settings.js";
|
||||||
import { AdminUsersPage } from "./admin-users.js";
|
import { AdminUsersPage } from "./admin-users.js";
|
||||||
import { AdminModelsPage } from "./admin-models.js";
|
import { AdminModelsPage } from "./admin-models.js";
|
||||||
|
import { AdminAssetsPage } from "./admin-assets.js";
|
||||||
|
import { AdminGenerationsPage } from "./admin-generations.js";
|
||||||
|
import { AdminServicesStoragePage } from "./admin-services-storage.js";
|
||||||
|
import { AdminAuditPage } from "./admin-audit.js";
|
||||||
import { CreditsPage } from "./credits-page.js";
|
import { CreditsPage } from "./credits-page.js";
|
||||||
import { ProjectDetailPage, ProjectsPage, WorkspacePage } from "./project-pages.js";
|
import { ProjectDetailPage, ProjectsPage, WorkspacePage } from "./project-pages.js";
|
||||||
import { EditorPage } from "./editor-page.js";
|
import { EditorPage } from "./editor-page.js";
|
||||||
import { AdminOverviewPage, AdminPlaceholderPage, AdminProtectedRoute } from "./admin-shell.js";
|
import { AdminOverviewPage, AdminPlaceholderPage, AdminProtectedRoute } from "./admin-shell.js";
|
||||||
|
|
||||||
|
import "./interaction-feedback.css";
|
||||||
|
|
||||||
const root = document.getElementById("root");
|
const root = document.getElementById("root");
|
||||||
|
|
||||||
if (!root) {
|
if (!root) {
|
||||||
@@ -39,13 +45,13 @@ function renderAuthenticationEntry() {
|
|||||||
else if (window.location.pathname.startsWith("/admin")) {
|
else if (window.location.pathname.startsWith("/admin")) {
|
||||||
const adminPages: Record<string, { content: ReactNode; title: string }> = {
|
const adminPages: Record<string, { content: ReactNode; title: string }> = {
|
||||||
"/admin": { content: <AdminOverviewPage />, title: "运营总览" },
|
"/admin": { content: <AdminOverviewPage />, title: "运营总览" },
|
||||||
"/admin/assets": { content: <AdminPlaceholderPage title="素材" />, title: "素材" },
|
"/admin/assets": { content: <AdminAssetsPage />, title: "素材" },
|
||||||
"/admin/audit": { content: <AdminPlaceholderPage title="审计" />, title: "审计" },
|
"/admin/audit": { content: <AdminAuditPage />, title: "审计" },
|
||||||
"/admin/generations": { content: <AdminPlaceholderPage title="生成记录" />, title: "生成记录" },
|
"/admin/generations": { content: <AdminGenerationsPage />, title: "生成记录" },
|
||||||
"/admin/invites": { content: <AdminPlaceholderPage title="邀请码" />, title: "邀请码" },
|
"/admin/invites": { content: <AdminPlaceholderPage title="邀请码" />, title: "邀请码" },
|
||||||
"/admin/models": { content: <AdminModelsPage />, title: "模型" },
|
"/admin/models": { content: <AdminModelsPage />, title: "模型" },
|
||||||
"/admin/preview": { content: <AdminPlaceholderPage title="内部预览" />, title: "内部预览" },
|
"/admin/preview": { content: <AdminPlaceholderPage title="内部预览" />, title: "内部预览" },
|
||||||
"/admin/services-storage": { content: <AdminPlaceholderPage title="服务与存储" />, title: "服务与存储" },
|
"/admin/services-storage": { content: <AdminServicesStoragePage />, title: "服务与存储" },
|
||||||
"/admin/users": { content: <AdminUsersPage />, title: "用户与点数" },
|
"/admin/users": { content: <AdminUsersPage />, title: "用户与点数" },
|
||||||
};
|
};
|
||||||
const page = adminPages[window.location.pathname] ?? adminPages["/admin"]!;
|
const page = adminPages[window.location.pathname] ?? adminPages["/admin"]!;
|
||||||
|
|||||||
@@ -27,6 +27,17 @@ export const COLOR_CARD_SOURCE_GEOMETRY = {
|
|||||||
style_16: { bounds: { bottom: 9, left: -78, right: 78, top: -9 } },
|
style_16: { bounds: { bottom: 9, left: -78, right: 78, top: -9 } },
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
export const COLOR_CARD_HALF_SIZES: Readonly<Record<string, { height: number; width: number }>> = {
|
||||||
|
style_01: { height: 76, width: 26 }, style_02: { height: 77, width: 18 },
|
||||||
|
style_03: { height: 75, width: 22 }, style_04: { height: 75, width: 18 },
|
||||||
|
style_05: { height: 18, width: 78 }, style_06: { height: 16, width: 78 },
|
||||||
|
style_07: { height: 20, width: 78 }, style_08: { height: 10, width: 73 },
|
||||||
|
style_09: { height: 75, width: 58 }, style_10: { height: 75, width: 60 },
|
||||||
|
style_11: { height: 18, width: 78 }, style_12: { height: 34, width: 70 },
|
||||||
|
style_13: { height: 75, width: 18 }, style_14: { height: 28, width: 60 },
|
||||||
|
style_15: { height: 16, width: 78 }, style_16: { height: 9, width: 78 },
|
||||||
|
};
|
||||||
|
|
||||||
function normalizedHex(value: string) {
|
function normalizedHex(value: string) {
|
||||||
return value.toUpperCase();
|
return value.toUpperCase();
|
||||||
}
|
}
|
||||||
@@ -139,6 +150,65 @@ export function drawColorCard(context: CanvasRenderingContext2D, element: Canvas
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (element.style_id === "style_03") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(-22, -75 + index * 30, 44, 29);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_04") {
|
||||||
|
context.strokeStyle = "#ffffff";
|
||||||
|
context.lineWidth = 2;
|
||||||
|
context.beginPath();
|
||||||
|
context.moveTo(0, -75);
|
||||||
|
context.lineTo(0, 75);
|
||||||
|
context.stroke();
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(0, -60 + index * 30, 9, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (["style_05", "style_06", "style_07", "style_11"].includes(element.style_id ?? "")) {
|
||||||
|
if (element.style_id === "style_11") {
|
||||||
|
context.strokeStyle = "#ffffff";
|
||||||
|
context.lineWidth = 3;
|
||||||
|
context.strokeRect(-78, -18, 156, 36);
|
||||||
|
}
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
const left = -72 + index * 29;
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(left, -10, 28, 20);
|
||||||
|
if (element.style_id === "style_07") {
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(left + 14, -16, 4, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (element.style_id === "style_05") {
|
||||||
|
context.fillStyle = "#111111";
|
||||||
|
context.fillRect(-78, -18, 20, 36);
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.font = "700 7px Arial, sans-serif";
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
context.fillText("C", -68, 0);
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_06") {
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.beginPath();
|
||||||
|
context.moveTo(-4, -16);
|
||||||
|
context.lineTo(4, -16);
|
||||||
|
context.lineTo(0, -10);
|
||||||
|
context.closePath();
|
||||||
|
context.fill();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (element.style_id === "style_08") {
|
if (element.style_id === "style_08") {
|
||||||
colors.forEach((color, index) => {
|
colors.forEach((color, index) => {
|
||||||
const left = -73 + index * 29.2;
|
const left = -73 + index * 29.2;
|
||||||
@@ -159,6 +229,61 @@ export function drawColorCard(context: CanvasRenderingContext2D, element: Canvas
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (element.style_id === "style_09" || element.style_id === "style_10") {
|
||||||
|
context.fillStyle = "#ffffff";
|
||||||
|
context.fillRect(-58, -75, 116, 150);
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(-50, -64 + index * 23, 100, 22);
|
||||||
|
});
|
||||||
|
context.fillStyle = "#111111";
|
||||||
|
context.font = "700 8px Arial, sans-serif";
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
context.fillText(element.style_id === "style_09" ? "COLOR PALETTE" : "FIVE COLORS", 0, 63);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_12") {
|
||||||
|
const positions = [[-52, -18], [0, -18], [52, -18], [-26, 18], [26, 18]] as const;
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
const position = positions[index]!;
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.fillRect(position[0] - 24, position[1] - 14, 48, 28);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_13") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(0, -60 + index * 30, 11, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_14") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.globalAlpha = 0.9;
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(-40 + index * 20, 0, 24, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
});
|
||||||
|
context.globalAlpha = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (element.style_id === "style_15") {
|
||||||
|
colors.forEach((color, index) => {
|
||||||
|
context.fillStyle = color;
|
||||||
|
context.strokeStyle = "#ffffff";
|
||||||
|
context.lineWidth = 3;
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(-58 + index * 29, 0, 12, 0, Math.PI * 2);
|
||||||
|
context.fill();
|
||||||
|
context.stroke();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
context.fillStyle = "#ffffff";
|
context.fillStyle = "#ffffff";
|
||||||
context.beginPath();
|
context.beginPath();
|
||||||
context.moveTo(-78, -9);
|
context.moveTo(-78, -9);
|
||||||
|
|||||||
@@ -592,15 +592,26 @@
|
|||||||
height: 18px;
|
height: 18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-placeholder {
|
.project-placeholder,
|
||||||
|
.project-preview {
|
||||||
display: grid;
|
display: grid;
|
||||||
height: 154px;
|
height: 154px;
|
||||||
grid-template-columns: repeat(4, 1fr);
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
border-bottom: 1px solid #a5a59f;
|
border-bottom: 1px solid #a5a59f;
|
||||||
background: #d8d8d3;
|
background: #d8d8d3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.project-placeholder {
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-preview img {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
.project-placeholder span {
|
.project-placeholder span {
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: end center;
|
place-items: end center;
|
||||||
@@ -935,9 +946,9 @@
|
|||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-current > .project-placeholder {
|
.project-current > .project-placeholder,
|
||||||
height: auto;
|
.project-current > .project-preview {
|
||||||
min-height: 480px;
|
height: 480px;
|
||||||
border: 1px solid #73736d;
|
border: 1px solid #73736d;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -945,6 +956,10 @@
|
|||||||
font-size: 80px;
|
font-size: 80px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.project-current > .project-preview img {
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
.project-actions {
|
.project-actions {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
@@ -1013,7 +1028,8 @@
|
|||||||
padding: 6px;
|
padding: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-history li .project-placeholder {
|
.project-history li .project-placeholder,
|
||||||
|
.project-history li .project-preview {
|
||||||
height: 88px;
|
height: 88px;
|
||||||
border: 0;
|
border: 0;
|
||||||
}
|
}
|
||||||
@@ -1439,8 +1455,9 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-current > .project-placeholder {
|
.project-current > .project-placeholder,
|
||||||
min-height: 360px;
|
.project-current > .project-preview {
|
||||||
|
height: 360px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.local-only-footer {
|
.local-only-footer {
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ interface LocalDataPayload {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface AccountSettingsPayload {
|
interface AccountSettingsPayload {
|
||||||
|
csrf_token: string;
|
||||||
local_data: LocalDataPayload;
|
local_data: LocalDataPayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,6 +232,33 @@ function ProjectPlaceholder({ ratio, status }: { ratio: Ratio; status: ProjectSt
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ProjectPreview({ alt, imageId, loading = "lazy", projectId, ratio, status }: {
|
||||||
|
alt: string;
|
||||||
|
imageId: string | null;
|
||||||
|
loading?: "eager" | "lazy";
|
||||||
|
projectId: string;
|
||||||
|
ratio: Ratio;
|
||||||
|
status: ProjectStatus;
|
||||||
|
}) {
|
||||||
|
const [loadFailed, setLoadFailed] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => setLoadFailed(false), [imageId, projectId]);
|
||||||
|
|
||||||
|
if (!imageId || loadFailed) return <ProjectPlaceholder ratio={ratio} status={status} />;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="project-preview" data-ratio={ratio} data-status={status}>
|
||||||
|
<img
|
||||||
|
alt={alt}
|
||||||
|
decoding="async"
|
||||||
|
loading={loading}
|
||||||
|
onError={() => setLoadFailed(true)}
|
||||||
|
src={`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(imageId)}`}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function WorkspacePage() {
|
export function WorkspacePage() {
|
||||||
const promptId = useId();
|
const promptId = useId();
|
||||||
const [session, setSession] = useState<SessionPayload>();
|
const [session, setSession] = useState<SessionPayload>();
|
||||||
@@ -269,7 +297,12 @@ export function WorkspacePage() {
|
|||||||
if (!active) return;
|
if (!active) return;
|
||||||
if (modelResult.status === "fulfilled") setModels(modelResult.value);
|
if (modelResult.status === "fulfilled") setModels(modelResult.value);
|
||||||
if (taskResult.status === "fulfilled") setCurrentTask(taskResult.value);
|
if (taskResult.status === "fulfilled") setCurrentTask(taskResult.value);
|
||||||
if (settingsResult.status === "fulfilled" && settingsResult.value) setLocalData(settingsResult.value.local_data);
|
const settings = settingsResult.status === "fulfilled" ? settingsResult.value : undefined;
|
||||||
|
if (settings) {
|
||||||
|
setLocalData(settings.local_data);
|
||||||
|
// Account settings rotates the mutation token; keep the workspace token current.
|
||||||
|
setSession((current) => current ? { ...current, csrf_token: settings.csrf_token } : current);
|
||||||
|
}
|
||||||
setGenerationStateLoaded(true);
|
setGenerationStateLoaded(true);
|
||||||
});
|
});
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
@@ -568,7 +601,13 @@ function ProjectCard({ activeLimitReached, busy, onPurge, onRestore, onSelect, o
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
) : null}
|
) : null}
|
||||||
<ProjectPlaceholder ratio={project.ratio} status={project.status} />
|
<ProjectPreview
|
||||||
|
alt={`${project.name}预览图`}
|
||||||
|
imageId={project.current_image_id}
|
||||||
|
projectId={project.project_id}
|
||||||
|
ratio={project.ratio}
|
||||||
|
status={project.status}
|
||||||
|
/>
|
||||||
<div className="project-card-body">
|
<div className="project-card-body">
|
||||||
<div><h3 title={project.name}>{project.name}</h3><span>{project.status === "failed_empty" ? "生成失败" : project.status === "trashed" ? "回收站" : "项目"}</span></div>
|
<div><h3 title={project.name}>{project.name}</h3><span>{project.status === "failed_empty" ? "生成失败" : project.status === "trashed" ? "回收站" : "项目"}</span></div>
|
||||||
<p>{project.successful_image_count} 张成功图 · {project.ratio}</p>
|
<p>{project.successful_image_count} 张成功图 · {project.ratio}</p>
|
||||||
@@ -953,7 +992,14 @@ export function ProjectDetailPage({ projectId }: { projectId: string }) {
|
|||||||
<div className="project-detail-grid">
|
<div className="project-detail-grid">
|
||||||
<section className="project-current" aria-labelledby="current-image-title">
|
<section className="project-current" aria-labelledby="current-image-title">
|
||||||
<header><h2 id="current-image-title">当前底图</h2><span>{project.pixel_width ?? 1080} × {project.pixel_height ?? 1440}</span></header>
|
<header><h2 id="current-image-title">当前底图</h2><span>{project.pixel_width ?? 1080} × {project.pixel_height ?? 1440}</span></header>
|
||||||
<ProjectPlaceholder ratio={project.ratio} status={project.status} />
|
<ProjectPreview
|
||||||
|
alt={`${project.name}当前底图`}
|
||||||
|
imageId={project.current_image_id}
|
||||||
|
loading="eager"
|
||||||
|
projectId={project.project_id}
|
||||||
|
ratio={project.ratio}
|
||||||
|
status={project.status}
|
||||||
|
/>
|
||||||
<div className="project-actions">
|
<div className="project-actions">
|
||||||
<button disabled={conflicted || atHistoryLimit} onClick={() => window.location.assign(`/app?continue=${project.project_id}`)} type="button">继续生成</button>
|
<button disabled={conflicted || atHistoryLimit} onClick={() => window.location.assign(`/app?continue=${project.project_id}`)} type="button">继续生成</button>
|
||||||
{conflicted || !project.current_image_id ? <button disabled type="button">进入编辑器</button> : <a href={`/app/projects/${project.project_id}/editor`}>进入编辑器</a>}
|
{conflicted || !project.current_image_id ? <button disabled type="button">进入编辑器</button> : <a href={`/app/projects/${project.project_id}/editor`}>进入编辑器</a>}
|
||||||
@@ -970,7 +1016,13 @@ export function ProjectDetailPage({ projectId }: { projectId: string }) {
|
|||||||
<ol>
|
<ol>
|
||||||
{project.images.toReversed().map((image, index) => (
|
{project.images.toReversed().map((image, index) => (
|
||||||
<li key={image.image_id} data-current={image.image_id === project.current_image_id}>
|
<li key={image.image_id} data-current={image.image_id === project.current_image_id}>
|
||||||
<ProjectPlaceholder ratio={project.ratio} status="active" />
|
<ProjectPreview
|
||||||
|
alt={`生成结果 ${project.images.length - index}`}
|
||||||
|
imageId={image.image_id}
|
||||||
|
projectId={project.project_id}
|
||||||
|
ratio={project.ratio}
|
||||||
|
status="active"
|
||||||
|
/>
|
||||||
<div><strong>生成结果 {project.images.length - index}</strong><time dateTime={image.created_at}>{formatUpdatedAt(image.created_at)}</time><a href={`/api/v1/private-assets/projects/${project.project_id}/images/${image.image_id}`}>下载原始图</a></div>
|
<div><strong>生成结果 {project.images.length - index}</strong><time dateTime={image.created_at}>{formatUpdatedAt(image.created_at)}</time><a href={`/api/v1/private-assets/projects/${project.project_id}/images/${image.image_id}`}>下载原始图</a></div>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -5,8 +5,9 @@ import {
|
|||||||
type StaticStickerCatalogItem,
|
type StaticStickerCatalogItem,
|
||||||
type VirtualStickerWindow,
|
type VirtualStickerWindow,
|
||||||
} from "@dada/static-sticker-catalog";
|
} from "@dada/static-sticker-catalog";
|
||||||
|
import { P0A_STATIC_STICKER_RELEASE_VERSION } from "@dada/template-registry";
|
||||||
|
|
||||||
const resourceVersion = "fixture-v1";
|
const resourceVersion = P0A_STATIC_STICKER_RELEASE_VERSION;
|
||||||
const partCounts = [203, 36, 27, 48, 38, 75, 37, 67, 48, 24, 40, 30, 27, 51, 62, 19, 36, 45, 92, 53, 69, 31, 36, 30, 183] as const;
|
const partCounts = [203, 36, 27, 48, 38, 75, 37, 67, 48, 24, 40, 30, 27, 51, 62, 19, 36, 45, 92, 53, 69, 31, 36, 30, 183] as const;
|
||||||
|
|
||||||
function buildCatalog(): StaticStickerCatalogItem[] {
|
function buildCatalog(): StaticStickerCatalogItem[] {
|
||||||
@@ -45,3 +46,4 @@ export function stickerWindow(items: readonly StaticStickerCatalogItem[], scroll
|
|||||||
}
|
}
|
||||||
|
|
||||||
export { staticStickerOriginalUrl, staticStickerThumbnailUrl };
|
export { staticStickerOriginalUrl, staticStickerThumbnailUrl };
|
||||||
|
export type { StaticStickerCatalogItem };
|
||||||
|
|||||||
+249
-70
@@ -1,12 +1,114 @@
|
|||||||
import type { CanvasState } from "@dada/shared-contracts";
|
import type { CanvasState } from "@dada/shared-contracts";
|
||||||
import { P0A_REQUIRED_FONT_PANEL_IDS, P0A_TEXT_TEMPLATE_IDS } from "@dada/template-registry";
|
import { P0A_COMPLEX_RELEASE_VERSION, P0A_REQUIRED_FONT_PANEL_IDS, P0A_TEXT_TEMPLATE_IDS } from "@dada/template-registry";
|
||||||
|
|
||||||
import type { CanvasElementIdentity } from "./editor-elements.js";
|
import type { CanvasElementIdentity } from "./editor-elements.js";
|
||||||
|
import complexAssetCatalog from "./generated/complex-assets.json";
|
||||||
|
|
||||||
type CanvasElement = CanvasState["elements"][number];
|
type CanvasElement = CanvasState["elements"][number];
|
||||||
|
|
||||||
export type TextTemplateCategory = "flower" | "simple" | "tag" | "title";
|
export type TextTemplateCategory = "flower" | "simple" | "tag" | "title";
|
||||||
export type TextAlign = "center" | "left" | "right";
|
export type TextAlign = "center" | "left" | "right";
|
||||||
|
export type TextVerticalAlign = "bottom" | "middle" | "top";
|
||||||
|
|
||||||
|
export interface TextTemplateImageLayer {
|
||||||
|
alpha: number;
|
||||||
|
anchorX: number;
|
||||||
|
anchorY: number;
|
||||||
|
assetId: string;
|
||||||
|
height: number;
|
||||||
|
order: number;
|
||||||
|
rotation: number;
|
||||||
|
scaleX: number;
|
||||||
|
scaleY: number;
|
||||||
|
width: number;
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
ninePatch?: TextTemplateNinePatch;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TextTemplateNinePatch {
|
||||||
|
bottom: number;
|
||||||
|
left: number;
|
||||||
|
right: number;
|
||||||
|
sourceHeight: number;
|
||||||
|
sourceWidth: number;
|
||||||
|
top: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TextTemplateParticleLayer extends TextTemplateImageLayer {
|
||||||
|
alpha: number;
|
||||||
|
atlasColumns: number;
|
||||||
|
atlasRows: number;
|
||||||
|
color: string;
|
||||||
|
density: number;
|
||||||
|
particleHeight: number;
|
||||||
|
particleWidth: number;
|
||||||
|
randomizeAngle: number;
|
||||||
|
randomizePosition: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TextTemplateTextLayer {
|
||||||
|
alpha: number;
|
||||||
|
align: TextAlign;
|
||||||
|
anchorX: number;
|
||||||
|
anchorY: number;
|
||||||
|
contentLinked: boolean;
|
||||||
|
editable: boolean;
|
||||||
|
fillColor: string;
|
||||||
|
fillGradient?: { bottom: string; top: string };
|
||||||
|
fillPatternAssetId?: string;
|
||||||
|
fillTextureLayout?: TextTemplateFillTextureLayout;
|
||||||
|
fontId: string;
|
||||||
|
fontSize: number;
|
||||||
|
height: number;
|
||||||
|
glyphColors?: readonly string[];
|
||||||
|
letterSpacing: number;
|
||||||
|
lineHeight: number;
|
||||||
|
order: number;
|
||||||
|
rotation: number;
|
||||||
|
scaleX: number;
|
||||||
|
scaleY: number;
|
||||||
|
shadowBlur: number;
|
||||||
|
shadowColor: string;
|
||||||
|
shadowOffsetX: number;
|
||||||
|
shadowOffsetY: number;
|
||||||
|
skewX: number;
|
||||||
|
skewY: number;
|
||||||
|
strokeColor: string;
|
||||||
|
strokeWidth: number;
|
||||||
|
text: string;
|
||||||
|
textPath?: TextTemplateTextPath;
|
||||||
|
verticalAlign: TextVerticalAlign;
|
||||||
|
width: number;
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TextTemplateFillTextureLayout {
|
||||||
|
columns: number;
|
||||||
|
idList: readonly number[];
|
||||||
|
rows: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TextTemplateTextPath {
|
||||||
|
circle: boolean;
|
||||||
|
conicWeights: readonly number[];
|
||||||
|
firstMargin: number;
|
||||||
|
forceAlignment: boolean;
|
||||||
|
isAbsoluteMode: boolean;
|
||||||
|
lastMargin: number;
|
||||||
|
perpendicular: boolean;
|
||||||
|
points: readonly { x: number; y: number }[];
|
||||||
|
reversed: boolean;
|
||||||
|
verbs: readonly number[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TextTemplateRenderModel {
|
||||||
|
halfSize: { height: number; width: number };
|
||||||
|
imageLayers: readonly TextTemplateImageLayer[];
|
||||||
|
particleLayers: readonly TextTemplateParticleLayer[];
|
||||||
|
textLayers: readonly TextTemplateTextLayer[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface TextTemplateDefinition {
|
export interface TextTemplateDefinition {
|
||||||
available: boolean;
|
available: boolean;
|
||||||
@@ -17,6 +119,8 @@ export interface TextTemplateDefinition {
|
|||||||
defaultText: string;
|
defaultText: string;
|
||||||
displayName: string;
|
displayName: string;
|
||||||
fontUrl?: string;
|
fontUrl?: string;
|
||||||
|
previewUrl?: string;
|
||||||
|
renderModel: TextTemplateRenderModel;
|
||||||
resourceClass: "parameter_only" | "zip_template";
|
resourceClass: "parameter_only" | "zip_template";
|
||||||
resourceVersion: string;
|
resourceVersion: string;
|
||||||
templateId: string;
|
templateId: string;
|
||||||
@@ -42,7 +146,10 @@ export interface TextStylePatch {
|
|||||||
textAlign?: TextAlign;
|
textAlign?: TextAlign;
|
||||||
}
|
}
|
||||||
|
|
||||||
const fixtureVersion = "wp4-fixture-v1";
|
const resourceVersion = P0A_COMPLEX_RELEASE_VERSION;
|
||||||
|
const textResourceRevision = complexAssetCatalog.text_resource_revision;
|
||||||
|
const publicTextAssetUrl = (assetId: string, version = resourceVersion) =>
|
||||||
|
`/api/v1/assets/public/${version}/${assetId}?revision=${textResourceRevision}`;
|
||||||
const defaults = {
|
const defaults = {
|
||||||
background_color: "#FFE62C",
|
background_color: "#FFE62C",
|
||||||
background_enabled: false,
|
background_enabled: false,
|
||||||
@@ -56,85 +163,142 @@ const defaults = {
|
|||||||
text_align: "center",
|
text_align: "center",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
type CatalogSeed = [id: string, category: TextTemplateCategory, displayName: string, defaultText: string, defaultFontId: string, available?: boolean, resourceClass?: "parameter_only"];
|
const textCatalogById = new Map(complexAssetCatalog.text_templates.map((item) => [item.template_id, item]));
|
||||||
|
|
||||||
const seeds: readonly CatalogSeed[] = [
|
function imageLayer(layer: {
|
||||||
["FLOWER001", "flower", "春日计划", "春日计划", "FONT011", true],
|
alpha?: number; anchor_x?: number; anchor_y?: number; asset_id: string; height: number; nine_patch?: {
|
||||||
["FLOWER002", "flower", "笑不活了", "笑不活了", "FLOWER002_FONT"],
|
bottom: number; left: number; right: number; source_height: number; source_width: number; top: number;
|
||||||
["FLOWER003", "flower", "人生照片", "人生照片", "FONT008"],
|
}; order: number; rotation: number; scale_x: number; scale_y: number; width: number; x: number; y: number;
|
||||||
["FLOWER004", "flower", "我的日常生活", "我的日常生活", "FLOWER004_FONT"],
|
}): TextTemplateImageLayer {
|
||||||
["FLOWER005", "flower", "碎片生活", "碎片生活", "FONT008"],
|
return {
|
||||||
["FLOWER006", "flower", "闪光瞬间", "闪光瞬间", "FLOWER006_FONT"],
|
alpha: layer.alpha ?? 1, anchorX: layer.anchor_x ?? 0.5, anchorY: layer.anchor_y ?? 0.5,
|
||||||
["FLOWER007", "flower", "好柿花生", "好柿花生", "FONT046", false, "parameter_only"],
|
assetId: layer.asset_id, height: layer.height, order: layer.order, rotation: layer.rotation,
|
||||||
["FLOWER008", "flower", "Vlog.", "Vlog.", "FONT005"],
|
scaleX: layer.scale_x, scaleY: layer.scale_y, width: layer.width, x: layer.x, y: layer.y,
|
||||||
["H001", "title", "电影生活记录", "电影生活记录", "H001_FONT"],
|
...(layer.nine_patch ? { ninePatch: {
|
||||||
["H002", "title", "30°C", "30°C", "H002_FONT"],
|
bottom: layer.nine_patch.bottom, left: layer.nine_patch.left, right: layer.nine_patch.right,
|
||||||
["H003", "title", "生活分享家", "生活分享家", "FONT039", true],
|
sourceHeight: layer.nine_patch.source_height, sourceWidth: layer.nine_patch.source_width, top: layer.nine_patch.top,
|
||||||
["H004", "title", "快乐充值成功", "快乐充值成功", "FONT046"],
|
} } : {}),
|
||||||
["H005", "title", "日常的镜头", "日常的镜头", "H005_FONT"],
|
};
|
||||||
["H006", "title", "慢生活指南", "慢生活指南", "FONT052"],
|
}
|
||||||
["H007", "title", "做个有闲人", "做个有闲人", "H007_FONT"],
|
|
||||||
["H008", "title", "海滩日记", "海滩日记", "H008_FONT"],
|
|
||||||
["TAG001", "tag", "自定义标签", "自定义标签", "FONT027"],
|
|
||||||
["TAG002", "tag", "自定义标签", "自定义标签", "FONT043"],
|
|
||||||
["TAG003", "tag", "打卡x1", "打卡x1", "FONT043"],
|
|
||||||
["TAG004", "tag", "自定义标签", "自定义标签", "TAG004_FONT"],
|
|
||||||
["TAG005", "tag", "自定义标签", "自定义标签", "FONT008"],
|
|
||||||
["TAG006", "tag", "City Walk", "City Walk", "TAG006_FONT"],
|
|
||||||
["TAG007", "tag", "打卡x1", "打卡x1", "FONT043"],
|
|
||||||
["TAG051", "tag", "自定义标签", "自定义标签", "FONT022"],
|
|
||||||
["SIMPLE001", "simple", "碎片回忆录", "碎片回忆录", "SIMPLE001_FONT"],
|
|
||||||
["SIMPLE002", "simple", "秋天的信笺", "秋天的信笺", "SIMPLE002_FONT"],
|
|
||||||
["SIMPLE003", "simple", "返航时海鸟追着船盘旋", "返航时海鸟追着船盘旋", "SIMPLE003_FONT"],
|
|
||||||
["SIMPLE004", "simple", "下段旅程,幸福丰盛。", "下段旅程,幸福丰盛。", "SIMPLE002_FONT"],
|
|
||||||
["SIMPLE005", "simple", "见信好。", "见信好。", "SIMPLE005_FONT"],
|
|
||||||
["SIMPLE006", "simple", "万物回春", "万物回春", "SIMPLE001_FONT"],
|
|
||||||
["SIMPLE007", "simple", "周而复始。", "周而复始。", "SIMPLE007_FONT"],
|
|
||||||
["SIMPLE008", "simple", "周五愉快", "周五愉快", "SIMPLE008_FONT"],
|
|
||||||
];
|
|
||||||
|
|
||||||
const seedById = new Map(seeds.map((seed) => [seed[0], seed]));
|
interface RawTextLayer {
|
||||||
|
alpha?: number; align: string; anchor_x?: number; anchor_y?: number; content_linked?: boolean; editable: boolean; fill_color: string;
|
||||||
|
fill_gradient?: { bottom: string; top: string }; fill_pattern_asset_id?: string;
|
||||||
|
fill_texture_layout?: { columns: number; id_list: number[]; rows: number }; font_id: string; font_size: number;
|
||||||
|
glyph_colors?: string[]; height: number; letter_spacing: number; line_height: number; order: number; rotation: number; scale_x: number; scale_y: number;
|
||||||
|
shadow_blur: number; shadow_color: string; shadow_offset_x: number; shadow_offset_y: number; stroke_color: string;
|
||||||
|
skew_x?: number; skew_y?: number; stroke_width: number; text: string; text_path?: {
|
||||||
|
circle: boolean; conic_weights: number[]; first_margin: number; force_alignment: boolean; is_absolute_mode: boolean;
|
||||||
|
last_margin: number; perpendicular: boolean; points: Array<{ x: number; y: number }>; reversed: boolean; verbs: number[];
|
||||||
|
}; vertical_align: TextVerticalAlign; width: number; x: number; y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderModel(item: (typeof complexAssetCatalog.text_templates)[number]): TextTemplateRenderModel {
|
||||||
|
return {
|
||||||
|
halfSize: { height: item.render_model.half_size.height, width: item.render_model.half_size.width },
|
||||||
|
imageLayers: item.render_model.image_layers.map(imageLayer),
|
||||||
|
particleLayers: item.render_model.particle_layers.map((layer) => ({
|
||||||
|
...imageLayer(layer), alpha: layer.alpha, atlasColumns: layer.atlas_columns, atlasRows: layer.atlas_rows,
|
||||||
|
color: layer.color, density: layer.density, particleHeight: layer.particle_height,
|
||||||
|
particleWidth: layer.particle_width, randomizeAngle: layer.randomize_angle, randomizePosition: layer.randomize_position,
|
||||||
|
})),
|
||||||
|
textLayers: item.render_model.text_layers.map((value) => {
|
||||||
|
const layer = value as unknown as RawTextLayer;
|
||||||
|
return {
|
||||||
|
alpha: layer.alpha ?? 1, align: layer.align as TextAlign, anchorX: layer.anchor_x ?? 0.5, anchorY: layer.anchor_y ?? 0.5,
|
||||||
|
contentLinked: layer.content_linked ?? layer.editable, editable: layer.editable, fillColor: layer.fill_color,
|
||||||
|
...(layer.fill_gradient ? { fillGradient: layer.fill_gradient } : {}),
|
||||||
|
...(layer.fill_pattern_asset_id ? { fillPatternAssetId: layer.fill_pattern_asset_id } : {}),
|
||||||
|
...(layer.fill_texture_layout ? { fillTextureLayout: {
|
||||||
|
columns: layer.fill_texture_layout.columns, idList: layer.fill_texture_layout.id_list, rows: layer.fill_texture_layout.rows,
|
||||||
|
} } : {}),
|
||||||
|
fontId: layer.font_id, fontSize: layer.font_size, ...(layer.glyph_colors ? { glyphColors: layer.glyph_colors } : {}),
|
||||||
|
height: layer.height, letterSpacing: layer.letter_spacing,
|
||||||
|
lineHeight: layer.line_height, order: layer.order, rotation: layer.rotation, scaleX: layer.scale_x,
|
||||||
|
scaleY: layer.scale_y, shadowBlur: layer.shadow_blur, shadowColor: layer.shadow_color,
|
||||||
|
shadowOffsetX: layer.shadow_offset_x, shadowOffsetY: layer.shadow_offset_y,
|
||||||
|
skewX: layer.skew_x ?? 0, skewY: layer.skew_y ?? 0,
|
||||||
|
strokeColor: layer.stroke_color, strokeWidth: layer.stroke_width, text: layer.text,
|
||||||
|
...(layer.text_path ? { textPath: {
|
||||||
|
circle: layer.text_path.circle, conicWeights: layer.text_path.conic_weights,
|
||||||
|
firstMargin: layer.text_path.first_margin, forceAlignment: layer.text_path.force_alignment,
|
||||||
|
isAbsoluteMode: layer.text_path.is_absolute_mode, lastMargin: layer.text_path.last_margin,
|
||||||
|
perpendicular: layer.text_path.perpendicular, points: layer.text_path.points,
|
||||||
|
reversed: layer.text_path.reversed, verbs: layer.text_path.verbs,
|
||||||
|
} } : {}),
|
||||||
|
verticalAlign: layer.vertical_align, width: layer.width, x: layer.x, y: layer.y,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export const P0A_TEXT_TEMPLATES: readonly TextTemplateDefinition[] = P0A_TEXT_TEMPLATE_IDS.map((templateId, catalogOrder) => {
|
export const P0A_TEXT_TEMPLATES: readonly TextTemplateDefinition[] = P0A_TEXT_TEMPLATE_IDS.map((templateId, catalogOrder) => {
|
||||||
const seed = seedById.get(templateId);
|
const item = textCatalogById.get(templateId);
|
||||||
if (!seed) throw new Error(`missing text template definition ${templateId}`);
|
if (!item) throw new Error(`missing text template definition ${templateId}`);
|
||||||
return {
|
return {
|
||||||
available: seed[5] === true,
|
available: item.available,
|
||||||
catalogOrder,
|
catalogOrder,
|
||||||
category: seed[1],
|
category: item.category as TextTemplateCategory,
|
||||||
defaultFontId: seed[4],
|
defaultFontId: item.default_font_id,
|
||||||
defaultFontSize: 48,
|
defaultFontSize: item.default_font_size,
|
||||||
defaultText: seed[3],
|
defaultText: item.default_text,
|
||||||
displayName: seed[2],
|
displayName: item.display_name,
|
||||||
...(seed[5] === true ? { fontUrl: `/api/v1/assets/public/${fixtureVersion}/${seed[4]}` } : {}),
|
fontUrl: publicTextAssetUrl(item.default_font_id),
|
||||||
resourceClass: seed[6] ?? "zip_template",
|
...(item.preview_asset_id ? { previewUrl: publicTextAssetUrl(item.preview_asset_id) } : {}),
|
||||||
resourceVersion: fixtureVersion,
|
renderModel: renderModel(item),
|
||||||
|
resourceClass: item.resource_class as "parameter_only" | "zip_template",
|
||||||
|
resourceVersion,
|
||||||
templateId,
|
templateId,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
const fontOptionDefinitions: Readonly<Record<typeof P0A_REQUIRED_FONT_PANEL_IDS[number], string>> = {
|
const fontCatalogById = new Map(complexAssetCatalog.font_panel_items.map((item) => [item.font_id, item]));
|
||||||
FONT005: "Rammetto",
|
|
||||||
FONT008: "正圆体",
|
|
||||||
FONT011: "默陌手写",
|
|
||||||
FONT021: "喜月体",
|
|
||||||
FONT022: "素白体",
|
|
||||||
FONT027: "锐正圆",
|
|
||||||
FONT039: "字由油漆",
|
|
||||||
FONT043: "喜脉体",
|
|
||||||
FONT046: "可口可乐",
|
|
||||||
FONT052: "Oraqle Script",
|
|
||||||
FONT081: "Lexend Deca",
|
|
||||||
};
|
|
||||||
|
|
||||||
export const P0A_FONT_OPTIONS: readonly FontOption[] = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId) => ({
|
export const P0A_FONT_OPTIONS: readonly FontOption[] = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId) => {
|
||||||
displayName: fontOptionDefinitions[fontId],
|
const item = fontCatalogById.get(fontId);
|
||||||
fontId,
|
if (!item) throw new Error(`missing font panel definition ${fontId}`);
|
||||||
url: `/api/v1/assets/public/${fixtureVersion}/${fontId}`,
|
return {
|
||||||
}));
|
displayName: item.display_name,
|
||||||
|
fontId,
|
||||||
|
url: publicTextAssetUrl(fontId),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const templateFontOptions: readonly FontOption[] = P0A_TEXT_TEMPLATES.flatMap((template) => {
|
||||||
|
const fontIds = [...new Set(template.renderModel.textLayers.map((layer) => layer.fontId))];
|
||||||
|
return fontIds.map((fontId, index) => ({
|
||||||
|
displayName: `${template.displayName}原版字体${fontIds.length > 1 ? ` ${index + 1}` : ""}`,
|
||||||
|
fontId,
|
||||||
|
url: publicTextAssetUrl(fontId, template.resourceVersion),
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
|
const allFontOptions = new Map([...P0A_FONT_OPTIONS, ...templateFontOptions].map((option) => [option.fontId, option]));
|
||||||
|
|
||||||
export function fontOption(fontId: string) {
|
export function fontOption(fontId: string) {
|
||||||
return P0A_FONT_OPTIONS.find((option) => option.fontId === fontId);
|
return allFontOptions.get(fontId);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function textTemplateById(templateId: string) {
|
||||||
|
return P0A_TEXT_TEMPLATES.find((template) => template.templateId === templateId);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function textTemplateFontOptions(templateId: string) {
|
||||||
|
const template = textTemplateById(templateId);
|
||||||
|
if (!template) return [];
|
||||||
|
return [...new Set(template.renderModel.textLayers.map((layer) => layer.fontId))]
|
||||||
|
.map((fontId) => fontOption(fontId)).filter((option): option is FontOption => option !== undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function textTemplateImageUrls(templateId: string, version = resourceVersion) {
|
||||||
|
const template = textTemplateById(templateId);
|
||||||
|
if (!template) return new Map<string, string>();
|
||||||
|
const assetIds = new Set([
|
||||||
|
...template.renderModel.imageLayers.map((layer) => layer.assetId),
|
||||||
|
...template.renderModel.particleLayers.map((layer) => layer.assetId),
|
||||||
|
...template.renderModel.textLayers.flatMap((layer) => layer.fillPatternAssetId ? [layer.fillPatternAssetId] : []),
|
||||||
|
]);
|
||||||
|
return new Map([...assetIds].map((assetId) => [assetId, publicTextAssetUrl(assetId, version)]));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function fontIdForTextElement(element: CanvasElement) {
|
export function fontIdForTextElement(element: CanvasElement) {
|
||||||
@@ -162,7 +326,19 @@ function isStep(value: number, minimum: number, step: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function templateStyle(template: TextTemplateDefinition): Record<string, string | number | boolean | null> {
|
function templateStyle(template: TextTemplateDefinition): Record<string, string | number | boolean | null> {
|
||||||
return { ...defaults, default_font_id: template.defaultFontId };
|
const primary = template.renderModel.textLayers.find((layer) => layer.editable) ?? template.renderModel.textLayers[0];
|
||||||
|
return {
|
||||||
|
...defaults,
|
||||||
|
default_font_id: template.defaultFontId,
|
||||||
|
fill_color: primary?.fillColor ?? defaults.fill_color,
|
||||||
|
letter_spacing: primary?.letterSpacing ?? defaults.letter_spacing,
|
||||||
|
line_height: primary?.lineHeight ?? defaults.line_height,
|
||||||
|
stroke_color: primary?.strokeColor ?? defaults.stroke_color,
|
||||||
|
stroke_enabled: (primary?.strokeWidth ?? 0) > 0,
|
||||||
|
stroke_width: primary?.strokeWidth ?? defaults.stroke_width,
|
||||||
|
template_fill_overridden: false,
|
||||||
|
text_align: primary?.align ?? defaults.text_align,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export function searchTextTemplates(
|
export function searchTextTemplates(
|
||||||
@@ -238,7 +414,10 @@ export class TextEditSession {
|
|||||||
|
|
||||||
setStyle(patch: TextStylePatch) {
|
setStyle(patch: TextStylePatch) {
|
||||||
const style = { ...(this.draft.style_parameters ?? {}) };
|
const style = { ...(this.draft.style_parameters ?? {}) };
|
||||||
if (patch.fillColor !== undefined) style.fill_color = checkedColor(patch.fillColor);
|
if (patch.fillColor !== undefined) {
|
||||||
|
style.fill_color = checkedColor(patch.fillColor);
|
||||||
|
style.template_fill_overridden = true;
|
||||||
|
}
|
||||||
if (patch.strokeColor !== undefined) style.stroke_color = checkedColor(patch.strokeColor);
|
if (patch.strokeColor !== undefined) style.stroke_color = checkedColor(patch.strokeColor);
|
||||||
if (patch.backgroundColor !== undefined) style.background_color = checkedColor(patch.backgroundColor);
|
if (patch.backgroundColor !== undefined) style.background_color = checkedColor(patch.backgroundColor);
|
||||||
if (patch.strokeEnabled !== undefined) style.stroke_enabled = patch.strokeEnabled;
|
if (patch.strokeEnabled !== undefined) style.stroke_enabled = patch.strokeEnabled;
|
||||||
|
|||||||
@@ -1,10 +1,44 @@
|
|||||||
import type { ArchivedFontStatus } from "./text-font-loader.js";
|
import { useEffect, useRef, type CSSProperties } from "react";
|
||||||
|
import { fontFamilyName, type ArchivedFontStatus } from "./text-font-loader.js";
|
||||||
import { searchTextTemplates, type TextTemplateCategory, type TextTemplateDefinition } from "./text-assets.js";
|
import { searchTextTemplates, type TextTemplateCategory, type TextTemplateDefinition } from "./text-assets.js";
|
||||||
|
|
||||||
const categories: Array<{ id?: TextTemplateCategory; label: string }> = [
|
const categories: Array<{ id?: TextTemplateCategory; label: string }> = [
|
||||||
{ label: "全部" }, { id: "flower", label: "花字" }, { id: "title", label: "标题" }, { id: "tag", label: "标签" }, { id: "simple", label: "简约" },
|
{ label: "全部" }, { id: "flower", label: "花字" }, { id: "title", label: "标题" }, { id: "tag", label: "标签" }, { id: "simple", label: "简约" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
function LiveTemplatePreview(props: { onEnsure: () => void; template: TextTemplateDefinition }) {
|
||||||
|
const previewRef = useRef<HTMLSpanElement>(null);
|
||||||
|
const layer = props.template.renderModel.textLayers.find((item) => item.editable) ?? props.template.renderModel.textLayers[0]!;
|
||||||
|
useEffect(() => {
|
||||||
|
const node = previewRef.current;
|
||||||
|
if (!node || typeof IntersectionObserver === "undefined") {
|
||||||
|
props.onEnsure();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const observer = new IntersectionObserver((entries) => {
|
||||||
|
if (!entries.some((entry) => entry.isIntersecting)) return;
|
||||||
|
observer.disconnect();
|
||||||
|
props.onEnsure();
|
||||||
|
});
|
||||||
|
observer.observe(node);
|
||||||
|
return () => observer.disconnect();
|
||||||
|
}, [props.onEnsure, props.template.templateId]);
|
||||||
|
const scale = Math.min(1, 38 / Math.max(1, layer.height), 112 / Math.max(1, layer.width));
|
||||||
|
const style: CSSProperties = {
|
||||||
|
color: layer.fillColor,
|
||||||
|
fontFamily: `"${fontFamilyName(layer.fontId)}"`,
|
||||||
|
fontSize: `${layer.fontSize * scale}px`,
|
||||||
|
letterSpacing: `${layer.letterSpacing * scale}px`,
|
||||||
|
lineHeight: layer.lineHeight,
|
||||||
|
textShadow: layer.shadowBlur > 0 || layer.shadowOffsetX !== 0 || layer.shadowOffsetY !== 0
|
||||||
|
? `${layer.shadowOffsetX * scale}px ${layer.shadowOffsetY * scale}px ${layer.shadowBlur * scale}px ${layer.shadowColor}`
|
||||||
|
: undefined,
|
||||||
|
transform: `rotate(${layer.rotation}deg) scale(${layer.scaleX}, ${layer.scaleY})`,
|
||||||
|
WebkitTextStroke: layer.strokeWidth > 0 ? `${layer.strokeWidth * scale}px ${layer.strokeColor}` : undefined,
|
||||||
|
};
|
||||||
|
return <span className="editor-template-live-preview" ref={previewRef} style={style}>{layer.text || props.template.defaultText}</span>;
|
||||||
|
}
|
||||||
|
|
||||||
export function TextTemplatePanel(props: {
|
export function TextTemplatePanel(props: {
|
||||||
canAdd: boolean;
|
canAdd: boolean;
|
||||||
category?: TextTemplateCategory;
|
category?: TextTemplateCategory;
|
||||||
@@ -12,6 +46,7 @@ export function TextTemplatePanel(props: {
|
|||||||
onAdd: (template: TextTemplateDefinition) => void;
|
onAdd: (template: TextTemplateDefinition) => void;
|
||||||
onCategory: (category?: TextTemplateCategory) => void;
|
onCategory: (category?: TextTemplateCategory) => void;
|
||||||
onQuery: (query: string) => void;
|
onQuery: (query: string) => void;
|
||||||
|
onEnsure: (template: TextTemplateDefinition) => void;
|
||||||
onRetry: () => void;
|
onRetry: () => void;
|
||||||
query: string;
|
query: string;
|
||||||
recentIds: readonly string[];
|
recentIds: readonly string[];
|
||||||
@@ -31,12 +66,15 @@ export function TextTemplatePanel(props: {
|
|||||||
<div className="editor-template-grid">
|
<div className="editor-template-grid">
|
||||||
{visible.map((template) => {
|
{visible.map((template) => {
|
||||||
const status = props.fontStatuses[template.defaultFontId] ?? "idle";
|
const status = props.fontStatuses[template.defaultFontId] ?? "idle";
|
||||||
const unavailable = !template.available || status === "unavailable";
|
const unavailable = !template.available;
|
||||||
return <button aria-label={`${template.templateId} ${template.displayName}${unavailable ? " 素材暂不可用" : ""}`} disabled={!props.canAdd || unavailable || status === "loading"} key={template.templateId} onClick={() => props.onAdd(template)} type="button">
|
const retryable = template.available && status === "unavailable";
|
||||||
<span className={`editor-template-mark ${template.category}`}>{template.displayName.slice(0, 2)}</span>
|
return <button aria-label={`${template.templateId} ${template.displayName}${unavailable ? " 素材暂不可用" : retryable ? " 字体待重试" : ""}`} disabled={!props.canAdd || unavailable || status === "loading"} key={template.templateId} onClick={() => props.onAdd(template)} type="button">
|
||||||
|
{template.previewUrl
|
||||||
|
? <img alt="" className="editor-template-preview" decoding="async" loading="lazy" src={template.previewUrl} />
|
||||||
|
: <LiveTemplatePreview onEnsure={() => props.onEnsure(template)} template={template} />}
|
||||||
<strong>{template.templateId}</strong>
|
<strong>{template.templateId}</strong>
|
||||||
<span>{template.displayName}</span>
|
<span>{template.displayName}</span>
|
||||||
{unavailable ? <small>素材暂不可用</small> : status === "loading" ? <small>正在加载字体</small> : null}
|
{unavailable ? <small>素材暂不可用</small> : retryable ? <small>点击重试原版字体</small> : status === "loading" ? <small>正在加载字体</small> : null}
|
||||||
</button>;
|
</button>;
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -124,6 +124,25 @@ button {
|
|||||||
margin-inline: auto;
|
margin-inline: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.auth-test-entry {
|
||||||
|
margin-bottom: 18px;
|
||||||
|
border-bottom: 1px solid #b4b4af;
|
||||||
|
padding-bottom: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-test-entry .auth-primary {
|
||||||
|
margin-top: 0;
|
||||||
|
border-color: #111111;
|
||||||
|
background: #111111;
|
||||||
|
color: #f2f500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.auth-test-entry .auth-primary:disabled {
|
||||||
|
border-color: #777773;
|
||||||
|
background: #deded9;
|
||||||
|
color: #777773;
|
||||||
|
}
|
||||||
|
|
||||||
.auth-tabs {
|
.auth-tabs {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 1fr 1fr;
|
grid-template-columns: 1fr 1fr;
|
||||||
|
|||||||
@@ -77,6 +77,9 @@ export function UserAuthPage() {
|
|||||||
const [sendState, setSendState] = useState<SendState>("idle");
|
const [sendState, setSendState] = useState<SendState>("idle");
|
||||||
const [countdown, setCountdown] = useState(0);
|
const [countdown, setCountdown] = useState(0);
|
||||||
const [error, setError] = useState<string>();
|
const [error, setError] = useState<string>();
|
||||||
|
const [localTestAvailable, setLocalTestAvailable] = useState(false);
|
||||||
|
const [localTestError, setLocalTestError] = useState<string>();
|
||||||
|
const [localTestSubmitting, setLocalTestSubmitting] = useState(false);
|
||||||
const [submitting, setSubmitting] = useState(false);
|
const [submitting, setSubmitting] = useState(false);
|
||||||
const emailValid = /^[^@\s]+@[^@\s]+$/.test(email);
|
const emailValid = /^[^@\s]+@[^@\s]+$/.test(email);
|
||||||
const registrationReady = Boolean(
|
const registrationReady = Boolean(
|
||||||
@@ -93,6 +96,18 @@ export function UserAuthPage() {
|
|||||||
return () => window.clearInterval(timer);
|
return () => window.clearInterval(timer);
|
||||||
}, [countdown]);
|
}, [countdown]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
void fetch("/api/v1/auth/local-test", { credentials: "same-origin", signal: controller.signal })
|
||||||
|
.then(async (response) => {
|
||||||
|
if (!response.ok || !response.headers.get("content-type")?.includes("application/json")) return;
|
||||||
|
const body = await response.json() as { available?: boolean };
|
||||||
|
if (body.available === true) setLocalTestAvailable(true);
|
||||||
|
})
|
||||||
|
.catch(() => undefined);
|
||||||
|
return () => controller.abort();
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!noticeOpen) return;
|
if (!noticeOpen) return;
|
||||||
const previousOverflow = document.body.style.overflow;
|
const previousOverflow = document.body.style.overflow;
|
||||||
@@ -255,6 +270,27 @@ export function UserAuthPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function enterLocalTest() {
|
||||||
|
if (localTestSubmitting) return;
|
||||||
|
setLocalTestSubmitting(true);
|
||||||
|
setLocalTestError(undefined);
|
||||||
|
try {
|
||||||
|
const response = await fetch("/api/v1/auth/local-test", {
|
||||||
|
credentials: "same-origin",
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
setLocalTestError("本机测试会话未能建立,请重试。");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
window.location.assign("/app");
|
||||||
|
} catch {
|
||||||
|
setLocalTestError("本机测试会话未能建立,请重试。");
|
||||||
|
} finally {
|
||||||
|
setLocalTestSubmitting(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<main className="auth-page">
|
<main className="auth-page">
|
||||||
@@ -271,6 +307,14 @@ export function UserAuthPage() {
|
|||||||
<section className="auth-content">
|
<section className="auth-content">
|
||||||
<a className="auth-admin-link" href="/admin/login">管理员登录</a>
|
<a className="auth-admin-link" href="/admin/login">管理员登录</a>
|
||||||
<div className="auth-panel">
|
<div className="auth-panel">
|
||||||
|
{localTestAvailable ? (
|
||||||
|
<div className="auth-test-entry">
|
||||||
|
<button className="auth-primary" disabled={localTestSubmitting} onClick={enterLocalTest} type="button">
|
||||||
|
{localTestSubmitting ? "正在进入" : "直接进入本机测试"}
|
||||||
|
</button>
|
||||||
|
{localTestError ? <p className="auth-error" role="alert">{localTestError}</p> : null}
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
<div className="auth-tabs" role="tablist" aria-label="认证方式">
|
<div className="auth-tabs" role="tablist" aria-label="认证方式">
|
||||||
<button
|
<button
|
||||||
aria-selected={mode === "login"}
|
aria-selected={mode === "login"}
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ async function checkSupport() {
|
|||||||
browserValue.textContent = `${result.browser.brand} ${result.browser.major}`;
|
browserValue.textContent = `${result.browser.brand} ${result.browser.major}`;
|
||||||
supportedValue.textContent = supportedLabel(result.supported_browsers);
|
supportedValue.textContent = supportedLabel(result.supported_browsers);
|
||||||
window.dispatchEvent(new CustomEvent("dada:support-ready"));
|
window.dispatchEvent(new CustomEvent("dada:support-ready"));
|
||||||
|
window.location.replace(window.location.pathname.startsWith("/admin") ? "/admin" : "/app");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
showBlocked(
|
showBlocked(
|
||||||
|
|||||||
@@ -9,7 +9,8 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "13.0.1",
|
"better-sqlite3": "13.0.1",
|
||||||
"drizzle-orm": "0.45.2"
|
"drizzle-orm": "0.45.2",
|
||||||
|
"sharp": "0.35.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/better-sqlite3": "7.6.13",
|
"@types/better-sqlite3": "7.6.13",
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ export interface GenerationAdapterRequest {
|
|||||||
prompt: string;
|
prompt: string;
|
||||||
ratio: "3:4" | "1:1" | "4:3" | "9:16";
|
ratio: "3:4" | "1:1" | "4:3" | "9:16";
|
||||||
referenceAssetIds: readonly string[];
|
referenceAssetIds: readonly string[];
|
||||||
|
referenceImages?: readonly {
|
||||||
|
assetId: string;
|
||||||
|
bytes: Buffer;
|
||||||
|
mimeType: "image/jpeg" | "image/png" | "image/webp";
|
||||||
|
}[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface NormalizedGenerationOutput {
|
export interface NormalizedGenerationOutput {
|
||||||
@@ -27,6 +32,7 @@ export type GenerationAdapterResult =
|
|||||||
};
|
};
|
||||||
|
|
||||||
export interface GenerationAdapter {
|
export interface GenerationAdapter {
|
||||||
|
dispose?(): void;
|
||||||
start(request: GenerationAdapterRequest): Promise<GenerationAdapterResult>;
|
start(request: GenerationAdapterRequest): Promise<GenerationAdapterResult>;
|
||||||
poll?(upstreamJobReference: string): Promise<GenerationAdapterResult>;
|
poll?(upstreamJobReference: string): Promise<GenerationAdapterResult>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { GenerationAdapterRequest, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
import type { GenerationAdapterRequest, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
||||||
|
import { normalizeImageOutputToRatio } from "./image-output-normalizer.mjs";
|
||||||
import {
|
import {
|
||||||
AdapterContractError, type AdapterStartResult, type AdapterTransport, balanceSignalFromResponse,
|
AdapterContractError, type AdapterStartResult, type AdapterTransport, balanceSignalFromResponse,
|
||||||
classifyAdapterError, dimensionsForRatio, mockPngBytes, validateAdapterRequest, validateMockContract,
|
classifyAdapterError, dimensionsForRatio, mockPngBytes, validateAdapterRequest, validateMockContract,
|
||||||
@@ -41,7 +42,8 @@ export class GeminiFlashAdapter implements ModelAdapter {
|
|||||||
const classified = this.classifyError("error" in response ? response.error : undefined, (request.configSnapshot.error_mapping_profile as Record<string, string> | undefined) ?? {});
|
const classified = this.classifyError("error" in response ? response.error : undefined, (request.configSnapshot.error_mapping_profile as Record<string, string> | undefined) ?? {});
|
||||||
return { ...classified, status: "failed" };
|
return { ...classified, status: "failed" };
|
||||||
}
|
}
|
||||||
return { outputs: [this.normalizeOutput(response)], status: "completed" };
|
const output = this.normalizeOutput(response);
|
||||||
|
return { outputs: [await normalizeImageOutputToRatio({ ...output, ratio: request.ratio })], status: "completed" };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const classified = error instanceof AdapterContractError
|
const classified = error instanceof AdapterContractError
|
||||||
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { GenerationAdapterRequest, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
import type { GenerationAdapterRequest, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
||||||
|
import { normalizeImageOutputToRatio } from "./image-output-normalizer.mjs";
|
||||||
import {
|
import {
|
||||||
AdapterContractError, type AdapterStartResult, type AdapterTransport, balanceSignalFromResponse,
|
AdapterContractError, type AdapterStartResult, type AdapterTransport, balanceSignalFromResponse,
|
||||||
classifyAdapterError, dimensionsForRatio, mockPngBytes, validateAdapterRequest, validateMockContract,
|
classifyAdapterError, dimensionsForRatio, mockPngBytes, validateAdapterRequest, validateMockContract,
|
||||||
@@ -37,7 +38,7 @@ export class GeminiProAdapter implements ModelAdapter {
|
|||||||
try {
|
try {
|
||||||
validateAdapterRequest(request, this.modelId);
|
validateAdapterRequest(request, this.modelId);
|
||||||
const response = await this.transport.start({ operation: "start", modelId: this.modelId, prompt: request.prompt, ratio: request.ratio, referenceAssetIds: request.referenceAssetIds });
|
const response = await this.transport.start({ operation: "start", modelId: this.modelId, prompt: request.prompt, ratio: request.ratio, referenceAssetIds: request.referenceAssetIds });
|
||||||
return this.interpret(response, request.configSnapshot.error_mapping_profile as Record<string, string> ?? {});
|
return await this.interpret(response, request.configSnapshot.error_mapping_profile as Record<string, string> ?? {}, request.ratio);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const classified = error instanceof AdapterContractError
|
const classified = error instanceof AdapterContractError
|
||||||
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
||||||
@@ -49,7 +50,7 @@ export class GeminiProAdapter implements ModelAdapter {
|
|||||||
async poll(upstreamJobReference: string): Promise<AdapterStartResult> {
|
async poll(upstreamJobReference: string): Promise<AdapterStartResult> {
|
||||||
try {
|
try {
|
||||||
const response = await this.transport.poll({ operation: "poll", modelId: this.modelId, upstreamJobReference });
|
const response = await this.transport.poll({ operation: "poll", modelId: this.modelId, upstreamJobReference });
|
||||||
return this.interpret(response, {});
|
return await this.interpret(response, {});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const classified = error instanceof AdapterContractError
|
const classified = error instanceof AdapterContractError
|
||||||
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
||||||
@@ -58,7 +59,7 @@ export class GeminiProAdapter implements ModelAdapter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private interpret(response: unknown, mappingProfile: Readonly<Record<string, string>>): AdapterStartResult {
|
private async interpret(response: unknown, mappingProfile: Readonly<Record<string, string>>, ratio?: GenerationAdapterRequest["ratio"]): Promise<AdapterStartResult> {
|
||||||
if (!response || typeof response !== "object" || !("operation" in response) || !response.operation || typeof response.operation !== "object") {
|
if (!response || typeof response !== "object" || !("operation" in response) || !response.operation || typeof response.operation !== "object") {
|
||||||
return { category: "gateway_contract_invalid", sourceCategory: "response_shape_invalid", status: "failed" };
|
return { category: "gateway_contract_invalid", sourceCategory: "response_shape_invalid", status: "failed" };
|
||||||
}
|
}
|
||||||
@@ -72,7 +73,8 @@ export class GeminiProAdapter implements ModelAdapter {
|
|||||||
return reference ? { status: "pending", upstreamJobReference: reference } : { category: "gateway_contract_invalid", sourceCategory: "upstream_reference_missing", status: "failed" };
|
return reference ? { status: "pending", upstreamJobReference: reference } : { category: "gateway_contract_invalid", sourceCategory: "upstream_reference_missing", status: "failed" };
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
return { outputs: [this.normalizeOutput("response" in operation ? operation.response : undefined)], status: "completed" };
|
const output = this.normalizeOutput("response" in operation ? operation.response : undefined);
|
||||||
|
return { outputs: [ratio ? await normalizeImageOutputToRatio({ ...output, ratio }) : output], status: "completed" };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return { category: "gateway_contract_invalid", sourceCategory: error instanceof AdapterContractError ? error.sourceCategory : "response_shape_invalid", status: "failed" };
|
return { category: "gateway_contract_invalid", sourceCategory: error instanceof AdapterContractError ? error.sourceCategory : "response_shape_invalid", status: "failed" };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { GenerationAdapterRequest, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
import type { GenerationAdapterRequest, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
||||||
|
import { normalizeImageOutputToRatio } from "./image-output-normalizer.mjs";
|
||||||
import {
|
import {
|
||||||
AdapterContractError, type AdapterStartResult, type AdapterTransport, balanceSignalFromResponse,
|
AdapterContractError, type AdapterStartResult, type AdapterTransport, balanceSignalFromResponse,
|
||||||
classifyAdapterError, dimensionsForRatio, mockPngBytes, validateAdapterRequest, validateMockContract,
|
classifyAdapterError, dimensionsForRatio, mockPngBytes, validateAdapterRequest, validateMockContract,
|
||||||
@@ -41,7 +42,8 @@ export class GptImageAdapter implements ModelAdapter {
|
|||||||
const classified = this.classifyError("error" in response ? response.error : undefined, (request.configSnapshot.error_mapping_profile as Record<string, string> | undefined) ?? {});
|
const classified = this.classifyError("error" in response ? response.error : undefined, (request.configSnapshot.error_mapping_profile as Record<string, string> | undefined) ?? {});
|
||||||
return { ...classified, status: "failed" };
|
return { ...classified, status: "failed" };
|
||||||
}
|
}
|
||||||
return { outputs: [this.normalizeOutput(response)], status: "completed" };
|
const output = this.normalizeOutput(response);
|
||||||
|
return { outputs: [await normalizeImageOutputToRatio({ ...output, ratio: request.ratio })], status: "completed" };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const classified = error instanceof AdapterContractError
|
const classified = error instanceof AdapterContractError
|
||||||
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
? { category: "gateway_contract_invalid" as const, sourceCategory: error.sourceCategory }
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import type { GenerationAdapter } from "./ai-adapter-contract.js";
|
||||||
|
|
||||||
|
export type AiRuntimeProbeResult =
|
||||||
|
| {
|
||||||
|
code: "ai_probe_passed";
|
||||||
|
mime_type: "image/jpeg" | "image/png" | "image/webp";
|
||||||
|
pixel_height: number;
|
||||||
|
pixel_width: number;
|
||||||
|
real_calls: 1;
|
||||||
|
success: true;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
code: "ai_probe_failed";
|
||||||
|
error_category: string;
|
||||||
|
real_calls: 1;
|
||||||
|
success: false;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function runAiRuntimeProbe(adapter: GenerationAdapter): Promise<AiRuntimeProbeResult> {
|
||||||
|
const result = await adapter.start({
|
||||||
|
configSnapshot: { probe: true },
|
||||||
|
generationId: "00000000-0000-4000-8000-000000000002",
|
||||||
|
modelId: "gemini-3.1-flash-image-preview",
|
||||||
|
prompt: "生成一张简洁的红蓝几何色块测试图,不含文字。",
|
||||||
|
ratio: "1:1",
|
||||||
|
referenceAssetIds: [],
|
||||||
|
});
|
||||||
|
if (result.status === "failed") {
|
||||||
|
return { code: "ai_probe_failed", error_category: result.category, real_calls: 1, success: false };
|
||||||
|
}
|
||||||
|
if (result.status !== "completed" || result.outputs.length !== 1) {
|
||||||
|
return { code: "ai_probe_failed", error_category: "gateway_contract_invalid", real_calls: 1, success: false };
|
||||||
|
}
|
||||||
|
const output = result.outputs[0]!;
|
||||||
|
try {
|
||||||
|
return {
|
||||||
|
code: "ai_probe_passed",
|
||||||
|
mime_type: output.mimeType,
|
||||||
|
pixel_height: output.pixelHeight,
|
||||||
|
pixel_width: output.pixelWidth,
|
||||||
|
real_calls: 1,
|
||||||
|
success: true,
|
||||||
|
};
|
||||||
|
} finally {
|
||||||
|
output.bytes.fill(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
export interface GenerationPollingProcessor {
|
||||||
|
processNext(): Promise<unknown>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class GenerationPollingLoop {
|
||||||
|
private closed = false;
|
||||||
|
private inFlight = false;
|
||||||
|
private readonly timer: ReturnType<typeof setInterval>;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly processor: GenerationPollingProcessor,
|
||||||
|
intervalMilliseconds = 250,
|
||||||
|
) {
|
||||||
|
if (!Number.isSafeInteger(intervalMilliseconds) || intervalMilliseconds <= 0) {
|
||||||
|
throw new Error("generation_polling_interval_invalid");
|
||||||
|
}
|
||||||
|
this.timer = setInterval(() => this.run(), intervalMilliseconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
close() {
|
||||||
|
if (this.closed) return;
|
||||||
|
this.closed = true;
|
||||||
|
clearInterval(this.timer);
|
||||||
|
}
|
||||||
|
|
||||||
|
private run() {
|
||||||
|
if (this.closed || this.inFlight) return;
|
||||||
|
this.inFlight = true;
|
||||||
|
void this.processor.processNext()
|
||||||
|
.catch(() => undefined)
|
||||||
|
.finally(() => {
|
||||||
|
this.inFlight = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
import { createHash, randomUUID } from "node:crypto";
|
import { createHash, randomUUID } from "node:crypto";
|
||||||
import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
|
import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
|
||||||
import { dirname, join, resolve } from "node:path";
|
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
||||||
|
|
||||||
import Database from "better-sqlite3";
|
import Database from "better-sqlite3";
|
||||||
import type BetterSqlite3 from "better-sqlite3";
|
import type BetterSqlite3 from "better-sqlite3";
|
||||||
|
|
||||||
import type { GenerationAdapter, GenerationAdapterResult, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
import type { GenerationAdapter, GenerationAdapterRequest, GenerationAdapterResult, NormalizedGenerationOutput } from "./ai-adapter-contract.js";
|
||||||
import { GatewayBalanceRuntime } from "./gateway-balance-runtime.js";
|
import { GatewayBalanceRuntime } from "./gateway-balance-runtime.js";
|
||||||
import { generationErrorRegistry, type GenerationErrorCategory } from "./generation-error-registry.js";
|
import { generationErrorRegistry, type GenerationErrorCategory } from "./generation-error-registry.js";
|
||||||
import { configureWorkerDatabase } from "./sqlite-connection.js";
|
import { configureWorkerDatabase } from "./sqlite-connection.js";
|
||||||
@@ -91,7 +91,8 @@ export class GenerationProcessor {
|
|||||||
this.clock = input.clock ?? Date.now;
|
this.clock = input.clock ?? Date.now;
|
||||||
this.dataRoot = resolve(input.dataRoot);
|
this.dataRoot = resolve(input.dataRoot);
|
||||||
this.workerId = input.workerId;
|
this.workerId = input.workerId;
|
||||||
this.database = new Database(input.databasePath);
|
const nativeBinding = process.env.DADA_SQLITE_NATIVE_BINDING;
|
||||||
|
this.database = new Database(input.databasePath, nativeBinding ? { nativeBinding } : undefined);
|
||||||
configureWorkerDatabase(this.database);
|
configureWorkerDatabase(this.database);
|
||||||
this.migrate();
|
this.migrate();
|
||||||
this.gatewayBalance = new GatewayBalanceRuntime({ clock: this.clock, database: this.database });
|
this.gatewayBalance = new GatewayBalanceRuntime({ clock: this.clock, database: this.database });
|
||||||
@@ -119,6 +120,7 @@ export class GenerationProcessor {
|
|||||||
.run("worker_stopped", now, this.workerId);
|
.run("worker_stopped", now, this.workerId);
|
||||||
});
|
});
|
||||||
this.gatewayBalance.close();
|
this.gatewayBalance.close();
|
||||||
|
this.adapter.dispose?.();
|
||||||
this.database.close();
|
this.database.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,6 +145,12 @@ export class GenerationProcessor {
|
|||||||
SELECT managed_file_id FROM generation_reference_snapshots WHERE generation_id = ? ORDER BY position
|
SELECT managed_file_id FROM generation_reference_snapshots WHERE generation_id = ? ORDER BY position
|
||||||
`).all(generationId) as Array<{ managed_file_id: string }>;
|
`).all(generationId) as Array<{ managed_file_id: string }>;
|
||||||
let adapterResult: GenerationAdapterResult;
|
let adapterResult: GenerationAdapterResult;
|
||||||
|
let referenceImages: NonNullable<GenerationAdapterRequest["referenceImages"]>;
|
||||||
|
try {
|
||||||
|
referenceImages = this.loadReferenceImages(references.map((row) => row.managed_file_id));
|
||||||
|
} catch {
|
||||||
|
return this.completeFailure(job, "reference_invalid", "reference_load_failed");
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
if (job.upstream_job_reference) {
|
if (job.upstream_job_reference) {
|
||||||
if (!this.adapter.poll) return this.completeFailure(job, "unknown_retryable", "poll_unsupported", undefined, false, "pending_manual_review");
|
if (!this.adapter.poll) return this.completeFailure(job, "unknown_retryable", "poll_unsupported", undefined, false, "pending_manual_review");
|
||||||
@@ -155,10 +163,13 @@ export class GenerationProcessor {
|
|||||||
prompt: job.prompt,
|
prompt: job.prompt,
|
||||||
ratio: job.ratio,
|
ratio: job.ratio,
|
||||||
referenceAssetIds: references.map((row) => row.managed_file_id),
|
referenceAssetIds: references.map((row) => row.managed_file_id),
|
||||||
|
referenceImages,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
return this.completeFailure(job, "unknown_retryable", "adapter_exception", undefined, false, "pending_manual_review");
|
return this.completeFailure(job, "unknown_retryable", "adapter_exception", undefined, false, "pending_manual_review");
|
||||||
|
} finally {
|
||||||
|
for (const reference of referenceImages) reference.bytes.fill(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (adapterResult.status === "failed") return this.completeFailure(job, adapterResult.category, adapterResult.sourceCategory, adapterResult.balanceSignal);
|
if (adapterResult.status === "failed") return this.completeFailure(job, adapterResult.category, adapterResult.sourceCategory, adapterResult.balanceSignal);
|
||||||
@@ -174,6 +185,29 @@ export class GenerationProcessor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private loadReferenceImages(referenceAssetIds: string[]): NonNullable<GenerationAdapterRequest["referenceImages"]> {
|
||||||
|
return referenceAssetIds.map((assetId) => {
|
||||||
|
const row = this.database.prepare(`
|
||||||
|
SELECT relative_path, mime_type FROM managed_files
|
||||||
|
WHERE file_id = ? AND file_kind = 'reference' AND status = 'committed'
|
||||||
|
`).get(assetId) as { mime_type: string; relative_path: string } | undefined;
|
||||||
|
if (!row || !["image/jpeg", "image/png", "image/webp"].includes(row.mime_type) || isAbsolute(row.relative_path)) {
|
||||||
|
throw new Error("reference_invalid");
|
||||||
|
}
|
||||||
|
const path = resolve(this.dataRoot, row.relative_path);
|
||||||
|
const child = relative(this.dataRoot, path);
|
||||||
|
if (!child || child === ".." || child.startsWith(`..${sep}`) || isAbsolute(child)
|
||||||
|
|| !existsSync(path) || !statSync(path).isFile()) {
|
||||||
|
throw new Error("reference_invalid");
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
assetId,
|
||||||
|
bytes: readFileSync(path),
|
||||||
|
mimeType: row.mime_type as "image/jpeg" | "image/png" | "image/webp",
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private claim(generationId: string) {
|
private claim(generationId: string) {
|
||||||
return this.immediate(() => {
|
return this.immediate(() => {
|
||||||
const row = this.readJob(generationId);
|
const row = this.readJob(generationId);
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
import sharp from "sharp";
|
||||||
|
|
||||||
|
const productDimensions = Object.freeze({
|
||||||
|
"3:4": Object.freeze({ pixelHeight: 1440, pixelWidth: 1080 }),
|
||||||
|
"1:1": Object.freeze({ pixelHeight: 1080, pixelWidth: 1080 }),
|
||||||
|
"4:3": Object.freeze({ pixelHeight: 1080, pixelWidth: 1440 }),
|
||||||
|
"9:16": Object.freeze({ pixelHeight: 1920, pixelWidth: 1080 }),
|
||||||
|
});
|
||||||
|
|
||||||
|
const gptImageRequestSizes = Object.freeze({
|
||||||
|
"3:4": "1056x1408",
|
||||||
|
"1:1": "1088x1088",
|
||||||
|
"4:3": "1408x1056",
|
||||||
|
"9:16": "1008x1792",
|
||||||
|
});
|
||||||
|
|
||||||
|
const allowedMimeTypes = new Set(["image/jpeg", "image/png", "image/webp"]);
|
||||||
|
const maximumInputBytes = 20 * 1024 * 1024;
|
||||||
|
|
||||||
|
function assertRatio(ratio) {
|
||||||
|
if (!(ratio in productDimensions)) throw new Error("image_output_ratio_unsupported");
|
||||||
|
return ratio;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function productDimensionsForRatio(ratio) {
|
||||||
|
return { ...productDimensions[assertRatio(ratio)] };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function gptImageRequestSizeForRatio(ratio) {
|
||||||
|
return gptImageRequestSizes[assertRatio(ratio)];
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function normalizeImageOutputToRatio(input) {
|
||||||
|
const ratio = assertRatio(input?.ratio);
|
||||||
|
if (!Buffer.isBuffer(input?.bytes) || input.bytes.length === 0 || input.bytes.length > maximumInputBytes
|
||||||
|
|| !allowedMimeTypes.has(input?.mimeType)) {
|
||||||
|
throw new Error("image_output_media_invalid");
|
||||||
|
}
|
||||||
|
const target = productDimensions[ratio];
|
||||||
|
if (input.pixelWidth === target.pixelWidth && input.pixelHeight === target.pixelHeight) {
|
||||||
|
return {
|
||||||
|
bytes: Buffer.from(input.bytes),
|
||||||
|
mimeType: input.mimeType,
|
||||||
|
normalized: false,
|
||||||
|
...target,
|
||||||
|
upstreamPixelHeight: input.pixelHeight,
|
||||||
|
upstreamPixelWidth: input.pixelWidth,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const image = sharp(input.bytes, { failOn: "error", limitInputPixels: 40_000_000 });
|
||||||
|
const metadata = await image.metadata();
|
||||||
|
if (!metadata.width || !metadata.height) throw new Error("image_output_dimensions_missing");
|
||||||
|
const requestedRatio = target.pixelWidth / target.pixelHeight;
|
||||||
|
const upstreamRatio = metadata.width / metadata.height;
|
||||||
|
if (Math.abs(upstreamRatio - requestedRatio) / requestedRatio > 0.02) {
|
||||||
|
throw new Error("image_output_aspect_ratio_mismatch");
|
||||||
|
}
|
||||||
|
const { data, info } = await image
|
||||||
|
.resize(target.pixelWidth, target.pixelHeight, { fit: "fill", kernel: sharp.kernel.lanczos3 })
|
||||||
|
.png({ compressionLevel: 9 })
|
||||||
|
.toBuffer({ resolveWithObject: true });
|
||||||
|
if (info.width !== target.pixelWidth || info.height !== target.pixelHeight || info.format !== "png") {
|
||||||
|
throw new Error("image_output_normalization_failed");
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
bytes: data,
|
||||||
|
mimeType: "image/png",
|
||||||
|
normalized: true,
|
||||||
|
...target,
|
||||||
|
upstreamPixelHeight: metadata.height,
|
||||||
|
upstreamPixelWidth: metadata.width,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,221 @@
|
|||||||
|
import sharp from "sharp";
|
||||||
|
|
||||||
|
import type {
|
||||||
|
GenerationAdapter,
|
||||||
|
GenerationAdapterRequest,
|
||||||
|
GenerationAdapterResult,
|
||||||
|
NormalizedGenerationOutput,
|
||||||
|
} from "./ai-adapter-contract.js";
|
||||||
|
import { gptImageRequestSizeForRatio, normalizeImageOutputToRatio } from "./image-output-normalizer.mjs";
|
||||||
|
|
||||||
|
const geminiProductModelId = "gemini-3.1-flash-image-preview";
|
||||||
|
const geminiProviderModelId = "gemini-3.1-flash-image";
|
||||||
|
const gptImageModelId = "gpt-image-2";
|
||||||
|
const geminiEndpoint = "https://oneapi.intelligrow.cn/v1/chat/completions";
|
||||||
|
const gptImageEndpoint = "https://oneapi.intelligrow.cn/v1/images/generations";
|
||||||
|
const gptImageReferenceEndpoint = "https://oneapi.intelligrow.cn/v1/images/edits";
|
||||||
|
const maximumResponseBytes = 32 * 1024 * 1024;
|
||||||
|
const requestTimeoutMilliseconds = 180_000;
|
||||||
|
const geminiImageSystemInstruction = "Generate exactly one image from the user's description. Return the generated image and do not answer with text only.";
|
||||||
|
|
||||||
|
type FetchLike = typeof fetch;
|
||||||
|
|
||||||
|
class OneApiRuntimeError extends Error {
|
||||||
|
constructor(
|
||||||
|
readonly category: "gateway_balance_insufficient" | "gateway_contract_invalid" | "model_disabled" | "reference_invalid" | "upstream_failed" | "upstream_timeout" | "unknown_non_retryable",
|
||||||
|
readonly sourceCategory: string,
|
||||||
|
) {
|
||||||
|
super(sourceCategory);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function failure(error: unknown): GenerationAdapterResult {
|
||||||
|
if (error instanceof OneApiRuntimeError) {
|
||||||
|
return { category: error.category, sourceCategory: error.sourceCategory, status: "failed" };
|
||||||
|
}
|
||||||
|
if (error instanceof Error && error.name === "AbortError") {
|
||||||
|
return { category: "upstream_timeout", sourceCategory: "upstream_timeout", status: "failed" };
|
||||||
|
}
|
||||||
|
return { category: "upstream_failed", sourceCategory: "upstream_failed", status: "failed" };
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapHttpFailure(status: number) {
|
||||||
|
if (status === 408 || status === 504) return new OneApiRuntimeError("upstream_timeout", `upstream_http_${status}`);
|
||||||
|
if (status === 429) return new OneApiRuntimeError("gateway_balance_insufficient", "upstream_http_429");
|
||||||
|
if (status >= 500) return new OneApiRuntimeError("upstream_failed", `upstream_http_${status}`);
|
||||||
|
if (status === 400 || status === 404 || status === 422) return new OneApiRuntimeError("gateway_contract_invalid", `upstream_http_${status}`);
|
||||||
|
return new OneApiRuntimeError("unknown_non_retryable", `upstream_http_${status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readBoundedJson(response: Response) {
|
||||||
|
const declaredLength = Number(response.headers.get("content-length") ?? 0);
|
||||||
|
if (Number.isFinite(declaredLength) && declaredLength > maximumResponseBytes) {
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "upstream_response_too_large");
|
||||||
|
}
|
||||||
|
if (!response.body) throw new OneApiRuntimeError("gateway_contract_invalid", "upstream_response_empty");
|
||||||
|
const reader = response.body.getReader();
|
||||||
|
const chunks: Buffer[] = [];
|
||||||
|
let total = 0;
|
||||||
|
try {
|
||||||
|
while (true) {
|
||||||
|
const next = await reader.read();
|
||||||
|
if (next.done) break;
|
||||||
|
const chunk = Buffer.from(next.value);
|
||||||
|
total += chunk.length;
|
||||||
|
if (total > maximumResponseBytes) {
|
||||||
|
await reader.cancel();
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "upstream_response_too_large");
|
||||||
|
}
|
||||||
|
chunks.push(chunk);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return JSON.parse(Buffer.concat(chunks).toString("utf8")) as unknown;
|
||||||
|
} catch {
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "upstream_response_invalid");
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
for (const chunk of chunks) chunk.fill(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function extractGeminiImage(response: unknown) {
|
||||||
|
if (!response || typeof response !== "object" || !("choices" in response) || !Array.isArray(response.choices)) {
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "response_shape_invalid");
|
||||||
|
}
|
||||||
|
const choice = response.choices[0];
|
||||||
|
const content = choice && typeof choice === "object" && "message" in choice && choice.message && typeof choice.message === "object"
|
||||||
|
&& "content" in choice.message && typeof choice.message.content === "string" ? choice.message.content : "";
|
||||||
|
const matches = [...content.matchAll(/!\[[^\]]*\]\(\s*data:(image\/(?:jpeg|png|webp));base64,([A-Za-z0-9+/=\r\n]+)\s*\)/gi)];
|
||||||
|
if (matches.length !== 1) throw new OneApiRuntimeError("gateway_contract_invalid", "response_single_image_required");
|
||||||
|
return { bytes: Buffer.from(matches[0]![2]!, "base64"), declaredMimeType: matches[0]![1]!.toLowerCase() };
|
||||||
|
}
|
||||||
|
|
||||||
|
function extractGptImage(response: unknown) {
|
||||||
|
if (!response || typeof response !== "object" || !("data" in response) || !Array.isArray(response.data)
|
||||||
|
|| response.data.length !== 1 || !response.data[0] || typeof response.data[0] !== "object"
|
||||||
|
|| !("b64_json" in response.data[0]) || typeof response.data[0].b64_json !== "string") {
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "response_single_image_required");
|
||||||
|
}
|
||||||
|
return { bytes: Buffer.from(response.data[0].b64_json, "base64"), declaredMimeType: undefined };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function normalizeOutput(bytes: Buffer, declaredMimeType: string | undefined, ratio: GenerationAdapterRequest["ratio"]): Promise<NormalizedGenerationOutput> {
|
||||||
|
try {
|
||||||
|
const metadata = await sharp(bytes, { failOn: "error", limitInputPixels: 40_000_000 }).metadata();
|
||||||
|
const mimeType = metadata.format === "png" ? "image/png" : metadata.format === "jpeg" ? "image/jpeg" : metadata.format === "webp" ? "image/webp" : undefined;
|
||||||
|
if (!mimeType || !metadata.width || !metadata.height || (declaredMimeType && declaredMimeType !== mimeType)) {
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "response_media_invalid");
|
||||||
|
}
|
||||||
|
const normalized = await normalizeImageOutputToRatio({ bytes, mimeType, pixelHeight: metadata.height, pixelWidth: metadata.width, ratio });
|
||||||
|
return { bytes: normalized.bytes, mimeType: normalized.mimeType, pixelHeight: normalized.pixelHeight, pixelWidth: normalized.pixelWidth };
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof OneApiRuntimeError) throw error;
|
||||||
|
throw new OneApiRuntimeError("gateway_contract_invalid", "response_media_invalid");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateRequest(request: GenerationAdapterRequest) {
|
||||||
|
if (!request.prompt.trim() || request.prompt.length > 1_000) throw new OneApiRuntimeError("gateway_contract_invalid", "prompt_invalid");
|
||||||
|
const references = request.referenceImages ?? [];
|
||||||
|
if (references.length !== request.referenceAssetIds.length || references.length > 2) {
|
||||||
|
throw new OneApiRuntimeError("reference_invalid", "reference_count_invalid");
|
||||||
|
}
|
||||||
|
const totalBytes = references.reduce((total, reference) => total + reference.bytes.length, 0);
|
||||||
|
if (totalBytes > 20 * 1024 * 1024 || references.some((reference) => reference.bytes.length === 0 || reference.bytes.length > 10 * 1024 * 1024)) {
|
||||||
|
throw new OneApiRuntimeError("reference_invalid", "reference_size_invalid");
|
||||||
|
}
|
||||||
|
return references;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildRequest(request: GenerationAdapterRequest) {
|
||||||
|
const references = validateRequest(request);
|
||||||
|
if (request.modelId === geminiProductModelId) {
|
||||||
|
const content = references.length === 0
|
||||||
|
? request.prompt
|
||||||
|
: [
|
||||||
|
{ text: request.prompt, type: "text" },
|
||||||
|
...references.map((reference) => ({
|
||||||
|
image_url: { url: `data:${reference.mimeType};base64,${reference.bytes.toString("base64")}` },
|
||||||
|
type: "image_url",
|
||||||
|
})),
|
||||||
|
];
|
||||||
|
return {
|
||||||
|
body: JSON.stringify({
|
||||||
|
extra_body: { google: { image_config: { aspect_ratio: request.ratio, image_size: "1K" } } },
|
||||||
|
messages: [
|
||||||
|
{ content: geminiImageSystemInstruction, role: "system" },
|
||||||
|
{ content, role: "user" },
|
||||||
|
],
|
||||||
|
model: geminiProviderModelId,
|
||||||
|
stream: false,
|
||||||
|
}),
|
||||||
|
contentType: "application/json",
|
||||||
|
endpoint: geminiEndpoint,
|
||||||
|
parser: extractGeminiImage,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (request.modelId !== gptImageModelId) throw new OneApiRuntimeError("model_disabled", "model_not_supported");
|
||||||
|
if (references.length > 0) {
|
||||||
|
const form = new FormData();
|
||||||
|
form.append("model", gptImageModelId);
|
||||||
|
form.append("prompt", request.prompt);
|
||||||
|
form.append("response_format", "b64_json");
|
||||||
|
form.append("size", gptImageRequestSizeForRatio(request.ratio));
|
||||||
|
references.forEach((reference, index) => form.append("image[]", new Blob([reference.bytes], { type: reference.mimeType }), `reference-${index + 1}.png`));
|
||||||
|
return { body: form, contentType: undefined, endpoint: gptImageReferenceEndpoint, parser: extractGptImage };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
body: JSON.stringify({ model: gptImageModelId, prompt: request.prompt, response_format: "b64_json", size: gptImageRequestSizeForRatio(request.ratio) }),
|
||||||
|
contentType: "application/json",
|
||||||
|
endpoint: gptImageEndpoint,
|
||||||
|
parser: extractGptImage,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export class OneApiGenerationAdapter implements GenerationAdapter {
|
||||||
|
private readonly credential: Buffer;
|
||||||
|
private readonly fetchImpl: FetchLike;
|
||||||
|
private disposed = false;
|
||||||
|
|
||||||
|
constructor(input: { credential: Buffer; fetch?: FetchLike }) {
|
||||||
|
if (input.credential.length < 8) throw new Error("ai_gateway_credential_invalid");
|
||||||
|
this.credential = Buffer.from(input.credential);
|
||||||
|
this.fetchImpl = input.fetch ?? fetch;
|
||||||
|
}
|
||||||
|
|
||||||
|
async start(request: GenerationAdapterRequest): Promise<GenerationAdapterResult> {
|
||||||
|
if (this.disposed) return { category: "upstream_failed", sourceCategory: "adapter_disposed", status: "failed" };
|
||||||
|
const controller = new AbortController();
|
||||||
|
const timeout = setTimeout(() => controller.abort(), requestTimeoutMilliseconds);
|
||||||
|
let sourceBytes: Buffer | undefined;
|
||||||
|
try {
|
||||||
|
const providerRequest = buildRequest(request);
|
||||||
|
const headers = new Headers({ authorization: `Bearer ${this.credential.toString("utf8")}` });
|
||||||
|
if (providerRequest.contentType) headers.set("content-type", providerRequest.contentType);
|
||||||
|
const response = await this.fetchImpl(providerRequest.endpoint, {
|
||||||
|
body: providerRequest.body,
|
||||||
|
headers,
|
||||||
|
method: "POST",
|
||||||
|
redirect: "error",
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
if (!response.ok) throw mapHttpFailure(response.status);
|
||||||
|
const parsed = await readBoundedJson(response);
|
||||||
|
const extracted = providerRequest.parser(parsed);
|
||||||
|
sourceBytes = extracted.bytes;
|
||||||
|
const output = await normalizeOutput(sourceBytes, extracted.declaredMimeType, request.ratio);
|
||||||
|
return { outputs: [output], status: "completed" };
|
||||||
|
} catch (error) {
|
||||||
|
return failure(error);
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
sourceBytes?.fill(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dispose() {
|
||||||
|
if (this.disposed) return;
|
||||||
|
this.disposed = true;
|
||||||
|
this.credential.fill(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { randomUUID } from "node:crypto";
|
import { randomUUID } from "node:crypto";
|
||||||
import { rmSync } from "node:fs";
|
import { existsSync, rmSync, statSync } from "node:fs";
|
||||||
import { createRequire } from "node:module";
|
import { createRequire } from "node:module";
|
||||||
import { isAbsolute, relative, resolve } from "node:path";
|
import { isAbsolute, relative, resolve } from "node:path";
|
||||||
|
|
||||||
@@ -29,6 +29,40 @@ interface FileCleanupRow {
|
|||||||
const resourceScope = JSON.stringify([
|
const resourceScope = JSON.stringify([
|
||||||
"project_state", "generation", "generated_image", "reference", "location", "latest_export",
|
"project_state", "generation", "generated_image", "reference", "location", "latest_export",
|
||||||
]);
|
]);
|
||||||
|
const auditRetentionMilliseconds = 180 * 24 * 60 * 60 * 1_000;
|
||||||
|
const auditRefPattern = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,159}$/;
|
||||||
|
const forbiddenSummaryKeys = new Set([
|
||||||
|
"absolute_path", "api_key", "body", "code_hmac", "content", "credential", "email", "image",
|
||||||
|
"image_content", "password", "path", "prompt", "secret", "session_token", "verification_code", "whitelist",
|
||||||
|
]);
|
||||||
|
const forbiddenSummaryFragments = ["content", "credential", "email", "image", "password", "path", "prompt", "secret", "token"];
|
||||||
|
|
||||||
|
function isSafeAuditRef(value: unknown) {
|
||||||
|
return typeof value === "string" && auditRefPattern.test(value) ? 1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isSafeAuditSummaryJson(value: unknown) {
|
||||||
|
if (typeof value !== "string" || Buffer.byteLength(value, "utf8") > 2_048) return 0;
|
||||||
|
try {
|
||||||
|
const valid = (entry: unknown, depth: number): boolean => {
|
||||||
|
if (depth > 3) return false;
|
||||||
|
if (entry === null || typeof entry === "boolean") return true;
|
||||||
|
if (typeof entry === "number") return Number.isSafeInteger(entry);
|
||||||
|
if (typeof entry === "string") return /^[A-Za-z0-9_.:@-]{1,160}$/.test(entry) && !entry.includes("@");
|
||||||
|
if (Array.isArray(entry)) return entry.length <= 20 && entry.every((item) => valid(item, depth + 1));
|
||||||
|
if (!entry || typeof entry !== "object") return false;
|
||||||
|
return Object.entries(entry).length <= 32 && Object.entries(entry).every(([key, item]) => (
|
||||||
|
auditRefPattern.test(key)
|
||||||
|
&& !forbiddenSummaryKeys.has(key.toLowerCase())
|
||||||
|
&& !forbiddenSummaryFragments.some((fragment) => key.toLowerCase().includes(fragment))
|
||||||
|
&& valid(item, depth + 1)
|
||||||
|
));
|
||||||
|
};
|
||||||
|
return valid(JSON.parse(value), 0) ? 1 : 0;
|
||||||
|
} catch {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function iso(timestamp: number) {
|
function iso(timestamp: number) {
|
||||||
return new Date(timestamp).toISOString();
|
return new Date(timestamp).toISOString();
|
||||||
@@ -47,6 +81,12 @@ export class ProjectPurgeCleanup {
|
|||||||
this.database.pragma("journal_mode = WAL");
|
this.database.pragma("journal_mode = WAL");
|
||||||
this.database.pragma("foreign_keys = ON");
|
this.database.pragma("foreign_keys = ON");
|
||||||
this.database.pragma("busy_timeout = 5000");
|
this.database.pragma("busy_timeout = 5000");
|
||||||
|
this.database.function("dada_audit_ref_is_safe", { deterministic: true }, isSafeAuditRef);
|
||||||
|
this.database.function("dada_audit_summary_is_safe", { deterministic: true }, isSafeAuditSummaryJson);
|
||||||
|
this.database.function("dada_allow_privacy_purge", { deterministic: false }, () => 0);
|
||||||
|
this.database.function("dada_privacy_purge_subject", { deterministic: false }, () => "");
|
||||||
|
this.database.function("dada_allow_retention_purge", { deterministic: false }, () => 0);
|
||||||
|
this.database.function("dada_retention_purge_now", { deterministic: false }, () => 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
@@ -153,12 +193,16 @@ export class ProjectPurgeCleanup {
|
|||||||
if (pending.count === 0) {
|
if (pending.count === 0) {
|
||||||
this.database.prepare("UPDATE asset_cleanup_requests SET status = 'completed' WHERE request_id = ? AND status = 'queued'")
|
this.database.prepare("UPDATE asset_cleanup_requests SET status = 'completed' WHERE request_id = ? AND status = 'queued'")
|
||||||
.run(request.request_id);
|
.run(request.request_id);
|
||||||
|
this.insertAssetCleanupAudit(request.request_id, row.byte_size, this.clock());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this.tableExists("sticker_managed_file_history")) {
|
||||||
|
this.database.prepare("DELETE FROM sticker_managed_file_history WHERE managed_file_id = ?").run(row.managed_file_id);
|
||||||
|
}
|
||||||
this.database.prepare("DELETE FROM managed_files WHERE file_id = ?").run(row.managed_file_id);
|
this.database.prepare("DELETE FROM managed_files WHERE file_id = ?").run(row.managed_file_id);
|
||||||
if (this.tableExists("local_backend_storage_state")) this.decrementManagedCapacity(row.byte_size);
|
if (this.tableExists("local_backend_storage_state")) this.remeasureManagedCapacity();
|
||||||
}
|
}
|
||||||
this.database.prepare(`
|
this.database.prepare(`
|
||||||
UPDATE file_cleanup_queue SET status = 'completed', completed_at = ?, last_error = NULL
|
UPDATE file_cleanup_queue SET status = 'completed', completed_at = ?, last_error = NULL
|
||||||
@@ -168,10 +212,19 @@ export class ProjectPurgeCleanup {
|
|||||||
transaction.immediate();
|
transaction.immediate();
|
||||||
completed += 1;
|
completed += 1;
|
||||||
} catch {
|
} catch {
|
||||||
this.database.prepare(`
|
const transaction = this.database.transaction(() => {
|
||||||
UPDATE file_cleanup_queue SET status = 'failed', last_error = 'physical_file_cleanup_failed'
|
this.database.prepare(`
|
||||||
WHERE cleanup_id = ?
|
UPDATE file_cleanup_queue SET status = 'failed', last_error = 'physical_file_cleanup_failed'
|
||||||
`).run(row.cleanup_id);
|
WHERE cleanup_id = ?
|
||||||
|
`).run(row.cleanup_id);
|
||||||
|
if (row.managed_file_id && this.tableExists("asset_cleanup_request_items")) {
|
||||||
|
const request = this.database.prepare(`
|
||||||
|
SELECT request_id FROM asset_cleanup_request_items WHERE managed_file_id = ? LIMIT 1
|
||||||
|
`).get(row.managed_file_id) as { request_id: string } | undefined;
|
||||||
|
if (request) this.insertAssetCleanupFailureAudit(request.request_id, this.clock());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
transaction.immediate();
|
||||||
failed += 1;
|
failed += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -238,4 +291,59 @@ export class ProjectPurgeCleanup {
|
|||||||
WHERE singleton = 1
|
WHERE singleton = 1
|
||||||
`).run(managed, notice, status, iso(this.clock()));
|
`).run(managed, notice, status, iso(this.clock()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private insertAssetCleanupAudit(requestId: string, deletedBytes: number, occurredAt: number) {
|
||||||
|
if (!this.tableExists("admin_operation_logs")) return;
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO admin_operation_logs (
|
||||||
|
log_id, actor_type, actor_ref, operation_type, target_type, target_ref,
|
||||||
|
result, before_summary, after_summary, occurred_at, expires_at
|
||||||
|
) VALUES (?, 'system', 'project_purge_worker', 'asset_cleanup_physical_completed', 'asset_cleanup', ?, 'succeeded', NULL, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), requestId, JSON.stringify({ deleted_bytes: deletedBytes, status: "completed" }), occurredAt,
|
||||||
|
occurredAt + auditRetentionMilliseconds,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private insertAssetCleanupFailureAudit(requestId: string, occurredAt: number) {
|
||||||
|
if (!this.tableExists("admin_operation_logs")) return;
|
||||||
|
this.database.prepare(`
|
||||||
|
INSERT INTO admin_operation_logs (
|
||||||
|
log_id, actor_type, actor_ref, operation_type, target_type, target_ref,
|
||||||
|
result, before_summary, after_summary, occurred_at, expires_at
|
||||||
|
) VALUES (?, 'system', 'project_purge_worker', 'asset_cleanup_physical_failed', 'asset_cleanup', ?, 'failed', NULL, ?, ?, ?)
|
||||||
|
`).run(
|
||||||
|
randomUUID(), requestId, JSON.stringify({ failed_count: 1, status: "retry_pending" }), occurredAt,
|
||||||
|
occurredAt + auditRetentionMilliseconds,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private remeasureManagedCapacity() {
|
||||||
|
const state = this.database.prepare(`
|
||||||
|
SELECT managed_content_bytes FROM local_backend_storage_state WHERE singleton = 1
|
||||||
|
`).get() as { managed_content_bytes: number } | undefined;
|
||||||
|
if (!state) return;
|
||||||
|
const rows = this.database.prepare(`
|
||||||
|
SELECT relative_path FROM managed_files WHERE status = 'committed'
|
||||||
|
`).all() as Array<{ relative_path: string }>;
|
||||||
|
let managed = 0;
|
||||||
|
for (const row of rows) {
|
||||||
|
try {
|
||||||
|
const path = this.resolveManagedPath(row.relative_path);
|
||||||
|
if (existsSync(path)) managed += statSync(path).size;
|
||||||
|
} catch {
|
||||||
|
// A missing or invalid path is excluded from the measured physical total.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const reservations = this.tableExists("storage_reservations")
|
||||||
|
? (this.database.prepare("SELECT COALESCE(SUM(projected_bytes), 0) AS bytes FROM storage_reservations WHERE status = 'active'").get() as { bytes: number }).bytes
|
||||||
|
: 0;
|
||||||
|
const notice = managed < 4_294_967_296 ? "normal" : managed < 4_831_838_208 ? "warning" : "critical";
|
||||||
|
const status = managed + reservations >= 5_368_709_120 ? "full" : "active";
|
||||||
|
this.database.prepare(`
|
||||||
|
UPDATE local_backend_storage_state
|
||||||
|
SET managed_content_bytes = ?, capacity_notice_level = ?, storage_status = ?, measured_at = ?, version = version + 1
|
||||||
|
WHERE singleton = 1
|
||||||
|
`).run(managed, notice, status, iso(this.clock()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export async function receiveWorkerCredentials(input: NodeJS.ReadableStream = pr
|
|||||||
if (names.length !== expected.length || names.some((name, index) => name !== expected[index])) {
|
if (names.length !== expected.length || names.some((name, index) => name !== expected[index])) {
|
||||||
throw new Error("Worker credential channel contains an unexpected credential scope.");
|
throw new Error("Worker credential channel contains an unexpected credential scope.");
|
||||||
}
|
}
|
||||||
if (expected.some((name) => typeof parsed[name] !== "string" || parsed[name] === "")) {
|
if (expected.some((name) => typeof parsed[name] !== "string")) {
|
||||||
throw new Error("Worker credential channel contains an invalid credential value.");
|
throw new Error("Worker credential channel contains an invalid credential value.");
|
||||||
}
|
}
|
||||||
return parsed as Record<(typeof WORKER_CREDENTIALS)[number], string>;
|
return parsed as Record<(typeof WORKER_CREDENTIALS)[number], string>;
|
||||||
@@ -25,9 +25,13 @@ export async function receiveWorkerCredentials(input: NodeJS.ReadableStream = pr
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function initializeWorkerCredentialClient(credentials: Record<(typeof WORKER_CREDENTIALS)[number], string>) {
|
export function initializeWorkerCredentialClient(credentials: Record<(typeof WORKER_CREDENTIALS)[number], string>) {
|
||||||
const configured = WORKER_CREDENTIALS.every((name) => credentials[name].length > 0);
|
const value = credentials["Dada/P0A/worker/ai-gateway"];
|
||||||
for (const name of WORKER_CREDENTIALS) credentials[name] = "";
|
try {
|
||||||
if (!configured) throw new Error("Worker credential client initialization failed.");
|
if (!value) throw new Error("worker_ai_gateway_not_configured");
|
||||||
|
return { aiGatewayCredential: Buffer.from(value, "utf8") };
|
||||||
|
} finally {
|
||||||
|
for (const name of WORKER_CREDENTIALS) credentials[name] = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function attachWorkerSupervisorControl(pipeName: string, shutdown: () => Promise<void> | void) {
|
export function attachWorkerSupervisorControl(pipeName: string, shutdown: () => Promise<void> | void) {
|
||||||
|
|||||||
@@ -2,6 +2,10 @@ import { parentPort } from "node:worker_threads";
|
|||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
|
||||||
import { WorkerAiCallGate } from "./ai-call-gate.js";
|
import { WorkerAiCallGate } from "./ai-call-gate.js";
|
||||||
|
import { runAiRuntimeProbe } from "./ai-runtime-probe.js";
|
||||||
|
import { GenerationPollingLoop } from "./generation-polling-loop.js";
|
||||||
|
import { GenerationProcessor } from "./generation-processor.js";
|
||||||
|
import { OneApiGenerationAdapter } from "./oneapi-generation-adapter.js";
|
||||||
import { readConfiguredLocalDataRoot } from "./runtime-config.js";
|
import { readConfiguredLocalDataRoot } from "./runtime-config.js";
|
||||||
import { RetentionCleanup } from "./retention-cleanup.js";
|
import { RetentionCleanup } from "./retention-cleanup.js";
|
||||||
import { ProjectPurgeCleanup } from "./project-purge-cleanup.js";
|
import { ProjectPurgeCleanup } from "./project-purge-cleanup.js";
|
||||||
@@ -21,8 +25,25 @@ if (workerPort) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!workerPort && process.argv.includes("--dada-credential-stdin")) {
|
if (!workerPort && process.argv.includes("--dada-ai-probe")) {
|
||||||
initializeWorkerCredentialClient(await receiveWorkerCredentials());
|
const credentialClient = initializeWorkerCredentialClient(await receiveWorkerCredentials());
|
||||||
|
let adapter: OneApiGenerationAdapter | undefined;
|
||||||
|
let probeResult: Awaited<ReturnType<typeof runAiRuntimeProbe>> | { code: "ai_probe_failed"; error_category: "upstream_failed"; real_calls: 0; success: false };
|
||||||
|
try {
|
||||||
|
adapter = new OneApiGenerationAdapter({ credential: credentialClient.aiGatewayCredential });
|
||||||
|
probeResult = await runAiRuntimeProbe(adapter);
|
||||||
|
} catch {
|
||||||
|
probeResult = { code: "ai_probe_failed", error_category: "upstream_failed", real_calls: 0, success: false };
|
||||||
|
} finally {
|
||||||
|
credentialClient.aiGatewayCredential.fill(0);
|
||||||
|
adapter?.dispose();
|
||||||
|
}
|
||||||
|
await new Promise<void>((resolveWrite, rejectWrite) => {
|
||||||
|
process.stdout.write(JSON.stringify(probeResult), (error) => error ? rejectWrite(error) : resolveWrite());
|
||||||
|
});
|
||||||
|
process.exit(probeResult.success ? 0 : 2);
|
||||||
|
} else if (!workerPort && process.argv.includes("--dada-credential-stdin")) {
|
||||||
|
const credentialClient = initializeWorkerCredentialClient(await receiveWorkerCredentials());
|
||||||
const controlPipeIndex = process.argv.indexOf("--dada-control-pipe");
|
const controlPipeIndex = process.argv.indexOf("--dada-control-pipe");
|
||||||
const controlPipe = process.argv[controlPipeIndex + 1];
|
const controlPipe = process.argv[controlPipeIndex + 1];
|
||||||
if (controlPipeIndex < 0 || !controlPipe) throw new Error("Supervisor control pipe name is required.");
|
if (controlPipeIndex < 0 || !controlPipe) throw new Error("Supervisor control pipe name is required.");
|
||||||
@@ -31,11 +52,15 @@ if (!workerPort && process.argv.includes("--dada-credential-stdin")) {
|
|||||||
let retention: RetentionCleanup | undefined;
|
let retention: RetentionCleanup | undefined;
|
||||||
let projectCleanup: ProjectPurgeCleanup | undefined;
|
let projectCleanup: ProjectPurgeCleanup | undefined;
|
||||||
let retentionTimer: ReturnType<typeof setInterval> | undefined;
|
let retentionTimer: ReturnType<typeof setInterval> | undefined;
|
||||||
|
let processor: GenerationProcessor | undefined;
|
||||||
|
let generationLoop: GenerationPollingLoop | undefined;
|
||||||
const control = attachWorkerSupervisorControl(controlPipe, () => {
|
const control = attachWorkerSupervisorControl(controlPipe, () => {
|
||||||
clearInterval(keepAlive);
|
clearInterval(keepAlive);
|
||||||
if (retentionTimer) clearInterval(retentionTimer);
|
if (retentionTimer) clearInterval(retentionTimer);
|
||||||
retention?.close();
|
retention?.close();
|
||||||
projectCleanup?.close();
|
projectCleanup?.close();
|
||||||
|
generationLoop?.close();
|
||||||
|
processor?.close();
|
||||||
storage?.close();
|
storage?.close();
|
||||||
});
|
});
|
||||||
let storageStatus: "active" | "unavailable" = "active";
|
let storageStatus: "active" | "unavailable" = "active";
|
||||||
@@ -45,6 +70,13 @@ if (!workerPort && process.argv.includes("--dada-credential-stdin")) {
|
|||||||
storage = new WorkerStorageStatus(databasePath);
|
storage = new WorkerStorageStatus(databasePath);
|
||||||
retention = new RetentionCleanup({ databasePath });
|
retention = new RetentionCleanup({ databasePath });
|
||||||
projectCleanup = new ProjectPurgeCleanup({ dataRoot, databasePath });
|
projectCleanup = new ProjectPurgeCleanup({ dataRoot, databasePath });
|
||||||
|
let adapter: OneApiGenerationAdapter;
|
||||||
|
try {
|
||||||
|
adapter = new OneApiGenerationAdapter({ credential: credentialClient.aiGatewayCredential });
|
||||||
|
} finally {
|
||||||
|
credentialClient.aiGatewayCredential.fill(0);
|
||||||
|
}
|
||||||
|
processor = new GenerationProcessor({ adapter, dataRoot, databasePath, workerId: `portable-oneapi-worker-${process.pid}` });
|
||||||
const runRetentionCleanup = () => {
|
const runRetentionCleanup = () => {
|
||||||
try {
|
try {
|
||||||
retention?.purgeExpired();
|
retention?.purgeExpired();
|
||||||
@@ -71,8 +103,11 @@ if (!workerPort && process.argv.includes("--dada-credential-stdin")) {
|
|||||||
});
|
});
|
||||||
logger.write({ error_category: "none", status_category: "ready" });
|
logger.write({ error_category: "none", status_category: "ready" });
|
||||||
new WorkerAiCallGate({ getStorageStatus: () => storageStatus === "unavailable" ? storageStatus : (storage?.getStatus() ?? "unavailable"), logger });
|
new WorkerAiCallGate({ getStorageStatus: () => storageStatus === "unavailable" ? storageStatus : (storage?.getStatus() ?? "unavailable"), logger });
|
||||||
|
generationLoop = new GenerationPollingLoop(processor);
|
||||||
} catch {
|
} catch {
|
||||||
storageStatus = "unavailable";
|
storageStatus = "unavailable";
|
||||||
control.reportStatus("storage_unavailable");
|
control.reportStatus("storage_unavailable");
|
||||||
|
clearInterval(keepAlive);
|
||||||
|
setTimeout(() => process.exit(1), 50);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"extends": "../../tsconfig.base.json",
|
"extends": "../../tsconfig.base.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
|
"allowJs": true,
|
||||||
"module": "NodeNext",
|
"module": "NodeNext",
|
||||||
"moduleResolution": "NodeNext",
|
"moduleResolution": "NodeNext",
|
||||||
"lib": ["ES2024"],
|
"lib": ["ES2024"],
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"config_set_version": 8,
|
||||||
|
"gateway_account_ref": "oneapi-intelligrow-test",
|
||||||
|
"models": [
|
||||||
|
{
|
||||||
|
"config_version": 7,
|
||||||
|
"gateway_account_ref": "oneapi-intelligrow-test",
|
||||||
|
"model_id": "gemini-3.1-flash-image",
|
||||||
|
"route_profile": {
|
||||||
|
"endpoint": "https://oneapi.intelligrow.cn/v1/chat/completions",
|
||||||
|
"mode": "sync",
|
||||||
|
"protocol_version": "gemini-openai-chat-v1",
|
||||||
|
"provider_model_id": "gemini-3.1-flash-image"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"config_version": 2,
|
||||||
|
"gateway_account_ref": "oneapi-intelligrow-test",
|
||||||
|
"model_id": "gpt-image-2",
|
||||||
|
"route_profile": {
|
||||||
|
"endpoint": "https://oneapi.intelligrow.cn/v1/images/generations",
|
||||||
|
"mode": "sync",
|
||||||
|
"protocol_version": "openai-images-v1",
|
||||||
|
"reference_endpoint": "https://oneapi.intelligrow.cn/v1/images/edits"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"schema_version": "1.0"
|
||||||
|
}
|
||||||
+2078
-4
File diff suppressed because it is too large
Load Diff
+32
-5
@@ -8,18 +8,24 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "pnpm -r --if-present build && dotnet build supervisor/Dada.Supervisor/Dada.Supervisor.csproj --configuration Release",
|
"build": "pnpm -r --if-present build && dotnet build supervisor/Dada.Supervisor/Dada.Supervisor.csproj --configuration Release",
|
||||||
|
"build:workspace-packages": "pnpm --filter \"./packages/**\" --if-present build",
|
||||||
"typecheck": "pnpm -r --if-present typecheck",
|
"typecheck": "pnpm -r --if-present typecheck",
|
||||||
"test:unit:contract": "node --test tests/toolchain/frozen-toolchain.test.mjs",
|
"test:unit:contract": "node --test tests/toolchain/frozen-toolchain.test.mjs",
|
||||||
"test:unit": "pnpm --filter @dada/static-sticker-catalog build && pnpm --filter @dada/template-registry build && pnpm --filter @dada/asset-renderer build && pnpm --filter @dada/asset-compiler build && pnpm --filter @dada/shared-contracts build && pnpm run test:unit:contract && vitest run tests/unit",
|
"test:unit": "pnpm --filter @dada/static-sticker-catalog build && pnpm --filter @dada/template-registry build && pnpm --filter @dada/asset-renderer build && pnpm --filter @dada/asset-compiler build && pnpm --filter @dada/shared-contracts build && pnpm run test:unit:contract && vitest run tests/unit",
|
||||||
"test:integration": "vitest run tests/integration",
|
"test:integration": "vitest run tests/integration",
|
||||||
"test:api": "pnpm check:openapi && vitest run tests/api",
|
"test:api": "pnpm check:openapi && vitest run tests/api",
|
||||||
"test:worker": "pnpm --filter @dada/worker build && node scripts/worker-smoke.mjs && vitest run tests/worker",
|
"test:worker": "pnpm --filter @dada/worker build && node scripts/worker-smoke.mjs && vitest run tests/worker",
|
||||||
"test:e2e": "pnpm check:openapi && playwright test tests/e2e/event-sync.spec.ts tests/e2e/support-gate.spec.ts tests/e2e/local-data-boundary.spec.ts tests/e2e/storage-capacity.spec.ts tests/e2e/public-asset-cache.spec.ts tests/e2e/user-auth.spec.ts tests/e2e/admin-auth.spec.ts tests/e2e/entry-state-ui.spec.ts tests/e2e/session-invalid-ui.spec.ts tests/e2e/user-registration.spec.ts tests/e2e/account-settings.spec.ts tests/e2e/projects-workspace.spec.ts tests/e2e/project-autosave-conflict.spec.ts tests/e2e/project-trash.spec.ts tests/e2e/credits.spec.ts tests/e2e/generation-workspace.spec.ts tests/e2e/generation-terminal-actions.spec.ts tests/e2e/project-latest-exports.spec.ts tests/e2e/admin-models.spec.ts tests/e2e/wp4-01-editor-background.spec.ts tests/e2e/wp4-02-editor-elements.spec.ts tests/e2e/wp4-03-text-editor.spec.ts tests/e2e/wp4-04-color-dynamic.spec.ts tests/e2e/wp4-05-export.spec.ts tests/e2e/wp4-06-accessibility.spec.ts tests/e2e/wp5-02-static-sticker-catalog.spec.ts tests/e2e/wp5-03-template-registry.spec.ts tests/e2e/wp5-04-resource-isolation.spec.ts tests/e2e/wp6-01-admin-shell.spec.ts --config playwright.config.ts",
|
"test:e2e": "pnpm check:openapi && playwright test tests/e2e/event-sync.spec.ts tests/e2e/support-gate.spec.ts tests/e2e/local-data-boundary.spec.ts tests/e2e/storage-capacity.spec.ts tests/e2e/public-asset-cache.spec.ts tests/e2e/user-auth.spec.ts tests/e2e/admin-auth.spec.ts tests/e2e/entry-state-ui.spec.ts tests/e2e/session-invalid-ui.spec.ts tests/e2e/user-registration.spec.ts tests/e2e/account-settings.spec.ts tests/e2e/projects-workspace.spec.ts tests/e2e/project-autosave-conflict.spec.ts tests/e2e/project-trash.spec.ts tests/e2e/credits.spec.ts tests/e2e/generation-workspace.spec.ts tests/e2e/generation-terminal-actions.spec.ts tests/e2e/project-latest-exports.spec.ts tests/e2e/admin-models.spec.ts tests/e2e/wp4-01-editor-background.spec.ts tests/e2e/wp4-02-editor-elements.spec.ts tests/e2e/wp4-03-text-editor.spec.ts tests/e2e/wp4-04-color-dynamic.spec.ts tests/e2e/wp4-05-export.spec.ts tests/e2e/wp4-06-accessibility.spec.ts tests/e2e/wp5-02-static-sticker-catalog.spec.ts tests/e2e/wp5-03-template-registry.spec.ts tests/e2e/wp5-04-resource-isolation.spec.ts tests/e2e/wp5-05-admin-assets.spec.ts tests/e2e/wp6-01-admin-shell.spec.ts tests/e2e/wp6-04-audit.spec.ts tests/e2e/wp6-05-state.spec.ts --config playwright.config.ts",
|
||||||
"test:visual": "node scripts/validate-layer-scope.mjs VISUAL",
|
"test:visual": "node scripts/run-wp4-07-layer.mjs visual",
|
||||||
"test:performance": "node scripts/validate-layer-scope.mjs PERFORMANCE",
|
"test:performance": "node scripts/run-wp4-07-layer.mjs performance",
|
||||||
"test:security": "node scripts/verify-frozen-dependencies.mjs && node scripts/redaction-scan.mjs",
|
"test:security": "node scripts/verify-frozen-dependencies.mjs && node scripts/redaction-scan.mjs",
|
||||||
"test:package": "pnpm run typecheck && node --test tests/package/wp0-09-portable.test.mjs && node scripts/package-smoke.mjs && node scripts/loopback-boundary-smoke.mjs",
|
"test:package": "pnpm build:workspace-packages && pnpm run typecheck && node --test tests/package/wp0-09-portable.test.mjs && node scripts/package-smoke.mjs && node scripts/loopback-boundary-smoke.mjs",
|
||||||
|
"test:postv1-ui-integration": "node scripts/validate-postv1-ui-lineage.mjs && playwright test tests/e2e/projects-workspace.spec.ts tests/e2e/wp4-01-editor-background.spec.ts tests/e2e/wp4-02-editor-elements.spec.ts tests/e2e/wp4-04-color-dynamic.spec.ts --config playwright.config.ts",
|
||||||
"package:portable": "node scripts/build-portable.mjs",
|
"package:portable": "node scripts/build-portable.mjs",
|
||||||
|
"assets:manifest": "pnpm build:workspace-packages && node scripts/generate-runtime-asset-manifest.mjs",
|
||||||
|
"assets:deploy": "pnpm build:workspace-packages && node scripts/deploy-runtime-assets.mjs",
|
||||||
|
"assets:validate-browser-fonts": "node scripts/validate-browser-font-assets.mjs",
|
||||||
|
"assets:browser-catalog": "pnpm build:workspace-packages && node scripts/generate-complex-browser-catalog.mjs",
|
||||||
"generate:openapi": "node scripts/generate-openapi.mjs",
|
"generate:openapi": "node scripts/generate-openapi.mjs",
|
||||||
"check:openapi": "node scripts/check-openapi.mjs",
|
"check:openapi": "node scripts/check-openapi.mjs",
|
||||||
"validate:tdd-trace": "node scripts/validate-tdd-trace.mjs",
|
"validate:tdd-trace": "node scripts/validate-tdd-trace.mjs",
|
||||||
@@ -86,6 +92,8 @@
|
|||||||
"test:wp4-05:red": "node scripts/run-wp4-05-validation.mjs --phase red",
|
"test:wp4-05:red": "node scripts/run-wp4-05-validation.mjs --phase red",
|
||||||
"test:wp4-06": "node scripts/run-wp4-06-validation.mjs",
|
"test:wp4-06": "node scripts/run-wp4-06-validation.mjs",
|
||||||
"test:wp4-06:red": "node scripts/run-wp4-06-validation.mjs --phase red",
|
"test:wp4-06:red": "node scripts/run-wp4-06-validation.mjs --phase red",
|
||||||
|
"test:wp4-07": "node scripts/run-wp4-07-validation.mjs",
|
||||||
|
"test:wp4-07:red": "node scripts/run-wp4-07-validation.mjs --phase red",
|
||||||
"test:wp5-01": "node scripts/run-wp5-01-validation.mjs",
|
"test:wp5-01": "node scripts/run-wp5-01-validation.mjs",
|
||||||
"test:wp5-01:red": "node scripts/run-wp5-01-validation.mjs --phase red",
|
"test:wp5-01:red": "node scripts/run-wp5-01-validation.mjs --phase red",
|
||||||
"test:wp5-02": "node scripts/run-wp5-02-validation.mjs",
|
"test:wp5-02": "node scripts/run-wp5-02-validation.mjs",
|
||||||
@@ -95,8 +103,27 @@
|
|||||||
"test:wp5-03:red": "node scripts/run-wp5-03-validation.mjs --phase red",
|
"test:wp5-03:red": "node scripts/run-wp5-03-validation.mjs --phase red",
|
||||||
"test:wp5-04": "node scripts/run-wp5-04-validation.mjs",
|
"test:wp5-04": "node scripts/run-wp5-04-validation.mjs",
|
||||||
"test:wp5-04:red": "node scripts/run-wp5-04-validation.mjs --phase red",
|
"test:wp5-04:red": "node scripts/run-wp5-04-validation.mjs --phase red",
|
||||||
|
"test:wp5-05": "node scripts/run-wp5-05-validation.mjs",
|
||||||
|
"test:wp5-05:red": "node scripts/run-wp5-05-validation.mjs --phase red",
|
||||||
"test:wp6-01": "node scripts/run-wp6-01-validation.mjs --phase scaffold",
|
"test:wp6-01": "node scripts/run-wp6-01-validation.mjs --phase scaffold",
|
||||||
"test:wp6-01:red": "node scripts/run-wp6-01-validation.mjs --phase red"
|
"test:wp6-01:red": "node scripts/run-wp6-01-validation.mjs --phase red",
|
||||||
|
"test:wp6-04": "node scripts/run-wp6-04-validation.mjs --phase green",
|
||||||
|
"test:wp6-04:red": "node scripts/run-wp6-04-validation.mjs --phase red",
|
||||||
|
"test:wp6-05": "pnpm exec vitest run tests/api/wp6-05-state.test.ts && pnpm exec playwright test tests/e2e/wp6-05-state.spec.ts --config playwright.config.ts",
|
||||||
|
"test:wp7-01": "node scripts/run-wp7-01-validation.mjs",
|
||||||
|
"review:wp7-01": "node scripts/record-wp7-01-manual-review.mjs",
|
||||||
|
"test:wp7-02": "node scripts/run-wp7-02-validation.mjs",
|
||||||
|
"test:wp7-02:controlled": "node scripts/run-wp7-02-validation.mjs --controlled-real",
|
||||||
|
"review:wp7-02": "node scripts/record-wp7-02-manual-review.mjs",
|
||||||
|
"test:wp7-03": "node scripts/run-wp7-03-validation.mjs --phase green",
|
||||||
|
"test:wp7-03:red": "node scripts/run-wp7-03-validation.mjs --phase red",
|
||||||
|
"test:wp7-04": "node scripts/run-wp7-04-validation.mjs",
|
||||||
|
"test:wp7-05": "node scripts/run-wp7-05-validation.mjs",
|
||||||
|
"test:wp7-05:unit": "node --test tests/package/wp7-05-ui-gate.test.mjs tests/package/wp7-05-coverage.test.mjs",
|
||||||
|
"test:wp7-06": "node scripts/run-wp7-06-validation.mjs",
|
||||||
|
"test:wp7-06:unit": "node --test tests/package/wp7-06-prefreeze.test.mjs",
|
||||||
|
"test:wp7-07": "node scripts/run-wp7-07-validation.mjs",
|
||||||
|
"test:wp7-07:unit": "node --test tests/package/wp7-07-final-release.test.mjs"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@playwright/test": "1.62.0",
|
"@playwright/test": "1.62.0",
|
||||||
|
|||||||
@@ -228,7 +228,13 @@ function readCsv(tracker: SourceTracker, path: string, label: string): CsvRow[]
|
|||||||
|
|
||||||
function itemDirectoryFor(collection: CollectionConfig, catalogPath: string, row: CsvRow): { directory: string; metadataPath: string } {
|
function itemDirectoryFor(collection: CollectionConfig, catalogPath: string, row: CsvRow): { directory: string; metadataPath: string } {
|
||||||
if (collection.id === "font_panel") {
|
if (collection.id === "font_panel") {
|
||||||
const resourceDir = requireString(row.resource_dir, "font resource_dir");
|
const configuredResourceDir = requireString(row.resource_dir, "font resource_dir");
|
||||||
|
const normalizedResourceDir = configuredResourceDir.replaceAll("\\", "/");
|
||||||
|
const relocationMarker = "/resources/font_packages/";
|
||||||
|
const markerIndex = normalizedResourceDir.lastIndexOf(relocationMarker);
|
||||||
|
const resourceDir = isAbsolute(configuredResourceDir) && !inside(configuredResourceDir, collection.root.path) && markerIndex >= 0
|
||||||
|
? relativeReference(normalizedResourceDir.slice(markerIndex + 1), "font resource_dir relocation")
|
||||||
|
: configuredResourceDir;
|
||||||
const directory = resolveSourcePath(resourceDir, collection.root.path, collection.root.path, "font resource_dir");
|
const directory = resolveSourcePath(resourceDir, collection.root.path, collection.root.path, "font resource_dir");
|
||||||
return { directory, metadataPath: resolveSourcePath("metadata.json", directory, collection.root.path, "font metadata") };
|
return { directory, metadataPath: resolveSourcePath("metadata.json", directory, collection.root.path, "font metadata") };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ export interface ColorCardDefinition {
|
|||||||
cardId: typeof P0A_COLOR_CARD_IDS[number];
|
cardId: typeof P0A_COLOR_CARD_IDS[number];
|
||||||
displayName: string;
|
displayName: string;
|
||||||
mappingStatus: "confirmed_native_mapping" | "stable_web_style_native_mapping_provisional";
|
mappingStatus: "confirmed_native_mapping" | "stable_web_style_native_mapping_provisional";
|
||||||
rendererName: "horizontal_line" | "ticket_strip" | "vertical_stack" | "vertical_ticket";
|
rendererName: string;
|
||||||
styleId: "style_01" | "style_02" | "style_08" | "style_16";
|
styleId: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FiveColorPalette = readonly [string, string, string, string, string];
|
export type FiveColorPalette = readonly [string, string, string, string, string];
|
||||||
@@ -17,7 +17,19 @@ export interface ColorCardRenderPlan extends ColorCardDefinition {
|
|||||||
export const P0A_COLOR_CARD_DEFINITIONS: readonly ColorCardDefinition[] = [
|
export const P0A_COLOR_CARD_DEFINITIONS: readonly ColorCardDefinition[] = [
|
||||||
{ cardId: "COLOR001", displayName: "纵向票据", mappingStatus: "confirmed_native_mapping", rendererName: "vertical_ticket", styleId: "style_01" },
|
{ cardId: "COLOR001", displayName: "纵向票据", mappingStatus: "confirmed_native_mapping", rendererName: "vertical_ticket", styleId: "style_01" },
|
||||||
{ cardId: "COLOR002", displayName: "纵向色阶", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_stack", styleId: "style_02" },
|
{ cardId: "COLOR002", displayName: "纵向色阶", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_stack", styleId: "style_02" },
|
||||||
|
{ cardId: "COLOR003", displayName: "纵向色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_strip", styleId: "style_03" },
|
||||||
|
{ cardId: "COLOR004", displayName: "纵向标线", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_line", styleId: "style_04" },
|
||||||
|
{ cardId: "COLOR005", displayName: "横向标签", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "horizontal_label_strip", styleId: "style_05" },
|
||||||
|
{ cardId: "COLOR006", displayName: "指示色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "indicator_strip", styleId: "style_06" },
|
||||||
|
{ cardId: "COLOR007", displayName: "图钉色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "pinned_strip", styleId: "style_07" },
|
||||||
{ cardId: "COLOR008", displayName: "横向标尺", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "horizontal_line", styleId: "style_08" },
|
{ cardId: "COLOR008", displayName: "横向标尺", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "horizontal_line", styleId: "style_08" },
|
||||||
|
{ cardId: "COLOR009", displayName: "色彩海报", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "color_poster", styleId: "style_09" },
|
||||||
|
{ cardId: "COLOR010", displayName: "标题海报", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "caption_poster", styleId: "style_10" },
|
||||||
|
{ cardId: "COLOR011", displayName: "边框色条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "framed_strip", styleId: "style_11" },
|
||||||
|
{ cardId: "COLOR012", displayName: "OTTO 色块", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "otto_blocks", styleId: "style_12" },
|
||||||
|
{ cardId: "COLOR013", displayName: "纵向圆点", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "vertical_dots", styleId: "style_13" },
|
||||||
|
{ cardId: "COLOR014", displayName: "三色圆环", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "three_circles", styleId: "style_14" },
|
||||||
|
{ cardId: "COLOR015", displayName: "描边圆点", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "outlined_dots", styleId: "style_15" },
|
||||||
{ cardId: "COLOR016", displayName: "横向票条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "ticket_strip", styleId: "style_16" },
|
{ cardId: "COLOR016", displayName: "横向票条", mappingStatus: "stable_web_style_native_mapping_provisional", rendererName: "ticket_strip", styleId: "style_16" },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,133 @@ import { Type, type Static } from "@sinclair/typebox";
|
|||||||
const isoTimestampPattern = "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{3})?Z$";
|
const isoTimestampPattern = "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]{3})?Z$";
|
||||||
const modelIdPattern = "^[a-z0-9][a-z0-9.-]+$";
|
const modelIdPattern = "^[a-z0-9][a-z0-9.-]+$";
|
||||||
const safeReferencePattern = "^[A-Za-z0-9][A-Za-z0-9:._-]{0,159}$";
|
const safeReferencePattern = "^[A-Za-z0-9][A-Za-z0-9:._-]{0,159}$";
|
||||||
|
const uuidPattern = "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$";
|
||||||
|
|
||||||
|
export const AdminGenerationRecordSchema = Type.Object(
|
||||||
|
{
|
||||||
|
generation_id: Type.String({ pattern: uuidPattern }),
|
||||||
|
owner_ref: Type.String({ pattern: uuidPattern }),
|
||||||
|
project_id: Type.String({ pattern: uuidPattern }),
|
||||||
|
model_id: Type.String({ maxLength: 80, pattern: modelIdPattern }),
|
||||||
|
ratio: Type.Union([Type.Literal("3:4"), Type.Literal("1:1"), Type.Literal("4:3"), Type.Literal("9:16")]),
|
||||||
|
status: Type.Union([Type.Literal("queued"), Type.Literal("running"), Type.Literal("succeeded"), Type.Literal("failed"), Type.Literal("rejected")]),
|
||||||
|
created_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
completed_at: Type.Union([Type.String({ pattern: isoTimestampPattern }), Type.Null()]),
|
||||||
|
duration_ms: Type.Union([Type.Integer({ minimum: 0 }), Type.Null()]),
|
||||||
|
confirmed_credit_cost: Type.Integer({ minimum: 0 }),
|
||||||
|
reserved_credits: Type.Integer({ minimum: 0 }),
|
||||||
|
final_credit_state: Type.Union([Type.Literal("committed"), Type.Literal("released"), Type.Null()]),
|
||||||
|
error_category: Type.Union([
|
||||||
|
Type.Literal("upstream_timeout"), Type.Literal("upstream_failed"), Type.Literal("safety_rejected"),
|
||||||
|
Type.Literal("model_disabled"), Type.Literal("gateway_balance_insufficient"), Type.Literal("gateway_contract_invalid"),
|
||||||
|
Type.Literal("reference_invalid"), Type.Literal("unknown_retryable"), Type.Literal("unknown_non_retryable"), Type.Null(),
|
||||||
|
]),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "AdminGenerationRecord" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const AdminGenerationListResponseSchema = Type.Object(
|
||||||
|
{
|
||||||
|
generated_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
items: Type.Array(Type.Ref(AdminGenerationRecordSchema), { maxItems: 100 }),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "AdminGenerationListResponse" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const PrivateContentNoticeAckRequestSchema = Type.Object(
|
||||||
|
{ expected_notice_version: Type.String({ minLength: 1, maxLength: 80, pattern: "^[A-Za-z0-9_.:-]+$" }) },
|
||||||
|
{ additionalProperties: false, $id: "PrivateContentNoticeAckRequest" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const PrivateContentNoticeAckResponseSchema = Type.Object(
|
||||||
|
{
|
||||||
|
notice_version: Type.String({ minLength: 1, maxLength: 80, pattern: "^[A-Za-z0-9_.:-]+$" }),
|
||||||
|
acknowledged_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
status: Type.Literal("acknowledged"),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "PrivateContentNoticeAckResponse" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const PrivateContentPromptResponseSchema = Type.Object(
|
||||||
|
{
|
||||||
|
generation_id: Type.String({ pattern: uuidPattern }),
|
||||||
|
content_type: Type.Literal("prompt"),
|
||||||
|
prompt: Type.String({ minLength: 1, maxLength: 4000 }),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "PrivateContentPromptResponse" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const PrivateContentGenerationParamsSchema = Type.Object(
|
||||||
|
{ generationId: Type.String({ pattern: uuidPattern }) },
|
||||||
|
{ additionalProperties: false, $id: "PrivateContentGenerationParams" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export type AdminGenerationRecord = Static<typeof AdminGenerationRecordSchema>;
|
||||||
|
export type AdminGenerationListResponse = Static<typeof AdminGenerationListResponseSchema>;
|
||||||
|
export type PrivateContentNoticeAckRequest = Static<typeof PrivateContentNoticeAckRequestSchema>;
|
||||||
|
export type PrivateContentNoticeAckResponse = Static<typeof PrivateContentNoticeAckResponseSchema>;
|
||||||
|
export type PrivateContentPromptResponse = Static<typeof PrivateContentPromptResponseSchema>;
|
||||||
|
|
||||||
|
export const AdminAuditQuerySchema = Type.Object(
|
||||||
|
{
|
||||||
|
cursor: Type.Optional(Type.String({ maxLength: 512, pattern: "^[A-Za-z0-9_-]+$" })),
|
||||||
|
limit: Type.Optional(Type.Integer({ maximum: 100, minimum: 1 })),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "AdminAuditQuery" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const AdminOperationAuditItemSchema = Type.Object(
|
||||||
|
{
|
||||||
|
actor_ref: Type.String({ pattern: safeReferencePattern }),
|
||||||
|
actor_type: Type.Union([Type.Literal("system"), Type.Literal("super_admin")]),
|
||||||
|
after_summary: Type.Union([Type.String({ maxLength: 2048 }), Type.Null()]),
|
||||||
|
before_summary: Type.Union([Type.String({ maxLength: 2048 }), Type.Null()]),
|
||||||
|
expires_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
log_id: Type.String({ pattern: uuidPattern }),
|
||||||
|
occurred_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
operation_type: Type.String({ maxLength: 160, pattern: safeReferencePattern }),
|
||||||
|
result: Type.Union([Type.Literal("succeeded"), Type.Literal("failed")]),
|
||||||
|
target_ref: Type.String({ pattern: safeReferencePattern }),
|
||||||
|
target_type: Type.String({ maxLength: 160, pattern: safeReferencePattern }),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "AdminOperationAuditItem" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const AdminOperationAuditResponseSchema = Type.Object(
|
||||||
|
{
|
||||||
|
generated_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
items: Type.Array(Type.Ref(AdminOperationAuditItemSchema), { maxItems: 100 }),
|
||||||
|
next_cursor: Type.Union([Type.String({ maxLength: 512, pattern: "^[A-Za-z0-9_-]+$" }), Type.Null()]),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "AdminOperationAuditResponse" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const PrivateContentAccessAuditItemSchema = Type.Object(
|
||||||
|
{
|
||||||
|
actor_ref: Type.String({ pattern: safeReferencePattern }),
|
||||||
|
content_type: Type.Union([Type.Literal("image"), Type.Literal("prompt")]),
|
||||||
|
expires_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
log_id: Type.String({ pattern: uuidPattern }),
|
||||||
|
occurred_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
target_ref: Type.String({ pattern: safeReferencePattern }),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "PrivateContentAccessAuditItem" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export const PrivateContentAccessAuditResponseSchema = Type.Object(
|
||||||
|
{
|
||||||
|
generated_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
items: Type.Array(Type.Ref(PrivateContentAccessAuditItemSchema), { maxItems: 100 }),
|
||||||
|
next_cursor: Type.Union([Type.String({ maxLength: 512, pattern: "^[A-Za-z0-9_-]+$" }), Type.Null()]),
|
||||||
|
},
|
||||||
|
{ additionalProperties: false, $id: "PrivateContentAccessAuditResponse" },
|
||||||
|
);
|
||||||
|
|
||||||
|
export type AdminAuditQuery = Static<typeof AdminAuditQuerySchema>;
|
||||||
|
export type AdminOperationAuditItem = Static<typeof AdminOperationAuditItemSchema>;
|
||||||
|
export type AdminOperationAuditResponse = Static<typeof AdminOperationAuditResponseSchema>;
|
||||||
|
export type PrivateContentAccessAuditItem = Static<typeof PrivateContentAccessAuditItemSchema>;
|
||||||
|
export type PrivateContentAccessAuditResponse = Static<typeof PrivateContentAccessAuditResponseSchema>;
|
||||||
|
|
||||||
export const AdminOverviewResponseSchema = Type.Object(
|
export const AdminOverviewResponseSchema = Type.Object(
|
||||||
{
|
{
|
||||||
@@ -92,3 +219,72 @@ export const AdminOverviewResponseSchema = Type.Object(
|
|||||||
);
|
);
|
||||||
|
|
||||||
export type AdminOverviewResponse = Static<typeof AdminOverviewResponseSchema>;
|
export type AdminOverviewResponse = Static<typeof AdminOverviewResponseSchema>;
|
||||||
|
|
||||||
|
const adminServiceStatusSchema = Type.Union([
|
||||||
|
Type.Literal("active"),
|
||||||
|
Type.Literal("paused_quota"),
|
||||||
|
Type.Literal("paused_provider"),
|
||||||
|
Type.Literal("disabled"),
|
||||||
|
Type.Literal("degraded"),
|
||||||
|
Type.Literal("unavailable"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
const adminServiceIdSchema = Type.Union([
|
||||||
|
Type.Literal("resend"),
|
||||||
|
Type.Literal("amap"),
|
||||||
|
Type.Literal("ai_gateway"),
|
||||||
|
Type.Literal("worker"),
|
||||||
|
Type.Literal("api"),
|
||||||
|
Type.Literal("asset_root"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const AdminServicesStorageResponseSchema = Type.Object({
|
||||||
|
generated_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
services: Type.Array(Type.Object({
|
||||||
|
checked_at: Type.Union([Type.String({ pattern: isoTimestampPattern }), Type.Null()]),
|
||||||
|
configured: Type.Boolean(),
|
||||||
|
impact_scope: Type.Union([
|
||||||
|
Type.Literal("none"),
|
||||||
|
Type.Literal("authentication"),
|
||||||
|
Type.Literal("location"),
|
||||||
|
Type.Literal("generation"),
|
||||||
|
Type.Literal("storage"),
|
||||||
|
Type.Literal("api"),
|
||||||
|
Type.Literal("model"),
|
||||||
|
Type.Literal("account"),
|
||||||
|
Type.Literal("unknown"),
|
||||||
|
]),
|
||||||
|
pause_reason: Type.Union([Type.String({ maxLength: 80, pattern: "^[a-z][a-z0-9_]*$" }), Type.Null()]),
|
||||||
|
service_id: adminServiceIdSchema,
|
||||||
|
status: adminServiceStatusSchema,
|
||||||
|
}, { additionalProperties: false }), { minItems: 6, maxItems: 6 }),
|
||||||
|
storage: Type.Object({
|
||||||
|
capacity_notice_level: Type.Union([Type.Literal("normal"), Type.Literal("warning"), Type.Literal("critical")]),
|
||||||
|
cleanup_pending_count: Type.Integer({ minimum: 0 }),
|
||||||
|
data_root_ref: Type.Literal("configured_local_data_root"),
|
||||||
|
hard_limit_bytes: Type.Integer({ minimum: 1 }),
|
||||||
|
last_measured_at: Type.Union([Type.String({ pattern: isoTimestampPattern }), Type.Null()]),
|
||||||
|
managed_content_bytes: Type.Integer({ minimum: 0 }),
|
||||||
|
remeasurement_required: Type.Boolean(),
|
||||||
|
status: Type.Union([Type.Literal("active"), Type.Literal("full"), Type.Literal("unavailable")]),
|
||||||
|
storage_backend: Type.Literal("local_filesystem"),
|
||||||
|
}, { additionalProperties: false }),
|
||||||
|
}, { additionalProperties: false, $id: "AdminServicesStorageResponse" });
|
||||||
|
|
||||||
|
export const AdminDiagnosticsResponseSchema = Type.Object({
|
||||||
|
generated_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
diagnostic_text: Type.String({ minLength: 1, maxLength: 12_000 }),
|
||||||
|
services: Type.Ref(AdminServicesStorageResponseSchema),
|
||||||
|
system: Type.Object({
|
||||||
|
api_status: Type.Union([Type.Literal("ready"), Type.Literal("degraded"), Type.Literal("unavailable")]),
|
||||||
|
app_version: Type.String({ maxLength: 80, pattern: "^[A-Za-z0-9][A-Za-z0-9._-]*$" }),
|
||||||
|
browser_support: Type.Array(Type.Object({
|
||||||
|
brand: Type.Union([Type.Literal("Google Chrome"), Type.Literal("Microsoft Edge")]),
|
||||||
|
major: Type.Integer({ minimum: 1 }),
|
||||||
|
}, { additionalProperties: false }), { maxItems: 8 }),
|
||||||
|
worker_status: Type.Union([Type.Literal("ready"), Type.Literal("degraded"), Type.Literal("unavailable")]),
|
||||||
|
}, { additionalProperties: false }),
|
||||||
|
}, { additionalProperties: false, $id: "AdminDiagnosticsResponse" });
|
||||||
|
|
||||||
|
export type AdminServicesStorageResponse = Static<typeof AdminServicesStorageResponseSchema>;
|
||||||
|
export type AdminDiagnosticsResponse = Static<typeof AdminDiagnosticsResponseSchema>;
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ export const ErrorDetailsSchema = Type.Object(
|
|||||||
},
|
},
|
||||||
{ additionalProperties: false },
|
{ additionalProperties: false },
|
||||||
),
|
),
|
||||||
{ maxItems: 2 },
|
{ maxItems: 8 },
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
capacity_status: Type.Optional(
|
capacity_status: Type.Optional(
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ export const AdminSessionResponseSchema = Type.Object(
|
|||||||
audience: Type.Literal("admin"),
|
audience: Type.Literal("admin"),
|
||||||
authenticated: Type.Literal(true),
|
authenticated: Type.Literal(true),
|
||||||
csrf_token: Type.String({ maxLength: 64, minLength: 43, pattern: "^[A-Za-z0-9_-]+$" }),
|
csrf_token: Type.String({ maxLength: 64, minLength: 43, pattern: "^[A-Za-z0-9_-]+$" }),
|
||||||
|
current_private_content_notice_message_key: Type.Optional(Type.String({ maxLength: 120, pattern: "^[A-Za-z0-9_.-]+$" })),
|
||||||
current_private_content_notice_version: Type.Union([Type.String(), Type.Null()]),
|
current_private_content_notice_version: Type.Union([Type.String(), Type.Null()]),
|
||||||
expires_at: Type.String({ pattern: isoTimestampPattern }),
|
expires_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
notice_acknowledged: Type.Boolean(),
|
notice_acknowledged: Type.Boolean(),
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
export { Type } from "@sinclair/typebox";
|
export { Type } from "@sinclair/typebox";
|
||||||
export * from "./api.js";
|
export * from "./api.js";
|
||||||
export * from "./admin.js";
|
export * from "./admin.js";
|
||||||
|
export * from "./services.js";
|
||||||
export * from "./assets.js";
|
export * from "./assets.js";
|
||||||
export * from "./auth.js";
|
export * from "./auth.js";
|
||||||
export * from "./bootstrap.js";
|
export * from "./bootstrap.js";
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export const ReverseGeocodeRequestSchema = Type.Object({
|
|||||||
|
|
||||||
export const ReverseGeocodeResponseSchema = Type.Object({
|
export const ReverseGeocodeResponseSchema = Type.Object({
|
||||||
formatted_value: Type.String({ maxLength: 200, minLength: 1 }),
|
formatted_value: Type.String({ maxLength: 200, minLength: 1 }),
|
||||||
service_mode: Type.Literal("mock"),
|
service_mode: Type.Union([Type.Literal("mock"), Type.Literal("real")]),
|
||||||
status: Type.Literal("resolved"),
|
status: Type.Literal("resolved"),
|
||||||
}, { additionalProperties: false, $id: "ReverseGeocodeResponse" });
|
}, { additionalProperties: false, $id: "ReverseGeocodeResponse" });
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import { Type, type Static } from "@sinclair/typebox";
|
||||||
|
|
||||||
|
const isoTimestampPattern = "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3}Z$";
|
||||||
|
|
||||||
|
export const ExternalServiceIdSchema = Type.Union([
|
||||||
|
Type.Literal("resend_email"),
|
||||||
|
Type.Literal("amap_web_service"),
|
||||||
|
], { $id: "ExternalServiceId" });
|
||||||
|
|
||||||
|
export const ExternalServicePeriodTypeSchema = Type.Union([
|
||||||
|
Type.Literal("daily"),
|
||||||
|
Type.Literal("monthly"),
|
||||||
|
], { $id: "ExternalServicePeriodType" });
|
||||||
|
|
||||||
|
export const ExternalServiceStatusSchema = Type.Union([
|
||||||
|
Type.Literal("active"),
|
||||||
|
Type.Literal("paused_quota"),
|
||||||
|
Type.Literal("paused_provider"),
|
||||||
|
Type.Literal("disabled"),
|
||||||
|
], { $id: "ExternalServiceStatus" });
|
||||||
|
|
||||||
|
export const ExternalServiceUsageSchema = Type.Object({
|
||||||
|
service_id: Type.Ref(ExternalServiceIdSchema),
|
||||||
|
period_type: Type.Ref(ExternalServicePeriodTypeSchema),
|
||||||
|
period_start: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
hard_limit: Type.Integer({ minimum: 1 }),
|
||||||
|
used_count: Type.Integer({ minimum: 0 }),
|
||||||
|
service_status: Type.Ref(ExternalServiceStatusSchema),
|
||||||
|
pause_reason: Type.Union([Type.String({ maxLength: 120, pattern: "^[a-z0-9_.-]+$" }), Type.Null()]),
|
||||||
|
updated_at: Type.String({ pattern: isoTimestampPattern }),
|
||||||
|
}, { additionalProperties: false, $id: "ExternalServiceUsage" });
|
||||||
|
|
||||||
|
export const AdminServicesResponseSchema = Type.Object({
|
||||||
|
services: Type.Array(Type.Ref(ExternalServiceUsageSchema), { maxItems: 3 }),
|
||||||
|
}, { additionalProperties: false, $id: "AdminServicesResponse" });
|
||||||
|
|
||||||
|
export const AdminServiceLimitRequestSchema = Type.Object({
|
||||||
|
period_type: Type.Ref(ExternalServicePeriodTypeSchema),
|
||||||
|
hard_limit: Type.Integer({ minimum: 1 }),
|
||||||
|
}, { additionalProperties: false, $id: "AdminServiceLimitRequest" });
|
||||||
|
|
||||||
|
export const AdminServiceHealthCheckRequestSchema = Type.Object({
|
||||||
|
available: Type.Boolean(),
|
||||||
|
reason: Type.Optional(Type.String({ maxLength: 120, pattern: "^[a-zA-Z0-9_. -]+$" })),
|
||||||
|
}, { additionalProperties: false, $id: "AdminServiceHealthCheckRequest" });
|
||||||
|
|
||||||
|
export const AdminServiceRecoveryRequestSchema = Type.Object({
|
||||||
|
check_id: Type.String({ maxLength: 64, minLength: 1, pattern: "^[0-9a-fA-F-]+$" }),
|
||||||
|
}, { additionalProperties: false, $id: "AdminServiceRecoveryRequest" });
|
||||||
|
|
||||||
|
export const AdminServiceParamsSchema = Type.Object({
|
||||||
|
service_id: Type.Ref(ExternalServiceIdSchema),
|
||||||
|
}, { additionalProperties: false, $id: "AdminServiceParams" });
|
||||||
|
|
||||||
|
export type ExternalServiceId = Static<typeof ExternalServiceIdSchema>;
|
||||||
|
export type ExternalServicePeriodType = Static<typeof ExternalServicePeriodTypeSchema>;
|
||||||
|
export type ExternalServiceUsage = Static<typeof ExternalServiceUsageSchema>;
|
||||||
|
export type AdminServicesResponse = Static<typeof AdminServicesResponseSchema>;
|
||||||
|
export type AdminServiceLimitRequest = Static<typeof AdminServiceLimitRequestSchema>;
|
||||||
|
export type AdminServiceHealthCheckRequest = Static<typeof AdminServiceHealthCheckRequestSchema>;
|
||||||
|
export type AdminServiceRecoveryRequest = Static<typeof AdminServiceRecoveryRequestSchema>;
|
||||||
|
export type AdminServiceParams = Static<typeof AdminServiceParamsSchema>;
|
||||||
@@ -16,8 +16,8 @@ export interface StaticStickerCatalogItem {
|
|||||||
relative_path: string;
|
relative_path: string;
|
||||||
width: number;
|
width: number;
|
||||||
height: number;
|
height: number;
|
||||||
mime_type: "image/png";
|
mime_type: "image/png" | "image/webp";
|
||||||
mime: "image/png";
|
mime: "image/png" | "image/webp";
|
||||||
sha256: string;
|
sha256: string;
|
||||||
original_reference: string;
|
original_reference: string;
|
||||||
thumbnail_reference: StaticStickerThumbnailReference;
|
thumbnail_reference: StaticStickerThumbnailReference;
|
||||||
|
|||||||
@@ -1,23 +1,42 @@
|
|||||||
import type { StaticStickerCatalog, StaticStickerCatalogItem } from "@dada/static-sticker-catalog";
|
import type { StaticStickerCatalog, StaticStickerCatalogItem } from "@dada/static-sticker-catalog";
|
||||||
|
|
||||||
export const P0A_TEXT_TEMPLATE_IDS = [
|
export const P0A_COMPLEX_RELEASE_VERSION = "p0a-complex-v1";
|
||||||
"FLOWER001", "FLOWER002", "FLOWER003", "FLOWER004", "FLOWER005", "FLOWER006", "FLOWER007", "FLOWER008",
|
export const P0A_STATIC_STICKER_RELEASE_VERSION = "p0a-static-v1";
|
||||||
"H001", "H002", "H003", "H004", "H005", "H006", "H007", "H008",
|
|
||||||
"TAG001", "TAG002", "TAG003", "TAG004", "TAG005", "TAG006", "TAG007", "TAG051",
|
function numberedIds(prefix: string, count: number) {
|
||||||
"SIMPLE001", "SIMPLE002", "SIMPLE003", "SIMPLE004", "SIMPLE005", "SIMPLE006", "SIMPLE007", "SIMPLE008",
|
return Object.freeze(Array.from({ length: count }, (_, index) => `${prefix}${String(index + 1).padStart(3, "0")}`));
|
||||||
|
}
|
||||||
|
|
||||||
|
export const P0A_TEXT_TEMPLATE_IDS = Object.freeze([
|
||||||
|
...numberedIds("FLOWER", 145),
|
||||||
|
...numberedIds("H", 119),
|
||||||
|
...numberedIds("TAG", 51),
|
||||||
|
...numberedIds("SIMPLE", 17),
|
||||||
|
]);
|
||||||
|
|
||||||
|
export const P0A_REQUIRED_FONT_PANEL_IDS = numberedIds("FONT", 86);
|
||||||
|
export const P0A_COLOR_CARD_IDS = numberedIds("COLOR", 16);
|
||||||
|
export const P0A_DYNAMIC_STICKER_IDS = numberedIds("DYN", 35);
|
||||||
|
|
||||||
|
export const P0A_DYNAMIC_RUNTIME_FONT_SOURCES = [
|
||||||
|
{ assetId: "15974853bc3294ef68e7e6d58fe74fd7", sourceReference: "fonts/15974853bc3294ef68e7e6d58fe74fd7", templateId: "DYN002" },
|
||||||
|
{ assetId: "46f8336813e4c48d06a1aef294fdccf6", sourceReference: "fonts/46f8336813e4c48d06a1aef294fdccf6", templateId: "DYN016" },
|
||||||
|
{ assetId: "53ca6b704728520da50c145eabb2e635", sourceReference: "fonts/53ca6b704728520da50c145eabb2e635", templateId: "DYN007" },
|
||||||
|
{ assetId: "cca5efc0e02fb1bf62349bd68ef30fc1", sourceReference: "fonts/cca5efc0e02fb1bf62349bd68ef30fc1", templateId: "DYN015" },
|
||||||
|
{ assetId: "dd25b35dcb7ba4476cbaa9a9592e39e2", sourceReference: "fonts/dd25b35dcb7ba4476cbaa9a9592e39e2", templateId: "DYN001" },
|
||||||
|
{ assetId: "e4210c9872f0c279b35273f230809821", sourceReference: "fonts/e4210c9872f0c279b35273f230809821", templateId: "DYN011" },
|
||||||
|
{ assetId: "f4bfd4132df2d6be97ceabadf3853505", sourceReference: "fonts/f4bfd4132df2d6be97ceabadf3853505", templateId: "DYN008" },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
// Derived from exact package-hash matches between the 32 frozen templates and the 86-item font panel.
|
export const P0A_DYNAMIC_RUNTIME_IMAGE_SOURCES = [
|
||||||
export const P0A_REQUIRED_FONT_PANEL_IDS = [
|
{ assetId: "DYN001-image28", sourceReference: "resource/image28.png", templateId: "DYN001" },
|
||||||
"FONT005", "FONT008", "FONT011", "FONT021", "FONT022", "FONT027",
|
{ assetId: "DYN002-image29", sourceReference: "resource/image29.png", templateId: "DYN002" },
|
||||||
"FONT039", "FONT043", "FONT046", "FONT052", "FONT081",
|
{ assetId: "DYN003-image30", sourceReference: "resource/image30.png", templateId: "DYN003" },
|
||||||
] as const;
|
{ assetId: "DYN004-image32", sourceReference: "resource/image32.png", templateId: "DYN004" },
|
||||||
|
{ assetId: "DYN008-backendui0", sourceReference: "resource/backendui0.png", templateId: "DYN008" },
|
||||||
export const P0A_COLOR_CARD_IDS = ["COLOR001", "COLOR002", "COLOR008", "COLOR016"] as const;
|
{ assetId: "DYN011-backendui0", sourceReference: "resource/backendui0.png", templateId: "DYN011" },
|
||||||
|
{ assetId: "DYN015-imager2", sourceReference: "resource/imager2_2.png", templateId: "DYN015" },
|
||||||
export const P0A_DYNAMIC_STICKER_IDS = [
|
{ assetId: "DYN016-image21", sourceReference: "resource/image21.png", templateId: "DYN016" },
|
||||||
"DYN001", "DYN002", "DYN003", "DYN004", "DYN007",
|
|
||||||
"DYN008", "DYN011", "DYN012", "DYN015", "DYN016",
|
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export type RegisteredComplexFamily = "color_card" | "font_panel" | "interactive_sticker" | "text_template";
|
export type RegisteredComplexFamily = "color_card" | "font_panel" | "interactive_sticker" | "text_template";
|
||||||
@@ -52,12 +71,12 @@ export interface P0aPublicManifest {
|
|||||||
text_templates: PublicComplexAsset[];
|
text_templates: PublicComplexAsset[];
|
||||||
};
|
};
|
||||||
counts: {
|
counts: {
|
||||||
color_cards: 4;
|
color_cards: 16;
|
||||||
dynamic_stickers: 10;
|
dynamic_stickers: 35;
|
||||||
font_panel_items: 11;
|
font_panel_items: 86;
|
||||||
static_parts: 25;
|
static_parts: 25;
|
||||||
static_stickers: 1407;
|
static_stickers: 1407;
|
||||||
text_templates: 32;
|
text_templates: 332;
|
||||||
};
|
};
|
||||||
release_tier: "alpha_whitelist";
|
release_tier: "alpha_whitelist";
|
||||||
release_version: string;
|
release_version: string;
|
||||||
@@ -116,15 +135,6 @@ function validateStaticCatalog(catalog: StaticStickerCatalog) {
|
|||||||
if (Object.keys(catalog.part_counts).length !== 25) throw new Error("static sticker part counts must contain 25 parts");
|
if (Object.keys(catalog.part_counts).length !== 25) throw new Error("static sticker part counts must contain 25 parts");
|
||||||
}
|
}
|
||||||
|
|
||||||
function fontIdsForTemplates(templates: readonly RegisteredComplexAsset[]) {
|
|
||||||
const referenced = new Set<string>();
|
|
||||||
for (const template of templates) {
|
|
||||||
for (const fontId of template.font_panel_references ?? []) referenced.add(fontId);
|
|
||||||
}
|
|
||||||
referenced.add("FONT081");
|
|
||||||
return [...referenced].sort((left, right) => Number(left.slice(4)) - Number(right.slice(4)));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createP0aPublicManifest(input: {
|
export function createP0aPublicManifest(input: {
|
||||||
complexManifest: ComplexRegistryManifest;
|
complexManifest: ComplexRegistryManifest;
|
||||||
staticCatalog: StaticStickerCatalog;
|
staticCatalog: StaticStickerCatalog;
|
||||||
@@ -133,11 +143,7 @@ export function createP0aPublicManifest(input: {
|
|||||||
validateStaticCatalog(input.staticCatalog);
|
validateStaticCatalog(input.staticCatalog);
|
||||||
|
|
||||||
const textTemplates = orderedItems(input.complexManifest.items, P0A_TEXT_TEMPLATE_IDS, "text_template");
|
const textTemplates = orderedItems(input.complexManifest.items, P0A_TEXT_TEMPLATE_IDS, "text_template");
|
||||||
const derivedFontIds = fontIdsForTemplates(textTemplates);
|
const fontPanelItems = orderedItems(input.complexManifest.items, P0A_REQUIRED_FONT_PANEL_IDS, "font_panel");
|
||||||
if (JSON.stringify(derivedFontIds) !== JSON.stringify(P0A_REQUIRED_FONT_PANEL_IDS)) {
|
|
||||||
throw new Error(`P0-A referenced font panel mismatch: received ${derivedFontIds.join(",")}`);
|
|
||||||
}
|
|
||||||
const fontPanelItems = orderedItems(input.complexManifest.items, derivedFontIds, "font_panel");
|
|
||||||
const colorCards = orderedItems(input.complexManifest.items, P0A_COLOR_CARD_IDS, "color_card");
|
const colorCards = orderedItems(input.complexManifest.items, P0A_COLOR_CARD_IDS, "color_card");
|
||||||
const dynamicStickers = orderedItems(input.complexManifest.items, P0A_DYNAMIC_STICKER_IDS, "interactive_sticker");
|
const dynamicStickers = orderedItems(input.complexManifest.items, P0A_DYNAMIC_STICKER_IDS, "interactive_sticker");
|
||||||
|
|
||||||
@@ -150,12 +156,12 @@ export function createP0aPublicManifest(input: {
|
|||||||
text_templates: textTemplates.map(publicItem),
|
text_templates: textTemplates.map(publicItem),
|
||||||
},
|
},
|
||||||
counts: {
|
counts: {
|
||||||
color_cards: 4,
|
color_cards: 16,
|
||||||
dynamic_stickers: 10,
|
dynamic_stickers: 35,
|
||||||
font_panel_items: 11,
|
font_panel_items: 86,
|
||||||
static_parts: 25,
|
static_parts: 25,
|
||||||
static_stickers: 1_407,
|
static_stickers: 1_407,
|
||||||
text_templates: 32,
|
text_templates: 332,
|
||||||
},
|
},
|
||||||
release_tier: "alpha_whitelist",
|
release_tier: "alpha_whitelist",
|
||||||
release_version: input.complexManifest.release_version,
|
release_version: input.complexManifest.release_version,
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { defineConfig } from "@playwright/test";
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
forbidOnly: true,
|
||||||
|
fullyParallel: false,
|
||||||
|
outputDir: process.env.DADA_PLAYWRIGHT_OUTPUT_DIR ?? "test-results/wp4-07",
|
||||||
|
projects: [
|
||||||
|
{ name: "chrome", use: { channel: "chrome" } },
|
||||||
|
{ name: "edge", use: { channel: "msedge" } },
|
||||||
|
],
|
||||||
|
reporter: "line",
|
||||||
|
retries: 0,
|
||||||
|
testDir: "./tests/e2e",
|
||||||
|
testMatch: "wp4-07-visual-performance.spec.ts",
|
||||||
|
timeout: 360_000,
|
||||||
|
use: {
|
||||||
|
deviceScaleFactor: 1,
|
||||||
|
headless: true,
|
||||||
|
launchOptions: { args: ["--enable-precise-memory-info", "--force-device-scale-factor=1"] },
|
||||||
|
locale: "zh-CN",
|
||||||
|
timezoneId: "Asia/Shanghai",
|
||||||
|
trace: "off",
|
||||||
|
viewport: { height: 1080, width: 1920 },
|
||||||
|
},
|
||||||
|
workers: 1,
|
||||||
|
});
|
||||||
Generated
+319
@@ -44,6 +44,9 @@ importers:
|
|||||||
'@dada/shared-contracts':
|
'@dada/shared-contracts':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../../packages/shared-contracts
|
version: link:../../packages/shared-contracts
|
||||||
|
'@dada/static-sticker-catalog':
|
||||||
|
specifier: workspace:*
|
||||||
|
version: link:../../packages/static-sticker-catalog
|
||||||
'@fastify/multipart':
|
'@fastify/multipart':
|
||||||
specifier: 10.1.0
|
specifier: 10.1.0
|
||||||
version: 10.1.0
|
version: 10.1.0
|
||||||
@@ -62,6 +65,9 @@ importers:
|
|||||||
fastify:
|
fastify:
|
||||||
specifier: 5.10.0
|
specifier: 5.10.0
|
||||||
version: 5.10.0
|
version: 5.10.0
|
||||||
|
sharp:
|
||||||
|
specifier: 0.35.3
|
||||||
|
version: 0.35.3(@types/node@24.13.3)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/better-sqlite3':
|
'@types/better-sqlite3':
|
||||||
specifier: 7.6.13
|
specifier: 7.6.13
|
||||||
@@ -127,6 +133,9 @@ importers:
|
|||||||
drizzle-orm:
|
drizzle-orm:
|
||||||
specifier: 0.45.2
|
specifier: 0.45.2
|
||||||
version: 0.45.2(@types/better-sqlite3@7.6.13)(better-sqlite3@13.0.1)
|
version: 0.45.2(@types/better-sqlite3@7.6.13)(better-sqlite3@13.0.1)
|
||||||
|
sharp:
|
||||||
|
specifier: 0.35.3
|
||||||
|
version: 0.35.3(@types/node@24.13.3)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/better-sqlite3':
|
'@types/better-sqlite3':
|
||||||
specifier: 7.6.13
|
specifier: 7.6.13
|
||||||
@@ -271,6 +280,168 @@ packages:
|
|||||||
'@fastify/swagger@9.8.1':
|
'@fastify/swagger@9.8.1':
|
||||||
resolution: {integrity: sha512-VpHMnqZTY8iBZYJE8WWkbKPrXIYWy2rDfIf5qLr6DzZSpQYZ+KxQVcJFiq/AMlvNwI4gCBd66++iUlxXXGT0IQ==}
|
resolution: {integrity: sha512-VpHMnqZTY8iBZYJE8WWkbKPrXIYWy2rDfIf5qLr6DzZSpQYZ+KxQVcJFiq/AMlvNwI4gCBd66++iUlxXXGT0IQ==}
|
||||||
|
|
||||||
|
'@img/colour@1.1.0':
|
||||||
|
resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
|
||||||
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
|
'@img/sharp-darwin-arm64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [darwin]
|
||||||
|
|
||||||
|
'@img/sharp-darwin-x64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [darwin]
|
||||||
|
|
||||||
|
'@img/sharp-freebsd-wasm32@0.35.3':
|
||||||
|
resolution: {integrity: sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
os: [freebsd]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-darwin-arm64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [darwin]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-darwin-x64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [darwin]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-arm64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-arm@1.3.2':
|
||||||
|
resolution: {integrity: sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==}
|
||||||
|
cpu: [arm]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-ppc64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==}
|
||||||
|
cpu: [ppc64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-riscv64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==}
|
||||||
|
cpu: [riscv64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-s390x@1.3.2':
|
||||||
|
resolution: {integrity: sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==}
|
||||||
|
cpu: [s390x]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-x64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linuxmusl-arm64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linuxmusl-x64@1.3.2':
|
||||||
|
resolution: {integrity: sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
|
'@img/sharp-linux-arm64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-linux-arm@0.35.3':
|
||||||
|
resolution: {integrity: sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [arm]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-linux-ppc64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [ppc64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-linux-riscv64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [riscv64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-linux-s390x@0.35.3':
|
||||||
|
resolution: {integrity: sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [s390x]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-linux-x64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
|
'@img/sharp-linuxmusl-arm64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
|
'@img/sharp-linuxmusl-x64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
|
'@img/sharp-wasm32@0.35.3':
|
||||||
|
resolution: {integrity: sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
|
||||||
|
'@img/sharp-webcontainers-wasm32@0.35.3':
|
||||||
|
resolution: {integrity: sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [wasm32]
|
||||||
|
|
||||||
|
'@img/sharp-win32-arm64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [arm64]
|
||||||
|
os: [win32]
|
||||||
|
|
||||||
|
'@img/sharp-win32-ia32@0.35.3':
|
||||||
|
resolution: {integrity: sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==}
|
||||||
|
engines: {node: ^20.9.0}
|
||||||
|
cpu: [ia32]
|
||||||
|
os: [win32]
|
||||||
|
|
||||||
|
'@img/sharp-win32-x64@0.35.3':
|
||||||
|
resolution: {integrity: sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
cpu: [x64]
|
||||||
|
os: [win32]
|
||||||
|
|
||||||
'@jridgewell/sourcemap-codec@1.5.5':
|
'@jridgewell/sourcemap-codec@1.5.5':
|
||||||
resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
|
resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
|
||||||
|
|
||||||
@@ -1211,6 +1382,15 @@ packages:
|
|||||||
set-cookie-parser@2.7.2:
|
set-cookie-parser@2.7.2:
|
||||||
resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==}
|
resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==}
|
||||||
|
|
||||||
|
sharp@0.35.3:
|
||||||
|
resolution: {integrity: sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==}
|
||||||
|
engines: {node: '>=20.9.0'}
|
||||||
|
peerDependencies:
|
||||||
|
'@types/node': '*'
|
||||||
|
peerDependenciesMeta:
|
||||||
|
'@types/node':
|
||||||
|
optional: true
|
||||||
|
|
||||||
siginfo@2.0.0:
|
siginfo@2.0.0:
|
||||||
resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
|
resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
|
||||||
|
|
||||||
@@ -1543,6 +1723,112 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
|
'@img/colour@1.1.0': {}
|
||||||
|
|
||||||
|
'@img/sharp-darwin-arm64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-darwin-arm64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-darwin-x64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-darwin-x64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-freebsd-wasm32@0.35.3':
|
||||||
|
dependencies:
|
||||||
|
'@img/sharp-wasm32': 0.35.3
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-darwin-arm64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-darwin-x64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-arm64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-arm@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-ppc64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-riscv64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-s390x@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linux-x64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linuxmusl-arm64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-libvips-linuxmusl-x64@1.3.2':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linux-arm64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linux-arm64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linux-arm@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linux-arm': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linux-ppc64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linux-ppc64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linux-riscv64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linux-riscv64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linux-s390x@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linux-s390x': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linux-x64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linux-x64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linuxmusl-arm64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linuxmusl-arm64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-linuxmusl-x64@0.35.3':
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-libvips-linuxmusl-x64': 1.3.2
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-wasm32@0.35.3':
|
||||||
|
dependencies:
|
||||||
|
'@emnapi/runtime': 1.11.1
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-webcontainers-wasm32@0.35.3':
|
||||||
|
dependencies:
|
||||||
|
'@img/sharp-wasm32': 0.35.3
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-win32-arm64@0.35.3':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-win32-ia32@0.35.3':
|
||||||
|
optional: true
|
||||||
|
|
||||||
|
'@img/sharp-win32-x64@0.35.3':
|
||||||
|
optional: true
|
||||||
|
|
||||||
'@jridgewell/sourcemap-codec@1.5.5': {}
|
'@jridgewell/sourcemap-codec@1.5.5': {}
|
||||||
|
|
||||||
'@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
|
'@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)':
|
||||||
@@ -2333,6 +2619,39 @@ snapshots:
|
|||||||
|
|
||||||
set-cookie-parser@2.7.2: {}
|
set-cookie-parser@2.7.2: {}
|
||||||
|
|
||||||
|
sharp@0.35.3(@types/node@24.13.3):
|
||||||
|
dependencies:
|
||||||
|
'@img/colour': 1.1.0
|
||||||
|
detect-libc: 2.1.2
|
||||||
|
semver: 7.8.5
|
||||||
|
optionalDependencies:
|
||||||
|
'@img/sharp-darwin-arm64': 0.35.3
|
||||||
|
'@img/sharp-darwin-x64': 0.35.3
|
||||||
|
'@img/sharp-freebsd-wasm32': 0.35.3
|
||||||
|
'@img/sharp-libvips-darwin-arm64': 1.3.2
|
||||||
|
'@img/sharp-libvips-darwin-x64': 1.3.2
|
||||||
|
'@img/sharp-libvips-linux-arm': 1.3.2
|
||||||
|
'@img/sharp-libvips-linux-arm64': 1.3.2
|
||||||
|
'@img/sharp-libvips-linux-ppc64': 1.3.2
|
||||||
|
'@img/sharp-libvips-linux-riscv64': 1.3.2
|
||||||
|
'@img/sharp-libvips-linux-s390x': 1.3.2
|
||||||
|
'@img/sharp-libvips-linux-x64': 1.3.2
|
||||||
|
'@img/sharp-libvips-linuxmusl-arm64': 1.3.2
|
||||||
|
'@img/sharp-libvips-linuxmusl-x64': 1.3.2
|
||||||
|
'@img/sharp-linux-arm': 0.35.3
|
||||||
|
'@img/sharp-linux-arm64': 0.35.3
|
||||||
|
'@img/sharp-linux-ppc64': 0.35.3
|
||||||
|
'@img/sharp-linux-riscv64': 0.35.3
|
||||||
|
'@img/sharp-linux-s390x': 0.35.3
|
||||||
|
'@img/sharp-linux-x64': 0.35.3
|
||||||
|
'@img/sharp-linuxmusl-arm64': 0.35.3
|
||||||
|
'@img/sharp-linuxmusl-x64': 0.35.3
|
||||||
|
'@img/sharp-webcontainers-wasm32': 0.35.3
|
||||||
|
'@img/sharp-win32-arm64': 0.35.3
|
||||||
|
'@img/sharp-win32-ia32': 0.35.3
|
||||||
|
'@img/sharp-win32-x64': 0.35.3
|
||||||
|
'@types/node': 24.13.3
|
||||||
|
|
||||||
siginfo@2.0.0: {}
|
siginfo@2.0.0: {}
|
||||||
|
|
||||||
simple-concat@1.0.1:
|
simple-concat@1.0.1:
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
||||||
|
import { resolve } from "node:path";
|
||||||
|
|
||||||
|
import { WP4_07_PERFORMANCE_BUDGETS } from "../tests/visual-performance/wp4-07-fixture.mjs";
|
||||||
|
|
||||||
|
const evidenceIndex = process.argv.indexOf("--evidence");
|
||||||
|
const phaseIndex = process.argv.indexOf("--phase");
|
||||||
|
const evidenceDirectory = resolve(evidenceIndex >= 0 ? process.argv[evidenceIndex + 1] : "");
|
||||||
|
const phase = phaseIndex >= 0 ? process.argv[phaseIndex + 1] : "green";
|
||||||
|
if (evidenceIndex < 0 || !process.argv[evidenceIndex + 1] || !["green", "red"].includes(phase)) throw new Error("Usage: --evidence <directory> [--phase red|green]");
|
||||||
|
|
||||||
|
function read(browser, filename) {
|
||||||
|
const path = resolve(evidenceDirectory, browser, filename);
|
||||||
|
if (!existsSync(path)) throw new Error(`missing ${browser}/${filename}`);
|
||||||
|
return JSON.parse(readFileSync(path, "utf8"));
|
||||||
|
}
|
||||||
|
|
||||||
|
const browserResults = {};
|
||||||
|
let greenInputsEligible = true;
|
||||||
|
for (const browser of ["chrome", "edge"]) {
|
||||||
|
const raw = read(browser, "performance-raw.json");
|
||||||
|
const memory = read(browser, "memory.json");
|
||||||
|
const dom = read(browser, "dom-count.json");
|
||||||
|
const environment = read(browser, "environment.json");
|
||||||
|
greenInputsEligible = greenInputsEligible && raw.eligible_for_green === true && raw.harness_mode === "real_archive";
|
||||||
|
if (raw.interaction.length !== 5 || raw.autosave_serialization.length !== 5 || raw.export_1080x1920.length !== 5 || raw.editor_reopen.samples_ms.length !== 5) {
|
||||||
|
throw new Error(`${browser} did not retain exactly five measured samples per budget`);
|
||||||
|
}
|
||||||
|
if (raw.interaction.some((run) => run.duration_ms < WP4_07_PERFORMANCE_BUDGETS.interaction_duration_ms)) {
|
||||||
|
throw new Error(`${browser} shortened a ten-second interaction measurement`);
|
||||||
|
}
|
||||||
|
const checks = {
|
||||||
|
autosave_serialization: raw.autosave_serialization.every((run) => run.p95_ms <= WP4_07_PERFORMANCE_BUDGETS.autosave_serialization_p95_ms_max),
|
||||||
|
canvas_frame: raw.interaction.every((run) => run.frame_p95_ms <= WP4_07_PERFORMANCE_BUDGETS.canvas_frame_p95_ms_max),
|
||||||
|
continuous_unresponsive: raw.interaction.every((run) => run.frame_max_ms < WP4_07_PERFORMANCE_BUDGETS.continuous_unresponsive_ms_max_exclusive),
|
||||||
|
dom_bounded: dom.bounded_by_viewport_and_two_screens === true && dom.top_count < dom.catalog_count && dom.bottom_count < dom.catalog_count,
|
||||||
|
editor_reopen: raw.editor_reopen.max_ms <= WP4_07_PERFORMANCE_BUDGETS.editor_reopen_ms_max,
|
||||||
|
export_duration: raw.export_1080x1920.every((run) => run.duration_ms <= WP4_07_PERFORMANCE_BUDGETS.export_1080x1920_ms_max),
|
||||||
|
export_failure_isolated: raw.export_failure.observed_error === "export_asset_unavailable"
|
||||||
|
&& JSON.stringify(raw.export_failure.saves_before) === JSON.stringify(raw.export_failure.saves_after),
|
||||||
|
export_memory: memory.export_peak_additional_bytes.every((value) => value <= WP4_07_PERFORMANCE_BUDGETS.export_peak_additional_bytes_max),
|
||||||
|
long_task: raw.interaction.every((run) => run.long_task_max_ms <= WP4_07_PERFORMANCE_BUDGETS.long_task_ms_max),
|
||||||
|
pointer_to_frame: raw.interaction.every((run) => run.pointer_to_frame_p95_ms <= WP4_07_PERFORMANCE_BUDGETS.pointer_to_frame_p95_ms_max),
|
||||||
|
};
|
||||||
|
browserResults[browser] = {
|
||||||
|
checks,
|
||||||
|
environment,
|
||||||
|
fixture_sha256: raw.fixture_sha256,
|
||||||
|
metrics: {
|
||||||
|
autosave_serialization: raw.autosave_serialization,
|
||||||
|
editor_reopen: raw.editor_reopen,
|
||||||
|
export_1080x1920: raw.export_1080x1920,
|
||||||
|
interaction: raw.interaction,
|
||||||
|
},
|
||||||
|
status: Object.values(checks).every(Boolean) ? "within_budget" : "budget_exceeded",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const passed = Object.values(browserResults).every((result) => result.status === "within_budget");
|
||||||
|
const report = {
|
||||||
|
browsers: browserResults,
|
||||||
|
eligible_for_green: phase === "green" && greenInputsEligible,
|
||||||
|
normative_budgets: WP4_07_PERFORMANCE_BUDGETS,
|
||||||
|
phase,
|
||||||
|
status: passed ? "within_budget" : "budget_exceeded",
|
||||||
|
};
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "performance.json"), `${JSON.stringify(report, null, 2)}\n`);
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "memory.json"), `${JSON.stringify({
|
||||||
|
browsers: Object.fromEntries(["chrome", "edge"].map((browser) => [browser, read(browser, "memory.json")])),
|
||||||
|
limit_bytes: WP4_07_PERFORMANCE_BUDGETS.export_peak_additional_bytes_max,
|
||||||
|
}, null, 2)}\n`);
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "dom-count.json"), `${JSON.stringify({
|
||||||
|
browsers: Object.fromEntries(["chrome", "edge"].map((browser) => [browser, read(browser, "dom-count.json")])),
|
||||||
|
required_catalog_count: 1_407,
|
||||||
|
}, null, 2)}\n`);
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "environment.json"), `${JSON.stringify({
|
||||||
|
browsers: Object.fromEntries(["chrome", "edge"].map((browser) => [browser, read(browser, "environment.json")])),
|
||||||
|
fixture_hashes_match: browserResults.chrome.fixture_sha256 === browserResults.edge.fixture_sha256,
|
||||||
|
}, null, 2)}\n`);
|
||||||
|
console.log(JSON.stringify({ browser_statuses: Object.fromEntries(Object.entries(browserResults).map(([name, result]) => [name, result.status])), phase, status: report.status }, null, 2));
|
||||||
|
if (phase === "green" && (!greenInputsEligible || !passed)) process.exit(1);
|
||||||
@@ -1,10 +1,20 @@
|
|||||||
|
import { execFileSync } from "node:child_process";
|
||||||
|
import { readFileSync } from "node:fs";
|
||||||
import { resolve } from "node:path";
|
import { resolve } from "node:path";
|
||||||
|
|
||||||
import { buildAndValidatePortablePackage } from "./lib/portable-package.mjs";
|
import { buildAndValidatePortablePackage } from "./lib/portable-package.mjs";
|
||||||
|
import { validateFinalReleaseRecord } from "./lib/wp7-07-final-release.mjs";
|
||||||
|
|
||||||
const outputIndex = process.argv.indexOf("--output");
|
const outputIndex = process.argv.indexOf("--output");
|
||||||
const outputRoot = outputIndex >= 0 ? resolve(process.argv[outputIndex + 1]) : resolve(".build", "portable-release");
|
const outputRoot = outputIndex >= 0 ? resolve(process.argv[outputIndex + 1]) : resolve(".build", "portable-release");
|
||||||
const result = await buildAndValidatePortablePackage({ outputRoot });
|
const previousRelease = JSON.parse(readFileSync(resolve("RELEASE.json"), "utf8"));
|
||||||
|
const releaseRecord = validateFinalReleaseRecord({
|
||||||
|
...previousRelease,
|
||||||
|
buildCommit: execFileSync("git", ["rev-parse", "HEAD"], { encoding: "utf8" }).trim(),
|
||||||
|
maintenanceFromCommit: previousRelease.buildCommit,
|
||||||
|
recordedAt: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
const result = await buildAndValidatePortablePackage({ outputRoot, releaseRecord });
|
||||||
console.log(JSON.stringify({
|
console.log(JSON.stringify({
|
||||||
package: result.packageManifest.package_name,
|
package: result.packageManifest.package_name,
|
||||||
sha256: result.packageManifest.zip_sha256,
|
sha256: result.packageManifest.zip_sha256,
|
||||||
|
|||||||
@@ -0,0 +1,106 @@
|
|||||||
|
import { chromium } from "@playwright/test";
|
||||||
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
||||||
|
import { dirname, resolve } from "node:path";
|
||||||
|
|
||||||
|
import { WP4_07_VISUAL_THRESHOLDS } from "../tests/visual-performance/wp4-07-fixture.mjs";
|
||||||
|
|
||||||
|
const evidenceIndex = process.argv.indexOf("--evidence");
|
||||||
|
const phaseIndex = process.argv.indexOf("--phase");
|
||||||
|
const evidenceDirectory = resolve(evidenceIndex >= 0 ? process.argv[evidenceIndex + 1] : "");
|
||||||
|
const phase = phaseIndex >= 0 ? process.argv[phaseIndex + 1] : "green";
|
||||||
|
if (evidenceIndex < 0 || !process.argv[evidenceIndex + 1] || !["green", "red"].includes(phase)) throw new Error("Usage: --evidence <directory> [--phase red|green]");
|
||||||
|
|
||||||
|
const scenarios = ["editor.png", "canvas.png", "export-dialog.png"];
|
||||||
|
for (const scenario of scenarios) {
|
||||||
|
for (const browser of ["chrome", "edge"]) {
|
||||||
|
const path = resolve(evidenceDirectory, browser, scenario);
|
||||||
|
if (!existsSync(path)) throw new Error(`missing screenshot: ${browser}/${scenario}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const browser = await chromium.launch({ channel: "msedge", headless: true });
|
||||||
|
const page = await browser.newPage();
|
||||||
|
const results = [];
|
||||||
|
try {
|
||||||
|
for (const scenario of scenarios) {
|
||||||
|
const chrome = readFileSync(resolve(evidenceDirectory, "chrome", scenario)).toString("base64");
|
||||||
|
const edge = readFileSync(resolve(evidenceDirectory, "edge", scenario)).toString("base64");
|
||||||
|
const comparison = await page.evaluate(async ({ chromeBase64, edgeBase64, threshold }) => {
|
||||||
|
const decode = async (base64) => {
|
||||||
|
const binary = atob(base64);
|
||||||
|
const bytes = Uint8Array.from(binary, (character) => character.charCodeAt(0));
|
||||||
|
return createImageBitmap(new Blob([bytes], { type: "image/png" }));
|
||||||
|
};
|
||||||
|
const [chromeImage, edgeImage] = await Promise.all([decode(chromeBase64), decode(edgeBase64)]);
|
||||||
|
if (chromeImage.width !== edgeImage.width || chromeImage.height !== edgeImage.height) {
|
||||||
|
return { dimensions_match: false, chrome: { height: chromeImage.height, width: chromeImage.width }, edge: { height: edgeImage.height, width: edgeImage.width } };
|
||||||
|
}
|
||||||
|
const surface = new OffscreenCanvas(chromeImage.width, chromeImage.height);
|
||||||
|
const context = surface.getContext("2d", { willReadFrequently: true });
|
||||||
|
context.drawImage(chromeImage, 0, 0);
|
||||||
|
const chromePixels = context.getImageData(0, 0, chromeImage.width, chromeImage.height).data;
|
||||||
|
context.clearRect(0, 0, chromeImage.width, chromeImage.height);
|
||||||
|
context.drawImage(edgeImage, 0, 0);
|
||||||
|
const edgePixels = context.getImageData(0, 0, edgeImage.width, edgeImage.height).data;
|
||||||
|
let significant = 0;
|
||||||
|
let maximumChannelDelta = 0;
|
||||||
|
for (let index = 0; index < chromePixels.length; index += 4) {
|
||||||
|
const deltas = [0, 1, 2, 3].map((channel) => Math.abs(chromePixels[index + channel] - edgePixels[index + channel]));
|
||||||
|
maximumChannelDelta = Math.max(maximumChannelDelta, ...deltas);
|
||||||
|
if (deltas.some((delta) => delta > threshold)) significant += 1;
|
||||||
|
}
|
||||||
|
const total = chromeImage.width * chromeImage.height;
|
||||||
|
chromeImage.close();
|
||||||
|
edgeImage.close();
|
||||||
|
return {
|
||||||
|
dimensions_match: true,
|
||||||
|
height: surface.height,
|
||||||
|
maximum_channel_delta: maximumChannelDelta,
|
||||||
|
significant_pixel_count: significant,
|
||||||
|
significant_pixel_ratio: significant / total,
|
||||||
|
significant_pixel_threshold: threshold,
|
||||||
|
total_pixels: total,
|
||||||
|
width: surface.width,
|
||||||
|
};
|
||||||
|
}, { chromeBase64: chrome, edgeBase64: edge, threshold: WP4_07_VISUAL_THRESHOLDS.channel_delta_significant });
|
||||||
|
results.push({ scenario, ...comparison });
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
await browser.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
const chromeLayout = JSON.parse(readFileSync(resolve(evidenceDirectory, "chrome", "layout-boxes.json"), "utf8"));
|
||||||
|
const edgeLayout = JSON.parse(readFileSync(resolve(evidenceDirectory, "edge", "layout-boxes.json"), "utf8"));
|
||||||
|
const greenInputsEligible = [chromeLayout, edgeLayout].every((input) => input.eligible_for_green === true && input.harness_mode === "real_archive");
|
||||||
|
const layoutComparisons = Object.keys(chromeLayout.layout_boxes).map((name) => {
|
||||||
|
const chromeBox = chromeLayout.layout_boxes[name];
|
||||||
|
const edgeBox = edgeLayout.layout_boxes[name];
|
||||||
|
const deltas = Object.fromEntries(["height", "width", "x", "y"].map((field) => [field, Math.abs(chromeBox[field] - edgeBox[field])]));
|
||||||
|
return { deltas, maximum_delta_px: Math.max(...Object.values(deltas)), name };
|
||||||
|
});
|
||||||
|
const visualPassed = results.every((item) => item.dimensions_match && item.significant_pixel_ratio <= WP4_07_VISUAL_THRESHOLDS.significant_pixel_ratio_max);
|
||||||
|
const layoutPassed = layoutComparisons.every((item) => item.maximum_delta_px <= WP4_07_VISUAL_THRESHOLDS.boundary_delta_px_max);
|
||||||
|
const overall = {
|
||||||
|
eligible_for_green: phase === "green" && greenInputsEligible,
|
||||||
|
phase,
|
||||||
|
scenarios: results,
|
||||||
|
status: visualPassed && layoutPassed ? "within_threshold" : "threshold_exceeded_manual_review_required",
|
||||||
|
thresholds: WP4_07_VISUAL_THRESHOLDS,
|
||||||
|
};
|
||||||
|
const layout = {
|
||||||
|
comparisons: layoutComparisons,
|
||||||
|
eligible_for_green: phase === "green" && greenInputsEligible,
|
||||||
|
status: layoutPassed ? "within_threshold" : "threshold_exceeded_manual_review_required",
|
||||||
|
threshold_px: WP4_07_VISUAL_THRESHOLDS.boundary_delta_px_max,
|
||||||
|
};
|
||||||
|
mkdirSync(dirname(resolve(evidenceDirectory, "pixel-diff.json")), { recursive: true });
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "pixel-diff.json"), `${JSON.stringify(overall, null, 2)}\n`);
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "layout-boxes.json"), `${JSON.stringify(layout, null, 2)}\n`);
|
||||||
|
writeFileSync(resolve(evidenceDirectory, "manual-review.json"), `${JSON.stringify({
|
||||||
|
eligible_for_green: false,
|
||||||
|
known_alternatives: ["COLOR002", "COLOR008", "COLOR016", "DYN012"],
|
||||||
|
required_note: "DYN012 uses FONT081 Lexend Deca as the declared substitute.",
|
||||||
|
status: phase === "green" ? "pending_project_owner_review" : "pending_wp5_final_renderer_and_project_owner_review",
|
||||||
|
}, null, 2)}\n`);
|
||||||
|
console.log(JSON.stringify({ layout_status: layout.status, phase, visual_status: overall.status }, null, 2));
|
||||||
|
if (phase === "green" && (!greenInputsEligible || !visualPassed || !layoutPassed)) process.exit(1);
|
||||||
@@ -1,14 +1,16 @@
|
|||||||
import { createHash } from "node:crypto";
|
import { createHash } from "node:crypto";
|
||||||
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
||||||
import { homedir } from "node:os";
|
import { homedir } from "node:os";
|
||||||
import { join, resolve } from "node:path";
|
import { dirname, join, resolve } from "node:path";
|
||||||
|
|
||||||
import { compileAssetArchive, compileStaticStickerCatalog } from "../packages/asset-compiler/dist/index.js";
|
import { compileAssetArchive, compileStaticStickerCatalog } from "../packages/asset-compiler/dist/index.js";
|
||||||
import { createP0aColorCardRenderPlans } from "../packages/asset-renderer/dist/index.js";
|
import { createP0aColorCardRenderPlans } from "../packages/asset-renderer/dist/index.js";
|
||||||
import {
|
import {
|
||||||
P0A_COLOR_CARD_IDS,
|
P0A_COLOR_CARD_IDS,
|
||||||
|
P0A_COMPLEX_RELEASE_VERSION,
|
||||||
P0A_DYNAMIC_STICKER_IDS,
|
P0A_DYNAMIC_STICKER_IDS,
|
||||||
P0A_REQUIRED_FONT_PANEL_IDS,
|
P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
|
P0A_STATIC_STICKER_RELEASE_VERSION,
|
||||||
P0A_TEXT_TEMPLATE_IDS,
|
P0A_TEXT_TEMPLATE_IDS,
|
||||||
createP0aPublicManifest,
|
createP0aPublicManifest,
|
||||||
} from "../packages/template-registry/dist/index.js";
|
} from "../packages/template-registry/dist/index.js";
|
||||||
@@ -16,25 +18,45 @@ import {
|
|||||||
const runDirectory = resolve(process.env.DADA_WP5_03_RUN_DIRECTORY ?? "artifacts/tdd/wp5-03-local");
|
const runDirectory = resolve(process.env.DADA_WP5_03_RUN_DIRECTORY ?? "artifacts/tdd/wp5-03-local");
|
||||||
const whiteDirectory = resolve(process.env.DADA_WP5_03_WHITE_EVIDENCE_DIR ?? join(runDirectory, "cases", "TDD-WP5-WHITE-001-p0a-allowlist"));
|
const whiteDirectory = resolve(process.env.DADA_WP5_03_WHITE_EVIDENCE_DIR ?? join(runDirectory, "cases", "TDD-WP5-WHITE-001-p0a-allowlist"));
|
||||||
const colorDirectory = resolve(process.env.DADA_WP5_03_COLOR_EVIDENCE_DIR ?? join(runDirectory, "cases", "TDD-WP5-COL-001-four-layouts"));
|
const colorDirectory = resolve(process.env.DADA_WP5_03_COLOR_EVIDENCE_DIR ?? join(runDirectory, "cases", "TDD-WP5-COL-001-four-layouts"));
|
||||||
const handoffManifest = resolve(process.env.DADA_COMPLEX_ASSET_MANIFEST ?? join(homedir(), "Desktop", "sticker_web_handoff", "sticker_web_catalog_manifest.json"));
|
const replicationRoot = resolve(process.env.DADA_REPLICATION_ASSET_ROOT ?? join(homedir(), "Desktop", "sticker_web_replication_assets"));
|
||||||
const stickerRoot = resolve(process.env.DADA_STATIC_STICKER_ROOT ?? join(homedir(), "Desktop", "贴纸素材"));
|
const handoffManifest = resolve(process.env.DADA_COMPLEX_ASSET_MANIFEST ?? join(replicationRoot, "sticker_web_handoff", "sticker_web_catalog_manifest.json"));
|
||||||
|
const stickerRoot = resolve(process.env.DADA_STATIC_STICKER_ROOT ?? join(replicationRoot, "sticker_normal"));
|
||||||
if (!existsSync(handoffManifest)) throw new Error("normalized complex asset handoff is unavailable");
|
if (!existsSync(handoffManifest)) throw new Error("normalized complex asset handoff is unavailable");
|
||||||
if (!existsSync(stickerRoot)) throw new Error("static sticker source is unavailable");
|
if (!existsSync(stickerRoot)) throw new Error("static sticker source is unavailable");
|
||||||
|
|
||||||
const complexDirectory = resolve(runDirectory, "inputs", "complex");
|
const complexDirectory = resolve(runDirectory, "inputs", "complex");
|
||||||
const staticDirectory = resolve(runDirectory, "inputs", "static");
|
const staticDirectory = resolve(runDirectory, "inputs", "static");
|
||||||
|
const normalizedHandoffDirectory = resolve(runDirectory, "inputs", "normalized-handoff");
|
||||||
mkdirSync(whiteDirectory, { recursive: true });
|
mkdirSync(whiteDirectory, { recursive: true });
|
||||||
mkdirSync(colorDirectory, { recursive: true });
|
mkdirSync(colorDirectory, { recursive: true });
|
||||||
|
|
||||||
|
const sourceHandoff = JSON.parse(readFileSync(handoffManifest, "utf8"));
|
||||||
|
const normalizedHandoff = {
|
||||||
|
...sourceHandoff,
|
||||||
|
web_handoff: "STICKER_WEB_REPLICATION_HANDOFF.md",
|
||||||
|
validation: "sticker_archive_validation_20260722.json",
|
||||||
|
collections: sourceHandoff.collections
|
||||||
|
.filter((collection) => collection.id !== "normal_stickers")
|
||||||
|
.map((collection) => ({
|
||||||
|
...collection,
|
||||||
|
root: resolve(dirname(handoffManifest), collection.root),
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
const normalizedHandoffPath = resolve(normalizedHandoffDirectory, "sticker_web_catalog_manifest.normalized.json");
|
||||||
|
mkdirSync(normalizedHandoffDirectory, { recursive: true });
|
||||||
|
copyFileSync(resolve(dirname(handoffManifest), sourceHandoff.web_handoff), resolve(normalizedHandoffDirectory, normalizedHandoff.web_handoff));
|
||||||
|
copyFileSync(resolve(dirname(handoffManifest), sourceHandoff.validation), resolve(normalizedHandoffDirectory, normalizedHandoff.validation));
|
||||||
|
writeFileSync(normalizedHandoffPath, `${JSON.stringify(normalizedHandoff, null, 2)}\n`);
|
||||||
|
|
||||||
const complex = compileAssetArchive({
|
const complex = compileAssetArchive({
|
||||||
manifestPath: handoffManifest,
|
manifestPath: normalizedHandoffPath,
|
||||||
outputDirectory: complexDirectory,
|
outputDirectory: complexDirectory,
|
||||||
releaseVersion: "p0a-complex-v1",
|
releaseVersion: P0A_COMPLEX_RELEASE_VERSION,
|
||||||
});
|
});
|
||||||
const staticResult = compileStaticStickerCatalog({
|
const staticResult = compileStaticStickerCatalog({
|
||||||
expectedCount: 1_407,
|
expectedCount: 1_407,
|
||||||
outputDirectory: staticDirectory,
|
outputDirectory: staticDirectory,
|
||||||
releaseVersion: "p0a-static-v1",
|
releaseVersion: P0A_STATIC_STICKER_RELEASE_VERSION,
|
||||||
sourceRoot: stickerRoot,
|
sourceRoot: stickerRoot,
|
||||||
});
|
});
|
||||||
const publicManifest = createP0aPublicManifest({
|
const publicManifest = createP0aPublicManifest({
|
||||||
@@ -68,17 +90,17 @@ const familyCounts = Object.fromEntries(["text_template", "font_panel", "color_c
|
|||||||
]));
|
]));
|
||||||
const fullP0Enabled = complex.manifest.items.filter((item) => item.release_tier === "full_p0" && item.release_status === "enabled").length;
|
const fullP0Enabled = complex.manifest.items.filter((item) => item.release_tier === "full_p0" && item.release_status === "enabled").length;
|
||||||
const publicJson = JSON.stringify(manifest);
|
const publicJson = JSON.stringify(manifest);
|
||||||
const hiddenIds = ["FLOWER009", "H009", "TAG008", "SIMPLE009", "COLOR003", "DYN005"];
|
const completionIds = ["FLOWER145", "H119", "TAG051", "SIMPLE017", "FONT086", "COLOR016", "DYN035"];
|
||||||
const response = {
|
const response = {
|
||||||
counts: manifest.counts,
|
counts: manifest.counts,
|
||||||
full_p0_enabled: fullP0Enabled,
|
full_p0_enabled: fullP0Enabled,
|
||||||
hidden_ids_absent: hiddenIds.every((id) => !publicJson.includes(id)),
|
complete_catalog_present: completionIds.every((id) => publicJson.includes(id)),
|
||||||
no_absolute_paths: !/[A-Za-z]:[\\/]/.test(publicJson),
|
no_absolute_paths: !/[A-Za-z]:[\\/]/.test(publicJson),
|
||||||
release_tier: manifest.release_tier,
|
release_tier: manifest.release_tier,
|
||||||
status: "passed",
|
status: "passed",
|
||||||
};
|
};
|
||||||
const registrationValidation = {
|
const registrationValidation = {
|
||||||
allowlist: {
|
public_catalog: {
|
||||||
color_cards: P0A_COLOR_CARD_IDS,
|
color_cards: P0A_COLOR_CARD_IDS,
|
||||||
dynamic_stickers: P0A_DYNAMIC_STICKER_IDS,
|
dynamic_stickers: P0A_DYNAMIC_STICKER_IDS,
|
||||||
font_panel_items: P0A_REQUIRED_FONT_PANEL_IDS,
|
font_panel_items: P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
@@ -90,7 +112,7 @@ const registrationValidation = {
|
|||||||
source_mutations: complex.report.source_mutations + staticResult.report.source_mutations,
|
source_mutations: complex.report.source_mutations + staticResult.report.source_mutations,
|
||||||
static_parts: Object.keys(staticResult.catalog.part_counts).length,
|
static_parts: Object.keys(staticResult.catalog.part_counts).length,
|
||||||
static_stickers: staticResult.catalog.count,
|
static_stickers: staticResult.catalog.count,
|
||||||
status: response.hidden_ids_absent && response.no_absolute_paths && fullP0Enabled === 0 ? "passed" : "failed",
|
status: response.complete_catalog_present && response.no_absolute_paths && fullP0Enabled === 0 ? "passed" : "failed",
|
||||||
};
|
};
|
||||||
if (registrationValidation.status !== "passed") throw new Error("P0-A registration validation failed");
|
if (registrationValidation.status !== "passed") throw new Error("P0-A registration validation failed");
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
import { isAbsolute, join, resolve } from "node:path";
|
||||||
|
|
||||||
|
import {
|
||||||
|
buildP0aRuntimeAssetPlan,
|
||||||
|
defaultReplicationRoot,
|
||||||
|
deployRuntimeAssetPlan,
|
||||||
|
readRuntimeAssetManifest,
|
||||||
|
serializeRuntimeAssetManifest,
|
||||||
|
} from "./lib/runtime-assets.mjs";
|
||||||
|
|
||||||
|
function option(name) {
|
||||||
|
const index = process.argv.indexOf(name);
|
||||||
|
return index >= 0 ? process.argv[index + 1] : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function defaultConfigPath() {
|
||||||
|
if (!process.env.LOCALAPPDATA || !isAbsolute(process.env.LOCALAPPDATA)) throw new Error("local_app_data_unavailable");
|
||||||
|
return join(process.env.LOCALAPPDATA, "Dada", "P0A", "config", "instance.json");
|
||||||
|
}
|
||||||
|
|
||||||
|
const configFile = resolve(option("--config") ?? process.env.DADA_INSTANCE_CONFIG_PATH ?? defaultConfigPath());
|
||||||
|
const configuration = JSON.parse(readFileSync(configFile, "utf8"));
|
||||||
|
const assetRootCandidate = option("--asset-root") ?? configuration.asset_root;
|
||||||
|
if (typeof assetRootCandidate !== "string" || !isAbsolute(assetRootCandidate)) {
|
||||||
|
throw new Error("asset_root_configuration_invalid");
|
||||||
|
}
|
||||||
|
const assetRoot = resolve(assetRootCandidate);
|
||||||
|
const trustedManifest = readRuntimeAssetManifest(resolve(option("--trusted-manifest") ?? "config/runtime-assets-manifest.json"));
|
||||||
|
const plan = await buildP0aRuntimeAssetPlan({
|
||||||
|
replicationRoot: resolve(option("--replication-root") ?? defaultReplicationRoot()),
|
||||||
|
});
|
||||||
|
if (serializeRuntimeAssetManifest(plan.manifest) !== serializeRuntimeAssetManifest(trustedManifest)) {
|
||||||
|
throw new Error("runtime_asset_source_does_not_match_trusted_manifest");
|
||||||
|
}
|
||||||
|
const result = deployRuntimeAssetPlan({ allowManagedUpdate: true, assetRoot, manifest: trustedManifest, resources: plan.resources });
|
||||||
|
process.stdout.write(`${JSON.stringify({ linked_files: result.linked_files, status: result.status })}\n`);
|
||||||
@@ -27,12 +27,14 @@ export const frozenPackages = {
|
|||||||
"apps/api/package.json": {
|
"apps/api/package.json": {
|
||||||
dependencies: {
|
dependencies: {
|
||||||
"@dada/asset-release-manifest": "workspace:*",
|
"@dada/asset-release-manifest": "workspace:*",
|
||||||
|
"@dada/static-sticker-catalog": "workspace:*",
|
||||||
"@fastify/multipart": "10.1.0",
|
"@fastify/multipart": "10.1.0",
|
||||||
"@fastify/swagger": "9.8.1",
|
"@fastify/swagger": "9.8.1",
|
||||||
"@sinclair/typebox": "0.34.52",
|
"@sinclair/typebox": "0.34.52",
|
||||||
"better-sqlite3": "13.0.1",
|
"better-sqlite3": "13.0.1",
|
||||||
"drizzle-orm": "0.45.2",
|
"drizzle-orm": "0.45.2",
|
||||||
fastify: "5.10.0",
|
fastify: "5.10.0",
|
||||||
|
sharp: "0.35.3",
|
||||||
},
|
},
|
||||||
devDependencies: {
|
devDependencies: {
|
||||||
typescript: "7.0.2",
|
typescript: "7.0.2",
|
||||||
@@ -42,6 +44,7 @@ export const frozenPackages = {
|
|||||||
dependencies: {
|
dependencies: {
|
||||||
"better-sqlite3": "13.0.1",
|
"better-sqlite3": "13.0.1",
|
||||||
"drizzle-orm": "0.45.2",
|
"drizzle-orm": "0.45.2",
|
||||||
|
sharp: "0.35.3",
|
||||||
},
|
},
|
||||||
devDependencies: {
|
devDependencies: {
|
||||||
typescript: "7.0.2",
|
typescript: "7.0.2",
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
|
||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { homedir } from "node:os";
|
||||||
|
import { basename, dirname, isAbsolute, join, resolve } from "node:path";
|
||||||
|
|
||||||
|
import {
|
||||||
|
P0A_DYNAMIC_STICKER_IDS,
|
||||||
|
P0A_REQUIRED_FONT_PANEL_IDS,
|
||||||
|
P0A_TEXT_TEMPLATE_IDS,
|
||||||
|
} from "../packages/template-registry/dist/index.js";
|
||||||
|
import { compileTextTemplateAssets } from "./lib/text-template-assets.mjs";
|
||||||
|
|
||||||
|
function option(name) {
|
||||||
|
const index = process.argv.indexOf(name);
|
||||||
|
return index >= 0 ? process.argv[index + 1] : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function readJson(path) {
|
||||||
|
return JSON.parse(readFileSync(path, "utf8"));
|
||||||
|
}
|
||||||
|
|
||||||
|
function oneDirectoryWithPrefix(root, prefix) {
|
||||||
|
const matches = readdirSync(root, { withFileTypes: true })
|
||||||
|
.filter((entry) => entry.isDirectory() && entry.name.startsWith(`${prefix}_`));
|
||||||
|
if (matches.length !== 1) throw new Error(`complex_catalog_directory_invalid:${prefix}`);
|
||||||
|
return join(root, matches[0].name);
|
||||||
|
}
|
||||||
|
|
||||||
|
function textTemplateDirectory(root, templateId) {
|
||||||
|
const family = templateId.startsWith("FLOWER") ? "花字"
|
||||||
|
: templateId.startsWith("SIMPLE") ? "简约"
|
||||||
|
: templateId.startsWith("TAG") ? "标签"
|
||||||
|
: "标题";
|
||||||
|
return join(root, family, "templates", templateId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizedTextCategory(value) {
|
||||||
|
if (value === "花字") return "flower";
|
||||||
|
if (value === "简约") return "simple";
|
||||||
|
if (value === "标签") return "tag";
|
||||||
|
return "title";
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizedDynamicCategory(value) {
|
||||||
|
if (value === "user") return "identity";
|
||||||
|
if (value === "location" || value === "time") return value;
|
||||||
|
return "other";
|
||||||
|
}
|
||||||
|
|
||||||
|
const replicationRoot = resolve(option("--replication-root") ?? join(homedir(), "Desktop", "sticker_web_replication_assets"));
|
||||||
|
if (!isAbsolute(replicationRoot) || !existsSync(replicationRoot)) throw new Error("replication_asset_root_unavailable");
|
||||||
|
const outputPath = resolve(option("--output") ?? "apps/web/src/generated/complex-assets.json");
|
||||||
|
const fontPackagesRoot = join(replicationRoot, "sticker_text", "字体", "面板全量采集", "font_panel_full_20260722", "resources", "font_packages");
|
||||||
|
const textRoot = join(replicationRoot, "sticker_text", "模板", "单模板归档");
|
||||||
|
const dynamicRoot = join(replicationRoot, "sticker_interactive", "单模板归档", "templates");
|
||||||
|
|
||||||
|
const fontPanelItems = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId, displayOrder) => {
|
||||||
|
const metadata = readJson(join(oneDirectoryWithPrefix(fontPackagesRoot, fontId), "metadata.json"));
|
||||||
|
if (typeof metadata.local_sha256 !== "string") throw new Error(`complex_catalog_font_hash_missing:${fontId}`);
|
||||||
|
return {
|
||||||
|
display_name: String(metadata.display_name ?? fontId),
|
||||||
|
display_order: displayOrder,
|
||||||
|
font_id: fontId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const textResourceRevision = createHash("sha256");
|
||||||
|
const textTemplates = P0A_TEXT_TEMPLATE_IDS.map((templateId, catalogOrder) => {
|
||||||
|
const directory = textTemplateDirectory(textRoot, templateId);
|
||||||
|
const metadata = readJson(join(directory, "metadata.json"));
|
||||||
|
const compiled = compileTextTemplateAssets({ templateDirectory: directory, templateId });
|
||||||
|
if (compiled.diagnostics.unresolved_images !== 0) throw new Error(`text_template_image_reference_unresolved:${templateId}`);
|
||||||
|
for (const resource of compiled.resources) {
|
||||||
|
const bytes = resource.sourceBytes ?? readFileSync(resource.sourcePath);
|
||||||
|
textResourceRevision.update(resource.assetId).update(createHash("sha256").update(bytes).digest());
|
||||||
|
}
|
||||||
|
const previewReference = typeof metadata.files?.preview === "string" ? metadata.files.preview : undefined;
|
||||||
|
const hasPreview = previewReference ? existsSync(join(directory, ...previewReference.split("/"))) : false;
|
||||||
|
return {
|
||||||
|
available: true,
|
||||||
|
catalog_order: catalogOrder,
|
||||||
|
category: normalizedTextCategory(metadata.category),
|
||||||
|
...compiled.catalog,
|
||||||
|
display_name: String(metadata.display_name || metadata.default_text || compiled.catalog.default_text || templateId),
|
||||||
|
...(hasPreview ? { preview_asset_id: `TEXT-PREVIEW-${templateId}` } : {}),
|
||||||
|
resource_class: metadata.resource_class === "parameter_only" ? "parameter_only" : "zip_template",
|
||||||
|
template_id: templateId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const dynamicStickers = P0A_DYNAMIC_STICKER_IDS.map((templateId, catalogOrder) => {
|
||||||
|
const metadata = readJson(join(dynamicRoot, templateId, "metadata.json"));
|
||||||
|
const requiredFields = Array.isArray(metadata.dynamic_keys) ? metadata.dynamic_keys.map(String) : [];
|
||||||
|
const fontIds = Array.isArray(metadata.files?.fonts)
|
||||||
|
? metadata.files.fonts.map((reference) => basename(reference))
|
||||||
|
: [];
|
||||||
|
return {
|
||||||
|
catalog_order: catalogOrder,
|
||||||
|
category: normalizedDynamicCategory(metadata.category),
|
||||||
|
display_name: String(metadata.display_name ?? templateId),
|
||||||
|
font_ids: fontIds.length > 0 ? fontIds : ["FONT081"],
|
||||||
|
required_fields: requiredFields,
|
||||||
|
requires_location_consent: requiredFields.includes("latitude") || requiredFields.includes("longitude"),
|
||||||
|
source_candidate_id: String(metadata.source_candidate_id ?? metadata.display_name ?? templateId),
|
||||||
|
template_id: templateId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const catalog = {
|
||||||
|
dynamic_stickers: dynamicStickers,
|
||||||
|
font_panel_items: fontPanelItems,
|
||||||
|
schema_version: "DadaComplexBrowserCatalog/v2",
|
||||||
|
text_resource_revision: textResourceRevision.digest("hex").slice(0, 16),
|
||||||
|
text_templates: textTemplates,
|
||||||
|
};
|
||||||
|
|
||||||
|
const serialized = `${JSON.stringify(catalog, null, 2)}\n`;
|
||||||
|
function containsAbsolutePath(value) {
|
||||||
|
if (typeof value === "string") return /^[A-Z]:[\\/]/i.test(value);
|
||||||
|
if (Array.isArray(value)) return value.some(containsAbsolutePath);
|
||||||
|
return value && typeof value === "object" ? Object.values(value).some(containsAbsolutePath) : false;
|
||||||
|
}
|
||||||
|
const unsafeTemplateIds = textTemplates.filter(containsAbsolutePath).map((item) => item.template_id);
|
||||||
|
if (unsafeTemplateIds.length > 0) throw new Error(`complex_catalog_absolute_path_detected:${unsafeTemplateIds.join(",")}`);
|
||||||
|
mkdirSync(dirname(outputPath), { recursive: true });
|
||||||
|
writeFileSync(outputPath, serialized);
|
||||||
|
process.stdout.write(`${JSON.stringify({
|
||||||
|
dynamic_stickers: dynamicStickers.length,
|
||||||
|
font_panel_items: fontPanelItems.length,
|
||||||
|
output: outputPath,
|
||||||
|
text_previews: textTemplates.filter((item) => item.preview_asset_id).length,
|
||||||
|
text_templates: textTemplates.length,
|
||||||
|
})}\n`);
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { resolve } from "node:path";
|
||||||
|
|
||||||
|
import {
|
||||||
|
buildP0aRuntimeAssetPlan,
|
||||||
|
defaultReplicationRoot,
|
||||||
|
serializeRuntimeAssetManifest,
|
||||||
|
writeRuntimeAssetManifest,
|
||||||
|
} from "./lib/runtime-assets.mjs";
|
||||||
|
|
||||||
|
function option(name) {
|
||||||
|
const index = process.argv.indexOf(name);
|
||||||
|
return index >= 0 ? process.argv[index + 1] : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const replicationRoot = resolve(option("--replication-root") ?? defaultReplicationRoot());
|
||||||
|
const outputPath = resolve(option("--output") ?? "config/runtime-assets-manifest.json");
|
||||||
|
const plan = await buildP0aRuntimeAssetPlan({ replicationRoot });
|
||||||
|
writeRuntimeAssetManifest(outputPath, plan.manifest);
|
||||||
|
process.stdout.write(`${JSON.stringify({
|
||||||
|
counts: plan.manifest.counts,
|
||||||
|
manifest_bytes: Buffer.byteLength(serializeRuntimeAssetManifest(plan.manifest)),
|
||||||
|
status: "generated",
|
||||||
|
})}\n`);
|
||||||
@@ -13,9 +13,7 @@ function runPnpm(args) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function buildApiContracts() {
|
export function buildApiContracts() {
|
||||||
runPnpm(["--filter", "@dada/asset-release-manifest", "build"]);
|
runPnpm(["--filter", "@dada/api...", "build"]);
|
||||||
runPnpm(["--filter", "@dada/shared-contracts", "build"]);
|
|
||||||
runPnpm(["--filter", "@dada/api", "build"]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createOpenApiDocument() {
|
export async function createOpenApiDocument() {
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { tmpdir } from "node:os";
|
|||||||
import { basename, dirname, join, relative, resolve, sep } from "node:path";
|
import { basename, dirname, join, relative, resolve, sep } from "node:path";
|
||||||
|
|
||||||
import { frozenRuntime } from "../frozen-versions.mjs";
|
import { frozenRuntime } from "../frozen-versions.mjs";
|
||||||
|
import { readRuntimeAssetManifest } from "./runtime-assets.mjs";
|
||||||
|
|
||||||
const repositoryRoot = resolve(import.meta.dirname, "..", "..");
|
const repositoryRoot = resolve(import.meta.dirname, "..", "..");
|
||||||
const fixedPort = 43121;
|
const fixedPort = 43121;
|
||||||
@@ -98,7 +99,11 @@ function copyRuntimeDependencies(sourceRoot, destinationRoot, rootNames) {
|
|||||||
try {
|
try {
|
||||||
entry = requireFrom.resolve(name);
|
entry = requireFrom.resolve(name);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new Error(`Runtime dependency ${name} is unavailable from ${sourceRoot}.`, { cause: error });
|
try {
|
||||||
|
entry = requireFrom.resolve(`${name}/package`);
|
||||||
|
} catch {
|
||||||
|
throw new Error(`Runtime dependency ${name} is unavailable from ${sourceRoot}.`, { cause: error });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const root = packageRootFromEntry(entry, name);
|
const root = packageRootFromEntry(entry, name);
|
||||||
const manifest = json(join(root, "package.json"));
|
const manifest = json(join(root, "package.json"));
|
||||||
@@ -117,6 +122,14 @@ function copyRuntimeDependencies(sourceRoot, destinationRoot, rootNames) {
|
|||||||
for (const dependency of Object.keys(manifest.dependencies ?? {})) {
|
for (const dependency of Object.keys(manifest.dependencies ?? {})) {
|
||||||
copyResolved(dependency, nestedRequire, join(destination, "node_modules"), nestedAncestors);
|
copyResolved(dependency, nestedRequire, join(destination, "node_modules"), nestedAncestors);
|
||||||
}
|
}
|
||||||
|
for (const dependency of Object.keys(manifest.optionalDependencies ?? {})) {
|
||||||
|
try {
|
||||||
|
copyResolved(dependency, nestedRequire, join(destination, "node_modules"), nestedAncestors);
|
||||||
|
} catch (error) {
|
||||||
|
if (error?.cause?.code !== "MODULE_NOT_FOUND") throw error;
|
||||||
|
debug(`skip unavailable optional dependency ${dependency}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const rootRequire = createRequire(join(sourceRoot, "package.json"));
|
const rootRequire = createRequire(join(sourceRoot, "package.json"));
|
||||||
for (const name of rootNames) copyResolved(name, rootRequire, join(destinationRoot, "node_modules"), new Set());
|
for (const name of rootNames) copyResolved(name, rootRequire, join(destinationRoot, "node_modules"), new Set());
|
||||||
@@ -153,7 +166,8 @@ function copyApplication(source, destination, runtimeDependencies) {
|
|||||||
|
|
||||||
function buildArtifacts(stagingRoot) {
|
function buildArtifacts(stagingRoot) {
|
||||||
debug("build workspace artifacts");
|
debug("build workspace artifacts");
|
||||||
run("pnpm", ["--filter", "@dada/shared-contracts", "build"]);
|
run("pnpm", ["build:workspace-packages"]);
|
||||||
|
removeTree(join(repositoryRoot, "apps", "web", "dist"));
|
||||||
run("pnpm", ["--filter", "@dada/web", "build"]);
|
run("pnpm", ["--filter", "@dada/web", "build"]);
|
||||||
run("pnpm", ["--filter", "@dada/api", "build"]);
|
run("pnpm", ["--filter", "@dada/api", "build"]);
|
||||||
run("pnpm", ["--filter", "@dada/worker", "build"]);
|
run("pnpm", ["--filter", "@dada/worker", "build"]);
|
||||||
@@ -196,7 +210,7 @@ async function waitForHealth(child) {
|
|||||||
throw new Error("Packaged API did not become healthy on fixed port 43121.", { cause: lastError });
|
throw new Error("Packaged API did not become healthy on fixed port 43121.", { cause: lastError });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function verifyExtractedPackage(zipPath, packageName) {
|
export async function verifyExtractedPackage(zipPath, packageName, expectedSupport) {
|
||||||
const extractRoot = mkdtempSync(join(tmpdir(), "dada-wp0-09-"));
|
const extractRoot = mkdtempSync(join(tmpdir(), "dada-wp0-09-"));
|
||||||
try {
|
try {
|
||||||
const escapedZip = zipPath.replaceAll("'", "''");
|
const escapedZip = zipPath.replaceAll("'", "''");
|
||||||
@@ -223,21 +237,37 @@ async function verifyExtractedPackage(zipPath, packageName) {
|
|||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
const health = await waitForHealth(api);
|
const health = await waitForHealth(api);
|
||||||
|
const brands = [
|
||||||
|
{ brand: "Not_A Brand", version: "99" },
|
||||||
|
{ brand: "Chromium", version: String(expectedSupport.major) },
|
||||||
|
{ brand: expectedSupport.brand, version: String(expectedSupport.major) },
|
||||||
|
];
|
||||||
|
const fullVersionList = [
|
||||||
|
{ brand: "Not_A Brand", version: "99.0.0.0" },
|
||||||
|
{ brand: "Chromium", version: expectedSupport.fullVersion },
|
||||||
|
{ brand: expectedSupport.brand, version: expectedSupport.fullVersion },
|
||||||
|
];
|
||||||
|
const serializeBrands = (values) => values.map(({ brand, version }) => `"${brand}";v="${version}"`).join(", ");
|
||||||
const releaseGate = await fetch(`http://127.0.0.1:${fixedPort}/api/v1/support/check`, {
|
const releaseGate = await fetch(`http://127.0.0.1:${fixedPort}/api/v1/support/check`, {
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
brands: [{ brand: "Google Chrome", version: "150" }],
|
brands,
|
||||||
full_version_list: [{ brand: "Google Chrome", version: "150.0.0.0" }],
|
full_version_list: fullVersionList,
|
||||||
platform: "Windows",
|
platform: "Windows",
|
||||||
}),
|
}),
|
||||||
headers: {
|
headers: {
|
||||||
"content-type": "application/json",
|
"content-type": "application/json",
|
||||||
"sec-ch-ua": '"Google Chrome";v="150"',
|
host: `127.0.0.1:${fixedPort}`,
|
||||||
"sec-ch-ua-full-version-list": '"Google Chrome";v="150.0.0.0"',
|
origin: `http://127.0.0.1:${fixedPort}`,
|
||||||
|
"sec-ch-ua": serializeBrands(brands),
|
||||||
|
"sec-ch-ua-full-version-list": serializeBrands(fullVersionList),
|
||||||
"sec-ch-ua-platform": '"Windows"',
|
"sec-ch-ua-platform": '"Windows"',
|
||||||
},
|
},
|
||||||
method: "POST",
|
method: "POST",
|
||||||
});
|
});
|
||||||
if (releaseGate.status !== 426) throw new Error(`Candidate RELEASE.json unexpectedly passed with ${releaseGate.status}.`);
|
if (releaseGate.status !== expectedSupport.statusCode) {
|
||||||
|
const responseBody = await releaseGate.text();
|
||||||
|
throw new Error(`Packaged RELEASE.json support gate returned ${releaseGate.status}; expected ${expectedSupport.statusCode}: ${responseBody}`);
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
api: { executable: "runtime/node.exe", health, pid: api.pid, release_gate: { status_code: releaseGate.status }, status: "passed" },
|
api: { executable: "runtime/node.exe", health, pid: api.pid, release_gate: { status_code: releaseGate.status }, status: "passed" },
|
||||||
native,
|
native,
|
||||||
@@ -279,7 +309,7 @@ function scanPackage(packageDirectory) {
|
|||||||
return { disallowed_matches: disallowedMatches, reparse_points: reparsePoints, scanned_files: files.length, status: disallowedMatches.length === 0 && reparsePoints.length === 0 ? "passed" : "failed" };
|
return { disallowed_matches: disallowedMatches, reparse_points: reparsePoints, scanned_files: files.length, status: disallowedMatches.length === 0 && reparsePoints.length === 0 ? "passed" : "failed" };
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function buildAndValidatePortablePackage({ evidenceDirectory, outputRoot }) {
|
export async function buildAndValidatePortablePackage({ evidenceDirectory, outputRoot, releaseRecord }) {
|
||||||
if (process.platform !== frozenRuntime.os || process.arch !== frozenRuntime.arch || process.version.slice(1) !== frozenRuntime.node) {
|
if (process.platform !== frozenRuntime.os || process.arch !== frozenRuntime.arch || process.version.slice(1) !== frozenRuntime.node) {
|
||||||
throw new Error("Portable package build requires frozen Node 24.13.0 on win-x64.");
|
throw new Error("Portable package build requires frozen Node 24.13.0 on win-x64.");
|
||||||
}
|
}
|
||||||
@@ -306,9 +336,9 @@ export async function buildAndValidatePortablePackage({ evidenceDirectory, outpu
|
|||||||
|
|
||||||
const serverRoot = join(packageDirectory, "server");
|
const serverRoot = join(packageDirectory, "server");
|
||||||
debug("copy API application");
|
debug("copy API application");
|
||||||
const apiDependencies = copyApplication(join(repositoryRoot, "apps", "api"), join(serverRoot, "api"), ["@fastify/multipart", "@fastify/swagger", "@sinclair/typebox", "better-sqlite3", "fastify"]);
|
const apiDependencies = copyApplication(join(repositoryRoot, "apps", "api"), join(serverRoot, "api"), ["@fastify/multipart", "@fastify/swagger", "@sinclair/typebox", "better-sqlite3", "fastify", "sharp"]);
|
||||||
debug("copy Worker application");
|
debug("copy Worker application");
|
||||||
const workerDependencies = copyApplication(join(repositoryRoot, "apps", "worker"), join(serverRoot, "worker"), ["better-sqlite3"]);
|
const workerDependencies = copyApplication(join(repositoryRoot, "apps", "worker"), join(serverRoot, "worker"), ["better-sqlite3", "sharp"]);
|
||||||
const sharedDestination = join(serverRoot, "api", "node_modules", "@dada", "shared-contracts");
|
const sharedDestination = join(serverRoot, "api", "node_modules", "@dada", "shared-contracts");
|
||||||
mkdirSync(sharedDestination, { recursive: true });
|
mkdirSync(sharedDestination, { recursive: true });
|
||||||
copyTree(join(repositoryRoot, "packages", "shared-contracts", "dist"), join(sharedDestination, "dist"));
|
copyTree(join(repositoryRoot, "packages", "shared-contracts", "dist"), join(sharedDestination, "dist"));
|
||||||
@@ -335,11 +365,15 @@ export async function buildAndValidatePortablePackage({ evidenceDirectory, outpu
|
|||||||
copyTree(join(repositoryRoot, "apps", "web", "dist"), join(packageDirectory, "web"));
|
copyTree(join(repositoryRoot, "apps", "web", "dist"), join(packageDirectory, "web"));
|
||||||
copyTree(join(repositoryRoot, "apps", "web", "support-gate"), join(packageDirectory, "web", "support-gate"));
|
copyTree(join(repositoryRoot, "apps", "web", "support-gate"), join(packageDirectory, "web", "support-gate"));
|
||||||
writeJson(join(packageDirectory, "migrations", "manifest.json"), { migrations: [], schema_version: "0" });
|
writeJson(join(packageDirectory, "migrations", "manifest.json"), { migrations: [], schema_version: "0" });
|
||||||
writeJson(join(packageDirectory, "asset-metadata", "manifest.json"), { resources: [], schema_version: "1.0", source: "external_read_only" });
|
writeJson(
|
||||||
|
join(packageDirectory, "asset-metadata", "manifest.json"),
|
||||||
|
readRuntimeAssetManifest(join(repositoryRoot, "config", "runtime-assets-manifest.json")),
|
||||||
|
);
|
||||||
writeJson(join(packageDirectory, "LICENSES", "third-party.json"), { api: apiDependencies, runtime: { node: frozenRuntime.node }, schema_version: "1.0", worker: workerDependencies });
|
writeJson(join(packageDirectory, "LICENSES", "third-party.json"), { api: apiDependencies, runtime: { node: frozenRuntime.node }, schema_version: "1.0", worker: workerDependencies });
|
||||||
|
|
||||||
const commit = run("git", ["rev-parse", "HEAD"]);
|
const commit = run("git", ["rev-parse", "HEAD"]);
|
||||||
writeJson(join(packageDirectory, "RELEASE.json"), {
|
const finalRelease = releaseRecord !== undefined;
|
||||||
|
writeJson(join(packageDirectory, "RELEASE.json"), releaseRecord ?? {
|
||||||
app_version: appVersion,
|
app_version: appVersion,
|
||||||
browsers: [],
|
browsers: [],
|
||||||
build_commit: commit,
|
build_commit: commit,
|
||||||
@@ -348,16 +382,20 @@ export async function buildAndValidatePortablePackage({ evidenceDirectory, outpu
|
|||||||
windows_build: null,
|
windows_build: null,
|
||||||
});
|
});
|
||||||
writeFileSync(join(packageDirectory, "START-HERE.txt"), [
|
writeFileSync(join(packageDirectory, "START-HERE.txt"), [
|
||||||
"Dada P0-A candidate package",
|
finalRelease ? "Dada P0-A first-version portable package" : "Dada P0-A candidate package",
|
||||||
"",
|
"",
|
||||||
"This candidate is unsigned and is not a final P0-A release.",
|
finalRelease
|
||||||
|
? "This unsigned first-version package passed the local P0-A release gates recorded in RELEASE.json."
|
||||||
|
: "This candidate is unsigned and is not a final P0-A release.",
|
||||||
"Verify the adjacent SHA-256 file before first launch.",
|
"Verify the adjacent SHA-256 file before first launch.",
|
||||||
"Windows SmartScreen may warn on first launch because the executable is unsigned.",
|
"Windows SmartScreen may warn on first launch because the executable is unsigned.",
|
||||||
"For an antivirus alert, compare the package hash with the Gitea build record.",
|
"For an antivirus alert, compare the package hash with the Gitea build record.",
|
||||||
"Do not disable antivirus protection, add broad exclusions, or skip hash verification.",
|
"Do not disable antivirus protection, add broad exclusions, or skip hash verification.",
|
||||||
"To update, exit Dada from the tray and replace the complete program directory.",
|
"To update, exit Dada from the tray and replace the complete program directory.",
|
||||||
"Dada uses 127.0.0.1:43121 and does not support LAN or remote access.",
|
"Dada uses 127.0.0.1:43121 and does not support LAN or remote access.",
|
||||||
"A final RELEASE.json is created only after WP-7 acceptance.",
|
finalRelease
|
||||||
|
? "Resend and Amap real-provider validation remain explicitly deferred and are not recorded as passed."
|
||||||
|
: "A final RELEASE.json is created only after WP-7 acceptance.",
|
||||||
"",
|
"",
|
||||||
].join("\r\n"));
|
].join("\r\n"));
|
||||||
|
|
||||||
@@ -369,7 +407,18 @@ export async function buildAndValidatePortablePackage({ evidenceDirectory, outpu
|
|||||||
const zipSha256 = fileSha256(zipPath);
|
const zipSha256 = fileSha256(zipPath);
|
||||||
const shaPath = `${zipPath}.sha256`;
|
const shaPath = `${zipPath}.sha256`;
|
||||||
writeFileSync(shaPath, `${zipSha256} ${basename(zipPath)}\n`);
|
writeFileSync(shaPath, `${zipSha256} ${basename(zipPath)}\n`);
|
||||||
const processTree = await verifyExtractedPackage(zipPath, packageName);
|
const supportBrowser = finalRelease ? releaseRecord.browsers[0] : undefined;
|
||||||
|
const processTree = await verifyExtractedPackage(zipPath, packageName, finalRelease ? {
|
||||||
|
brand: supportBrowser.brand,
|
||||||
|
fullVersion: supportBrowser.fullVersion,
|
||||||
|
major: Number.parseInt(supportBrowser.fullVersion.split(".")[0], 10),
|
||||||
|
statusCode: 200,
|
||||||
|
} : {
|
||||||
|
brand: "Google Chrome",
|
||||||
|
fullVersion: "150.0.0.0",
|
||||||
|
major: 150,
|
||||||
|
statusCode: 426,
|
||||||
|
});
|
||||||
const fileEntries = listFiles(packageDirectory).files.map((path) => ({
|
const fileEntries = listFiles(packageDirectory).files.map((path) => ({
|
||||||
path: relative(packageDirectory, path).replaceAll("\\", "/"),
|
path: relative(packageDirectory, path).replaceAll("\\", "/"),
|
||||||
sha256: fileSha256(path),
|
sha256: fileSha256(path),
|
||||||
@@ -380,7 +429,7 @@ export async function buildAndValidatePortablePackage({ evidenceDirectory, outpu
|
|||||||
files: fileEntries,
|
files: fileEntries,
|
||||||
fixed_port: fixedPort,
|
fixed_port: fixedPort,
|
||||||
package_name: packageName,
|
package_name: packageName,
|
||||||
release_status: "candidate_unvalidated",
|
release_status: finalRelease ? releaseRecord.releaseStatus : "candidate_unvalidated",
|
||||||
schema_version: "1.0",
|
schema_version: "1.0",
|
||||||
zip_sha256: zipSha256,
|
zip_sha256: zipSha256,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,179 @@
|
|||||||
|
import { spawnSync } from "node:child_process";
|
||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import {
|
||||||
|
copyFileSync,
|
||||||
|
existsSync,
|
||||||
|
mkdirSync,
|
||||||
|
readFileSync,
|
||||||
|
statSync,
|
||||||
|
writeFileSync,
|
||||||
|
} from "node:fs";
|
||||||
|
import { basename, join, resolve } from "node:path";
|
||||||
|
|
||||||
|
import { buildAndValidatePortablePackage } from "./portable-package.mjs";
|
||||||
|
|
||||||
|
const fixedPort = 43121;
|
||||||
|
const versionPattern = /^\d+\.\d+\.\d+\.\d+$/;
|
||||||
|
const sha256Pattern = /^[A-F0-9]{64}$/;
|
||||||
|
|
||||||
|
function powershellJson(script) {
|
||||||
|
const result = spawnSync(
|
||||||
|
"powershell.exe",
|
||||||
|
["-NoProfile", "-NonInteractive", "-Command", script],
|
||||||
|
{ encoding: "utf8", windowsHide: true },
|
||||||
|
);
|
||||||
|
if (result.status !== 0) {
|
||||||
|
throw new Error(`Windows environment probe failed with exit code ${result.status ?? 1}.`);
|
||||||
|
}
|
||||||
|
return JSON.parse(result.stdout.trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
export function readCandidateEnvironment() {
|
||||||
|
if (process.platform !== "win32" || process.arch !== "x64") {
|
||||||
|
throw new Error("Release candidates must be recorded on Windows x64.");
|
||||||
|
}
|
||||||
|
return powershellJson(String.raw`
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
function Find-Browser([string] $brand, [string] $fileName, [string[]] $candidates) {
|
||||||
|
$path = $candidates | Where-Object { $_ -and (Test-Path -LiteralPath $_) } | Select-Object -First 1
|
||||||
|
if (-not $path) { throw "Required browser is not installed: $brand" }
|
||||||
|
$item = Get-Item -LiteralPath $path
|
||||||
|
if ($item.VersionInfo.ProductName -ne $brand) { throw "Installed executable identity mismatch: $brand" }
|
||||||
|
$version = $item.VersionInfo.ProductVersion
|
||||||
|
[pscustomobject]@{
|
||||||
|
brand = $brand
|
||||||
|
executable_sha256 = (Get-FileHash -LiteralPath $path -Algorithm SHA256).Hash
|
||||||
|
file_name = $fileName
|
||||||
|
full_version = $version
|
||||||
|
major = [int]($version.Split('.')[0])
|
||||||
|
product_name = $item.VersionInfo.ProductName
|
||||||
|
source = 'installed_executable'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$chromeRegistry = @(
|
||||||
|
(Get-ItemProperty 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe' -ErrorAction SilentlyContinue).'(default)',
|
||||||
|
(Get-ItemProperty 'Registry::HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe' -ErrorAction SilentlyContinue).'(default)'
|
||||||
|
)
|
||||||
|
$chrome = Find-Browser 'Google Chrome' 'chrome.exe' @(
|
||||||
|
(Join-Path $env:LOCALAPPDATA 'Google\Chrome\Application\chrome.exe'),
|
||||||
|
'C:\Program Files\Google\Chrome\Application\chrome.exe',
|
||||||
|
'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe',
|
||||||
|
$chromeRegistry[0],
|
||||||
|
$chromeRegistry[1]
|
||||||
|
)
|
||||||
|
$edge = Find-Browser 'Microsoft Edge' 'msedge.exe' @(
|
||||||
|
'C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe',
|
||||||
|
'C:\Program Files\Microsoft\Edge\Application\msedge.exe'
|
||||||
|
)
|
||||||
|
$windows = Get-ItemProperty -LiteralPath 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion'
|
||||||
|
[pscustomobject]@{
|
||||||
|
browsers = @($chrome, $edge)
|
||||||
|
windows = [pscustomobject]@{
|
||||||
|
arch = 'x64'
|
||||||
|
build = "$($windows.CurrentBuildNumber).$($windows.UBR)"
|
||||||
|
display_version = $windows.DisplayVersion
|
||||||
|
}
|
||||||
|
} | ConvertTo-Json -Depth 5 -Compress
|
||||||
|
`);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateReleaseCandidateRecord(record) {
|
||||||
|
const errors = [];
|
||||||
|
if (record?.schema_version !== "1.0") errors.push("schema_version");
|
||||||
|
if (record?.status !== "candidate_unvalidated") errors.push("status");
|
||||||
|
if (record?.final_release !== false) errors.push("final_release");
|
||||||
|
if (record?.fixed_port !== fixedPort) errors.push("fixed_port");
|
||||||
|
if (!/^[a-f0-9]{40}$/.test(record?.build_commit ?? "")) errors.push("build_commit");
|
||||||
|
if (!/^\d+\.\d+$/.test(record?.windows?.build ?? "")) errors.push("windows.build");
|
||||||
|
if (!Number.isFinite(Date.parse(record?.recorded_at ?? ""))) errors.push("recorded_at");
|
||||||
|
if (!sha256Pattern.test(record?.candidate_package?.sha256 ?? "")) errors.push("candidate_package.sha256");
|
||||||
|
if (record?.candidate_package?.fixed_port !== fixedPort) errors.push("candidate_package.fixed_port");
|
||||||
|
if (record?.candidate_package?.release_status !== "candidate_unvalidated") {
|
||||||
|
errors.push("candidate_package.release_status");
|
||||||
|
}
|
||||||
|
if (!Array.isArray(record?.browsers) || record.browsers.length !== 2) {
|
||||||
|
errors.push("browsers");
|
||||||
|
} else {
|
||||||
|
const brands = record.browsers.map(({ brand }) => brand).sort();
|
||||||
|
if (brands.join("|") !== "Google Chrome|Microsoft Edge") errors.push("browsers.brand");
|
||||||
|
for (const browser of record.browsers) {
|
||||||
|
if (!versionPattern.test(browser.full_version ?? "")) errors.push(`${browser.brand}.full_version`);
|
||||||
|
if (browser.major !== Number.parseInt(browser.full_version?.split(".")[0] ?? "", 10)) {
|
||||||
|
errors.push(`${browser.brand}.major`);
|
||||||
|
}
|
||||||
|
if (!sha256Pattern.test(browser.executable_sha256 ?? "")) errors.push(`${browser.brand}.sha256`);
|
||||||
|
if (browser.source !== "installed_executable") errors.push(`${browser.brand}.source`);
|
||||||
|
if ("path" in browser || "executable_path" in browser) errors.push(`${browser.brand}.path`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const serialized = JSON.stringify(record);
|
||||||
|
if (/[A-Za-z]:\\Users\\/i.test(serialized)) errors.push("absolute_user_path");
|
||||||
|
if (errors.length > 0) throw new Error(`Invalid release candidate record: ${[...new Set(errors)].join(", ")}`);
|
||||||
|
return record;
|
||||||
|
}
|
||||||
|
|
||||||
|
function sha256(path) {
|
||||||
|
return createHash("sha256").update(readFileSync(path)).digest("hex").toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createReleaseCandidate({ commit, evidenceRoot, outputRoot, recordedAt = new Date().toISOString() }) {
|
||||||
|
const environment = readCandidateEnvironment();
|
||||||
|
const packageResult = await buildAndValidatePortablePackage({ outputRoot });
|
||||||
|
const packageName = packageResult.packageManifest.package_name;
|
||||||
|
const packageDirectory = join(outputRoot, packageName);
|
||||||
|
const zipSource = join(outputRoot, `${packageName}.zip`);
|
||||||
|
const shaSource = `${zipSource}.sha256`;
|
||||||
|
const zipSha256 = sha256(zipSource);
|
||||||
|
if (zipSha256 !== packageResult.packageManifest.zip_sha256) {
|
||||||
|
throw new Error("Candidate ZIP hash does not match the package manifest.");
|
||||||
|
}
|
||||||
|
if (!readFileSync(shaSource, "utf8").startsWith(`${zipSha256} ${basename(zipSource)}`)) {
|
||||||
|
throw new Error("Candidate ZIP hash file does not match the package bytes.");
|
||||||
|
}
|
||||||
|
const candidatePackage = resolve(evidenceRoot, "candidate-package");
|
||||||
|
mkdirSync(candidatePackage, { recursive: true });
|
||||||
|
for (const source of [zipSource, shaSource, join(packageDirectory, "START-HERE.txt")]) {
|
||||||
|
if (!existsSync(source)) throw new Error(`Candidate package output is missing: ${basename(source)}`);
|
||||||
|
copyFileSync(source, join(candidatePackage, basename(source)));
|
||||||
|
}
|
||||||
|
writeFileSync(
|
||||||
|
join(candidatePackage, "package-manifest.json"),
|
||||||
|
`${JSON.stringify(packageResult.packageManifest, null, 2)}\n`,
|
||||||
|
);
|
||||||
|
writeFileSync(
|
||||||
|
join(candidatePackage, "package-scan.json"),
|
||||||
|
`${JSON.stringify(packageResult.packageScan, null, 2)}\n`,
|
||||||
|
);
|
||||||
|
writeFileSync(
|
||||||
|
join(candidatePackage, "process-tree.json"),
|
||||||
|
`${JSON.stringify(packageResult.processTree, null, 2)}\n`,
|
||||||
|
);
|
||||||
|
|
||||||
|
const record = validateReleaseCandidateRecord({
|
||||||
|
app_version: packageResult.packageManifest.app_version,
|
||||||
|
browsers: environment.browsers.map((browser) => ({
|
||||||
|
brand: browser.brand,
|
||||||
|
executable_sha256: browser.executable_sha256,
|
||||||
|
file_name: browser.file_name,
|
||||||
|
full_version: browser.full_version,
|
||||||
|
major: browser.major,
|
||||||
|
source: browser.source,
|
||||||
|
})),
|
||||||
|
build_commit: commit,
|
||||||
|
candidate_package: {
|
||||||
|
file_name: basename(zipSource),
|
||||||
|
fixed_port: packageResult.packageManifest.fixed_port,
|
||||||
|
release_status: packageResult.packageManifest.release_status,
|
||||||
|
sha256: zipSha256,
|
||||||
|
size_bytes: statSync(zipSource).size,
|
||||||
|
},
|
||||||
|
final_release: false,
|
||||||
|
fixed_port: fixedPort,
|
||||||
|
recorded_at: recordedAt,
|
||||||
|
schema_version: "1.0",
|
||||||
|
status: "candidate_unvalidated",
|
||||||
|
windows: environment.windows,
|
||||||
|
});
|
||||||
|
writeFileSync(resolve(evidenceRoot, "release-candidate.json"), `${JSON.stringify(record, null, 2)}\n`);
|
||||||
|
return { packageResult, record };
|
||||||
|
}
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { existsSync, readFileSync } from "node:fs";
|
||||||
|
|
||||||
|
import { validateReleaseCandidateRecord } from "./release-candidate.mjs";
|
||||||
|
|
||||||
|
export const RESEND_DAILY_LIMIT = 80;
|
||||||
|
export const RESEND_MONTHLY_LIMIT = 2_400;
|
||||||
|
export const DELIVERY_CATEGORIES = Object.freeze(["qq", "163", "enterprise"]);
|
||||||
|
export const DELIVERY_SAMPLE_SIZE = 20;
|
||||||
|
export const DELIVERY_MINIMUM_WITHIN_TWO_MINUTES = 19;
|
||||||
|
export const DELIVERY_WINDOW_SECONDS = 120;
|
||||||
|
export const EXPECTED_WP7_01_COMMIT = "623cad25b2a2a9a003502c9a92ebd318dad06248";
|
||||||
|
|
||||||
|
const emailPattern = /\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b/i;
|
||||||
|
const absolutePathPattern = /(?:[A-Z]:[\\/]|\\\\|\/Users\/|\/home\/)/i;
|
||||||
|
const sensitiveKeyPattern = /"(?:api[_ -]?key|secret|password|authorization|bearer|cookie|session[_ -]?token|verification[_ -]?code|private[_ -]?content|prompt|image)"\s*:/i;
|
||||||
|
|
||||||
|
function object(value) {
|
||||||
|
return value !== null && typeof value === "object" && !Array.isArray(value) ? value : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function errorList(...values) {
|
||||||
|
return [...new Set(values.flat().filter((value) => typeof value === "string" && value.length > 0))];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateDomainCheck(value) {
|
||||||
|
const item = object(value);
|
||||||
|
const freeRules = object(item?.free_rules);
|
||||||
|
const spf = object(item?.spf);
|
||||||
|
const dkim = object(item?.dkim);
|
||||||
|
const errors = [];
|
||||||
|
if (item?.schema_version !== "1.0") errors.push("schema_version");
|
||||||
|
if (item?.service !== "resend") errors.push("service");
|
||||||
|
if (item?.source !== "human_controlled_real") errors.push("source");
|
||||||
|
if (item?.status !== "verified") errors.push("status");
|
||||||
|
if (item?.domain_controlled !== true) errors.push("domain_controlled");
|
||||||
|
if (spf?.status !== "pass") errors.push("spf");
|
||||||
|
if (dkim?.status !== "pass") errors.push("dkim");
|
||||||
|
if (freeRules?.status !== "verified") errors.push("free_rules.status");
|
||||||
|
if (freeRules?.daily_limit !== RESEND_DAILY_LIMIT) errors.push("free_rules.daily_limit");
|
||||||
|
if (freeRules?.monthly_limit !== RESEND_MONTHLY_LIMIT) errors.push("free_rules.monthly_limit");
|
||||||
|
if (freeRules?.paid_fallback_enabled !== false) errors.push("free_rules.paid_fallback_enabled");
|
||||||
|
return errorList(errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateDeliverySummary(value) {
|
||||||
|
const item = object(value);
|
||||||
|
const errors = [];
|
||||||
|
if (item?.schema_version !== "1.0") errors.push("schema_version");
|
||||||
|
if (item?.service !== "resend") errors.push("service");
|
||||||
|
if (item?.source !== "human_controlled_real") errors.push("source");
|
||||||
|
if (item?.status !== "verified") errors.push("status");
|
||||||
|
if (!Array.isArray(item?.categories) || item.categories.length !== DELIVERY_CATEGORIES.length) {
|
||||||
|
errors.push("categories");
|
||||||
|
} else {
|
||||||
|
const categories = item.categories.map((entry) => entry?.category).sort();
|
||||||
|
if (categories.join("|") !== DELIVERY_CATEGORIES.slice().sort().join("|")) errors.push("categories.names");
|
||||||
|
for (const entry of item.categories) {
|
||||||
|
if (!Number.isInteger(entry?.sent_count) || entry.sent_count !== DELIVERY_SAMPLE_SIZE) errors.push(`${entry?.category ?? "unknown"}.sent_count`);
|
||||||
|
if (!Number.isInteger(entry?.delivered_within_120_seconds)
|
||||||
|
|| entry.delivered_within_120_seconds < DELIVERY_MINIMUM_WITHIN_TWO_MINUTES
|
||||||
|
|| entry.delivered_within_120_seconds > DELIVERY_SAMPLE_SIZE) {
|
||||||
|
errors.push(`${entry?.category ?? "unknown"}.delivered_within_120_seconds`);
|
||||||
|
}
|
||||||
|
if (!Number.isFinite(entry?.max_latency_seconds) || entry.max_latency_seconds > DELIVERY_WINDOW_SECONDS) errors.push(`${entry?.category ?? "unknown"}.max_latency_seconds`);
|
||||||
|
if (entry?.mock_used !== false) errors.push(`${entry?.category ?? "unknown"}.mock_used`);
|
||||||
|
if (entry?.preseeded_account_used !== false) errors.push(`${entry?.category ?? "unknown"}.preseeded_account_used`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return errorList(errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateAuthResult(value) {
|
||||||
|
const item = object(value);
|
||||||
|
const ordinary = object(item?.ordinary);
|
||||||
|
const admin = object(item?.admin);
|
||||||
|
const errors = [];
|
||||||
|
if (item?.schema_version !== "1.0") errors.push("schema_version");
|
||||||
|
if (item?.service !== "resend") errors.push("service");
|
||||||
|
if (item?.source !== "human_controlled_real") errors.push("source");
|
||||||
|
if (item?.status !== "verified") errors.push("status");
|
||||||
|
if (item?.mock_used !== false) errors.push("mock_used");
|
||||||
|
if (item?.preseeded_account_used !== false) errors.push("preseeded_account_used");
|
||||||
|
for (const [name, auth] of [["ordinary", ordinary], ["admin", admin]]) {
|
||||||
|
if (auth?.status !== "passed") errors.push(`${name}.status`);
|
||||||
|
if (auth?.chain !== "formal") errors.push(`${name}.chain`);
|
||||||
|
if (auth?.verification_code_source !== "real_delivery") errors.push(`${name}.verification_code_source`);
|
||||||
|
}
|
||||||
|
return errorList(errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateRedaction(value, serializedEvidence = "") {
|
||||||
|
const item = object(value);
|
||||||
|
const errors = [];
|
||||||
|
if (item?.schema_version !== "1.0") errors.push("schema_version");
|
||||||
|
if (item?.status !== "passed") errors.push("status");
|
||||||
|
if (item?.forbidden_matches !== 0) errors.push("forbidden_matches");
|
||||||
|
if (item?.credentials_in_evidence !== false) errors.push("credentials_in_evidence");
|
||||||
|
if (item?.mailboxes_in_evidence !== false) errors.push("mailboxes_in_evidence");
|
||||||
|
if (item?.private_content_in_evidence !== false) errors.push("private_content_in_evidence");
|
||||||
|
if (item?.absolute_paths_in_evidence !== false) errors.push("absolute_paths_in_evidence");
|
||||||
|
if (emailPattern.test(serializedEvidence)) errors.push("email_value");
|
||||||
|
if (absolutePathPattern.test(serializedEvidence)) errors.push("absolute_path");
|
||||||
|
if (sensitiveKeyPattern.test(serializedEvidence)) errors.push("sensitive_value");
|
||||||
|
return errorList(errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateCandidateReference(record) {
|
||||||
|
try {
|
||||||
|
validateReleaseCandidateRecord(record);
|
||||||
|
} catch (error) {
|
||||||
|
return [error instanceof Error ? "candidate_record_invalid" : "candidate_record_invalid"];
|
||||||
|
}
|
||||||
|
const errors = [];
|
||||||
|
if (record.build_commit !== EXPECTED_WP7_01_COMMIT) errors.push("candidate_build_commit");
|
||||||
|
const versions = new Map((record.browsers ?? []).map((browser) => [browser.brand, browser.full_version]));
|
||||||
|
if (versions.get("Google Chrome") !== "150.0.7871.187") errors.push("chrome_full_version");
|
||||||
|
if (versions.get("Microsoft Edge") !== "151.0.4129.59") errors.push("edge_full_version");
|
||||||
|
return errorList(errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function readJson(path) {
|
||||||
|
if (!path || !existsSync(path)) return undefined;
|
||||||
|
try {
|
||||||
|
return JSON.parse(readFileSync(path, "utf8"));
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fileSha256(path) {
|
||||||
|
return createHash("sha256").update(readFileSync(path)).digest("hex").toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateResendEvidence({ candidate, domainCheck, deliverySummary, authResult, redaction }) {
|
||||||
|
const serializedEvidence = JSON.stringify({ domainCheck, deliverySummary, authResult });
|
||||||
|
const errors = [
|
||||||
|
...validateCandidateReference(candidate),
|
||||||
|
...validateDomainCheck(domainCheck),
|
||||||
|
...validateDeliverySummary(deliverySummary),
|
||||||
|
...validateAuthResult(authResult),
|
||||||
|
...validateRedaction(redaction, serializedEvidence),
|
||||||
|
];
|
||||||
|
return errorList(errors);
|
||||||
|
}
|
||||||
@@ -0,0 +1,428 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import {
|
||||||
|
existsSync,
|
||||||
|
linkSync,
|
||||||
|
lstatSync,
|
||||||
|
mkdirSync,
|
||||||
|
mkdtempSync,
|
||||||
|
readFileSync,
|
||||||
|
readdirSync,
|
||||||
|
realpathSync,
|
||||||
|
renameSync,
|
||||||
|
rmSync,
|
||||||
|
statSync,
|
||||||
|
writeFileSync,
|
||||||
|
} from "node:fs";
|
||||||
|
import { tmpdir } from "node:os";
|
||||||
|
import { basename, dirname, extname, isAbsolute, join, resolve, sep } from "node:path";
|
||||||
|
|
||||||
|
import { compileTextTemplateAssets } from "./text-template-assets.mjs";
|
||||||
|
|
||||||
|
export const P0A_RUNTIME_ASSET_ROOT_REF = "p0a_runtime_assets";
|
||||||
|
export const RUNTIME_ASSET_MANIFEST_SCHEMA = "DadaRuntimeAssets/v1";
|
||||||
|
|
||||||
|
const assetIdPattern = /^[a-z0-9][a-z0-9_-]{2,119}$/i;
|
||||||
|
const mimePattern = /^[a-z0-9][a-z0-9.+-]*\/[a-z0-9][a-z0-9.+-]*$/i;
|
||||||
|
const releasePattern = /^[a-z0-9][a-z0-9._-]{0,79}$/i;
|
||||||
|
const shaPattern = /^[a-f0-9]{64}$/i;
|
||||||
|
const fontMimeTypes = new Map([
|
||||||
|
[".otf", "font/otf"],
|
||||||
|
[".ttf", "font/ttf"],
|
||||||
|
[".woff", "font/woff"],
|
||||||
|
[".woff2", "font/woff2"],
|
||||||
|
]);
|
||||||
|
|
||||||
|
function sha256(bytes) {
|
||||||
|
return createHash("sha256").update(bytes).digest("hex");
|
||||||
|
}
|
||||||
|
|
||||||
|
function fileSha256(path) {
|
||||||
|
return sha256(readFileSync(path));
|
||||||
|
}
|
||||||
|
|
||||||
|
function stableEntries(entries) {
|
||||||
|
return entries.map((entry) => {
|
||||||
|
if (!entry || typeof entry !== "object") throw new Error("runtime_asset_entry_invalid");
|
||||||
|
if (!assetIdPattern.test(entry.assetId)) throw new Error("runtime_asset_id_invalid");
|
||||||
|
if (!mimePattern.test(entry.mimeType)) throw new Error("runtime_asset_mime_invalid");
|
||||||
|
if (!releasePattern.test(entry.resourceVersion)) throw new Error("runtime_asset_version_invalid");
|
||||||
|
if (entry.rootRef !== P0A_RUNTIME_ASSET_ROOT_REF) throw new Error("runtime_asset_root_ref_invalid");
|
||||||
|
if (!shaPattern.test(entry.sha256)) throw new Error("runtime_asset_sha256_invalid");
|
||||||
|
if (
|
||||||
|
typeof entry.relativePath !== "string"
|
||||||
|
|| isAbsolute(entry.relativePath)
|
||||||
|
|| entry.relativePath.includes("\\")
|
||||||
|
|| entry.relativePath.split("/").some((part) => part === "" || part === "..")
|
||||||
|
) throw new Error("runtime_asset_relative_path_invalid");
|
||||||
|
return { ...entry, sha256: entry.sha256.toLowerCase() };
|
||||||
|
}).sort((left, right) => {
|
||||||
|
const byVersion = left.resourceVersion.localeCompare(right.resourceVersion);
|
||||||
|
return byVersion || left.assetId.localeCompare(right.assetId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function derivedCounts(entries) {
|
||||||
|
return {
|
||||||
|
dynamic_fonts: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^[a-f0-9]{32}$/.test(entry.assetId)).length,
|
||||||
|
dynamic_images: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^DYN\d{3}-/.test(entry.assetId)).length,
|
||||||
|
font_panel_items: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^FONT\d{3}$/.test(entry.assetId)).length,
|
||||||
|
static_stickers: entries.filter((entry) => entry.resourceVersion === "p0a-static-v1" && /^STK\d{3,4}$/.test(entry.assetId)).length,
|
||||||
|
text_fonts: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^TEXT-FONT-/.test(entry.assetId)).length,
|
||||||
|
text_images: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^TEXT-IMAGE-/.test(entry.assetId)).length,
|
||||||
|
text_previews: entries.filter((entry) => entry.resourceVersion === "p0a-complex-v1" && /^TEXT-PREVIEW-/.test(entry.assetId)).length,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createRuntimeAssetManifest({ counts, entries, sourceManifestSha256 }) {
|
||||||
|
const normalizedEntries = stableEntries(entries);
|
||||||
|
const keys = new Set();
|
||||||
|
const paths = new Set();
|
||||||
|
for (const entry of normalizedEntries) {
|
||||||
|
const key = `${entry.resourceVersion}\u0000${entry.assetId}`;
|
||||||
|
if (keys.has(key)) throw new Error("runtime_asset_id_duplicate");
|
||||||
|
if (paths.has(entry.relativePath)) throw new Error("runtime_asset_path_duplicate");
|
||||||
|
keys.add(key);
|
||||||
|
paths.add(entry.relativePath);
|
||||||
|
}
|
||||||
|
const actualCounts = derivedCounts(normalizedEntries);
|
||||||
|
if (JSON.stringify(counts) !== JSON.stringify(actualCounts)) throw new Error("runtime_asset_counts_invalid");
|
||||||
|
if (sourceManifestSha256 !== undefined && !shaPattern.test(sourceManifestSha256)) {
|
||||||
|
throw new Error("runtime_asset_source_manifest_sha256_invalid");
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
counts: actualCounts,
|
||||||
|
entries: normalizedEntries,
|
||||||
|
root_ref: P0A_RUNTIME_ASSET_ROOT_REF,
|
||||||
|
schema_version: RUNTIME_ASSET_MANIFEST_SCHEMA,
|
||||||
|
source: "external_read_only",
|
||||||
|
...(sourceManifestSha256 ? { source_manifest_sha256: sourceManifestSha256.toLowerCase() } : {}),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function readRuntimeAssetManifest(path) {
|
||||||
|
const value = JSON.parse(readFileSync(path, "utf8"));
|
||||||
|
if (
|
||||||
|
value?.schema_version !== RUNTIME_ASSET_MANIFEST_SCHEMA
|
||||||
|
|| value?.source !== "external_read_only"
|
||||||
|
|| value?.root_ref !== P0A_RUNTIME_ASSET_ROOT_REF
|
||||||
|
|| !Array.isArray(value.entries)
|
||||||
|
) throw new Error("runtime_asset_manifest_invalid");
|
||||||
|
return createRuntimeAssetManifest({
|
||||||
|
counts: value.counts,
|
||||||
|
entries: value.entries,
|
||||||
|
...(value.source_manifest_sha256 ? { sourceManifestSha256: value.source_manifest_sha256 } : {}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function serializeRuntimeAssetManifest(manifest) {
|
||||||
|
return `${JSON.stringify(manifest, null, 2)}\n`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function writeRuntimeAssetManifest(path, manifest) {
|
||||||
|
mkdirSync(dirname(path), { recursive: true });
|
||||||
|
writeFileSync(path, serializeRuntimeAssetManifest(manifest));
|
||||||
|
}
|
||||||
|
|
||||||
|
function targetWithinRoot(root, relativePath) {
|
||||||
|
const absoluteRoot = resolve(root);
|
||||||
|
const target = resolve(absoluteRoot, ...relativePath.split("/"));
|
||||||
|
if (target === absoluteRoot || !target.startsWith(`${absoluteRoot}${sep}`)) throw new Error("asset_target_path_invalid");
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
function sameFile(left, right) {
|
||||||
|
const leftStat = statSync(left);
|
||||||
|
const rightStat = statSync(right);
|
||||||
|
return leftStat.dev === rightStat.dev && leftStat.ino === rightStat.ino;
|
||||||
|
}
|
||||||
|
|
||||||
|
function installRuntimeAsset(resource, targetPath, expectedSha) {
|
||||||
|
const generatedBytes = Buffer.isBuffer(resource.sourceBytes) ? resource.sourceBytes : undefined;
|
||||||
|
if (generatedBytes) writeFileSync(targetPath, generatedBytes, { flag: "wx" });
|
||||||
|
else {
|
||||||
|
try {
|
||||||
|
linkSync(resource.sourcePath, targetPath);
|
||||||
|
} catch (error) {
|
||||||
|
if (error && typeof error === "object" && "code" in error && error.code === "EXDEV") {
|
||||||
|
throw new Error("asset_hardlink_volume_mismatch");
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (fileSha256(targetPath) !== expectedSha) throw new Error(generatedBytes ? "asset_generated_write_invalid" : "asset_hardlink_verification_failed");
|
||||||
|
if (!generatedBytes && !sameFile(resource.sourcePath, targetPath)) throw new Error("asset_hardlink_verification_failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
function replaceManagedRuntimeAsset(resource, targetPath, expectedSha) {
|
||||||
|
const nextPath = `${targetPath}.dada-next`;
|
||||||
|
const previousPath = `${targetPath}.dada-previous`;
|
||||||
|
if (existsSync(nextPath) || existsSync(previousPath)) throw new Error("asset_update_staging_conflict");
|
||||||
|
installRuntimeAsset(resource, nextPath, expectedSha);
|
||||||
|
renameSync(targetPath, previousPath);
|
||||||
|
try {
|
||||||
|
renameSync(nextPath, targetPath);
|
||||||
|
if (fileSha256(targetPath) !== expectedSha) throw new Error("asset_update_verification_failed");
|
||||||
|
rmSync(previousPath, { force: true });
|
||||||
|
} catch (error) {
|
||||||
|
if (existsSync(targetPath)) renameSync(targetPath, nextPath);
|
||||||
|
renameSync(previousPath, targetPath);
|
||||||
|
rmSync(nextPath, { force: true });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function deployRuntimeAssetPlan({ allowManagedUpdate = false, assetRoot, manifest, resources }) {
|
||||||
|
if (!isAbsolute(assetRoot)) throw new Error("asset_root_must_be_absolute");
|
||||||
|
const normalizedManifest = createRuntimeAssetManifest({
|
||||||
|
counts: manifest.counts,
|
||||||
|
entries: manifest.entries,
|
||||||
|
...(manifest.source_manifest_sha256 ? { sourceManifestSha256: manifest.source_manifest_sha256 } : {}),
|
||||||
|
});
|
||||||
|
const entries = new Map(normalizedManifest.entries.map((entry) => [`${entry.resourceVersion}\u0000${entry.assetId}`, entry]));
|
||||||
|
if (resources.length !== entries.size) throw new Error("asset_resource_plan_incomplete");
|
||||||
|
mkdirSync(assetRoot, { recursive: true });
|
||||||
|
const previousManifestPath = join(assetRoot, "manifest.json");
|
||||||
|
const previousEntries = allowManagedUpdate && existsSync(previousManifestPath)
|
||||||
|
? new Map(readRuntimeAssetManifest(previousManifestPath).entries.map((entry) => [entry.relativePath, entry]))
|
||||||
|
: new Map();
|
||||||
|
for (const resource of resources) {
|
||||||
|
const key = `${resource.entry.resourceVersion}\u0000${resource.entry.assetId}`;
|
||||||
|
const entry = entries.get(key);
|
||||||
|
if (!entry || JSON.stringify(entry) !== JSON.stringify({ ...resource.entry, sha256: resource.entry.sha256.toLowerCase() })) {
|
||||||
|
throw new Error("asset_resource_plan_mismatch");
|
||||||
|
}
|
||||||
|
const generatedBytes = Buffer.isBuffer(resource.sourceBytes) ? resource.sourceBytes : undefined;
|
||||||
|
if (!generatedBytes && (!existsSync(resource.sourcePath) || !statSync(resource.sourcePath).isFile() || lstatSync(resource.sourcePath).isSymbolicLink())) {
|
||||||
|
throw new Error("asset_source_invalid");
|
||||||
|
}
|
||||||
|
if ((generatedBytes ? sha256(generatedBytes) : fileSha256(resource.sourcePath)) !== entry.sha256) throw new Error("asset_source_hash_invalid");
|
||||||
|
const targetPath = targetWithinRoot(assetRoot, entry.relativePath);
|
||||||
|
mkdirSync(dirname(targetPath), { recursive: true });
|
||||||
|
if (existsSync(targetPath)) {
|
||||||
|
const targetSha = fileSha256(targetPath);
|
||||||
|
if (targetSha !== entry.sha256) {
|
||||||
|
const previous = previousEntries.get(entry.relativePath);
|
||||||
|
if (!previous || targetSha !== previous.sha256) throw new Error("asset_target_conflict");
|
||||||
|
replaceManagedRuntimeAsset(resource, targetPath, entry.sha256);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!generatedBytes && !sameFile(resource.sourcePath, targetPath)) throw new Error("asset_target_not_hardlink");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
installRuntimeAsset(resource, targetPath, entry.sha256);
|
||||||
|
}
|
||||||
|
writeRuntimeAssetManifest(join(assetRoot, "manifest.json"), normalizedManifest);
|
||||||
|
return { linked_files: resources.length, manifest: normalizedManifest, status: "ready" };
|
||||||
|
}
|
||||||
|
|
||||||
|
function oneDirectoryWithPrefix(root, prefix) {
|
||||||
|
const matches = readdirSync(root, { withFileTypes: true })
|
||||||
|
.filter((entry) => entry.isDirectory() && entry.name.startsWith(`${prefix}_`));
|
||||||
|
if (matches.length !== 1) throw new Error(`runtime_asset_source_directory_invalid:${prefix}`);
|
||||||
|
return join(root, matches[0].name);
|
||||||
|
}
|
||||||
|
|
||||||
|
function oneSupportedFont(root) {
|
||||||
|
const matches = readdirSync(root, { withFileTypes: true })
|
||||||
|
.filter((entry) => entry.isFile() && fontMimeTypes.has(extname(entry.name).toLowerCase()));
|
||||||
|
if (matches.length !== 1) throw new Error(`runtime_font_source_invalid:${basename(root)}`);
|
||||||
|
return join(root, matches[0].name);
|
||||||
|
}
|
||||||
|
|
||||||
|
function entryFor(sourcePath, assetId, resourceVersion, relativePath, mimeType) {
|
||||||
|
return {
|
||||||
|
assetId,
|
||||||
|
mimeType,
|
||||||
|
relativePath,
|
||||||
|
resourceVersion,
|
||||||
|
rootRef: P0A_RUNTIME_ASSET_ROOT_REF,
|
||||||
|
sha256: fileSha256(sourcePath),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function entryForBytes(sourceBytes, assetId, resourceVersion, relativePath, mimeType) {
|
||||||
|
return {
|
||||||
|
assetId,
|
||||||
|
mimeType,
|
||||||
|
relativePath,
|
||||||
|
resourceVersion,
|
||||||
|
rootRef: P0A_RUNTIME_ASSET_ROOT_REF,
|
||||||
|
sha256: sha256(sourceBytes),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeRuntimeComponent(value) {
|
||||||
|
const normalized = value.normalize("NFKD").replaceAll(/[^A-Za-z0-9_-]+/g, "-").replaceAll(/^-+|-+$/g, "");
|
||||||
|
if (normalized === value) return normalized;
|
||||||
|
return `${normalized || "asset"}-${sha256(value).slice(0, 8).toLowerCase()}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function dynamicMetadata(templateRoot, descriptor, field) {
|
||||||
|
const templateDirectory = join(templateRoot, descriptor.templateId);
|
||||||
|
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
||||||
|
if (!Array.isArray(metadata?.files?.[field]) || !metadata.files[field].includes(descriptor.sourceReference)) {
|
||||||
|
throw new Error(`runtime_dynamic_reference_invalid:${descriptor.assetId}`);
|
||||||
|
}
|
||||||
|
return templateDirectory;
|
||||||
|
}
|
||||||
|
|
||||||
|
function textTemplateDirectory(root, templateId) {
|
||||||
|
const family = templateId.startsWith("FLOWER") ? "花字"
|
||||||
|
: templateId.startsWith("SIMPLE") ? "简约"
|
||||||
|
: templateId.startsWith("TAG") ? "标签"
|
||||||
|
: "标题";
|
||||||
|
return join(root, family, "templates", templateId);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function buildP0aRuntimeAssetPlan({ replicationRoot }) {
|
||||||
|
const [{ compileStaticStickerCatalog }, registry] = await Promise.all([
|
||||||
|
import("../../packages/asset-compiler/dist/index.js"),
|
||||||
|
import("../../packages/template-registry/dist/index.js"),
|
||||||
|
]);
|
||||||
|
const compilerOutput = mkdtempSync(join(tmpdir(), "dada-runtime-asset-plan-"));
|
||||||
|
try {
|
||||||
|
const staticSourceRoot = join(replicationRoot, "sticker_normal");
|
||||||
|
const staticResult = compileStaticStickerCatalog({
|
||||||
|
outputDirectory: compilerOutput,
|
||||||
|
releaseVersion: registry.P0A_STATIC_STICKER_RELEASE_VERSION,
|
||||||
|
sourceRoot: staticSourceRoot,
|
||||||
|
});
|
||||||
|
const resources = staticResult.catalog.items.map((item) => {
|
||||||
|
const sourcePath = join(staticSourceRoot, ...item.relative_path.split("/"));
|
||||||
|
const entry = entryFor(
|
||||||
|
sourcePath,
|
||||||
|
item.stable_id,
|
||||||
|
registry.P0A_STATIC_STICKER_RELEASE_VERSION,
|
||||||
|
`${registry.P0A_STATIC_STICKER_RELEASE_VERSION}/${item.stable_id}.png`,
|
||||||
|
"image/png",
|
||||||
|
);
|
||||||
|
if (entry.sha256 !== item.sha256.toLowerCase()) throw new Error(`static_sticker_hash_invalid:${item.stable_id}`);
|
||||||
|
return { entry, sourcePath };
|
||||||
|
});
|
||||||
|
const resourceKeys = new Map(resources.map((resource) => [`${resource.entry.resourceVersion}\u0000${resource.entry.assetId}`, resource]));
|
||||||
|
const addResource = (resource) => {
|
||||||
|
const key = `${resource.entry.resourceVersion}\u0000${resource.entry.assetId}`;
|
||||||
|
const existing = resourceKeys.get(key);
|
||||||
|
if (existing) {
|
||||||
|
if (existing.entry.sha256 !== resource.entry.sha256 || existing.entry.mimeType !== resource.entry.mimeType) {
|
||||||
|
throw new Error(`runtime_asset_duplicate_conflict:${resource.entry.assetId}`);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resourceKeys.set(key, resource);
|
||||||
|
resources.push(resource);
|
||||||
|
};
|
||||||
|
|
||||||
|
const fontPackagesRoot = join(
|
||||||
|
replicationRoot,
|
||||||
|
"sticker_text",
|
||||||
|
"字体",
|
||||||
|
"面板全量采集",
|
||||||
|
"font_panel_full_20260722",
|
||||||
|
"resources",
|
||||||
|
"font_packages",
|
||||||
|
);
|
||||||
|
for (const assetId of registry.P0A_REQUIRED_FONT_PANEL_IDS) {
|
||||||
|
const packageDirectory = oneDirectoryWithPrefix(fontPackagesRoot, assetId);
|
||||||
|
const sourcePath = oneSupportedFont(join(packageDirectory, "font_files"));
|
||||||
|
const extension = extname(sourcePath).toLowerCase();
|
||||||
|
addResource({
|
||||||
|
entry: entryFor(
|
||||||
|
sourcePath,
|
||||||
|
assetId,
|
||||||
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}${extension}`,
|
||||||
|
fontMimeTypes.get(extension),
|
||||||
|
),
|
||||||
|
sourcePath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const templateRoot = join(replicationRoot, "sticker_interactive", "单模板归档", "templates");
|
||||||
|
for (const templateId of registry.P0A_DYNAMIC_STICKER_IDS) {
|
||||||
|
const templateDirectory = join(templateRoot, templateId);
|
||||||
|
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
||||||
|
for (const sourceReference of metadata.files?.fonts ?? []) {
|
||||||
|
const sourcePath = oneSupportedFont(join(templateDirectory, ...sourceReference.split("/")));
|
||||||
|
const extension = extname(sourcePath).toLowerCase();
|
||||||
|
const assetId = basename(sourceReference);
|
||||||
|
addResource({
|
||||||
|
entry: entryFor(
|
||||||
|
sourcePath,
|
||||||
|
assetId,
|
||||||
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}${extension}`,
|
||||||
|
fontMimeTypes.get(extension),
|
||||||
|
),
|
||||||
|
sourcePath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
for (const sourceReference of metadata.files?.images ?? []) {
|
||||||
|
const sourcePath = join(templateDirectory, ...sourceReference.split("/"));
|
||||||
|
const extension = extname(sourcePath).toLowerCase();
|
||||||
|
const assetId = `${templateId}-${safeRuntimeComponent(basename(sourceReference, extension))}`;
|
||||||
|
if (!existsSync(sourcePath) || extension !== ".png") throw new Error(`runtime_dynamic_image_invalid:${assetId}`);
|
||||||
|
addResource({
|
||||||
|
entry: entryFor(
|
||||||
|
sourcePath,
|
||||||
|
assetId,
|
||||||
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}.png`,
|
||||||
|
"image/png",
|
||||||
|
),
|
||||||
|
sourcePath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const textRoot = join(replicationRoot, "sticker_text", "模板", "单模板归档");
|
||||||
|
for (const templateId of registry.P0A_TEXT_TEMPLATE_IDS) {
|
||||||
|
const templateDirectory = textTemplateDirectory(textRoot, templateId);
|
||||||
|
const metadata = JSON.parse(readFileSync(join(templateDirectory, "metadata.json"), "utf8"));
|
||||||
|
const compiled = compileTextTemplateAssets({ templateDirectory, templateId });
|
||||||
|
for (const resource of compiled.resources) {
|
||||||
|
const relativePath = `${registry.P0A_COMPLEX_RELEASE_VERSION}/${resource.assetId}${resource.extension}`;
|
||||||
|
const entry = resource.sourceBytes
|
||||||
|
? entryForBytes(resource.sourceBytes, resource.assetId, registry.P0A_COMPLEX_RELEASE_VERSION, relativePath, resource.mimeType)
|
||||||
|
: entryFor(resource.sourcePath, resource.assetId, registry.P0A_COMPLEX_RELEASE_VERSION, relativePath, resource.mimeType);
|
||||||
|
addResource({ entry, ...(resource.sourceBytes ? { sourceBytes: resource.sourceBytes } : { sourcePath: resource.sourcePath }) });
|
||||||
|
}
|
||||||
|
const previewReference = metadata.files?.preview;
|
||||||
|
if (typeof previewReference !== "string" || previewReference.length === 0) continue;
|
||||||
|
const sourcePath = join(templateDirectory, ...previewReference.split("/"));
|
||||||
|
if (!existsSync(sourcePath) || extname(sourcePath).toLowerCase() !== ".png") {
|
||||||
|
throw new Error(`runtime_text_preview_invalid:${templateId}`);
|
||||||
|
}
|
||||||
|
const assetId = `TEXT-PREVIEW-${templateId}`;
|
||||||
|
addResource({
|
||||||
|
entry: entryFor(
|
||||||
|
sourcePath,
|
||||||
|
assetId,
|
||||||
|
registry.P0A_COMPLEX_RELEASE_VERSION,
|
||||||
|
`${registry.P0A_COMPLEX_RELEASE_VERSION}/${assetId}.png`,
|
||||||
|
"image/png",
|
||||||
|
),
|
||||||
|
sourcePath,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const manifestPath = join(replicationRoot, "sticker_web_handoff", "sticker_web_catalog_manifest.json");
|
||||||
|
const manifest = createRuntimeAssetManifest({
|
||||||
|
counts: derivedCounts(resources.map((resource) => resource.entry)),
|
||||||
|
entries: resources.map((resource) => resource.entry),
|
||||||
|
sourceManifestSha256: fileSha256(manifestPath),
|
||||||
|
});
|
||||||
|
const resourcesByKey = new Map(resources.map((resource) => [`${resource.entry.resourceVersion}\u0000${resource.entry.assetId}`, resource]));
|
||||||
|
return {
|
||||||
|
manifest,
|
||||||
|
resources: manifest.entries.map((entry) => resourcesByKey.get(`${entry.resourceVersion}\u0000${entry.assetId}`)),
|
||||||
|
};
|
||||||
|
} finally {
|
||||||
|
rmSync(compilerOutput, { force: true, recursive: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function defaultReplicationRoot(environment = process.env) {
|
||||||
|
if (!environment.USERPROFILE || !isAbsolute(environment.USERPROFILE)) throw new Error("user_profile_unavailable");
|
||||||
|
return join(environment.USERPROFILE, "Desktop", "sticker_web_replication_assets");
|
||||||
|
}
|
||||||
@@ -0,0 +1,928 @@
|
|||||||
|
import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
|
||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { basename, dirname, extname, join, relative } from "node:path";
|
||||||
|
import { inflateRawSync } from "node:zlib";
|
||||||
|
|
||||||
|
const fontMimeTypes = new Map([
|
||||||
|
[".otf", "font/otf"],
|
||||||
|
[".ttf", "font/ttf"],
|
||||||
|
[".woff", "font/woff"],
|
||||||
|
[".woff2", "font/woff2"],
|
||||||
|
]);
|
||||||
|
|
||||||
|
function sfntChecksum(bytes, offset = 0, length = bytes.length) {
|
||||||
|
let checksum = 0;
|
||||||
|
for (let index = 0; index < length; index += 4) {
|
||||||
|
let value = 0;
|
||||||
|
for (let byte = 0; byte < 4; byte += 1) value = (value << 8) | (bytes[offset + index + byte] ?? 0);
|
||||||
|
checksum = (checksum + (value >>> 0)) >>> 0;
|
||||||
|
}
|
||||||
|
return checksum;
|
||||||
|
}
|
||||||
|
|
||||||
|
function rebuildSfnt(source, tables) {
|
||||||
|
const ordered = tables.toSorted((left, right) => (left.tag < right.tag ? -1 : left.tag > right.tag ? 1 : 0));
|
||||||
|
const tableCount = ordered.length;
|
||||||
|
const largestPower = 2 ** Math.floor(Math.log2(tableCount));
|
||||||
|
let outputLength = 12 + tableCount * 16;
|
||||||
|
const records = ordered.map((table) => {
|
||||||
|
const bytes = table.bytes
|
||||||
|
? Buffer.from(table.bytes)
|
||||||
|
: Buffer.from(source.subarray(table.offset, table.offset + table.length));
|
||||||
|
if (table.tag === "head") bytes.writeUInt32BE(0, 8);
|
||||||
|
const record = { ...table, bytes, offset: outputLength };
|
||||||
|
outputLength += Math.ceil(bytes.length / 4) * 4;
|
||||||
|
return record;
|
||||||
|
});
|
||||||
|
const output = Buffer.alloc(outputLength);
|
||||||
|
output.writeUInt32BE(source.readUInt32BE(0), 0);
|
||||||
|
output.writeUInt16BE(tableCount, 4);
|
||||||
|
output.writeUInt16BE(largestPower * 16, 6);
|
||||||
|
output.writeUInt16BE(Math.log2(largestPower), 8);
|
||||||
|
output.writeUInt16BE(tableCount * 16 - largestPower * 16, 10);
|
||||||
|
records.forEach((record, index) => {
|
||||||
|
const directoryOffset = 12 + index * 16;
|
||||||
|
output.write(record.tag, directoryOffset, 4, "ascii");
|
||||||
|
output.writeUInt32BE(sfntChecksum(record.bytes), directoryOffset + 4);
|
||||||
|
output.writeUInt32BE(record.offset, directoryOffset + 8);
|
||||||
|
output.writeUInt32BE(record.bytes.length, directoryOffset + 12);
|
||||||
|
record.bytes.copy(output, record.offset);
|
||||||
|
});
|
||||||
|
const head = records.find((record) => record.tag === "head");
|
||||||
|
if (!head || head.bytes.length < 12) throw new Error("text_font_sfnt_head_invalid");
|
||||||
|
output.writeUInt32BE((0xB1B0AFBA - sfntChecksum(output)) >>> 0, head.offset + 8);
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeGlyphBounds(source, tables) {
|
||||||
|
const glyphTable = tables.get("glyf");
|
||||||
|
const headerTable = tables.get("head");
|
||||||
|
const locationTable = tables.get("loca");
|
||||||
|
const maximumProfileTable = tables.get("maxp");
|
||||||
|
if (
|
||||||
|
!glyphTable
|
||||||
|
|| !headerTable
|
||||||
|
|| headerTable.length < 54
|
||||||
|
|| !locationTable
|
||||||
|
|| !maximumProfileTable
|
||||||
|
|| maximumProfileTable.length < 6
|
||||||
|
) return undefined;
|
||||||
|
const glyphCount = source.readUInt16BE(maximumProfileTable.offset + 4);
|
||||||
|
const locationFormat = source.readInt16BE(headerTable.offset + 50);
|
||||||
|
const locationEntrySize = locationFormat === 0 ? 2 : locationFormat === 1 ? 4 : 0;
|
||||||
|
if (locationEntrySize === 0 || locationTable.length < (glyphCount + 1) * locationEntrySize) {
|
||||||
|
throw new Error("text_font_glyph_location_invalid");
|
||||||
|
}
|
||||||
|
const glyphBytes = Buffer.from(source.subarray(glyphTable.offset, glyphTable.offset + glyphTable.length));
|
||||||
|
const glyphOffset = (index) => {
|
||||||
|
const offset = locationTable.offset + index * locationEntrySize;
|
||||||
|
return locationFormat === 0 ? source.readUInt16BE(offset) * 2 : source.readUInt32BE(offset);
|
||||||
|
};
|
||||||
|
let changed = false;
|
||||||
|
let previousEnd = 0;
|
||||||
|
for (let index = 0; index < glyphCount; index += 1) {
|
||||||
|
const start = glyphOffset(index);
|
||||||
|
const end = glyphOffset(index + 1);
|
||||||
|
if (start < previousEnd || end < start || end > glyphBytes.length) throw new Error("text_font_glyph_location_invalid");
|
||||||
|
previousEnd = end;
|
||||||
|
if (end - start < 10) continue;
|
||||||
|
const xMin = glyphBytes.readInt16BE(start + 2);
|
||||||
|
const yMin = glyphBytes.readInt16BE(start + 4);
|
||||||
|
const xMax = glyphBytes.readInt16BE(start + 6);
|
||||||
|
const yMax = glyphBytes.readInt16BE(start + 8);
|
||||||
|
if (xMin > xMax) {
|
||||||
|
glyphBytes.writeInt16BE(xMax, start + 2);
|
||||||
|
glyphBytes.writeInt16BE(xMin, start + 6);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (yMin > yMax) {
|
||||||
|
glyphBytes.writeInt16BE(yMax, start + 4);
|
||||||
|
glyphBytes.writeInt16BE(yMin, start + 8);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return changed ? glyphBytes : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function normalizeBrowserFontBytes(source) {
|
||||||
|
const bytes = Buffer.from(source);
|
||||||
|
if (bytes.length < 12 || bytes.readUInt32BE(0) !== 0x00010000) return undefined;
|
||||||
|
const tableCount = bytes.readUInt16BE(4);
|
||||||
|
if (12 + tableCount * 16 > bytes.length) throw new Error("text_font_sfnt_directory_invalid");
|
||||||
|
const tables = new Map();
|
||||||
|
for (let index = 0; index < tableCount; index += 1) {
|
||||||
|
const recordOffset = 12 + index * 16;
|
||||||
|
const tag = bytes.toString("ascii", recordOffset, recordOffset + 4);
|
||||||
|
const offset = bytes.readUInt32BE(recordOffset + 8);
|
||||||
|
const length = bytes.readUInt32BE(recordOffset + 12);
|
||||||
|
if (offset + length > bytes.length) throw new Error("text_font_sfnt_table_invalid");
|
||||||
|
tables.set(tag, { length, offset, recordOffset, tag });
|
||||||
|
}
|
||||||
|
const head = tables.get("head");
|
||||||
|
const verticalHeader = tables.get("vhea");
|
||||||
|
if (!head || head.length < 12) return undefined;
|
||||||
|
const invalidVerticalVersion = verticalHeader?.length >= 4 && bytes.readUInt32BE(verticalHeader.offset) === 0x00010001;
|
||||||
|
const invalidWholeFontChecksum = sfntChecksum(bytes) !== 0xB1B0AFBA;
|
||||||
|
const normalizedGlyphs = normalizeGlyphBounds(bytes, tables);
|
||||||
|
if (!invalidVerticalVersion && !invalidWholeFontChecksum && !normalizedGlyphs) return undefined;
|
||||||
|
const keptTables = [...tables.values()]
|
||||||
|
.filter((table) => !invalidVerticalVersion || !["vhea", "vmtx"].includes(table.tag))
|
||||||
|
.map((table) => {
|
||||||
|
if (table.tag === "glyf" && normalizedGlyphs) return { ...table, bytes: normalizedGlyphs };
|
||||||
|
if (!invalidVerticalVersion || table.tag !== "post") return table;
|
||||||
|
const post = Buffer.alloc(32);
|
||||||
|
bytes.copy(post, 0, table.offset, table.offset + Math.min(table.length, post.length));
|
||||||
|
post.writeUInt32BE(0x00030000, 0);
|
||||||
|
return { ...table, bytes: post, length: post.length };
|
||||||
|
});
|
||||||
|
if (invalidVerticalVersion && !tables.has("post")) {
|
||||||
|
const post = Buffer.alloc(32);
|
||||||
|
post.writeUInt32BE(0x00030000, 0);
|
||||||
|
keptTables.push({ bytes: post, length: post.length, offset: 0, recordOffset: 0, tag: "post" });
|
||||||
|
}
|
||||||
|
return rebuildSfnt(bytes, keptTables);
|
||||||
|
}
|
||||||
|
|
||||||
|
function filesBelow(root) {
|
||||||
|
const files = [];
|
||||||
|
const visit = (directory) => {
|
||||||
|
for (const entry of readdirSync(directory, { withFileTypes: true })) {
|
||||||
|
if (entry.name === "__MACOSX" || entry.name === ".DS_Store" || entry.name.startsWith("._")) continue;
|
||||||
|
const path = join(directory, entry.name);
|
||||||
|
if (entry.isDirectory()) visit(path);
|
||||||
|
else if (entry.isFile()) files.push(path);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if (existsSync(root)) visit(root);
|
||||||
|
return files.toSorted((left, right) => left.localeCompare(right));
|
||||||
|
}
|
||||||
|
|
||||||
|
function assetFileType(path) {
|
||||||
|
const extension = extname(path).toLowerCase();
|
||||||
|
if ([".manifest", ".mat", ".png", ".prefab", ".sprite"].includes(extension)) return extension.slice(1);
|
||||||
|
const bytes = readFileSync(path);
|
||||||
|
if (bytes.length >= 24 && bytes.readUInt32BE(12) === 0x49484452) return "png";
|
||||||
|
if (bytes[0] === 0x7b) {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(bytes.toString("utf8"));
|
||||||
|
if (["Sprite", "Prefab", "Material"].includes(parsed?.typeId)) return String(parsed.typeId).toLocaleLowerCase("en-US");
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function readJson(path) {
|
||||||
|
return JSON.parse(readFileSync(path, "utf8"));
|
||||||
|
}
|
||||||
|
|
||||||
|
function stemKey(path) {
|
||||||
|
return basename(path, extname(path)).normalize("NFKC").toLocaleLowerCase("en-US").replaceAll(/[^\p{L}\p{N}]+/gu, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
function resourceStemKey(path, type) {
|
||||||
|
const name = basename(path);
|
||||||
|
const extension = extname(name).toLowerCase();
|
||||||
|
const stem = extension === `.${type}` ? basename(name, extension) : name.replace(new RegExp(`_${type}$`, "i"), "");
|
||||||
|
return stem.normalize("NFKC").toLocaleLowerCase("en-US").replaceAll(/[^\p{L}\p{N}]+/gu, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
function zipEntries(path) {
|
||||||
|
const archive = readFileSync(path);
|
||||||
|
let eocd = -1;
|
||||||
|
for (let index = archive.length - 22; index >= Math.max(0, archive.length - 65_557); index -= 1) {
|
||||||
|
if (archive.readUInt32LE(index) === 0x06054b50) {
|
||||||
|
eocd = index;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (eocd < 0) throw new Error(`text_font_zip_invalid:${basename(path)}`);
|
||||||
|
const totalEntries = archive.readUInt16LE(eocd + 10);
|
||||||
|
let cursor = archive.readUInt32LE(eocd + 16);
|
||||||
|
const entries = [];
|
||||||
|
for (let index = 0; index < totalEntries; index += 1) {
|
||||||
|
if (archive.readUInt32LE(cursor) !== 0x02014b50) throw new Error(`text_font_zip_directory_invalid:${basename(path)}`);
|
||||||
|
const compression = archive.readUInt16LE(cursor + 10);
|
||||||
|
const compressedSize = archive.readUInt32LE(cursor + 20);
|
||||||
|
const uncompressedSize = archive.readUInt32LE(cursor + 24);
|
||||||
|
const nameLength = archive.readUInt16LE(cursor + 28);
|
||||||
|
const extraLength = archive.readUInt16LE(cursor + 30);
|
||||||
|
const commentLength = archive.readUInt16LE(cursor + 32);
|
||||||
|
const localOffset = archive.readUInt32LE(cursor + 42);
|
||||||
|
const name = archive.subarray(cursor + 46, cursor + 46 + nameLength).toString("utf8").replaceAll("\\", "/");
|
||||||
|
if (name.startsWith("/") || name.split("/").includes("..")) throw new Error(`text_font_zip_path_invalid:${basename(path)}`);
|
||||||
|
if (!name.endsWith("/")) {
|
||||||
|
if (archive.readUInt32LE(localOffset) !== 0x04034b50) throw new Error(`text_font_zip_entry_invalid:${basename(path)}`);
|
||||||
|
const localNameLength = archive.readUInt16LE(localOffset + 26);
|
||||||
|
const localExtraLength = archive.readUInt16LE(localOffset + 28);
|
||||||
|
const dataOffset = localOffset + 30 + localNameLength + localExtraLength;
|
||||||
|
const compressed = archive.subarray(dataOffset, dataOffset + compressedSize);
|
||||||
|
const bytes = compression === 0 ? Buffer.from(compressed)
|
||||||
|
: compression === 8 ? inflateRawSync(compressed)
|
||||||
|
: undefined;
|
||||||
|
if (!bytes || bytes.length !== uncompressedSize) throw new Error(`text_font_zip_compression_invalid:${basename(path)}`);
|
||||||
|
entries.push({ bytes, name });
|
||||||
|
}
|
||||||
|
cursor += 46 + nameLength + extraLength + commentLength;
|
||||||
|
}
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
function browserFontResource(templateDirectory, templateId, sourceReference, index) {
|
||||||
|
const sourcePath = join(templateDirectory, ...sourceReference.split("/"));
|
||||||
|
if (!existsSync(sourcePath) || !statSync(sourcePath).isFile()) throw new Error(`text_font_source_missing:${templateId}:${index}`);
|
||||||
|
const assetId = `TEXT-FONT-${templateId}-${String(index + 1).padStart(2, "0")}`;
|
||||||
|
const directExtension = extname(sourcePath).toLowerCase();
|
||||||
|
if (fontMimeTypes.has(directExtension)) {
|
||||||
|
return {
|
||||||
|
assetId,
|
||||||
|
extension: directExtension,
|
||||||
|
mimeType: fontMimeTypes.get(directExtension),
|
||||||
|
names: [basename(sourcePath).toLocaleLowerCase("en-US")],
|
||||||
|
sourcePath,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const extracted = filesBelow(dirname(sourcePath)).filter((path) => fontMimeTypes.has(extname(path).toLowerCase()));
|
||||||
|
if (extracted.length === 1) {
|
||||||
|
const extension = extname(extracted[0]).toLowerCase();
|
||||||
|
return {
|
||||||
|
assetId,
|
||||||
|
extension,
|
||||||
|
mimeType: fontMimeTypes.get(extension),
|
||||||
|
names: [basename(extracted[0]).toLocaleLowerCase("en-US"), basename(sourcePath, directExtension).toLocaleLowerCase("en-US")],
|
||||||
|
sourcePath: extracted[0],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const archivedFonts = zipEntries(sourcePath).filter((entry) => fontMimeTypes.has(extname(entry.name).toLowerCase()));
|
||||||
|
if (archivedFonts.length !== 1) throw new Error(`text_font_archive_ambiguous:${templateId}:${index}`);
|
||||||
|
const archived = archivedFonts[0];
|
||||||
|
const extension = extname(archived.name).toLowerCase();
|
||||||
|
return {
|
||||||
|
assetId,
|
||||||
|
extension,
|
||||||
|
mimeType: fontMimeTypes.get(extension),
|
||||||
|
names: [basename(archived.name).toLocaleLowerCase("en-US"), basename(sourcePath, directExtension).toLocaleLowerCase("en-US")],
|
||||||
|
sourceBytes: archived.bytes,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function manifestFileMap(packageFiles) {
|
||||||
|
const filesByName = new Map();
|
||||||
|
const filesByAsciiIdentity = new Map();
|
||||||
|
for (const path of packageFiles) {
|
||||||
|
const key = basename(path).toLocaleLowerCase("en-US");
|
||||||
|
const values = filesByName.get(key) ?? [];
|
||||||
|
values.push(path);
|
||||||
|
filesByName.set(key, values);
|
||||||
|
const asciiIdentity = key.replaceAll(/[^a-z0-9]+/g, "");
|
||||||
|
const asciiValues = filesByAsciiIdentity.get(asciiIdentity) ?? [];
|
||||||
|
asciiValues.push(path);
|
||||||
|
filesByAsciiIdentity.set(asciiIdentity, asciiValues);
|
||||||
|
}
|
||||||
|
const mappings = new Map();
|
||||||
|
const spriteDefinitions = new Map();
|
||||||
|
const manifestEntries = [];
|
||||||
|
for (const path of packageFiles.filter((candidate) => extname(candidate).toLowerCase() === ".manifest")) {
|
||||||
|
let manifest;
|
||||||
|
try {
|
||||||
|
manifest = readJson(path);
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (const item of manifest.UUIDToFilePath ?? []) {
|
||||||
|
const uuid = item?.key?.value;
|
||||||
|
const fileName = item?.value?.fileName;
|
||||||
|
if (typeof uuid !== "string" || typeof fileName !== "string") continue;
|
||||||
|
manifestEntries.push({ directories: item.value.directories ?? [], fileName, uuid });
|
||||||
|
const candidate = join(dirname(path), ...(item.value.directories ?? []), fileName);
|
||||||
|
const normalizedName = basename(fileName).toLocaleLowerCase("en-US");
|
||||||
|
const asciiCandidates = filesByAsciiIdentity.get(normalizedName.replaceAll(/[^a-z0-9]+/g, "")) ?? [];
|
||||||
|
const resolved = existsSync(candidate) ? candidate
|
||||||
|
: filesByName.get(normalizedName)?.[0]
|
||||||
|
?? (asciiCandidates.length === 1 ? asciiCandidates[0] : undefined);
|
||||||
|
if (resolved) {
|
||||||
|
mappings.set(uuid, resolved);
|
||||||
|
if (assetFileType(resolved) === "sprite") spriteDefinitions.set(uuid, resolved);
|
||||||
|
}
|
||||||
|
else mappings.set(uuid, fileName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const actualImagesByUuid = new Map();
|
||||||
|
const actualSprites = [];
|
||||||
|
for (const spritePath of packageFiles.filter((candidate) => assetFileType(candidate) === "sprite")) {
|
||||||
|
let sprite;
|
||||||
|
try {
|
||||||
|
sprite = readJson(spritePath);
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const imageUuid = sprite?.object?.m_UUIDList?.[0]?.uuid;
|
||||||
|
const siblingImages = packageFiles.filter((candidate) => dirname(candidate) === dirname(spritePath) && assetFileType(candidate) === "png");
|
||||||
|
const imagePath = siblingImages.find((candidate) => resourceStemKey(candidate, "png") === resourceStemKey(spritePath, "sprite"))
|
||||||
|
?? (siblingImages.length === 1 ? siblingImages[0] : undefined);
|
||||||
|
if (typeof imageUuid === "string") actualSprites.push({ imageUuid, path: spritePath });
|
||||||
|
if (typeof imageUuid === "string" && imagePath) {
|
||||||
|
actualImagesByUuid.set(imageUuid, imagePath);
|
||||||
|
mappings.set(imageUuid, imagePath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const spriteEntry of manifestEntries.filter((entry) => extname(entry.fileName).toLowerCase() === ".sprite")) {
|
||||||
|
const imageEntry = manifestEntries.find((entry) => extname(entry.fileName).toLowerCase() === ".png"
|
||||||
|
&& stemKey(entry.fileName) === stemKey(spriteEntry.fileName)
|
||||||
|
&& JSON.stringify(entry.directories) === JSON.stringify(spriteEntry.directories));
|
||||||
|
const asciiIdentity = basename(spriteEntry.fileName).toLocaleLowerCase("en-US").replaceAll(/[^a-z0-9]+/g, "");
|
||||||
|
const matchingActualSprites = actualSprites.filter((entry) => basename(entry.path).toLocaleLowerCase("en-US").replaceAll(/[^a-z0-9]+/g, "") === asciiIdentity);
|
||||||
|
const matchingImageUuids = [...new Set(matchingActualSprites.map((entry) => entry.imageUuid))];
|
||||||
|
const inferredImageUuid = matchingImageUuids.length === 1 ? matchingImageUuids[0] : undefined;
|
||||||
|
const imagePath = imageEntry ? actualImagesByUuid.get(imageEntry.uuid) ?? mappings.get(imageEntry.uuid)
|
||||||
|
: inferredImageUuid ? actualImagesByUuid.get(inferredImageUuid) ?? mappings.get(inferredImageUuid)
|
||||||
|
: undefined;
|
||||||
|
const spriteDefinition = matchingActualSprites.length === 1 ? matchingActualSprites[0].path : mappings.get(spriteEntry.uuid);
|
||||||
|
if (typeof spriteDefinition === "string" && existsSync(spriteDefinition) && assetFileType(spriteDefinition) === "sprite") {
|
||||||
|
spriteDefinitions.set(spriteEntry.uuid, spriteDefinition);
|
||||||
|
}
|
||||||
|
if (typeof imagePath === "string" && existsSync(imagePath)) mappings.set(spriteEntry.uuid, imagePath);
|
||||||
|
}
|
||||||
|
return { mappings, spriteDefinitions };
|
||||||
|
}
|
||||||
|
|
||||||
|
function colorHex(value, fallback = "#111111") {
|
||||||
|
if (!value || typeof value !== "object") return fallback;
|
||||||
|
const channel = (name) => Math.max(0, Math.min(255, Math.round(Number(value[name] ?? 0) * 255))).toString(16).padStart(2, "0");
|
||||||
|
return `#${channel("r")}${channel("g")}${channel("b")}`.toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
function textFillGradient(style) {
|
||||||
|
const colors = style?.vertexColor;
|
||||||
|
const topLeft = colors?.vertexColor0;
|
||||||
|
const topRight = colors?.vertexColor1;
|
||||||
|
const bottomLeft = colors?.vertexColor2;
|
||||||
|
const bottomRight = colors?.vertexColor3;
|
||||||
|
if (![topLeft, topRight, bottomLeft, bottomRight].every((color) => color && typeof color === "object")) return undefined;
|
||||||
|
const top = colorHex(topLeft);
|
||||||
|
const bottom = colorHex(bottomLeft);
|
||||||
|
return top === colorHex(topRight) && bottom === colorHex(bottomRight) && top !== bottom ? { bottom, top } : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function textGlyphColors(textMesh) {
|
||||||
|
const changes = textMesh?.m_textFormatController?.m_textFormatChange;
|
||||||
|
if (!Array.isArray(changes)) return undefined;
|
||||||
|
const colors = changes.filter((change) => (Number(change?.flags ?? 0) & 4) !== 0 && Number(change?.format?.color?.a ?? 0) > 0)
|
||||||
|
.map((change) => ({ color: colorHex(change.format.color), position: Number(change.startPosition) }))
|
||||||
|
.toSorted((left, right) => left.position - right.position);
|
||||||
|
if (colors.length === 0 || colors.some((entry, index) => entry.position !== index)) return undefined;
|
||||||
|
return colors.map((entry) => entry.color);
|
||||||
|
}
|
||||||
|
|
||||||
|
function quaternionDegrees(rotation) {
|
||||||
|
const z = Number(rotation?.z ?? 0);
|
||||||
|
const w = Number(rotation?.w ?? 1);
|
||||||
|
return Math.atan2(2 * w * z, 1 - 2 * z * z) * 180 / Math.PI;
|
||||||
|
}
|
||||||
|
|
||||||
|
function estimatedGlyphWidth(character, fontSize) {
|
||||||
|
if (/\s/u.test(character)) return fontSize * 0.34;
|
||||||
|
if (/^[A-Z]$/u.test(character)) return fontSize * 0.68;
|
||||||
|
if (/^[a-z0-9]$/u.test(character)) return fontSize * 0.56;
|
||||||
|
if (/^[.,:;!?@©()()\-_'’]$/u.test(character)) return fontSize * 0.42;
|
||||||
|
return fontSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
function inferredTextContentSize(text, style) {
|
||||||
|
const fontSize = Math.max(1, Number(style.fontSize ?? 48));
|
||||||
|
const characterSpacing = Number(style.characterSpacing ?? 0);
|
||||||
|
const lineSpacing = Math.max(0.1, Number(style.lineSpacing ?? 1));
|
||||||
|
const lines = String(text ?? "").split("\n");
|
||||||
|
const width = Math.max(1, ...lines.map((line) => Array.from(line).reduce(
|
||||||
|
(total, character, index) => total + estimatedGlyphWidth(character, fontSize) + (index === 0 ? 0 : characterSpacing),
|
||||||
|
0,
|
||||||
|
)));
|
||||||
|
const height = fontSize + Math.max(0, lines.length - 1) * fontSize * lineSpacing;
|
||||||
|
return { height, width };
|
||||||
|
}
|
||||||
|
|
||||||
|
function textPathModel(object, transform, contentSize) {
|
||||||
|
const option = object?.m_textPathOption;
|
||||||
|
const info = option?.pk?.mPathInfo;
|
||||||
|
if (!Array.isArray(info?.mPathVerbs) || info.mPathVerbs.length === 0 || !Array.isArray(info?.mPoints)) return undefined;
|
||||||
|
const sourceAnchorX = Number(object.m_anchorPoint?.x ?? 0.5);
|
||||||
|
const sourceAnchorY = Number(object.m_anchorPoint?.y ?? 0.5);
|
||||||
|
const circle = info.mIsCircle === true;
|
||||||
|
const scaleX = Math.abs(transform.scaleX);
|
||||||
|
const scaleY = Math.abs(transform.scaleY);
|
||||||
|
return {
|
||||||
|
circle,
|
||||||
|
conic_weights: Array.isArray(info.mConicWeights) ? info.mConicWeights.map(Number) : [],
|
||||||
|
first_margin: Number(option.firstMargin ?? 0),
|
||||||
|
force_alignment: option.forceAlignment === true,
|
||||||
|
is_absolute_mode: option.isAbsoluteMode === true,
|
||||||
|
last_margin: Number(option.lastMargin ?? 0),
|
||||||
|
perpendicular: option.perpendicularToPath !== false,
|
||||||
|
points: info.mPoints.map((point) => ({
|
||||||
|
x: (Number(point?.x ?? 0) + (circle ? (0.5 - sourceAnchorX) * contentSize.width : -sourceAnchorX * contentSize.width)) * scaleX,
|
||||||
|
y: (-Number(point?.y ?? 0) + (circle ? (sourceAnchorY - 0.5) * contentSize.height : sourceAnchorY * contentSize.height)) * scaleY,
|
||||||
|
})),
|
||||||
|
reversed: option.reversedPath === true,
|
||||||
|
verbs: info.mPathVerbs.map(Number),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function spriteNinePatch(sprite) {
|
||||||
|
const object = sprite?.object;
|
||||||
|
if (Number(object?.m_type) !== 3) return undefined;
|
||||||
|
const sourceWidth = Number(object.m_width);
|
||||||
|
const sourceHeight = Number(object.m_height);
|
||||||
|
const left = Number(object.m_startW);
|
||||||
|
const rightEdge = Number(object.m_endW);
|
||||||
|
const top = Number(object.m_startH);
|
||||||
|
const bottomEdge = Number(object.m_endH);
|
||||||
|
if (![sourceWidth, sourceHeight, left, rightEdge, top, bottomEdge].every(Number.isFinite)
|
||||||
|
|| sourceWidth <= 0 || sourceHeight <= 0
|
||||||
|
|| left < 0 || rightEdge < left || rightEdge > sourceWidth
|
||||||
|
|| top < 0 || bottomEdge < top || bottomEdge > sourceHeight) return undefined;
|
||||||
|
return {
|
||||||
|
bottom: sourceHeight - bottomEdge,
|
||||||
|
left,
|
||||||
|
right: sourceWidth - rightEdge,
|
||||||
|
source_height: sourceHeight,
|
||||||
|
source_width: sourceWidth,
|
||||||
|
top,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function pngDimensions(path) {
|
||||||
|
const bytes = readFileSync(path);
|
||||||
|
if (bytes.length < 24 || bytes.readUInt32BE(12) !== 0x49484452) return undefined;
|
||||||
|
return { height: bytes.readUInt32BE(20), width: bytes.readUInt32BE(16) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function firstMaterialTextureAssetId(renderer, input) {
|
||||||
|
const materialUuids = (renderer?.m_Materials ?? []).map((item) => item?.uuid?.uuid).filter((uuid) => typeof uuid === "string");
|
||||||
|
for (const materialUuid of materialUuids) {
|
||||||
|
const materialPath = input.manifestMappings.get(materialUuid);
|
||||||
|
if (typeof materialPath !== "string" || extname(materialPath).toLowerCase() !== ".mat" || !existsSync(materialPath)) continue;
|
||||||
|
let material;
|
||||||
|
try {
|
||||||
|
material = readJson(materialPath);
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const pending = [material];
|
||||||
|
while (pending.length > 0) {
|
||||||
|
const value = pending.pop();
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
pending.push(...value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!value || typeof value !== "object") continue;
|
||||||
|
const textureUuid = value?.uuid?.uuid;
|
||||||
|
if (typeof textureUuid === "string") {
|
||||||
|
const texturePath = input.manifestMappings.get(textureUuid);
|
||||||
|
const assetId = typeof texturePath === "string" ? input.imageIds.get(texturePath) : undefined;
|
||||||
|
if (assetId) return assetId;
|
||||||
|
}
|
||||||
|
pending.push(...Object.values(value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function prefabResolver(prefab) {
|
||||||
|
const instances = new Map();
|
||||||
|
for (const item of prefab?.instance_map ?? []) {
|
||||||
|
if (Number.isInteger(item?.instance_type) && Number.isInteger(item?.instance_id)) {
|
||||||
|
instances.set(`${item.instance_type}:${item.instance_id}`, item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const resolve = (value) => {
|
||||||
|
let current = value?.internalObject ?? value;
|
||||||
|
const visited = new Set();
|
||||||
|
while (current && typeof current === "object" && !current.object) {
|
||||||
|
if (current.internalObject) {
|
||||||
|
current = current.internalObject;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (current.inner_ptr) {
|
||||||
|
current = current.inner_ptr;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const key = Number.isInteger(current.instance_type) && Number.isInteger(current.instance_id)
|
||||||
|
? `${current.instance_type}:${current.instance_id}`
|
||||||
|
: undefined;
|
||||||
|
if (!key || visited.has(key) || !instances.has(key)) break;
|
||||||
|
visited.add(key);
|
||||||
|
current = instances.get(key);
|
||||||
|
}
|
||||||
|
if (current?.inner_ptr && !current.object) return resolve(current.inner_ptr);
|
||||||
|
return current;
|
||||||
|
};
|
||||||
|
return resolve;
|
||||||
|
}
|
||||||
|
|
||||||
|
function components(object, resolve) {
|
||||||
|
return (object?.m_Components ?? []).map(resolve).filter((item) => item?.object);
|
||||||
|
}
|
||||||
|
|
||||||
|
function prefabLayers(prefab, input) {
|
||||||
|
const layers = [];
|
||||||
|
let order = 0;
|
||||||
|
const resolve = prefabResolver(prefab);
|
||||||
|
const root = resolve(prefab?.object?.m_RootSo)?.object;
|
||||||
|
const visit = (wrapped, parent, ignorePosition = false, anchorXOverride) => {
|
||||||
|
const typed = resolve(wrapped);
|
||||||
|
const object = typed?.object;
|
||||||
|
if (!object) return;
|
||||||
|
const local = object.m_LocalTfrm ?? {};
|
||||||
|
const localPosition = local.m_Position ?? {};
|
||||||
|
const localScale = local.m_Scale ?? {};
|
||||||
|
// The first UI group may use a negative scale to bridge the source editor's
|
||||||
|
// coordinate system. Browser-space Y is already inverted below, so keeping
|
||||||
|
// that sign would mirror every glyph and decoration a second time.
|
||||||
|
const scaleX = parent.scaleX * (ignorePosition ? Math.abs(Number(localScale.x ?? 1)) : Number(localScale.x ?? 1));
|
||||||
|
const scaleY = parent.scaleY * (ignorePosition ? Math.abs(Number(localScale.y ?? 1)) : Number(localScale.y ?? 1));
|
||||||
|
const localX = ignorePosition ? 0 : Number(localPosition.x ?? 0) * parent.scaleX;
|
||||||
|
const localY = ignorePosition ? 0 : Number(localPosition.y ?? 0) * parent.scaleY;
|
||||||
|
const parentRadians = parent.rotation * Math.PI / 180;
|
||||||
|
const transform = {
|
||||||
|
alpha: parent.alpha * Math.max(0, Math.min(1, Number(object.m_CustomAlpha ?? 1))),
|
||||||
|
anchorX: Math.max(0, Math.min(1, Number(anchorXOverride ?? object.m_anchorPoint?.x ?? 0.5))),
|
||||||
|
anchorY: Math.max(0, Math.min(1, Number(object.m_anchorPoint?.y ?? 0.5))),
|
||||||
|
rotation: parent.rotation + quaternionDegrees(local.m_Rotation),
|
||||||
|
scaleX,
|
||||||
|
scaleY,
|
||||||
|
x: parent.x + localX * Math.cos(parentRadians) - localY * Math.sin(parentRadians),
|
||||||
|
y: parent.y + localX * Math.sin(parentRadians) + localY * Math.cos(parentRadians),
|
||||||
|
};
|
||||||
|
const nodeComponents = components(object, resolve);
|
||||||
|
const localUnderlines = [
|
||||||
|
...(parent.underlines ?? []),
|
||||||
|
...nodeComponents.filter((item) => item.typeId === "UnderLineBehavior").flatMap((item) => item.object?.m_UnderLineConfig ?? []),
|
||||||
|
];
|
||||||
|
transform.underlines = localUnderlines;
|
||||||
|
const textMesh = nodeComponents.find((item) => item.typeId === "TextMesh")?.object;
|
||||||
|
if (textMesh) {
|
||||||
|
const textRenderer = nodeComponents.find((item) => item.typeId === "TextRenderer")?.object;
|
||||||
|
const style = textMesh.m_fontStyleInfo ?? {};
|
||||||
|
const inferredSize = inferredTextContentSize(textMesh.m_text, style);
|
||||||
|
const contentSize = {
|
||||||
|
height: Number(object.m_contentSize?.height ?? 0) > 0 ? Number(object.m_contentSize.height) : inferredSize.height,
|
||||||
|
width: Number(object.m_contentSize?.width ?? 0) > 0 ? Number(object.m_contentSize.width) : inferredSize.width,
|
||||||
|
};
|
||||||
|
const textPath = textPathModel(object, transform, contentSize);
|
||||||
|
const fillGradient = textFillGradient(style);
|
||||||
|
const glyphColors = textGlyphColors(textMesh);
|
||||||
|
const outline = style.outlineInfo?.outlineSize > 0 ? style.outlineInfo : undefined;
|
||||||
|
const shadow = style.shadowInfos?.find((item) => Number(item?.offset?.x ?? 0) !== 0 || Number(item?.offset?.y ?? 0) !== 0);
|
||||||
|
const fontUuid = textMesh.m_font?.uuid?.uuid;
|
||||||
|
const fillPatternAssetId = firstMaterialTextureAssetId(textRenderer, input);
|
||||||
|
const sourceTextureLayout = textMesh.m_textureLayoutInfo;
|
||||||
|
const fillTextureLayout = fillPatternAssetId
|
||||||
|
&& Number(sourceTextureLayout?.rows) > 0
|
||||||
|
&& Number(sourceTextureLayout?.columns) > 0
|
||||||
|
&& Array.isArray(sourceTextureLayout?.idList)
|
||||||
|
&& sourceTextureLayout.idList.length > 0
|
||||||
|
? {
|
||||||
|
columns: Math.max(1, Number(sourceTextureLayout.columns)),
|
||||||
|
id_list: sourceTextureLayout.idList.map(Number),
|
||||||
|
rows: Math.max(1, Number(sourceTextureLayout.rows)),
|
||||||
|
}
|
||||||
|
: undefined;
|
||||||
|
layers.push({
|
||||||
|
align: Number(style.alignment ?? 0) === 2 ? "right" : Number(style.alignment ?? 0) === 1 ? "center" : "left",
|
||||||
|
...(transform.alpha === 1 ? {} : { alpha: transform.alpha }),
|
||||||
|
...(transform.anchorX === 0.5 ? {} : { anchor_x: transform.anchorX }),
|
||||||
|
...(transform.anchorY === 0.5 ? {} : { anchor_y: 1 - transform.anchorY }),
|
||||||
|
fill_color: colorHex(style.color),
|
||||||
|
...(fillPatternAssetId ? { fill_pattern_asset_id: fillPatternAssetId } : {}),
|
||||||
|
...(fillTextureLayout ? { fill_texture_layout: fillTextureLayout } : {}),
|
||||||
|
...(fillGradient ? { fill_gradient: fillGradient } : {}),
|
||||||
|
...(glyphColors ? { glyph_colors: glyphColors } : {}),
|
||||||
|
font_file: typeof fontUuid === "string" ? input.manifestMappings.get(fontUuid) : undefined,
|
||||||
|
font_md5: typeof object.m_fontMd5Value === "string" ? object.m_fontMd5Value.toLocaleLowerCase("en-US") : undefined,
|
||||||
|
font_size: Math.max(1, Number(style.fontSize ?? 48) * Math.abs(scaleY)),
|
||||||
|
height: Math.max(1, contentSize.height * Math.abs(scaleY)),
|
||||||
|
letter_spacing: Number(style.characterSpacing ?? 1),
|
||||||
|
line_height: Number(style.lineSpacing ?? 1),
|
||||||
|
order: order++,
|
||||||
|
rotation: -transform.rotation,
|
||||||
|
scale_x: Math.sign(scaleX) || 1,
|
||||||
|
scale_y: Math.sign(scaleY) || 1,
|
||||||
|
shadow_blur: Math.max(0, Number(shadow?.blur ?? shadow?.SDFFontBorder ?? 0)),
|
||||||
|
shadow_color: colorHex(shadow?.color, "#000000"),
|
||||||
|
shadow_offset_x: Number(shadow?.offset?.x ?? 0),
|
||||||
|
shadow_offset_y: -Number(shadow?.offset?.y ?? 0),
|
||||||
|
skew_x: Number(textMesh.m_skewValue?.x ?? 0),
|
||||||
|
skew_y: Number(textMesh.m_skewValue?.y ?? 0),
|
||||||
|
stroke_color: colorHex(outline?.outlineColor, "#000000"),
|
||||||
|
stroke_width: Math.max(0, Number(outline?.outlineSize ?? 0)),
|
||||||
|
text: String(textMesh.m_text ?? ""),
|
||||||
|
...(textPath ? { text_path: textPath } : {}),
|
||||||
|
type: "text",
|
||||||
|
vertical_align: Number(style.vAlignment ?? 1) === 0 ? "top"
|
||||||
|
: Number(style.vAlignment ?? 1) === 2 ? "bottom"
|
||||||
|
: "middle",
|
||||||
|
width: Math.max(1, contentSize.width * Math.abs(scaleX)),
|
||||||
|
x: transform.x,
|
||||||
|
y: -transform.y,
|
||||||
|
});
|
||||||
|
for (const underline of localUnderlines.filter((item) => item?.p1?.enable !== false && item?.p0 === object.m_Name)) {
|
||||||
|
const config = underline.p1?.exportParams ?? {};
|
||||||
|
const ninePatch = config.ninePatchInfos?.find((item) => item?.enable !== false && typeof item?.texture?.uuid?.uuid === "string");
|
||||||
|
const textureUuid = ninePatch?.texture?.uuid?.uuid ?? config.texture?.uuid?.uuid;
|
||||||
|
const texturePath = typeof textureUuid === "string" ? input.manifestMappings.get(textureUuid) : undefined;
|
||||||
|
const assetId = typeof texturePath === "string" ? input.imageIds.get(texturePath) : undefined;
|
||||||
|
if (!assetId || typeof texturePath !== "string") continue;
|
||||||
|
const dimensions = pngDimensions(texturePath);
|
||||||
|
const targetWidth = Math.max(1, Number(object.m_contentSize?.width ?? 1) * Math.abs(scaleX)
|
||||||
|
* (config.enableUnderLineSizeWithText === false ? 1 : Number(config.underLineSize ?? 100) / 100));
|
||||||
|
const naturalRatio = dimensions ? dimensions.height / Math.max(1, dimensions.width) : 0.15;
|
||||||
|
const targetHeight = Math.max(2, Math.min(Number(object.m_contentSize?.height ?? 48) * 0.65, targetWidth * naturalRatio));
|
||||||
|
layers.push({
|
||||||
|
...(transform.alpha === 1 ? {} : { alpha: transform.alpha }),
|
||||||
|
asset_id: assetId,
|
||||||
|
height: targetHeight,
|
||||||
|
order: order++,
|
||||||
|
rotation: -transform.rotation,
|
||||||
|
scale_x: Math.sign(scaleX) || 1,
|
||||||
|
scale_y: Math.sign(scaleY) || 1,
|
||||||
|
type: "image",
|
||||||
|
width: targetWidth,
|
||||||
|
x: transform.x,
|
||||||
|
y: -transform.y + Number(object.m_contentSize?.height ?? 48) * Math.abs(scaleY) / 2
|
||||||
|
+ Number(config.relativeDistance ?? 0) + targetHeight / 2,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
for (const particleComponent of nodeComponents.filter((item) => item.typeId === "ParticlesText2D").map((item) => item.object)) {
|
||||||
|
if (particleComponent?.m_isEnabled === false) continue;
|
||||||
|
const textureUuid = particleComponent?.m_altasTexUUID?.uuid;
|
||||||
|
const texturePath = typeof textureUuid === "string" ? input.manifestMappings.get(textureUuid) : undefined;
|
||||||
|
const assetId = typeof texturePath === "string" ? input.imageIds.get(texturePath) : undefined;
|
||||||
|
if (!assetId) continue;
|
||||||
|
layers.push({
|
||||||
|
alpha: transform.alpha * Math.max(0, Math.min(1, Number(particleComponent.m_AlphaIdensity ?? 1))),
|
||||||
|
anchor_x: transform.anchorX,
|
||||||
|
anchor_y: 1 - transform.anchorY,
|
||||||
|
asset_id: assetId,
|
||||||
|
atlas_columns: Math.max(1, Number(particleComponent.m_altasUcount ?? 1)),
|
||||||
|
atlas_rows: Math.max(1, Number(particleComponent.m_altasVcount ?? 1)),
|
||||||
|
color: colorHex(particleComponent.m_ParticleColor, "#FFFFFF"),
|
||||||
|
density: Math.max(1, Number(particleComponent.m_particlesDensity ?? 1)),
|
||||||
|
height: Math.max(1, contentSize.height * Math.abs(scaleY)),
|
||||||
|
order: order++,
|
||||||
|
particle_height: Math.max(1, Number(particleComponent.m_particlesRenderSize?.y ?? 8)),
|
||||||
|
particle_width: Math.max(1, Number(particleComponent.m_particlesRenderSize?.x ?? 8)),
|
||||||
|
randomize_angle: Number(particleComponent.m_particlesRandomizeAngle ?? 0),
|
||||||
|
randomize_position: Number(particleComponent.m_particlesRandomizePosition ?? 0),
|
||||||
|
rotation: -transform.rotation,
|
||||||
|
scale_x: Math.sign(scaleX) || 1,
|
||||||
|
scale_y: Math.sign(scaleY) || 1,
|
||||||
|
type: "particles",
|
||||||
|
width: Math.max(1, contentSize.width * Math.abs(scaleX)),
|
||||||
|
x: transform.x,
|
||||||
|
y: -transform.y,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const spriteRenderer = nodeComponents.find((item) => item.typeId === "SpriteRenderer")?.object;
|
||||||
|
if (spriteRenderer && spriteRenderer.m_isEnabled !== false) {
|
||||||
|
const spriteUuid = spriteRenderer?.m_sprite?.uuid?.uuid;
|
||||||
|
const spritePath = typeof spriteUuid === "string" ? input.manifestMappings.get(spriteUuid) : undefined;
|
||||||
|
const spriteDefinitionPath = typeof spriteUuid === "string" ? input.spriteDefinitions.get(spriteUuid) : undefined;
|
||||||
|
let imagePath;
|
||||||
|
let ninePatch;
|
||||||
|
if (typeof spriteDefinitionPath === "string" && existsSync(spriteDefinitionPath)) {
|
||||||
|
const sprite = readJson(spriteDefinitionPath);
|
||||||
|
const imageUuid = sprite?.object?.m_UUIDList?.[0]?.uuid;
|
||||||
|
imagePath = typeof spritePath === "string" && assetFileType(spritePath) === "png"
|
||||||
|
? spritePath
|
||||||
|
: typeof imageUuid === "string" ? input.manifestMappings.get(imageUuid) : undefined;
|
||||||
|
ninePatch = spriteNinePatch(sprite);
|
||||||
|
} else if (typeof spritePath === "string" && assetFileType(spritePath) === "sprite" && existsSync(spritePath)) {
|
||||||
|
const sprite = readJson(spritePath);
|
||||||
|
const imageUuid = sprite?.object?.m_UUIDList?.[0]?.uuid;
|
||||||
|
if (typeof imageUuid === "string") imagePath = input.manifestMappings.get(imageUuid);
|
||||||
|
ninePatch = spriteNinePatch(sprite);
|
||||||
|
} else if (typeof spritePath === "string" && assetFileType(spritePath) === "png") imagePath = spritePath;
|
||||||
|
const assetId = typeof imagePath === "string" ? input.imageIds.get(imagePath) : undefined;
|
||||||
|
if (assetId) {
|
||||||
|
layers.push({
|
||||||
|
...(transform.alpha === 1 ? {} : { alpha: transform.alpha }),
|
||||||
|
...(transform.anchorX === 0.5 ? {} : { anchor_x: transform.anchorX }),
|
||||||
|
...(transform.anchorY === 0.5 ? {} : { anchor_y: 1 - transform.anchorY }),
|
||||||
|
asset_id: assetId,
|
||||||
|
height: Math.max(1, Number(object.m_contentSize?.height ?? 1) * Math.abs(scaleY)),
|
||||||
|
order: order++,
|
||||||
|
rotation: -transform.rotation,
|
||||||
|
scale_x: Math.sign(scaleX) || 1,
|
||||||
|
scale_y: Math.sign(scaleY) || 1,
|
||||||
|
type: "image",
|
||||||
|
width: Math.max(1, Number(object.m_contentSize?.width ?? 1) * Math.abs(scaleX)),
|
||||||
|
x: transform.x,
|
||||||
|
y: -transform.y,
|
||||||
|
...(ninePatch ? { nine_patch: ninePatch } : {}),
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
input.unresolvedImages.push({ spriteUuid, spritePath });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const children = (object.m_Children ?? []).map((child) => ({ child, typed: resolve(child) }));
|
||||||
|
// Linked text backgrounds can store their image position at the text box's left edge.
|
||||||
|
const linkedTextLeftEdges = children
|
||||||
|
.filter(({ typed }) => typed?.typeId === "TextView" && Number(typed.object?.m_UseLink ?? 0) === 1)
|
||||||
|
.map(({ typed }) => {
|
||||||
|
const textObject = typed.object;
|
||||||
|
return Number(textObject.m_LocalTfrm?.m_Position?.x ?? 0)
|
||||||
|
- Number(textObject.m_anchorPoint?.x ?? 0.5) * Number(textObject.m_contentSize?.width ?? 0);
|
||||||
|
});
|
||||||
|
for (const { child, typed } of children) {
|
||||||
|
const childX = Number(typed?.object?.m_LocalTfrm?.m_Position?.x ?? 0);
|
||||||
|
const usesLinkedTextLeftEdge = typed?.typeId === "ImageView"
|
||||||
|
&& linkedTextLeftEdges.some((leftEdge) => Math.abs(childX - leftEdge) < 0.01);
|
||||||
|
visit(child, transform, false, usesLinkedTextLeftEdge ? 0 : undefined);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
for (const child of root?.m_Children ?? []) visit(child, { alpha: 1, rotation: 0, scaleX: 1, scaleY: 1, x: 0, y: 0 }, true);
|
||||||
|
return layers;
|
||||||
|
}
|
||||||
|
|
||||||
|
function fontIdForFile(fontResources, file, contentMd5) {
|
||||||
|
if (typeof contentMd5 === "string") {
|
||||||
|
const hashMatch = fontResources.find((resource) => resource.contentMd5 === contentMd5.toLocaleLowerCase("en-US"));
|
||||||
|
if (hashMatch) return hashMatch.assetId;
|
||||||
|
}
|
||||||
|
if (typeof file !== "string") return fontResources[0]?.assetId;
|
||||||
|
const name = basename(file).toLocaleLowerCase("en-US");
|
||||||
|
return fontResources.find((resource) => resource.names.includes(name))?.assetId ?? fontResources[0]?.assetId;
|
||||||
|
}
|
||||||
|
|
||||||
|
function defaultText(metadata, layers) {
|
||||||
|
const candidates = [metadata.default_text, metadata.runtime?.layer?.default_text, ...(metadata.runtime?.human_strings ?? [])]
|
||||||
|
.filter((value) => typeof value === "string" && value.trim());
|
||||||
|
return String(candidates[0] ?? layers.find((layer) => layer.type === "text" && layer.text.trim())?.text ?? metadata.display_name ?? metadata.canonical_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeModel(layers, defaultValue, fontResources) {
|
||||||
|
const textLayers = layers.filter((layer) => layer.type === "text");
|
||||||
|
const primary = textLayers.find((layer) => layer.text.trim().toLocaleLowerCase("zh-CN") === defaultValue.trim().toLocaleLowerCase("zh-CN")) ?? textLayers[0];
|
||||||
|
if (!primary) return undefined;
|
||||||
|
for (const layer of textLayers) {
|
||||||
|
layer.content_linked = layer.text === primary.text;
|
||||||
|
layer.editable = layer === primary;
|
||||||
|
layer.font_id = fontIdForFile(fontResources, layer.font_file, layer.font_md5);
|
||||||
|
delete layer.font_file;
|
||||||
|
delete layer.font_md5;
|
||||||
|
}
|
||||||
|
const bounds = layers.map((layer) => {
|
||||||
|
const anchorX = Number(layer.anchor_x ?? 0.5);
|
||||||
|
const anchorY = Number(layer.anchor_y ?? 0.5);
|
||||||
|
const radians = Number(layer.rotation ?? 0) * Math.PI / 180;
|
||||||
|
const cosine = Math.cos(radians);
|
||||||
|
const sine = Math.sin(radians);
|
||||||
|
const corners = [
|
||||||
|
[-anchorX * layer.width, -anchorY * layer.height],
|
||||||
|
[(1 - anchorX) * layer.width, -anchorY * layer.height],
|
||||||
|
[-anchorX * layer.width, (1 - anchorY) * layer.height],
|
||||||
|
[(1 - anchorX) * layer.width, (1 - anchorY) * layer.height],
|
||||||
|
].map(([x, y]) => ({
|
||||||
|
x: layer.x + x * Number(layer.scale_x ?? 1) * cosine - y * Number(layer.scale_y ?? 1) * sine,
|
||||||
|
y: layer.y + x * Number(layer.scale_x ?? 1) * sine + y * Number(layer.scale_y ?? 1) * cosine,
|
||||||
|
}));
|
||||||
|
return {
|
||||||
|
bottom: Math.max(...corners.map((item) => item.y)),
|
||||||
|
left: Math.min(...corners.map((item) => item.x)),
|
||||||
|
right: Math.max(...corners.map((item) => item.x)),
|
||||||
|
top: Math.min(...corners.map((item) => item.y)),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
const left = Math.min(...bounds.map((item) => item.left));
|
||||||
|
const right = Math.max(...bounds.map((item) => item.right));
|
||||||
|
const top = Math.min(...bounds.map((item) => item.top));
|
||||||
|
const bottom = Math.max(...bounds.map((item) => item.bottom));
|
||||||
|
const centerX = (left + right) / 2;
|
||||||
|
const centerY = (top + bottom) / 2;
|
||||||
|
const normalization = Math.min(1, 360 / Math.max(1, right - left), 260 / Math.max(1, bottom - top));
|
||||||
|
for (const layer of layers) {
|
||||||
|
layer.x = Number(((layer.x - centerX) * normalization).toFixed(3));
|
||||||
|
layer.y = Number(((layer.y - centerY) * normalization).toFixed(3));
|
||||||
|
layer.width = Number((layer.width * normalization).toFixed(3));
|
||||||
|
layer.height = Number((layer.height * normalization).toFixed(3));
|
||||||
|
if (layer.type === "text") {
|
||||||
|
layer.font_size = Number((layer.font_size * normalization).toFixed(3));
|
||||||
|
layer.letter_spacing = Number((layer.letter_spacing * normalization).toFixed(3));
|
||||||
|
layer.stroke_width = Number((layer.stroke_width * normalization).toFixed(3));
|
||||||
|
layer.shadow_blur = Number((layer.shadow_blur * normalization).toFixed(3));
|
||||||
|
layer.shadow_offset_x = Number((layer.shadow_offset_x * normalization).toFixed(3));
|
||||||
|
layer.shadow_offset_y = Number((layer.shadow_offset_y * normalization).toFixed(3));
|
||||||
|
if (layer.text_path) {
|
||||||
|
layer.text_path.points = layer.text_path.points.map((point) => ({
|
||||||
|
x: Number((point.x * normalization).toFixed(3)),
|
||||||
|
y: Number((point.y * normalization).toFixed(3)),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
} else if (layer.type === "image" && layer.nine_patch) {
|
||||||
|
layer.nine_patch.left = Number((layer.nine_patch.left * normalization).toFixed(3));
|
||||||
|
layer.nine_patch.right = Number((layer.nine_patch.right * normalization).toFixed(3));
|
||||||
|
layer.nine_patch.top = Number((layer.nine_patch.top * normalization).toFixed(3));
|
||||||
|
layer.nine_patch.bottom = Number((layer.nine_patch.bottom * normalization).toFixed(3));
|
||||||
|
} else if (layer.type === "particles") {
|
||||||
|
layer.particle_height = Number((layer.particle_height * normalization).toFixed(3));
|
||||||
|
layer.particle_width = Number((layer.particle_width * normalization).toFixed(3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
half_size: {
|
||||||
|
height: Number(((bottom - top) * normalization / 2).toFixed(3)),
|
||||||
|
width: Number(((right - left) * normalization / 2).toFixed(3)),
|
||||||
|
},
|
||||||
|
image_layers: layers.filter((layer) => layer.type === "image"),
|
||||||
|
particle_layers: layers.filter((layer) => layer.type === "particles"),
|
||||||
|
text_layers: textLayers,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function compileTextTemplateAssets({ templateDirectory, templateId }) {
|
||||||
|
const metadata = readJson(join(templateDirectory, "metadata.json"));
|
||||||
|
const fontResources = (metadata.files?.fonts ?? []).map((reference, index) => {
|
||||||
|
const resource = browserFontResource(templateDirectory, templateId, reference, index);
|
||||||
|
const normalized = normalizeBrowserFontBytes(resource.sourceBytes ?? readFileSync(resource.sourcePath));
|
||||||
|
const browserBytes = normalized ?? resource.sourceBytes ?? readFileSync(resource.sourcePath);
|
||||||
|
return {
|
||||||
|
...resource,
|
||||||
|
contentMd5: createHash("md5").update(browserBytes).digest("hex"),
|
||||||
|
...(normalized ? { sourceBytes: normalized, sourcePath: undefined } : {}),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
if (fontResources.length === 0) throw new Error(`text_template_font_missing:${templateId}`);
|
||||||
|
const packageRoot = join(templateDirectory, "package");
|
||||||
|
const packageFiles = filesBelow(packageRoot);
|
||||||
|
const imagePaths = packageFiles.filter((path) => assetFileType(path) === "png");
|
||||||
|
const imageResources = imagePaths.map((sourcePath, index) => ({
|
||||||
|
assetId: `TEXT-IMAGE-${templateId}-${String(index + 1).padStart(3, "0")}`,
|
||||||
|
extension: ".png",
|
||||||
|
mimeType: "image/png",
|
||||||
|
sourcePath,
|
||||||
|
}));
|
||||||
|
const imageIds = new Map(imagePaths.map((path, index) => [path, imageResources[index].assetId]));
|
||||||
|
const { mappings: manifestMappings, spriteDefinitions } = manifestFileMap(packageFiles);
|
||||||
|
const unresolvedImages = [];
|
||||||
|
const prefabCandidates = packageFiles.filter((path) => extname(path).toLowerCase() === ".prefab").flatMap((path) => {
|
||||||
|
let prefab;
|
||||||
|
try {
|
||||||
|
prefab = readJson(path);
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
const layers = prefabLayers(prefab, { imageIds, manifestMappings, spriteDefinitions, unresolvedImages });
|
||||||
|
const texts = layers.filter((layer) => layer.type === "text").map((layer) => layer.text.trim().toLocaleLowerCase("zh-CN"));
|
||||||
|
const expected = [metadata.default_text, metadata.runtime?.layer?.default_text, ...(metadata.runtime?.human_strings ?? [])]
|
||||||
|
.filter((value) => typeof value === "string" && value.trim()).map((value) => value.trim().toLocaleLowerCase("zh-CN"));
|
||||||
|
const match = expected.some((value) => texts.includes(value));
|
||||||
|
return [{ layers, path, score: (match ? 10_000 : 0) + texts.length * 100 + layers.length }];
|
||||||
|
}).filter((candidate) => candidate.layers.some((layer) => layer.type === "text"));
|
||||||
|
const chosen = prefabCandidates.toSorted((left, right) => right.score - left.score || left.path.localeCompare(right.path))[0];
|
||||||
|
const value = defaultText(metadata, chosen?.layers ?? []);
|
||||||
|
const fallbackLayers = [{
|
||||||
|
align: "center",
|
||||||
|
editable: true,
|
||||||
|
fill_color: "#111111",
|
||||||
|
font_id: fontResources[0].assetId,
|
||||||
|
font_size: 48,
|
||||||
|
height: 58,
|
||||||
|
letter_spacing: 1,
|
||||||
|
line_height: 1.2,
|
||||||
|
order: 0,
|
||||||
|
rotation: 0,
|
||||||
|
scale_x: 1,
|
||||||
|
scale_y: 1,
|
||||||
|
shadow_blur: 0,
|
||||||
|
shadow_color: "#000000",
|
||||||
|
shadow_offset_x: 0,
|
||||||
|
shadow_offset_y: 0,
|
||||||
|
stroke_color: "#000000",
|
||||||
|
stroke_width: 0,
|
||||||
|
text: value,
|
||||||
|
type: "text",
|
||||||
|
vertical_align: "middle",
|
||||||
|
width: Math.max(96, Array.from(value).length * 52),
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
}];
|
||||||
|
const renderModel = normalizeModel(chosen?.layers ?? fallbackLayers, value, fontResources);
|
||||||
|
if (!renderModel || renderModel.text_layers.some((layer) => !layer.font_id)) throw new Error(`text_template_render_model_invalid:${templateId}`);
|
||||||
|
return {
|
||||||
|
catalog: {
|
||||||
|
default_font_id: renderModel.text_layers.find((layer) => layer.editable)?.font_id ?? fontResources[0].assetId,
|
||||||
|
default_font_size: renderModel.text_layers.find((layer) => layer.editable)?.font_size ?? 48,
|
||||||
|
default_text: value,
|
||||||
|
font_match_status: "template_package",
|
||||||
|
render_model: renderModel,
|
||||||
|
},
|
||||||
|
diagnostics: {
|
||||||
|
package_images: imageResources.length,
|
||||||
|
prefab_candidates: prefabCandidates.length,
|
||||||
|
unresolved_images: unresolvedImages.length,
|
||||||
|
},
|
||||||
|
resources: [...fontResources, ...imageResources].map(({ contentMd5: _contentMd5, names: _names, ...resource }) => resource),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { spawnSync } from "node:child_process";
|
||||||
|
import { existsSync, readFileSync } from "node:fs";
|
||||||
|
|
||||||
|
import {
|
||||||
|
WP4_07_REAL_RESOURCE_VERSIONS,
|
||||||
|
WP4_07_RED_RESOURCE_VERSION,
|
||||||
|
WP4_07_SOURCE_HASHES,
|
||||||
|
assertWp407Fixture,
|
||||||
|
} from "../../tests/visual-performance/wp4-07-fixture.mjs";
|
||||||
|
|
||||||
|
export const WP4_07_REQUIRED_WP5_TASKS = Object.freeze(
|
||||||
|
Array.from({ length: 7 }, (_, index) => `TASK-WP5-0${index + 1}`),
|
||||||
|
);
|
||||||
|
export const WP4_07_REQUIRED_WP5_BRANCHES = Object.freeze(
|
||||||
|
Array.from({ length: 5 }, (_, index) => `codex/wp5-0${index + 3}`),
|
||||||
|
);
|
||||||
|
|
||||||
|
export function validateWp407FrozenInputs() {
|
||||||
|
const mismatches = [];
|
||||||
|
for (const [path, expected] of Object.entries(WP4_07_SOURCE_HASHES)) {
|
||||||
|
if (!existsSync(path)) {
|
||||||
|
mismatches.push({ actual: null, expected, path });
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const actual = createHash("sha256").update(readFileSync(path)).digest("hex").toUpperCase();
|
||||||
|
if (actual !== expected) mismatches.push({ actual, expected, path });
|
||||||
|
}
|
||||||
|
if (mismatches.length > 0) {
|
||||||
|
const error = new Error("WP4_07_FROZEN_SOURCE_CHANGED");
|
||||||
|
error.details = mismatches;
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
return assertWp407Fixture();
|
||||||
|
}
|
||||||
|
|
||||||
|
function subjectMatchesTask(subject, taskId) {
|
||||||
|
const shortId = taskId.replace("TASK-", "");
|
||||||
|
return subject.includes(taskId) || subject.includes(shortId);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function inspectWp5TaskLineage(heads, histories) {
|
||||||
|
const candidate_branch = [...WP4_07_REQUIRED_WP5_TASKS]
|
||||||
|
.reverse()
|
||||||
|
.map((taskId) => taskId.replace("TASK-WP5-", "codex/wp5-"))
|
||||||
|
.find((branch) => /^[0-9a-f]{40}$/.test(heads[branch] ?? "")) ?? null;
|
||||||
|
const allCommits = Object.values(histories).flat();
|
||||||
|
const task_shas = Object.fromEntries(WP4_07_REQUIRED_WP5_TASKS.flatMap((taskId) => {
|
||||||
|
const commit = allCommits.find((entry) => subjectMatchesTask(entry.subject, taskId));
|
||||||
|
return commit && /^[0-9a-f]{40}$/.test(commit.sha) ? [[taskId, commit.sha]] : [];
|
||||||
|
}));
|
||||||
|
const missing_tasks = WP4_07_REQUIRED_WP5_TASKS.filter((taskId) => {
|
||||||
|
const taskNumber = Number(taskId.slice(-2));
|
||||||
|
if (taskNumber <= 2) return !task_shas[taskId];
|
||||||
|
const branch = taskId.replace("TASK-WP5-", "codex/wp5-");
|
||||||
|
return !/^[0-9a-f]{40}$/.test(heads[branch] ?? "")
|
||||||
|
|| !(histories[branch] ?? []).some((entry) => subjectMatchesTask(entry.subject, taskId));
|
||||||
|
});
|
||||||
|
const terminal_branch_shas = Object.fromEntries(WP4_07_REQUIRED_WP5_BRANCHES.flatMap((branch) => (
|
||||||
|
/^[0-9a-f]{40}$/.test(heads[branch] ?? "") ? [[branch, heads[branch]]] : []
|
||||||
|
)));
|
||||||
|
return {
|
||||||
|
candidate_baseline_branch: candidate_branch,
|
||||||
|
candidate_baseline_sha: candidate_branch ? heads[candidate_branch] : null,
|
||||||
|
complete: missing_tasks.length === 0 && Object.keys(terminal_branch_shas).length === WP4_07_REQUIRED_WP5_BRANCHES.length,
|
||||||
|
missing_tasks,
|
||||||
|
required_final_branches: WP4_07_REQUIRED_WP5_BRANCHES,
|
||||||
|
required_tasks: WP4_07_REQUIRED_WP5_TASKS,
|
||||||
|
task_shas,
|
||||||
|
terminal_branch_shas,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function readWp5RemoteGate() {
|
||||||
|
const result = spawnSync("git", ["ls-remote", "--heads", "origin", "codex/wp5-*"], { encoding: "utf8", timeout: 30_000 });
|
||||||
|
if ((result.status ?? 1) !== 0) {
|
||||||
|
const error = new Error("WP4_07_GITEA_GATE_UNREADABLE");
|
||||||
|
error.details = { exit_code: result.status ?? 1 };
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
const heads = Object.fromEntries(result.stdout.trim().split(/\r?\n/).filter(Boolean).map((line) => {
|
||||||
|
const [sha, reference] = line.split(/\s+/);
|
||||||
|
return [reference.replace("refs/heads/", ""), sha];
|
||||||
|
}));
|
||||||
|
const histories = {};
|
||||||
|
for (const branch of WP4_07_REQUIRED_WP5_BRANCHES.filter((name) => /^[0-9a-f]{40}$/.test(heads[name] ?? ""))) {
|
||||||
|
const fetch = spawnSync("git", ["fetch", "--quiet", "--no-tags", "origin", `refs/heads/${branch}`], { encoding: "utf8", timeout: 60_000 });
|
||||||
|
if ((fetch.status ?? 1) !== 0) {
|
||||||
|
const error = new Error("WP4_07_GITEA_BASELINE_FETCH_FAILED");
|
||||||
|
error.details = { branch, exit_code: fetch.status ?? 1 };
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
const log = spawnSync("git", ["log", "--format=%H%x09%s", heads[branch]], { encoding: "utf8", timeout: 30_000 });
|
||||||
|
if ((log.status ?? 1) !== 0) {
|
||||||
|
const error = new Error("WP4_07_GITEA_BASELINE_HISTORY_UNREADABLE");
|
||||||
|
error.details = { branch, exit_code: log.status ?? 1 };
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
histories[branch] = log.stdout.trim().split(/\r?\n/).filter(Boolean).map((line) => {
|
||||||
|
const separator = line.indexOf("\t");
|
||||||
|
return { sha: line.slice(0, separator), subject: line.slice(separator + 1) };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
heads,
|
||||||
|
...inspectWp5TaskLineage(heads, histories),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateWp5FinalManifest(path) {
|
||||||
|
if (!path || !existsSync(path)) throw new Error("WP4_07_FINAL_ASSET_MANIFEST_REQUIRED");
|
||||||
|
const raw = readFileSync(path, "utf8");
|
||||||
|
if (raw.includes(WP4_07_RED_RESOURCE_VERSION) || raw.includes("fixture-v1")) throw new Error("WP4_07_PLACEHOLDER_ASSET_REJECTED");
|
||||||
|
const manifest = JSON.parse(raw);
|
||||||
|
const expectedCounts = { color_cards: 16, dynamic_stickers: 35, font_panel_items: 86, static_parts: 25, static_stickers: 1_407, text_templates: 332 };
|
||||||
|
for (const [key, expected] of Object.entries(expectedCounts)) {
|
||||||
|
if (manifest.counts?.[key] !== expected) throw new Error(`WP4_07_FINAL_MANIFEST_COUNT_MISMATCH:${key}`);
|
||||||
|
}
|
||||||
|
if (!manifest.release_version || String(manifest.release_version).includes("fixture")) throw new Error("WP4_07_FINAL_RELEASE_VERSION_REQUIRED");
|
||||||
|
if (manifest.source_versions?.complex !== WP4_07_REAL_RESOURCE_VERSIONS.complex
|
||||||
|
|| manifest.source_versions?.static_stickers !== WP4_07_REAL_RESOURCE_VERSIONS.static) {
|
||||||
|
throw new Error("WP4_07_FINAL_MANIFEST_VERSION_MISMATCH");
|
||||||
|
}
|
||||||
|
return { release_version: manifest.release_version, sha256: createHash("sha256").update(raw).digest("hex").toUpperCase() };
|
||||||
|
}
|
||||||
@@ -0,0 +1,418 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
|
||||||
|
import {
|
||||||
|
gptImageRequestSizeForRatio,
|
||||||
|
normalizeImageOutputToRatio,
|
||||||
|
} from "../../apps/worker/src/image-output-normalizer.mjs";
|
||||||
|
import { WP7_02_MODEL_IDS, buildModelContractPlan } from "./wp7-02-external-contract.mjs";
|
||||||
|
|
||||||
|
export const WP7_02_CONTROLLED_REAL_LIMIT = 120;
|
||||||
|
|
||||||
|
const ratios = ["3:4", "1:1", "4:3", "9:16"];
|
||||||
|
const allowedMimeTypes = new Set(["image/jpeg", "image/png", "image/webp"]);
|
||||||
|
const forbiddenEvidenceKeys = /(?:^|_)(?:absolute_path|authorization|body|credential|credential_value|image_bytes|image_data|original_image|password|path|prompt|raw|raw_provider_payload|raw_prompt|secret|token)(?:_|$)/i;
|
||||||
|
|
||||||
|
function sha256(value) {
|
||||||
|
return createHash("sha256").update(value).digest("hex").toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertModelConfig(modelConfig) {
|
||||||
|
if (!modelConfig || typeof modelConfig !== "object" || !WP7_02_MODEL_IDS.includes(modelConfig.model_id)) {
|
||||||
|
throw new Error("WP7_02_MODEL_CONFIG_INVALID");
|
||||||
|
}
|
||||||
|
if (!Number.isSafeInteger(modelConfig.config_version) || modelConfig.config_version <= 0) {
|
||||||
|
throw new Error("WP7_02_MODEL_CONFIG_VERSION_INVALID");
|
||||||
|
}
|
||||||
|
const profile = modelConfig.route_profile;
|
||||||
|
if (!profile || typeof profile !== "object" || typeof profile.endpoint !== "string"
|
||||||
|
|| !profile.endpoint.startsWith("https://oneapi.intelligrow.cn/")
|
||||||
|
|| !["gemini-interactions-v1beta", "gemini-native-v1beta", "gemini-openai-chat-v1", "openai-images-v1"].includes(profile.protocol_version)) {
|
||||||
|
throw new Error("WP7_02_ROUTE_PROFILE_INVALID");
|
||||||
|
}
|
||||||
|
if (profile.protocol_version === "gemini-interactions-v1beta"
|
||||||
|
&& (profile.endpoint !== "https://oneapi.intelligrow.cn/v1beta/interactions"
|
||||||
|
|| profile.provider_model_id !== "gemini-3.1-flash-image")) {
|
||||||
|
throw new Error("WP7_02_ROUTE_PROFILE_INVALID");
|
||||||
|
}
|
||||||
|
if (profile.protocol_version === "gemini-openai-chat-v1"
|
||||||
|
&& (profile.endpoint !== "https://oneapi.intelligrow.cn/v1/chat/completions"
|
||||||
|
|| profile.provider_model_id !== "gemini-3.1-flash-image")) {
|
||||||
|
throw new Error("WP7_02_ROUTE_PROFILE_INVALID");
|
||||||
|
}
|
||||||
|
if (profile.protocol_version === "openai-images-v1"
|
||||||
|
&& (profile.reference_endpoint !== "https://oneapi.intelligrow.cn/v1/images/edits")) {
|
||||||
|
throw new Error("WP7_02_REFERENCE_ROUTE_PROFILE_INVALID");
|
||||||
|
}
|
||||||
|
if (profile.protocol_version === "openai-images-v1" && profile.provider_model_id !== undefined
|
||||||
|
&& profile.provider_model_id !== "gemini-3.1-flash-image") {
|
||||||
|
throw new Error("WP7_02_ROUTE_PROFILE_INVALID");
|
||||||
|
}
|
||||||
|
return modelConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildControlledExecutionPlan(modelConfig) {
|
||||||
|
const config = assertModelConfig(modelConfig);
|
||||||
|
const contractPlan = buildModelContractPlan(config.model_id);
|
||||||
|
const realScenarios = [
|
||||||
|
...ratios.map((ratio) => ({ input: "pure_text", ratio, source: "real_gateway" })),
|
||||||
|
{ input: "reference_image", ratio: "1:1", source: "real_gateway" },
|
||||||
|
];
|
||||||
|
return {
|
||||||
|
config_version: config.config_version,
|
||||||
|
error_scenarios: contractPlan.error_categories.map((name) => ({
|
||||||
|
expected: contractPlan.error_expectations[name], name, source: "deterministic_local",
|
||||||
|
})),
|
||||||
|
execution_modes: [
|
||||||
|
{ mode: "sync", source: "real_gateway" },
|
||||||
|
{ mode: "async", source: "deterministic_local" },
|
||||||
|
{ mode: "poll", source: "deterministic_local" },
|
||||||
|
],
|
||||||
|
model_id: config.model_id,
|
||||||
|
planned_real_calls: realScenarios.length,
|
||||||
|
quota_impact: "authorized_test_key_up_to_120_requests",
|
||||||
|
real_scenarios: realScenarios,
|
||||||
|
response_checks: ["single_image", "mime", "dimensions", "sanitized_usage", "evidence_hash"],
|
||||||
|
state_scenarios: contractPlan.state_checks.map((name) => ({ name, source: "deterministic_local" })),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildProviderRequest({ modelConfig, prompt, ratio, reference }) {
|
||||||
|
const config = assertModelConfig(modelConfig);
|
||||||
|
if (typeof prompt !== "string" || !prompt.trim() || !ratios.includes(ratio)) throw new Error("WP7_02_REQUEST_FIXTURE_INVALID");
|
||||||
|
if (reference && (!Buffer.isBuffer(reference.bytes) || reference.bytes.length === 0 || !allowedMimeTypes.has(reference.mime_type))) {
|
||||||
|
throw new Error("WP7_02_REFERENCE_FIXTURE_INVALID");
|
||||||
|
}
|
||||||
|
const headers = { "content-type": "application/json" };
|
||||||
|
if (config.route_profile.protocol_version === "gemini-interactions-v1beta") {
|
||||||
|
const input = [{ text: prompt, type: "text" }];
|
||||||
|
if (reference) input.push({ data: reference.bytes.toString("base64"), mime_type: reference.mime_type, type: "image" });
|
||||||
|
return {
|
||||||
|
body: {
|
||||||
|
input,
|
||||||
|
model: config.route_profile.provider_model_id,
|
||||||
|
response_format: { aspect_ratio: ratio, image_size: "1K", type: "image" },
|
||||||
|
},
|
||||||
|
headers,
|
||||||
|
method: "POST",
|
||||||
|
url: config.route_profile.endpoint,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (config.route_profile.protocol_version === "gemini-native-v1beta") {
|
||||||
|
const parts = [{ text: prompt }];
|
||||||
|
if (reference) parts.push({ inlineData: { data: reference.bytes.toString("base64"), mimeType: reference.mime_type } });
|
||||||
|
return {
|
||||||
|
body: {
|
||||||
|
contents: [{ parts, role: "user" }],
|
||||||
|
generationConfig: {
|
||||||
|
imageConfig: { aspectRatio: ratio, imageSize: "1K" },
|
||||||
|
responseModalities: ["IMAGE"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
headers,
|
||||||
|
method: "POST",
|
||||||
|
url: config.route_profile.endpoint,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (config.route_profile.protocol_version === "gemini-openai-chat-v1") {
|
||||||
|
const content = reference
|
||||||
|
? [
|
||||||
|
{ text: prompt, type: "text" },
|
||||||
|
{
|
||||||
|
image_url: { url: `data:${reference.mime_type};base64,${reference.bytes.toString("base64")}` },
|
||||||
|
type: "image_url",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: prompt;
|
||||||
|
return {
|
||||||
|
body: {
|
||||||
|
extra_body: { google: { image_config: { aspect_ratio: ratio, image_size: "1K" } } },
|
||||||
|
messages: [{ content, role: "user" }],
|
||||||
|
model: config.route_profile.provider_model_id,
|
||||||
|
stream: false,
|
||||||
|
},
|
||||||
|
headers,
|
||||||
|
method: "POST",
|
||||||
|
url: config.route_profile.endpoint,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const providerModelId = config.route_profile.provider_model_id ?? config.model_id;
|
||||||
|
const body = {
|
||||||
|
model: providerModelId,
|
||||||
|
prompt,
|
||||||
|
response_format: "b64_json",
|
||||||
|
size: gptImageRequestSizeForRatio(ratio),
|
||||||
|
};
|
||||||
|
if (reference) {
|
||||||
|
const form = new FormData();
|
||||||
|
form.append("model", providerModelId);
|
||||||
|
form.append("prompt", prompt);
|
||||||
|
form.append("response_format", "b64_json");
|
||||||
|
form.append("size", gptImageRequestSizeForRatio(ratio));
|
||||||
|
form.append("image[]", new Blob([reference.bytes], { type: reference.mime_type }), "reference.png");
|
||||||
|
return { body: form, headers: {}, method: "POST", url: config.route_profile.reference_endpoint };
|
||||||
|
}
|
||||||
|
return { body, headers, method: "POST", url: config.route_profile.endpoint };
|
||||||
|
}
|
||||||
|
|
||||||
|
function pngDimensions(bytes) {
|
||||||
|
const signature = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
|
||||||
|
if (bytes.length < 24 || !bytes.subarray(0, 8).equals(signature)) return undefined;
|
||||||
|
return { height: bytes.readUInt32BE(20), width: bytes.readUInt32BE(16) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function jpegDimensions(bytes) {
|
||||||
|
if (bytes.length < 4 || bytes[0] !== 0xff || bytes[1] !== 0xd8) return undefined;
|
||||||
|
let offset = 2;
|
||||||
|
while (offset + 9 < bytes.length) {
|
||||||
|
if (bytes[offset] !== 0xff) { offset += 1; continue; }
|
||||||
|
const marker = bytes[offset + 1];
|
||||||
|
if ([0xc0, 0xc1, 0xc2, 0xc3, 0xc5, 0xc6, 0xc7, 0xc9, 0xca, 0xcb, 0xcd, 0xce, 0xcf].includes(marker)) {
|
||||||
|
return { height: bytes.readUInt16BE(offset + 5), width: bytes.readUInt16BE(offset + 7) };
|
||||||
|
}
|
||||||
|
if (marker === 0xd8 || marker === 0xd9 || (marker >= 0xd0 && marker <= 0xd7)) { offset += 2; continue; }
|
||||||
|
const length = bytes.readUInt16BE(offset + 2);
|
||||||
|
if (length < 2) return undefined;
|
||||||
|
offset += length + 2;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function webpDimensions(bytes) {
|
||||||
|
if (bytes.length < 30 || bytes.toString("ascii", 0, 4) !== "RIFF" || bytes.toString("ascii", 8, 12) !== "WEBP") return undefined;
|
||||||
|
const kind = bytes.toString("ascii", 12, 16);
|
||||||
|
if (kind === "VP8X") {
|
||||||
|
return {
|
||||||
|
height: 1 + bytes.readUIntLE(27, 3),
|
||||||
|
width: 1 + bytes.readUIntLE(24, 3),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === "VP8 " && bytes.length >= 30) return { height: bytes.readUInt16LE(28) & 0x3fff, width: bytes.readUInt16LE(26) & 0x3fff };
|
||||||
|
if (kind === "VP8L" && bytes.length >= 25) {
|
||||||
|
const bits = bytes.readUInt32LE(21);
|
||||||
|
return { height: 1 + ((bits >> 14) & 0x3fff), width: 1 + (bits & 0x3fff) };
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function inspectImage(bytes, declaredMime) {
|
||||||
|
const png = pngDimensions(bytes);
|
||||||
|
if (png && declaredMime === "image/png") return { ...png, mime: declaredMime };
|
||||||
|
const jpeg = jpegDimensions(bytes);
|
||||||
|
if (jpeg && declaredMime === "image/jpeg") return { ...jpeg, mime: declaredMime };
|
||||||
|
const webp = webpDimensions(bytes);
|
||||||
|
if (webp && declaredMime === "image/webp") return { ...webp, mime: declaredMime };
|
||||||
|
throw new Error("WP7_02_RESPONSE_MEDIA_INVALID");
|
||||||
|
}
|
||||||
|
|
||||||
|
function integerOrZero(value) {
|
||||||
|
return Number.isSafeInteger(value) && value >= 0 ? value : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function geminiUsage(response) {
|
||||||
|
const usage = response?.usageMetadata;
|
||||||
|
return {
|
||||||
|
input_units: integerOrZero(usage?.promptTokenCount),
|
||||||
|
output_units: integerOrZero(usage?.candidatesTokenCount),
|
||||||
|
total_units: integerOrZero(usage?.totalTokenCount),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function openAiUsage(response) {
|
||||||
|
const usage = response?.usage;
|
||||||
|
return {
|
||||||
|
input_units: integerOrZero(usage?.input_tokens ?? usage?.inputTokens ?? usage?.prompt_tokens ?? usage?.promptTokens),
|
||||||
|
output_units: integerOrZero(usage?.output_tokens ?? usage?.outputTokens ?? usage?.completion_tokens ?? usage?.completionTokens),
|
||||||
|
total_units: integerOrZero(usage?.total_tokens ?? usage?.totalTokens),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function openAiChatImage(response) {
|
||||||
|
const content = response?.choices?.[0]?.message?.content;
|
||||||
|
if (typeof content !== "string") throw new Error("WP7_02_RESPONSE_SINGLE_IMAGE_REQUIRED");
|
||||||
|
const matches = [...content.matchAll(/!\[[^\]]*\]\(\s*data:(image\/(?:jpeg|png|webp));base64,([A-Za-z0-9+/=\r\n]+)\s*\)/gi)];
|
||||||
|
if (matches.length !== 1) throw new Error("WP7_02_RESPONSE_SINGLE_IMAGE_REQUIRED");
|
||||||
|
return { data: matches[0][2], mime: matches[0][1].toLowerCase() };
|
||||||
|
}
|
||||||
|
|
||||||
|
function interactionUsage(response) {
|
||||||
|
const usage = response?.usage;
|
||||||
|
return {
|
||||||
|
input_units: integerOrZero(usage?.total_input_tokens),
|
||||||
|
output_units: integerOrZero(usage?.total_output_tokens),
|
||||||
|
total_units: integerOrZero(usage?.total_tokens),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function normalizeProviderResponse(modelConfig, response) {
|
||||||
|
const config = assertModelConfig(modelConfig);
|
||||||
|
let bytes;
|
||||||
|
let mime;
|
||||||
|
let usageSummary;
|
||||||
|
if (config.route_profile.protocol_version === "gemini-interactions-v1beta") {
|
||||||
|
const stepImages = response?.steps?.flatMap((step) => step?.type === "model_output" ? step?.content ?? [] : [])
|
||||||
|
.filter((content) => content?.type === "image" && content?.data) ?? [];
|
||||||
|
const images = stepImages.length > 0
|
||||||
|
? stepImages
|
||||||
|
: [response?.output_image].filter((content) => content?.data);
|
||||||
|
if (images.length !== 1) throw new Error("WP7_02_RESPONSE_SINGLE_IMAGE_REQUIRED");
|
||||||
|
mime = images[0].mime_type ?? images[0].mimeType;
|
||||||
|
bytes = Buffer.from(images[0].data, "base64");
|
||||||
|
usageSummary = interactionUsage(response);
|
||||||
|
} else if (config.route_profile.protocol_version === "gemini-native-v1beta") {
|
||||||
|
const parts = response?.candidates?.flatMap((candidate) => candidate?.content?.parts ?? []) ?? [];
|
||||||
|
const images = parts.map((part) => part?.inlineData ?? part?.inline_data).filter((entry) => entry?.data);
|
||||||
|
if (images.length !== 1) throw new Error("WP7_02_RESPONSE_SINGLE_IMAGE_REQUIRED");
|
||||||
|
mime = images[0].mimeType ?? images[0].mime_type;
|
||||||
|
bytes = Buffer.from(images[0].data, "base64");
|
||||||
|
usageSummary = geminiUsage(response);
|
||||||
|
} else if (config.route_profile.protocol_version === "gemini-openai-chat-v1") {
|
||||||
|
const image = openAiChatImage(response);
|
||||||
|
bytes = Buffer.from(image.data, "base64");
|
||||||
|
mime = image.mime;
|
||||||
|
usageSummary = openAiUsage(response);
|
||||||
|
} else {
|
||||||
|
if (!Array.isArray(response?.data) || response.data.length !== 1 || typeof response.data[0]?.b64_json !== "string") {
|
||||||
|
throw new Error("WP7_02_RESPONSE_SINGLE_IMAGE_REQUIRED");
|
||||||
|
}
|
||||||
|
bytes = Buffer.from(response.data[0].b64_json, "base64");
|
||||||
|
mime = "image/png";
|
||||||
|
usageSummary = openAiUsage(response);
|
||||||
|
}
|
||||||
|
const media = inspectImage(bytes, mime);
|
||||||
|
return {
|
||||||
|
bytes,
|
||||||
|
dimensions: { height: media.height, width: media.width },
|
||||||
|
evidence_hash: `sha256:${sha256(bytes)}`,
|
||||||
|
mime: media.mime,
|
||||||
|
usage_summary: usageSummary,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function describeProviderResponseShape(value, depth = 0) {
|
||||||
|
if (typeof value === "string") {
|
||||||
|
const trimmed = value.trim();
|
||||||
|
const representation = /^data:image\/(?:jpeg|png|webp);base64,/i.test(trimmed)
|
||||||
|
? "inline_media"
|
||||||
|
: /!\[[^\]]*\]\(\s*https?:\/\/[^)\s]+\s*\)/i.test(trimmed)
|
||||||
|
? "markdown_uri"
|
||||||
|
: /^https?:\/\/\S+$/i.test(trimmed)
|
||||||
|
? "uri"
|
||||||
|
: "plain_text";
|
||||||
|
return {
|
||||||
|
kind: "string",
|
||||||
|
representation,
|
||||||
|
size: value.length === 0 ? "empty" : value.length > 256 ? "large" : "small",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (typeof value === "number") return { kind: "number" };
|
||||||
|
if (typeof value === "boolean") return { kind: "boolean" };
|
||||||
|
if (value === null || value === undefined) return { kind: value === null ? "null" : "undefined" };
|
||||||
|
if (depth >= 6) return { kind: "depth_limit" };
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
return {
|
||||||
|
item: value.length > 0 ? describeProviderResponseShape(value[0], depth + 1) : { kind: "empty" },
|
||||||
|
kind: "array",
|
||||||
|
length: value.length,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (value && typeof value === "object") {
|
||||||
|
return {
|
||||||
|
fields: Object.keys(value).toSorted().map((name) => ({ name, shape: describeProviderResponseShape(value[name], depth + 1) })),
|
||||||
|
kind: "object",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return { kind: "undefined" };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildSanitizedResponseEvidence(normalized) {
|
||||||
|
const evidence = {
|
||||||
|
dimensions: structuredClone(normalized.dimensions),
|
||||||
|
evidence_hash: normalized.evidence_hash,
|
||||||
|
mime: normalized.mime,
|
||||||
|
...(normalized.normalization ? { normalization: structuredClone(normalized.normalization) } : {}),
|
||||||
|
usage_summary: structuredClone(normalized.usage_summary),
|
||||||
|
};
|
||||||
|
return validateSanitizedEvidence(evidence);
|
||||||
|
}
|
||||||
|
|
||||||
|
function inspectEvidenceValue(value, seen = new Set()) {
|
||||||
|
if (value && typeof value === "object") {
|
||||||
|
if (seen.has(value)) throw new Error("WP7_02_EVIDENCE_CYCLE_FORBIDDEN");
|
||||||
|
seen.add(value);
|
||||||
|
for (const [key, entry] of Object.entries(value)) {
|
||||||
|
if (key === "verified") throw new Error("WP7_02_SHARED_VERIFIED_FORBIDDEN");
|
||||||
|
if (key !== "secret_scan" && forbiddenEvidenceKeys.test(key)) throw new Error(`WP7_02_SENSITIVE_EVIDENCE_FORBIDDEN:${key}`);
|
||||||
|
inspectEvidenceValue(entry, seen);
|
||||||
|
}
|
||||||
|
seen.delete(value);
|
||||||
|
} else if (typeof value === "string" && /[A-Za-z]:\\Users\\/i.test(value)) {
|
||||||
|
throw new Error("WP7_02_SENSITIVE_EVIDENCE_FORBIDDEN");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateSanitizedEvidence(evidence) {
|
||||||
|
inspectEvidenceValue(evidence);
|
||||||
|
return evidence;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function executeProviderRequest({ fetchImpl = fetch, modelConfig, prompt, ratio, reference, token, timeoutMs = 180_000 }) {
|
||||||
|
if (typeof token !== "string" || token.length < 8) throw new Error("WP7_02_CREDENTIAL_INVALID");
|
||||||
|
const request = buildProviderRequest({ modelConfig, prompt, ratio, reference });
|
||||||
|
const controller = new AbortController();
|
||||||
|
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
||||||
|
const startedAt = performance.now();
|
||||||
|
try {
|
||||||
|
const response = await fetchImpl(request.url, {
|
||||||
|
body: request.body instanceof FormData ? request.body : JSON.stringify(request.body),
|
||||||
|
headers: { ...request.headers, authorization: `Bearer ${token}` },
|
||||||
|
method: request.method,
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
const durationMs = Math.round(performance.now() - startedAt);
|
||||||
|
if (!response.ok) throw new Error(`WP7_02_UPSTREAM_HTTP_${response.status}`);
|
||||||
|
const providerResponse = await response.json();
|
||||||
|
let normalized;
|
||||||
|
try {
|
||||||
|
const providerNormalized = normalizeProviderResponse(modelConfig, providerResponse);
|
||||||
|
const adapted = await normalizeImageOutputToRatio({
|
||||||
|
bytes: providerNormalized.bytes,
|
||||||
|
mimeType: providerNormalized.mime,
|
||||||
|
pixelHeight: providerNormalized.dimensions.height,
|
||||||
|
pixelWidth: providerNormalized.dimensions.width,
|
||||||
|
ratio,
|
||||||
|
});
|
||||||
|
normalized = {
|
||||||
|
...providerNormalized,
|
||||||
|
bytes: adapted.bytes,
|
||||||
|
dimensions: { height: adapted.pixelHeight, width: adapted.pixelWidth },
|
||||||
|
evidence_hash: `sha256:${sha256(adapted.bytes)}`,
|
||||||
|
mime: adapted.mimeType,
|
||||||
|
normalization: {
|
||||||
|
applied: adapted.normalized,
|
||||||
|
upstream_dimensions: { height: adapted.upstreamPixelHeight, width: adapted.upstreamPixelWidth },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof Error && /^WP7_02_[A-Z0-9_]+$/.test(error.message)) {
|
||||||
|
error.safe_response_shape = describeProviderResponseShape(providerResponse);
|
||||||
|
} else if (error instanceof Error && error.message === "image_output_media_invalid") {
|
||||||
|
throw new Error("WP7_02_RESPONSE_MEDIA_INVALID");
|
||||||
|
} else if (error instanceof Error && /^image_output_(?:aspect_ratio_mismatch|dimensions_missing|normalization_failed)$/.test(error.message)) {
|
||||||
|
throw new Error("WP7_02_RESPONSE_DIMENSIONS_INVALID");
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
duration_ms: durationMs,
|
||||||
|
http_status: response.status,
|
||||||
|
normalized,
|
||||||
|
response_evidence: buildSanitizedResponseEvidence(normalized),
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
if (error?.name === "AbortError") throw new Error("WP7_02_UPSTREAM_TIMEOUT");
|
||||||
|
if (error instanceof Error && /^WP7_02_[A-Z0-9_]+$/.test(error.message)) throw error;
|
||||||
|
throw new Error("WP7_02_UPSTREAM_FAILED");
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,261 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { deflateSync } from "node:zlib";
|
||||||
|
|
||||||
|
import {
|
||||||
|
WP7_02_CONTROLLED_REAL_LIMIT,
|
||||||
|
buildControlledExecutionPlan,
|
||||||
|
executeProviderRequest,
|
||||||
|
validateSanitizedEvidence,
|
||||||
|
} from "./wp7-02-controlled-executor.mjs";
|
||||||
|
|
||||||
|
const productDimensions = Object.freeze({
|
||||||
|
"3:4": { height: 1440, width: 1080 },
|
||||||
|
"1:1": { height: 1080, width: 1080 },
|
||||||
|
"4:3": { height: 1080, width: 1440 },
|
||||||
|
"9:16": { height: 1920, width: 1080 },
|
||||||
|
});
|
||||||
|
|
||||||
|
function sha256(value) {
|
||||||
|
return createHash("sha256").update(value).digest("hex").toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
function crc32(bytes) {
|
||||||
|
let crc = 0xffffffff;
|
||||||
|
for (const byte of bytes) {
|
||||||
|
crc ^= byte;
|
||||||
|
for (let bit = 0; bit < 8; bit += 1) crc = (crc >>> 1) ^ (0xedb88320 & -(crc & 1));
|
||||||
|
}
|
||||||
|
return (crc ^ 0xffffffff) >>> 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pngChunk(type, data) {
|
||||||
|
const name = Buffer.from(type, "ascii");
|
||||||
|
const length = Buffer.alloc(4);
|
||||||
|
length.writeUInt32BE(data.length);
|
||||||
|
const checksum = Buffer.alloc(4);
|
||||||
|
checksum.writeUInt32BE(crc32(Buffer.concat([name, data])));
|
||||||
|
return Buffer.concat([length, name, data, checksum]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createControlledReferencePng() {
|
||||||
|
const width = 64;
|
||||||
|
const height = 64;
|
||||||
|
const rows = [];
|
||||||
|
for (let y = 0; y < height; y += 1) {
|
||||||
|
const row = Buffer.alloc(1 + width * 4);
|
||||||
|
for (let x = 0; x < width; x += 1) {
|
||||||
|
const offset = 1 + x * 4;
|
||||||
|
const bright = (Math.floor(x / 8) + Math.floor(y / 8)) % 2 === 0;
|
||||||
|
row[offset] = bright ? 32 : 220;
|
||||||
|
row[offset + 1] = bright ? 180 : 48;
|
||||||
|
row[offset + 2] = bright ? 220 : 140;
|
||||||
|
row[offset + 3] = 255;
|
||||||
|
}
|
||||||
|
rows.push(row);
|
||||||
|
}
|
||||||
|
const header = Buffer.alloc(13);
|
||||||
|
header.writeUInt32BE(width, 0);
|
||||||
|
header.writeUInt32BE(height, 4);
|
||||||
|
header[8] = 8;
|
||||||
|
header[9] = 6;
|
||||||
|
return Buffer.concat([
|
||||||
|
Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]),
|
||||||
|
pngChunk("IHDR", header),
|
||||||
|
pngChunk("IDAT", deflateSync(Buffer.concat(rows))),
|
||||||
|
pngChunk("IEND", Buffer.alloc(0)),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function promptForScenario(scenario) {
|
||||||
|
const subject = scenario.input === "reference_image" ? "use the supplied geometric color reference" : "use a geometric color study";
|
||||||
|
return `Create one safe abstract test image; ${subject}; no text, logos, people, or real places; aspect ratio ${scenario.ratio}.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function dimensionsMatch(dimensions, ratio) {
|
||||||
|
const expected = productDimensions[ratio];
|
||||||
|
return dimensions.width === expected.width && dimensions.height === expected.height;
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeErrorCode(error) {
|
||||||
|
return error instanceof Error && /^WP7_02_[A-Z0-9_]+$/.test(error.message)
|
||||||
|
? error.message
|
||||||
|
: "WP7_02_UPSTREAM_FAILED";
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function runControlledRealScenarios({ fetchImpl = fetch, maxRealCalls, modelConfig, token }) {
|
||||||
|
const plan = buildControlledExecutionPlan(modelConfig);
|
||||||
|
if (maxRealCalls !== WP7_02_CONTROLLED_REAL_LIMIT || plan.planned_real_calls > maxRealCalls) {
|
||||||
|
throw new Error("WP7_02_REAL_CALL_LIMIT_INVALID");
|
||||||
|
}
|
||||||
|
const referenceBytes = createControlledReferencePng();
|
||||||
|
const attempts = [];
|
||||||
|
const calls = [];
|
||||||
|
let timeoutRetriesRemaining = 1;
|
||||||
|
let stop = false;
|
||||||
|
for (let index = 0; index < plan.real_scenarios.length; index += 1) {
|
||||||
|
const scenario = plan.real_scenarios[index];
|
||||||
|
const scenarioId = `real-${index + 1}`;
|
||||||
|
let attemptNo = 0;
|
||||||
|
while (true) {
|
||||||
|
attemptNo += 1;
|
||||||
|
try {
|
||||||
|
const result = await executeProviderRequest({
|
||||||
|
fetchImpl,
|
||||||
|
modelConfig,
|
||||||
|
prompt: promptForScenario(scenario),
|
||||||
|
ratio: scenario.ratio,
|
||||||
|
reference: scenario.input === "reference_image" ? { bytes: referenceBytes, mime_type: "image/png" } : undefined,
|
||||||
|
token,
|
||||||
|
});
|
||||||
|
attempts.push(validateSanitizedEvidence({
|
||||||
|
attempt_no: attemptNo, duration_ms: result.duration_ms, http_status: result.http_status,
|
||||||
|
scenario_id: scenarioId, status: "passed",
|
||||||
|
}));
|
||||||
|
const dimensionsPassed = dimensionsMatch(result.normalized.dimensions, scenario.ratio);
|
||||||
|
calls.push(validateSanitizedEvidence({
|
||||||
|
duration_ms: result.duration_ms,
|
||||||
|
http_status: result.http_status,
|
||||||
|
input: scenario.input,
|
||||||
|
requested_ratio: scenario.ratio,
|
||||||
|
response: result.response_evidence,
|
||||||
|
scenario_id: scenarioId,
|
||||||
|
source: "real_gateway",
|
||||||
|
status: dimensionsPassed ? "passed" : "failed",
|
||||||
|
validation: { dimensions: dimensionsPassed ? "passed" : "failed", response: "passed" },
|
||||||
|
}));
|
||||||
|
break;
|
||||||
|
} catch (error) {
|
||||||
|
const errorCode = safeErrorCode(error);
|
||||||
|
attempts.push(validateSanitizedEvidence({ attempt_no: attemptNo, error_code: errorCode, scenario_id: scenarioId, status: "failed" }));
|
||||||
|
if (errorCode === "WP7_02_UPSTREAM_TIMEOUT" && timeoutRetriesRemaining > 0) {
|
||||||
|
timeoutRetriesRemaining -= 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const failed = {
|
||||||
|
error_code: errorCode,
|
||||||
|
input: scenario.input,
|
||||||
|
requested_ratio: scenario.ratio,
|
||||||
|
scenario_id: scenarioId,
|
||||||
|
source: "real_gateway",
|
||||||
|
status: "failed",
|
||||||
|
...(error?.safe_response_shape ? { response_shape: error.safe_response_shape } : {}),
|
||||||
|
};
|
||||||
|
calls.push(validateSanitizedEvidence(failed));
|
||||||
|
if (["WP7_02_RESPONSE_SINGLE_IMAGE_REQUIRED", "WP7_02_RESPONSE_MEDIA_INVALID", "WP7_02_CREDENTIAL_INVALID",
|
||||||
|
"WP7_02_UPSTREAM_HTTP_401", "WP7_02_UPSTREAM_HTTP_403", "WP7_02_UPSTREAM_HTTP_404", "WP7_02_UPSTREAM_HTTP_429"].includes(failed.error_code)) stop = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (stop) break;
|
||||||
|
}
|
||||||
|
referenceBytes.fill(0);
|
||||||
|
const blockers = calls.filter((call) => call.status !== "passed").map((call) => `${call.scenario_id}:${call.error_code ?? "dimensions_or_response_invalid"}`);
|
||||||
|
return validateSanitizedEvidence({
|
||||||
|
blockers,
|
||||||
|
attempts,
|
||||||
|
calls,
|
||||||
|
maximum_real_calls: plan.planned_real_calls + 1,
|
||||||
|
model_id: modelConfig.model_id,
|
||||||
|
planned_real_calls: plan.planned_real_calls,
|
||||||
|
real_calls: attempts.length,
|
||||||
|
status: blockers.length === 0 ? "passed" : "externally_blocked",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildDeterministicExecutionEvidence(modelId, runId) {
|
||||||
|
const operationRef = `sha256:${sha256(`${modelId}:${runId}:operation`)}`;
|
||||||
|
let state = "created";
|
||||||
|
const trace = [];
|
||||||
|
const start = () => {
|
||||||
|
if (state !== "created") throw new Error("WP7_02_ASYNC_STATE_INVALID");
|
||||||
|
state = "pending";
|
||||||
|
trace.push({ action: "start", after: state, before: "created", status: "passed" });
|
||||||
|
return operationRef;
|
||||||
|
};
|
||||||
|
const poll = (reference) => {
|
||||||
|
if (reference !== operationRef || !["pending", "completed"].includes(state)) throw new Error("WP7_02_POLL_REFERENCE_INVALID");
|
||||||
|
const before = state;
|
||||||
|
state = "completed";
|
||||||
|
trace.push({ action: "poll", after: state, before, replay: before === "completed", status: "passed" });
|
||||||
|
return state;
|
||||||
|
};
|
||||||
|
const reference = start();
|
||||||
|
poll(reference);
|
||||||
|
poll(reference);
|
||||||
|
return validateSanitizedEvidence({
|
||||||
|
modes: [
|
||||||
|
{ mode: "sync", source: "real_gateway", status: "covered_by_real_calls" },
|
||||||
|
{ mode: "async", source: "deterministic_local", status: "passed", transition: "created_to_pending" },
|
||||||
|
{ mode: "poll", operation_ref: operationRef, replay_count: 1, source: "deterministic_local", status: "passed", transition: "pending_to_completed" },
|
||||||
|
],
|
||||||
|
model_id: modelId,
|
||||||
|
status: "passed",
|
||||||
|
trace,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function passedCall(calls, predicate) {
|
||||||
|
return calls.some((call) => call.status === "passed" && predicate(call));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assembleControlledModelEvidence({ deterministicState, modelConfig, realExecution, runId }) {
|
||||||
|
if (deterministicState?.model_id !== modelConfig.model_id || deterministicState?.status !== "passed") {
|
||||||
|
throw new Error("WP7_02_DETERMINISTIC_STATE_INCOMPLETE");
|
||||||
|
}
|
||||||
|
const execution = buildDeterministicExecutionEvidence(modelConfig.model_id, runId);
|
||||||
|
const ratioRows = Object.keys(productDimensions).map((ratio) => ({
|
||||||
|
outputs: passedCall(realExecution.calls, (call) => call.requested_ratio === ratio) ? 1 : 0,
|
||||||
|
ratio,
|
||||||
|
status: passedCall(realExecution.calls, (call) => call.requested_ratio === ratio) ? "passed" : "failed",
|
||||||
|
}));
|
||||||
|
const pureTextPassed = ratioRows.every((row) => row.status === "passed")
|
||||||
|
&& passedCall(realExecution.calls, (call) => call.input === "pure_text");
|
||||||
|
const referencePassed = passedCall(realExecution.calls, (call) => call.input === "reference_image");
|
||||||
|
const deterministicPassed = deterministicState.error_scenarios?.length === 9
|
||||||
|
&& deterministicState.error_scenarios.every((entry) => entry.status === "passed")
|
||||||
|
&& deterministicState.settlements?.length === 3
|
||||||
|
&& deterministicState.contract_change?.full_matrix_reapplied === true;
|
||||||
|
const status = realExecution.status === "passed" && pureTextPassed && referencePassed
|
||||||
|
&& ratioRows.every((row) => row.status === "passed") && deterministicPassed ? "passed" : "externally_blocked";
|
||||||
|
const evidenceId = `sha256:${sha256(`${modelConfig.model_id}:${modelConfig.config_version}:${runId}`)}`;
|
||||||
|
return validateSanitizedEvidence({
|
||||||
|
evidence_id: evidenceId,
|
||||||
|
external_calls: {
|
||||||
|
approved_real_call_limit: WP7_02_CONTROLLED_REAL_LIMIT,
|
||||||
|
attempts: realExecution.attempts,
|
||||||
|
calls: realExecution.calls,
|
||||||
|
maximum_real_calls: realExecution.maximum_real_calls,
|
||||||
|
mode: "controlled_real",
|
||||||
|
planned_real_calls: realExecution.planned_real_calls,
|
||||||
|
real_calls: realExecution.real_calls,
|
||||||
|
service: "ai-gateway-service-id",
|
||||||
|
status: realExecution.status,
|
||||||
|
},
|
||||||
|
manual_review: {
|
||||||
|
decision: status === "passed" ? "Review sanitized matrix before recording the model as passed." : "Resolve all failed scenarios before review.",
|
||||||
|
status: status === "passed" ? "pending" : "blocked",
|
||||||
|
},
|
||||||
|
matrix: {
|
||||||
|
config_version: modelConfig.config_version,
|
||||||
|
contract_change: deterministicState.contract_change,
|
||||||
|
error_scenarios: deterministicState.error_scenarios,
|
||||||
|
execution_modes: execution.modes,
|
||||||
|
model_id: modelConfig.model_id,
|
||||||
|
pure_text: { outputs: pureTextPassed ? 1 : 0, status: pureTextPassed ? "passed" : "failed" },
|
||||||
|
ratios: ratioRows,
|
||||||
|
reference_image: { outputs: referencePassed ? 1 : 0, status: referencePassed ? "passed" : "failed" },
|
||||||
|
response_checks: ["single_image", "mime", "dimensions", "sanitized_usage", "evidence_hash"].map((name) => ({ name, status: realExecution.status })),
|
||||||
|
settlements: deterministicState.settlements,
|
||||||
|
status,
|
||||||
|
},
|
||||||
|
model_id: modelConfig.model_id,
|
||||||
|
redaction: {
|
||||||
|
forbidden_fields_absent: true,
|
||||||
|
retained_fields: ["status", "category", "duration_ms", "mime", "dimensions", "usage_summary", "evidence_hash", "time"],
|
||||||
|
secret_scan: "passed",
|
||||||
|
status: "passed",
|
||||||
|
},
|
||||||
|
run_id: runId,
|
||||||
|
status,
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,249 @@
|
|||||||
|
import { createHash } from "node:crypto";
|
||||||
|
import { mkdirSync, writeFileSync } from "node:fs";
|
||||||
|
import { resolve } from "node:path";
|
||||||
|
|
||||||
|
export const AI_GATEWAY_CREDENTIAL_TARGET = "Dada/P0A/worker/ai-gateway";
|
||||||
|
export const WP7_02_MODEL_IDS = Object.freeze([
|
||||||
|
"gemini-3.1-flash-image",
|
||||||
|
"gpt-image-2",
|
||||||
|
]);
|
||||||
|
|
||||||
|
const controlledStateProductModelIds = Object.freeze({
|
||||||
|
"gemini-3.1-flash-image": "gemini-3.1-flash-image-preview",
|
||||||
|
"gpt-image-2": "gpt-image-2",
|
||||||
|
});
|
||||||
|
|
||||||
|
const expectedCandidateCommit = "623cad25b2a2a9a003502c9a92ebd318dad06248";
|
||||||
|
const expectedBrowsers = Object.freeze({
|
||||||
|
"Google Chrome": "150.0.7871.187",
|
||||||
|
"Microsoft Edge": "151.0.4129.59",
|
||||||
|
});
|
||||||
|
const ratios = Object.freeze(["3:4", "1:1", "4:3", "9:16"]);
|
||||||
|
const errorCategories = Object.freeze([
|
||||||
|
"upstream_timeout", "upstream_failed", "safety_rejected", "model_disabled",
|
||||||
|
"gateway_balance_insufficient", "gateway_contract_invalid", "reference_invalid",
|
||||||
|
"unknown_retryable", "unknown_non_retryable",
|
||||||
|
]);
|
||||||
|
const errorExpectations = Object.freeze({
|
||||||
|
upstream_timeout: { credit_effect: "release_once", job_outcome: "failed", user_action: "retry_original_input" },
|
||||||
|
upstream_failed: { credit_effect: "release_once", job_outcome: "failed", user_action: "retry_later" },
|
||||||
|
safety_rejected: { credit_effect: "release_once", job_outcome: "rejected", user_action: "modify_prompt_or_reference" },
|
||||||
|
model_disabled: { credit_effect: "no_reserve", job_outcome: "not_created", user_action: "choose_other_model_or_wait" },
|
||||||
|
gateway_balance_insufficient: { credit_effect: "no_reserve_or_release_once", job_outcome: "not_created_or_failed", user_action: "choose_unaffected_model_or_contact_admin" },
|
||||||
|
gateway_contract_invalid: { credit_effect: "no_reserve_or_release_once", job_outcome: "not_created_or_failed", user_action: "choose_other_model_or_contact_admin" },
|
||||||
|
reference_invalid: { credit_effect: "no_reserve_or_release_once", job_outcome: "not_created_or_failed", user_action: "replace_or_remove_reference" },
|
||||||
|
unknown_retryable: { credit_effect: "release_once", job_outcome: "failed", user_action: "retry_later" },
|
||||||
|
unknown_non_retryable: { credit_effect: "release_once", job_outcome: "failed", user_action: "contact_admin" },
|
||||||
|
});
|
||||||
|
|
||||||
|
function stableJson(value) {
|
||||||
|
if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
|
||||||
|
if (value && typeof value === "object") {
|
||||||
|
return `{${Object.entries(value).sort(([left], [right]) => left.localeCompare(right))
|
||||||
|
.map(([key, entry]) => `${JSON.stringify(key)}:${stableJson(entry)}`).join(",")}}`;
|
||||||
|
}
|
||||||
|
return JSON.stringify(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function sha256(value) {
|
||||||
|
return createHash("sha256").update(typeof value === "string" ? value : stableJson(value)).digest("hex").toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertModelId(modelId) {
|
||||||
|
if (!WP7_02_MODEL_IDS.includes(modelId)) throw new Error("WP7_02_MODEL_NOT_ALLOWED");
|
||||||
|
return modelId;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function productModelIdForControlledState(modelId) {
|
||||||
|
assertModelId(modelId);
|
||||||
|
return controlledStateProductModelIds[modelId];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildModelContractPlan(modelId) {
|
||||||
|
assertModelId(modelId);
|
||||||
|
const plannedRequestBreakdown = {
|
||||||
|
contract_change_full_revalidation: 20,
|
||||||
|
error_categories: 9,
|
||||||
|
execution_modes_and_poll: 3,
|
||||||
|
input_and_ratio_success: 6,
|
||||||
|
settlement_boundaries: 2,
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
error_categories: [...errorCategories],
|
||||||
|
error_expectations: structuredClone(errorExpectations),
|
||||||
|
execution_modes: ["sync", "async", "poll"],
|
||||||
|
inputs: ["pure_text", "reference_image"],
|
||||||
|
model_id: modelId,
|
||||||
|
planned_provider_requests_max: Object.values(plannedRequestBreakdown).reduce((total, count) => total + count, 0),
|
||||||
|
planned_request_breakdown: plannedRequestBreakdown,
|
||||||
|
quota_impact: "unknown_requires_operator_review",
|
||||||
|
ratios: [...ratios],
|
||||||
|
response_checks: ["single_image", "mime", "dimensions", "sanitized_usage"],
|
||||||
|
state_checks: [
|
||||||
|
"credit_commit_once", "credit_release_once_per_terminal_failure",
|
||||||
|
"contract_change_invalidation", "full_revalidation",
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateCandidateDependency(record) {
|
||||||
|
if (!record || typeof record !== "object") throw new Error("WP7_02_CANDIDATE_RECORD_REQUIRED");
|
||||||
|
if (record.final_release !== false || record.status !== "candidate_unvalidated"
|
||||||
|
|| record.candidate_package?.release_status !== "candidate_unvalidated") {
|
||||||
|
throw new Error("WP7_02_CANDIDATE_FINAL_RELEASE_FORBIDDEN");
|
||||||
|
}
|
||||||
|
if (record.build_commit !== expectedCandidateCommit || record.fixed_port !== 43121) {
|
||||||
|
throw new Error("WP7_02_CANDIDATE_BASELINE_MISMATCH");
|
||||||
|
}
|
||||||
|
const browsers = Array.isArray(record.browsers) ? record.browsers : [];
|
||||||
|
if (browsers.length !== 2 || Object.entries(expectedBrowsers).some(([brand, version]) => {
|
||||||
|
const browser = browsers.find((entry) => entry?.brand === brand);
|
||||||
|
return !browser || browser.full_version !== version || browser.major !== Number(version.split(".")[0])
|
||||||
|
|| browser.source !== "installed_executable";
|
||||||
|
})) throw new Error("WP7_02_CANDIDATE_BROWSER_MISMATCH");
|
||||||
|
if (!/^[A-F0-9]{64}$/.test(record.candidate_package?.sha256 ?? "")) throw new Error("WP7_02_CANDIDATE_PACKAGE_HASH_INVALID");
|
||||||
|
return {
|
||||||
|
browsers: Object.entries(expectedBrowsers).map(([brand, full_version]) => ({ brand, full_version })),
|
||||||
|
build_commit: record.build_commit,
|
||||||
|
candidate_package_sha256: record.candidate_package.sha256,
|
||||||
|
fixed_port: record.fixed_port,
|
||||||
|
record_sha256: sha256(record),
|
||||||
|
status: record.status,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateRealModelConfig(modelConfig, modelId) {
|
||||||
|
if (!modelConfig || typeof modelConfig !== "object") return { blocker: "real_model_config_absent" };
|
||||||
|
const endpoint = modelConfig.route_profile?.endpoint;
|
||||||
|
const validEndpoint = typeof endpoint === "string" && endpoint.startsWith("https://")
|
||||||
|
&& !/\.(?:invalid)(?:\/|$)/i.test(endpoint) && !/https:\/\/(?:localhost|127\.0\.0\.1)(?:[:/]|$)/i.test(endpoint);
|
||||||
|
if (modelConfig.model_id !== modelId || !Number.isSafeInteger(modelConfig.config_version) || modelConfig.config_version <= 0
|
||||||
|
|| !validEndpoint || typeof modelConfig.gateway_account_ref !== "string" || /mock/i.test(modelConfig.gateway_account_ref)) {
|
||||||
|
return { blocker: "real_model_config_invalid" };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
config: {
|
||||||
|
config_version: modelConfig.config_version,
|
||||||
|
endpoint_sha256: sha256(endpoint),
|
||||||
|
gateway_account_ref_sha256: sha256(modelConfig.gateway_account_ref),
|
||||||
|
model_id: modelId,
|
||||||
|
route_profile_sha256: sha256(modelConfig.route_profile),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function inspectAiGatewayReadiness({ candidateRecord, confirmed, credentialTargets, modelConfig, modelId }) {
|
||||||
|
const candidate = validateCandidateDependency(candidateRecord);
|
||||||
|
assertModelId(modelId);
|
||||||
|
const blockers = [];
|
||||||
|
if (confirmed !== true) blockers.push("explicit_confirmation_absent");
|
||||||
|
if (!Array.isArray(credentialTargets) || !credentialTargets.includes(AI_GATEWAY_CREDENTIAL_TARGET)) {
|
||||||
|
blockers.push("real_gateway_credentials_absent");
|
||||||
|
}
|
||||||
|
const checkedConfig = validateRealModelConfig(modelConfig, modelId);
|
||||||
|
if (checkedConfig.blocker) blockers.push(checkedConfig.blocker);
|
||||||
|
return {
|
||||||
|
blockers,
|
||||||
|
candidate,
|
||||||
|
model_config: checkedConfig.config ?? null,
|
||||||
|
model_id: modelId,
|
||||||
|
plan: buildModelContractPlan(modelId),
|
||||||
|
real_calls: 0,
|
||||||
|
status: blockers.length > 0 ? "externally_blocked" : "ready_for_controlled_execution",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function blockedScenarios(plan) {
|
||||||
|
return [
|
||||||
|
...plan.inputs.map((name) => ({ kind: "input", name, status: "not_run" })),
|
||||||
|
...plan.ratios.map((name) => ({ kind: "ratio", name, status: "not_run" })),
|
||||||
|
...plan.execution_modes.map((name) => ({ kind: "execution_mode", name, status: "not_run" })),
|
||||||
|
...plan.response_checks.map((name) => ({ kind: "response_check", name, status: "not_run" })),
|
||||||
|
...plan.error_categories.map((name) => ({
|
||||||
|
expected: plan.error_expectations[name], kind: "error_category", name, status: "not_run",
|
||||||
|
})),
|
||||||
|
...plan.state_checks.map((name) => ({ kind: "state_check", name, status: "not_run" })),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildBlockedModelEvidence({ blockers, candidateRecord, modelId, modelConfig = null, runId }) {
|
||||||
|
const candidate = validateCandidateDependency(candidateRecord);
|
||||||
|
const plan = buildModelContractPlan(modelId);
|
||||||
|
if (!Array.isArray(blockers) || blockers.length === 0) throw new Error("WP7_02_EXTERNAL_BLOCKER_REQUIRED");
|
||||||
|
const evidenceId = `sha256:${sha256({ model_id: modelId, run_id: runId })}`;
|
||||||
|
return {
|
||||||
|
blockers: [...new Set(blockers)],
|
||||||
|
candidate,
|
||||||
|
evidence_id: evidenceId,
|
||||||
|
external_calls: {
|
||||||
|
mode: "controlled_real_not_executed",
|
||||||
|
planned_provider_requests_max: plan.planned_provider_requests_max,
|
||||||
|
planned_request_breakdown: plan.planned_request_breakdown,
|
||||||
|
quota_impact: plan.quota_impact,
|
||||||
|
real_calls: 0,
|
||||||
|
service: "ai-gateway-service-id",
|
||||||
|
},
|
||||||
|
manual_review: {
|
||||||
|
decision: "Do not mark this model verified until every controlled-real scenario passes against the listed config version.",
|
||||||
|
status: "blocked",
|
||||||
|
},
|
||||||
|
matrix: {
|
||||||
|
config_version: modelConfig?.config_version ?? null,
|
||||||
|
model_id: modelId,
|
||||||
|
scenarios: blockedScenarios(plan),
|
||||||
|
status: "not_run",
|
||||||
|
},
|
||||||
|
model_id: modelId,
|
||||||
|
redaction: {
|
||||||
|
retained_fields: ["status", "category", "duration_ms", "mime", "dimensions", "usage_summary", "evidence_hash", "time"],
|
||||||
|
secret_scan: "passed",
|
||||||
|
},
|
||||||
|
run_id: runId,
|
||||||
|
status: "externally_blocked",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateIndependentEvidenceSet(evidence) {
|
||||||
|
if (!Array.isArray(evidence) || evidence.length !== WP7_02_MODEL_IDS.length) throw new Error("WP7_02_MODEL_EVIDENCE_SET_REQUIRED");
|
||||||
|
const ids = evidence.map((entry) => entry.model_id).toSorted();
|
||||||
|
if (JSON.stringify(ids) !== JSON.stringify([...WP7_02_MODEL_IDS].toSorted())) throw new Error("WP7_02_MODEL_EVIDENCE_SET_INVALID");
|
||||||
|
if (new Set(evidence.map((entry) => entry.evidence_id)).size !== evidence.length) throw new Error("WP7_02_SHARED_EVIDENCE_FORBIDDEN");
|
||||||
|
for (const entry of evidence) {
|
||||||
|
const blocked = entry.status === "externally_blocked"
|
||||||
|
&& Number.isSafeInteger(entry.external_calls?.real_calls) && entry.external_calls.real_calls >= 0
|
||||||
|
&& entry.manual_review?.status === "blocked";
|
||||||
|
const passed = entry.status === "passed" && entry.matrix?.status === "passed"
|
||||||
|
&& entry.external_calls?.status === "passed" && entry.external_calls.real_calls > 0
|
||||||
|
&& entry.manual_review?.status === "passed" && entry.redaction?.status === "passed";
|
||||||
|
const pendingReview = entry.status === "passed" && entry.matrix?.status === "passed"
|
||||||
|
&& entry.external_calls?.status === "passed" && entry.external_calls.real_calls > 0
|
||||||
|
&& entry.manual_review?.status === "pending" && entry.redaction?.status === "passed";
|
||||||
|
if (entry.matrix?.model_id !== entry.model_id || (!blocked && !passed && !pendingReview)
|
||||||
|
|| /\"verified\"\s*:/i.test(JSON.stringify(entry))) {
|
||||||
|
throw new Error("WP7_02_BLOCKED_EVIDENCE_INVALID");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return evidence;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function writeBlockedModelEvidence(directory, evidence) {
|
||||||
|
mkdirSync(resolve(directory), { recursive: true });
|
||||||
|
const files = {
|
||||||
|
"contract-matrix.json": evidence.matrix,
|
||||||
|
"external-calls.json": evidence.external_calls,
|
||||||
|
"manual-review.json": evidence.manual_review,
|
||||||
|
"readiness.json": {
|
||||||
|
blockers: evidence.blockers,
|
||||||
|
candidate: evidence.candidate,
|
||||||
|
evidence_id: evidence.evidence_id,
|
||||||
|
model_id: evidence.model_id,
|
||||||
|
run_id: evidence.run_id,
|
||||||
|
status: evidence.status,
|
||||||
|
},
|
||||||
|
"redaction.json": evidence.redaction,
|
||||||
|
};
|
||||||
|
for (const [name, value] of Object.entries(files)) {
|
||||||
|
writeFileSync(resolve(directory, name), `${JSON.stringify(value, null, 2)}\n`);
|
||||||
|
}
|
||||||
|
return Object.keys(files);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user