refactor(*): 稳定期治理 - 收敛核心架构、错误语义并修复跨项目数据竞态
This commit is contained in:
ddCat
@@ -3,8 +3,8 @@ import { getImageBlob } from "@/services/image-storage";
|
||||
import { deleteRemoteAsset, deleteRemoteCanvasProject, getRemoteAsset, getRemoteAssetsByIds, getRemoteCanvasProject, getRemoteUserDataSnapshot, listRemoteAssetsPage, upsertRemoteAsset, upsertRemoteCanvasProject } from "@/services/api/user-data";
|
||||
import { appQueryClient } from "@/lib/query-client";
|
||||
import { resourceFileUrl, resourceIdFromStorageKey, resourceStorageKey, uploadResourceFile } from "@/services/api/resources";
|
||||
import { parseAssetRecordList } from "@/lib/asset-record";
|
||||
import { assetForRemoteSync } from "@/lib/asset-remote-sync";
|
||||
import { normalizeAssetRecord } from "@/lib/asset-storage-revision";
|
||||
import type { Asset } from "@/stores/use-asset-store";
|
||||
import { flushAssetStorePersistence, useAssetStore } from "@/stores/use-asset-store";
|
||||
import type { CanvasProject } from "@/stores/canvas/use-canvas-store";
|
||||
@@ -12,6 +12,7 @@ import { flushCanvasStorePersistence, useCanvasStore } from "@/stores/canvas/use
|
||||
import { useSyncProgressStore } from "@/stores/use-sync-progress-store";
|
||||
import { useCanvasHistoryStore } from "@/stores/canvas/use-canvas-history-store";
|
||||
import { repairMissingCanvasAssets } from "@/services/canvas-asset-repair";
|
||||
import { canvasNodeToAsset } from "@/lib/canvas/canvas-node-asset";
|
||||
|
||||
let activeRemoteUserId = "";
|
||||
type RemoteUserDataPhase = "inactive" | "hydrating" | "ready" | "failed";
|
||||
@@ -69,14 +70,11 @@ export async function loadAssetLibraryPage(options: Parameters<typeof listRemote
|
||||
if (epoch !== sessionEpoch) throw new Error("账号已切换，请重新读取素材");
|
||||
acceptRemoteAssets(result.assets);
|
||||
});
|
||||
return result;
|
||||
return { ...result, assets: parseAssetRecordList(result.assets) };
|
||||
}
|
||||
|
||||
function acceptRemoteAssets(remoteAssets: Asset[]) {
|
||||
// 服务端素材是历史遗留形状不定的 payload：早期记录可能没有 tags、图片尺寸等字段。
|
||||
// 归一化必须发生在进入 store 之前，否则页面会拿到不符合 Asset 类型的记录；
|
||||
// acknowledged 基线也要用同一份对象，避免归一化差异把素材永久标记为待上传。
|
||||
const assets = remoteAssets.map(normalizeAssetRecord);
|
||||
const assets = parseAssetRecordList(remoteAssets);
|
||||
const current = new Map(useAssetStore.getState().assets.map((asset) => [asset.id, asset]));
|
||||
for (const asset of assets) {
|
||||
const local = current.get(asset.id);
|
||||
@@ -119,7 +117,9 @@ export async function loadAssetsForUse(ids: Iterable<string>) {
|
||||
const LOCAL_STORAGE_KEY_PATTERN = /^(image|video|audio|file|video-reference|audio-reference):/;
|
||||
|
||||
export async function syncRemoteUserData(userId?: string | null) {
|
||||
let repairedCanvasAssets = false;
|
||||
// 登录/切换账号时，服务端快照建立新的远端基线；本地 IndexedDB 只负责首屏缓存，
|
||||
// 不能把服务端已经删除或当前用户无权访问的实体重新补回去。后续增量保存必须基于这份基线做冲突校验。
|
||||
let repairedCanvasAssets = false;
|
||||
await withRemoteUserDataSyncExclusive(async () => {
|
||||
incrementalSession = false;
|
||||
activeRemoteUserId = userId || "";
|
||||
@@ -136,7 +136,7 @@ export async function syncRemoteUserData(userId?: string | null) {
|
||||
const snapshot = await getRemoteUserDataSnapshot();
|
||||
// 登录时服务端是实体真相。浏览器 IndexedDB 只作为首屏缓存，不能把服务端已删除的记录补回去。
|
||||
// 这里只替换结构化记录，不在登录阶段解析图片/视频/音频 URL；媒体由实际使用方按需解析。
|
||||
const snapshotAssets = snapshot.assets.map(normalizeAssetRecord);
|
||||
const snapshotAssets = parseAssetRecordList(snapshot.assets);
|
||||
useCanvasStore.getState().replaceProjects(snapshot.projects);
|
||||
useAssetStore.getState().replaceAssets(snapshotAssets);
|
||||
const repair = repairMissingCanvasAssets();
|
||||
@@ -185,8 +185,14 @@ export function hasRemoteUserDataSyncSession() {
|
||||
return Boolean(activeRemoteUserId) && remoteUserDataPhase === "ready";
|
||||
}
|
||||
|
||||
/**
|
||||
* 串行执行用户数据同步、账号切换和登出相关的远端操作。
|
||||
*
|
||||
* 前一个操作失败只影响它自己，不能让后续操作永远停在 rejected tail；当前操作的
|
||||
* 结果仍原样返回，由调用方决定如何提示或重试，避免同步层把写入失败伪装成成功。
|
||||
*/
|
||||
export function withRemoteUserDataSyncExclusive<T>(operation: () => Promise<T>): Promise<T> {
|
||||
const pending = remoteOperationTail.catch(() => undefined).then(operation);
|
||||
const pending = remoteOperationTail.then(() => undefined, () => undefined).then(operation);
|
||||
remoteOperationTail = pending.then(
|
||||
() => undefined,
|
||||
() => undefined,
|
||||
@@ -207,6 +213,17 @@ export function scheduleRemoteUserDataSync() {
|
||||
}, 1200);
|
||||
}
|
||||
|
||||
export function formatLocalSavedRemotePending(localAction: string, error: unknown): string {
|
||||
const detail = error instanceof Error && error.message.trim() ? error.message.trim() : "未知错误";
|
||||
return `${localAction}，云端同步失败：${detail}。将自动重试。`;
|
||||
}
|
||||
|
||||
/** 本地写已成功、云端同步失败：排队同一幂等重试，并返回可直接展示的 warning。不得回滚本地写，也不得说成已保存到云端。 */
|
||||
export function localSavedRemotePendingMessage(localAction: string, error: unknown): string {
|
||||
scheduleRemoteUserDataSync();
|
||||
return formatLocalSavedRemotePending(localAction, error);
|
||||
}
|
||||
|
||||
export async function createCanvasProjectWithRemoteSync(title: string, projectId?: string, initialContent?: Partial<Pick<CanvasProject, "nodes" | "connections">>) {
|
||||
const id = useCanvasStore.getState().createProject(title, projectId);
|
||||
if (initialContent) useCanvasStore.getState().updateProject(id, initialContent);
|
||||
@@ -299,13 +316,12 @@ export async function deleteCanvasProjectsWithRemoteSync(ids: string[]) {
|
||||
assetChanged = true;
|
||||
}
|
||||
|
||||
// 2. 对于画布中尚未入库的媒体节点，直接归档为回收站素材
|
||||
// 2. 对于画布中尚未入库的媒体节点，直接归档为回收站素材。
|
||||
// 素材字段统一交给 canvasNodeToAsset 组装，避免删除路径另起一套尺寸、MIME 和资源定位规则。
|
||||
for (const project of deletedProjectObjects) {
|
||||
for (const node of project.nodes || []) {
|
||||
const isMedia = node.type === "image" || node.type === "video" || node.type === "audio";
|
||||
const content = typeof node.metadata?.content === "string" ? node.metadata.content : "";
|
||||
const storageKey = typeof node.metadata?.storageKey === "string" ? node.metadata.storageKey : undefined;
|
||||
if (!isMedia || (!content && !storageKey)) continue;
|
||||
if (!isMedia) continue;
|
||||
|
||||
const existingAsset = node.metadata?.assetId ? currentAssets.find((a) => a.id === node.metadata?.assetId) : undefined;
|
||||
if (existingAsset) {
|
||||
@@ -317,78 +333,25 @@ export async function deleteCanvasProjectsWithRemoteSync(ids: string[]) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const archivedAsset = canvasNodeToAsset(node, { canvasId: project.id, source: "canvas-manual" });
|
||||
if (!archivedAsset) continue;
|
||||
|
||||
const title = node.title || `${project.title} - ${node.type === "image" ? "图片" : node.type === "video" ? "视频" : "音频"}`;
|
||||
const prompt = typeof node.metadata?.prompt === "string" ? node.metadata.prompt : "";
|
||||
if (node.type === "image") {
|
||||
useAssetStore.getState().addAsset({
|
||||
kind: "image",
|
||||
title,
|
||||
coverUrl: content || "",
|
||||
tags: prompt ? [prompt.slice(0, 16)] : ["画布生成"],
|
||||
category: "other",
|
||||
status: "archived",
|
||||
source: `已删除画布：${project.title}`,
|
||||
data: {
|
||||
dataUrl: content || "",
|
||||
storageKey,
|
||||
width: Number(node.width) || 1024,
|
||||
height: Number(node.height) || 1024,
|
||||
bytes: Number(node.metadata?.bytes) || 0,
|
||||
mimeType: (node.metadata?.mimeType as string) || "image/png",
|
||||
},
|
||||
metadata: {
|
||||
canvasId: project.id,
|
||||
sourceNodeId: node.id,
|
||||
},
|
||||
});
|
||||
assetChanged = true;
|
||||
} else if (node.type === "video") {
|
||||
useAssetStore.getState().addAsset({
|
||||
kind: "video",
|
||||
title,
|
||||
coverUrl: content || "",
|
||||
tags: prompt ? [prompt.slice(0, 16)] : ["画布视频"],
|
||||
category: "other",
|
||||
status: "archived",
|
||||
source: `已删除画布：${project.title}`,
|
||||
data: {
|
||||
url: content || "",
|
||||
storageKey,
|
||||
width: Number(node.width) || 1280,
|
||||
height: Number(node.height) || 720,
|
||||
durationMs: Number(node.metadata?.durationMs) || 0,
|
||||
bytes: Number(node.metadata?.bytes) || 0,
|
||||
mimeType: (node.metadata?.mimeType as string) || "video/mp4",
|
||||
},
|
||||
metadata: {
|
||||
canvasId: project.id,
|
||||
sourceNodeId: node.id,
|
||||
},
|
||||
});
|
||||
assetChanged = true;
|
||||
} else if (node.type === "audio") {
|
||||
useAssetStore.getState().addAsset({
|
||||
kind: "audio",
|
||||
title,
|
||||
coverUrl: "",
|
||||
tags: ["画布音频"],
|
||||
category: "other",
|
||||
status: "archived",
|
||||
source: `已删除画布：${project.title}`,
|
||||
data: {
|
||||
url: content || "",
|
||||
storageKey,
|
||||
durationMs: Number(node.metadata?.durationMs) || 0,
|
||||
bytes: Number(node.metadata?.bytes) || 0,
|
||||
mimeType: (node.metadata?.mimeType as string) || "audio/mpeg",
|
||||
},
|
||||
metadata: {
|
||||
canvasId: project.id,
|
||||
sourceNodeId: node.id,
|
||||
},
|
||||
});
|
||||
assetChanged = true;
|
||||
}
|
||||
useAssetStore.getState().addAsset({
|
||||
...archivedAsset,
|
||||
title,
|
||||
tags: node.type === "audio" ? ["画布音频"] : prompt ? [prompt.slice(0, 16)] : [node.type === "video" ? "画布视频" : "画布生成"],
|
||||
category: "other",
|
||||
status: "archived",
|
||||
source: `已删除画布：${project.title}`,
|
||||
metadata: {
|
||||
...archivedAsset.metadata,
|
||||
canvasId: project.id,
|
||||
sourceNodeId: node.id,
|
||||
},
|
||||
});
|
||||
assetChanged = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -408,6 +371,8 @@ export async function deleteCanvasProjectsWithRemoteSync(ids: string[]) {
|
||||
}
|
||||
|
||||
export async function saveRemoteUserDataNow() {
|
||||
// 这是远端写入的总闸门：只有 phase=ready 且已建立 acknowledged 基线时才能提交。
|
||||
// 本地 Zustand/localForage 写成功不等于服务端写成功，任何同步异常都必须继续抛出给调用方。
|
||||
const epoch = sessionEpoch;
|
||||
if (!activeRemoteUserId) return;
|
||||
requireRemoteUserDataBaseline();
|
||||
|
||||
Reference in New Issue
Block a user