From 166028094cbbbc59e3d7851383f6eae5b11cd352 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sun, 30 Aug 2026 11:26:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(voices):=20=E9=85=8D=E9=9F=B3=E7=B4=A0?= =?UTF-8?q?=E6=9D=90=E4=B8=8A=E4=BC=A0=E5=8D=A1=E3=80=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E2=80=A6=E3=80=8D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 轮询成功状态从 'ready' 改为 'completed'（'ready' 是 voice-clones 状态，误用） - 去重命中分支：complete 接口返回 duplicated=true 或 ingest_job_id 为空时， 不轮询直接按上传成功处理（刷新列表、关闭弹窗） - 轮询优化：complete 后立即查第一次（后端通常 <1s 处理完），未完成再每 5s 轮询 - 两个上传 hook 同步修改： - pages/voices/hooks/useVoiceUpload.ts（旧配音库页） - pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts （新配音库页；去重命中时跳过轮询和打标签） - api/assets/types.ts 的 DirectUploadCompleteResult 补充 duplicated/asset_id 字段 --- apps/web/src/api/assets/types.ts | 4 +++ .../actions/useVoiceUpload.ts | 17 +++++++++---- .../src/pages/voices/hooks/useVoiceUpload.ts | 25 +++++++++++++------ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/apps/web/src/api/assets/types.ts b/apps/web/src/api/assets/types.ts index bb99baa5d..1875479e5 100644 --- a/apps/web/src/api/assets/types.ts +++ b/apps/web/src/api/assets/types.ts @@ -140,4 +140,8 @@ export interface DirectUploadCompleteResult { storage_key: string ingest_job_id: string url: string + /** 同库已存在相同 file_hash 的素材时为 true，ingest_job_id 为空 */ + duplicated?: boolean + /** duplicated 为 true 时返回已存在素材的 id */ + asset_id?: string } diff --git a/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts b/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts index 0e356b4f8..af0e4f910 100755 --- a/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts +++ b/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts @@ -48,20 +48,27 @@ export function useVoiceUpload({ voiceLibrary, createLibMutation }: UseVoiceUplo } // 2. 上传文件（带进度，后端自动创建 ingest job） - const { ingest_job_id } = await uploadAssetDirect({ + const complete = await uploadAssetDirect({ file: data.file, library_id: lib.id, onProgress: (p) => setUploadProgress(p), }) - // 3. 轮询 ingest job 状态 + // 去重命中（同库已存在相同 file_hash 素材）： + // 后端返回 duplicated=true 且 ingest_job_id 为空；跳过轮询和打标签，直接走 onSuccess + if (complete.duplicated === true || !complete.ingest_job_id) { + return + } + const { ingest_job_id } = complete + + // 3. 轮询 ingest job 状态（complete 后先立即查一次，未完成再每 5s 轮询） let job: Awaited> | null = null let retries = 0 const maxRetries = 60 // 最多等待 5 分钟 - while (retries < maxRetries) { + job = await getIngestJob(ingest_job_id) + while (job.status !== "completed" && job.status !== "failed" && retries < maxRetries) { await new Promise((r) => setTimeout(r, 5000)) job = await getIngestJob(ingest_job_id) - if (job.status === "completed" || job.status === "failed") break retries++ } @@ -72,7 +79,7 @@ export function useVoiceUpload({ voiceLibrary, createLibMutation }: UseVoiceUplo throw new Error("音频处理超时，请稍后在素材库查看") } - // 4. 打标签（标签走独立 API） + // 4. 打标签（标签走独立 API；去重命中时已提前 return，这里只对新创建的素材执行） if (data.tagIds.length > 0 && job.result_asset_id) { await tagAsset(job.result_asset_id, data.tagIds) } diff --git a/apps/web/src/pages/voices/hooks/useVoiceUpload.ts b/apps/web/src/pages/voices/hooks/useVoiceUpload.ts index 67ab38a26..2014bc1fb 100644 --- a/apps/web/src/pages/voices/hooks/useVoiceUpload.ts +++ b/apps/web/src/pages/voices/hooks/useVoiceUpload.ts @@ -32,24 +32,35 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) { if (!lib) throw new Error("配音库不存在，请先在配音库页面创建") /* 直传文件（后端会自动创建 ingest job） */ - const { ingest_job_id } = await uploadAssetDirect({ + const complete = await uploadAssetDirect({ file: data.file, library_id: lib.id, onProgress: (p) => setUploadProgress(p), }) - /* 轮询 ingest job 状态，等待 Worker 处理完成 */ - let jobStatus = "" + /* 去重命中（同库已存在相同 file_hash 素材）： + * 后端返回 duplicated=true 且 ingest_job_id 为空， + * 不轮询、直接按上传成功处理（onSuccess 分支 toast + 刷新列表） + */ + if (complete.duplicated === true || !complete.ingest_job_id) { + return + } + const { ingest_job_id } = complete + + /* 轮询 ingest job 状态，等待 Worker 处理完成； + * complete 后先立即查一次（后端通常不到 1s 处理完），未完成再每 5s 轮询。 + * 成功状态为 IngestJobStatus.completed；"ready" 是 voice-clones 的状态，此处误用需避免。 + */ + let job = await getIngestJob(ingest_job_id) let retries = 0 const maxRetries = 60 // 最多等待 5 分钟（60 * 5秒） - while (jobStatus !== "ready" && jobStatus !== "failed" && retries < maxRetries) { + while (job.status !== "completed" && job.status !== "failed" && retries < maxRetries) { await new Promise((r) => setTimeout(r, 5000)) - const job = await getIngestJob(ingest_job_id) - jobStatus = job.status + job = await getIngestJob(ingest_job_id) retries++ } - if (jobStatus === "failed") { + if (job.status === "failed") { throw new Error("音频处理失败，请重试") } if (retries >= maxRetries) { -- 2.54.0 From 008664512fe3fa033748df5a0358f5692d8efe74 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sun, 30 Aug 2026 11:33:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(voices):=20=E7=B2=BE=E7=A1=AE=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=8E=BB=E9=87=8D=E5=88=86=E6=94=AF=20+=20=E9=9D=9E?= =?UTF-8?q?=20duplicated=20=E6=97=B6=20ingest=5Fjob=5Fid=20=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E6=8A=9B=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 去重判断从 `duplicated === true || !ingest_job_id` 改为先判 duplicated - 非 duplicated 但 ingest_job_id 缺失时抛错（避免掩盖真实上传失败） - 回应 AI Code Review #1552 阻塞问题 --- .../hooks/useVoiceMaterials/actions/useVoiceUpload.ts | 9 +++++++-- apps/web/src/pages/voices/hooks/useVoiceUpload.ts | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts b/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts index af0e4f910..a22e5bdd8 100755 --- a/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts +++ b/apps/web/src/pages/voice-materials/hooks/useVoiceMaterials/actions/useVoiceUpload.ts @@ -55,10 +55,15 @@ export function useVoiceUpload({ voiceLibrary, createLibMutation }: UseVoiceUplo }) // 去重命中（同库已存在相同 file_hash 素材）： - // 后端返回 duplicated=true 且 ingest_job_id 为空；跳过轮询和打标签，直接走 onSuccess - if (complete.duplicated === true || !complete.ingest_job_id) { + // 后端返回 duplicated=true，ingest_job_id 为空；跳过轮询和打标签， + // mutationFn 正常 return 即 resolve，useMutation 自动触发 onSuccess 刷新列表。 + // 已存在素材复用上次标签，无需重新打标。 + if (complete.duplicated === true) { return } + if (!complete.ingest_job_id) { + throw new Error("上传完成但未返回处理任务 ID，请重试") + } const { ingest_job_id } = complete // 3. 轮询 ingest job 状态（complete 后先立即查一次，未完成再每 5s 轮询） diff --git a/apps/web/src/pages/voices/hooks/useVoiceUpload.ts b/apps/web/src/pages/voices/hooks/useVoiceUpload.ts index 2014bc1fb..eb25d6fa5 100644 --- a/apps/web/src/pages/voices/hooks/useVoiceUpload.ts +++ b/apps/web/src/pages/voices/hooks/useVoiceUpload.ts @@ -39,12 +39,16 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) { }) /* 去重命中（同库已存在相同 file_hash 素材）： - * 后端返回 duplicated=true 且 ingest_job_id 为空， - * 不轮询、直接按上传成功处理（onSuccess 分支 toast + 刷新列表） + * 后端返回 duplicated=true，ingest_job_id 为空， + * 不轮询、直接按上传成功处理（onSuccess 分支 toast + 刷新列表）。 + * 注意：mutationFn 正常 return 即视为 resolve，useMutation 会自动调 onSuccess。 */ - if (complete.duplicated === true || !complete.ingest_job_id) { + if (complete.duplicated === true) { return } + if (!complete.ingest_job_id) { + throw new Error("上传完成但未返回处理任务 ID，请重试") + } const { ingest_job_id } = complete /* 轮询 ingest job 状态，等待 Worker 处理完成； -- 2.54.0