refactor(*): 稳定期治理 - 收敛核心架构、错误语义并修复跨项目数据竞态
This commit is contained in:
1 parent
bacd502f5c
commit
b5f3413ded
298 files changed
+12681
-26428
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import type { Asset } from "@/stores/use-asset-store";
|
||||
import { defaultAssetCategoryForKind, normalizeAssetCategory } from "@/lib/asset-category";
|
||||
import { parseAssetRecord, parseAssetRecordList } from "@/lib/asset-record";
|
||||
|
||||
export type AssetStorageDocument = {
|
||||
state: { assets: Asset[] };
|
||||
@@ -8,51 +8,10 @@ export type AssetStorageDocument = {
|
||||
tombstones: { assets: Record<string, number> };
|
||||
};
|
||||
|
||||
export function normalizeAssetRecord(asset: Asset): Asset {
|
||||
const category = normalizeAssetCategory(asset.category, defaultAssetCategoryForKind(asset.kind));
|
||||
const folderId = typeof asset.folderId === "string" ? asset.folderId.trim() : "";
|
||||
const normalizedData = normalizeAssetData(asset);
|
||||
if (Array.isArray(asset.tags) && asset.tags.every((tag) => typeof tag === "string") && asset.category === category && (asset.folderId || "") === folderId && normalizedData === asset.data) return asset;
|
||||
return {
|
||||
...asset,
|
||||
tags: Array.isArray(asset.tags) ? asset.tags.filter((tag): tag is string => typeof tag === "string") : [],
|
||||
folderId: folderId || undefined,
|
||||
category,
|
||||
data: normalizedData,
|
||||
} as Asset;
|
||||
}
|
||||
|
||||
function normalizeAssetData(asset: Asset): Asset["data"] {
|
||||
const raw = asset.data && typeof asset.data === "object" ? asset.data as Record<string, unknown> : {};
|
||||
const numberValue = (value: unknown) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
|
||||
if (asset.kind === "text") return typeof raw.content === "string" ? asset.data : { content: "" };
|
||||
if (asset.kind === "image") {
|
||||
if (typeof raw.dataUrl === "string" && typeof raw.width === "number" && typeof raw.height === "number") return asset.data;
|
||||
return { dataUrl: typeof raw.dataUrl === "string" ? raw.dataUrl : asset.coverUrl || "", storageKey: typeof raw.storageKey === "string" ? raw.storageKey : undefined, width: numberValue(raw.width), height: numberValue(raw.height), bytes: numberValue(raw.bytes), mimeType: typeof raw.mimeType === "string" ? raw.mimeType : "image/*" };
|
||||
}
|
||||
if (asset.kind === "video") {
|
||||
if (typeof raw.url === "string" && typeof raw.width === "number" && typeof raw.height === "number") return asset.data;
|
||||
return { url: typeof raw.url === "string" ? raw.url : asset.coverUrl || "", storageKey: typeof raw.storageKey === "string" ? raw.storageKey : undefined, width: numberValue(raw.width), height: numberValue(raw.height), durationMs: numberValue(raw.durationMs), hasAudio: raw.hasAudio === true, bytes: numberValue(raw.bytes), mimeType: typeof raw.mimeType === "string" ? raw.mimeType : "video/*" };
|
||||
}
|
||||
if (asset.kind === "audio") {
|
||||
if (typeof raw.url === "string") return asset.data;
|
||||
return { url: "", storageKey: typeof raw.storageKey === "string" ? raw.storageKey : undefined, durationMs: numberValue(raw.durationMs), bytes: numberValue(raw.bytes), mimeType: typeof raw.mimeType === "string" ? raw.mimeType : "audio/*" };
|
||||
}
|
||||
if (asset.kind === "model") {
|
||||
if (typeof raw.url === "string" && typeof raw.fileName === "string") return asset.data;
|
||||
return { url: "", storageKey: typeof raw.storageKey === "string" ? raw.storageKey : undefined, bytes: numberValue(raw.bytes), mimeType: typeof raw.mimeType === "string" ? raw.mimeType : "model/*", fileName: typeof raw.fileName === "string" ? raw.fileName : asset.title || "未命名模型" };
|
||||
}
|
||||
return asset.data;
|
||||
}
|
||||
|
||||
function normalizeAssets(assets: Asset[]) {
|
||||
return assets.map(normalizeAssetRecord);
|
||||
}
|
||||
|
||||
export function parseAssetStorageDocument(value: string | null, fallback: Asset[] = []): AssetStorageDocument {
|
||||
if (!value) {
|
||||
return {
|
||||
state: { assets: normalizeAssets(fallback) },
|
||||
state: { assets: parseAssetRecordList(fallback) },
|
||||
version: 0,
|
||||
storageRevision: 0,
|
||||
tombstones: { assets: {} },
|
||||
@@ -69,13 +28,77 @@ export function parseAssetStorageDocument(value: string | null, fallback: Asset[
|
||||
const tombstones =
|
||||
rawTombstones && typeof rawTombstones === "object" && !Array.isArray(rawTombstones) ? Object.fromEntries(Object.entries(rawTombstones).filter((entry): entry is [string, number] => typeof entry[1] === "number" && Number.isFinite(entry[1]))) : {};
|
||||
return {
|
||||
state: { assets: normalizeAssets(parsed.state.assets as Asset[]) },
|
||||
state: { assets: parseAssetRecordList(parsed.state.assets) },
|
||||
version: typeof parsed.version === "number" ? parsed.version : 0,
|
||||
storageRevision: typeof parsed.storageRevision === "number" && Number.isFinite(parsed.storageRevision) ? parsed.storageRevision : 0,
|
||||
tombstones: { assets: tombstones },
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
export type InvalidAssetRecord = {
|
||||
index: number;
|
||||
id?: string;
|
||||
error: string;
|
||||
};
|
||||
|
||||
export type AssetStorageRecovery = {
|
||||
document: AssetStorageDocument;
|
||||
invalid: InvalidAssetRecord[];
|
||||
};
|
||||
|
||||
/**
|
||||
* 仅用于读取历史本地缓存:保留仍符合合同的素材,并把坏记录隔离到诊断结果。
|
||||
*
|
||||
* 这里不能把坏记录改成空 URL、通配 MIME 或其他“看起来可用”的默认值;
|
||||
* 读路径允许恢复可用部分,但写路径仍由 parseAssetRecord 严格阻断损坏状态。
|
||||
*/
|
||||
export function parseAssetStorageDocumentRecovering(value: string | null, fallback: Asset[] = []): AssetStorageRecovery {
|
||||
if (!value) {
|
||||
return {
|
||||
document: parseAssetStorageDocument(value, fallback),
|
||||
invalid: [],
|
||||
};
|
||||
}
|
||||
|
||||
const parsed = JSON.parse(value) as {
|
||||
state?: { assets?: unknown };
|
||||
version?: unknown;
|
||||
storageRevision?: unknown;
|
||||
tombstones?: { assets?: unknown };
|
||||
};
|
||||
if (!Array.isArray(parsed.state?.assets)) throw new Error("素材持久状态无效");
|
||||
|
||||
const invalid: InvalidAssetRecord[] = [];
|
||||
const assets: Asset[] = [];
|
||||
parsed.state.assets.forEach((item, index) => {
|
||||
try {
|
||||
assets.push(parseAssetRecord(item));
|
||||
} catch (error) {
|
||||
const id = isRecord(item) && typeof item.id === "string" && item.id.trim() ? item.id : undefined;
|
||||
invalid.push({
|
||||
index,
|
||||
...(id ? { id } : {}),
|
||||
error: error instanceof Error ? error.message : String(error),
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
const rawTombstones = parsed.tombstones?.assets;
|
||||
const tombstones =
|
||||
rawTombstones && typeof rawTombstones === "object" && !Array.isArray(rawTombstones) ? Object.fromEntries(Object.entries(rawTombstones).filter((entry): entry is [string, number] => typeof entry[1] === "number" && Number.isFinite(entry[1]))) : {};
|
||||
|
||||
return {
|
||||
document: {
|
||||
state: { assets },
|
||||
version: typeof parsed.version === "number" ? parsed.version : 0,
|
||||
storageRevision: typeof parsed.storageRevision === "number" && Number.isFinite(parsed.storageRevision) ? parsed.storageRevision : 0,
|
||||
tombstones: { assets: tombstones },
|
||||
},
|
||||
invalid,
|
||||
};
|
||||
}
|
||||
|
||||
export function serializeAssetStorageDocument(document: AssetStorageDocument) {
|
||||
return JSON.stringify(document);
|
||||
}
|
||||
@@ -124,6 +147,11 @@ function mergeRecord(base: Record<string, unknown>, local: Record<string, unknow
|
||||
return merged;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将本地内存快照合并到最新 durable 文档:base 是读取时看到的版本,local 是当前用户修改,durable 是另一写入者已落盘的版本。
|
||||
* 删除通过 tombstone 记录 revision,避免旧标签页把已删除素材重新写回来;字段冲突按三方变更而不是最后写入时间粗暴覆盖。
|
||||
*/
|
||||
|
||||
export function rebaseAssetSnapshot(input: { document: AssetStorageDocument; baseAssets: Asset[]; localAssets: Asset[]; baseRevision: number }) {
|
||||
const nextRevision = input.document.storageRevision + 1;
|
||||
const tombstones = { assets: { ...input.document.tombstones.assets } };
|
||||
|
||||
Reference in new issue
Block a user