Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
fix: repair runtime health probes, workspace recovery, and subtitle fallback
wulien-center250a1861cd99
diff --git a/apps/desktop/e2e/desktop-network.spec.ts b/apps/desktop/e2e/desktop-network.spec.tsindex 1117b993..55e505e7 100644--- a/apps/desktop/e2e/desktop-network.spec.ts+++ b/apps/desktop/e2e/desktop-network.spec.ts@@ -45,6 +45,7 @@ test('@package-smoke Desktop 网络在 Socket QoS 抛出 EINVAL 时仍可请求OPENCREATOR_DESKTOP_NETWORK_TEST_RESULT: resultPath,OPENCREATOR_DESKTOP_NETWORK_TEST_USER_DATA: userData,OPENCREATOR_DESKTOP_NETWORK_TEST_MODULE: pathToFileURL(resolve(e2eDir, '../dist/main/desktop-network.js')).href,+ OPENCREATOR_DESKTOP_BOOTSTRAP_TEST_MODULE: pathToFileURL(resolve(e2eDir, '../dist/main/bootstrap-controller.js')).href,OPENCREATOR_DESKTOP_NETWORK_TEST_ORIGIN: `http://127.0.0.1:${(server.address() as AddressInfo).port}`,ELECTRON_ENABLE_LOGGING: '1',ELECTRON_LOG_FILE: electronLogPathdiff --git a/apps/desktop/e2e/fixtures/desktop-network.mjs b/apps/desktop/e2e/fixtures/desktop-network.mjsindex 06f39adf..203cb9e0 100644--- a/apps/desktop/e2e/fixtures/desktop-network.mjs+++ b/apps/desktop/e2e/fixtures/desktop-network.mjs@@ -1,4 +1,5 @@import assert from 'node:assert/strict';+import { EventEmitter } from 'node:events';import { writeFileSync } from 'node:fs';import { Socket } from 'node:net';import { app } from 'electron';@@ -20,6 +21,35 @@ void (async () => {phase = 'load network module';const { fetchDesktopRequest } = await import(process.env.OPENCREATOR_DESKTOP_NETWORK_TEST_MODULE);const origin = process.env.OPENCREATOR_DESKTOP_NETWORK_TEST_ORIGIN;+ phase = 'daemon health probe';+ const { BootstrapController } = await import(process.env.OPENCREATOR_DESKTOP_BOOTSTRAP_TEST_MODULE);+ const daemon = new EventEmitter();+ daemon.currentConnection = { address: origin, token: 'test' };+ let stopCount = 0;+ daemon.stop = async () => { stopCount += 1; };+ let timer;+ const healthy = new Promise((resolve, reject) => {+ timer = setTimeout(() => reject(new Error('Daemon health probe did not complete')), 5_000);+ const controller = new BootstrapController({+ daemon,+ logger: {+ info: message => {+ if (message === 'Runtime proxy failure health probe succeeded') resolve(controller);+ },+ warn: message => reject(new Error(message))+ }+ });+ controller.markWorkspaceReady();+ controller.reportProxyFailure(daemon.currentConnection);+ });+ try {+ const controller = await healthy;+ assert.equal(stopCount, 0);+ assert.equal(controller.currentState.phase, 'ready');+ await controller.stop();+ } finally {+ clearTimeout(timer);+ }phase = 'JSON request';const json = await fetchDesktopRequest(`${origin}/json`);assert.deepEqual(await json.json(), { ok: true });diff --git a/apps/desktop/src/main/bootstrap-controller.ts b/apps/desktop/src/main/bootstrap-controller.tsindex 79077a3c..3e9bf378 100644--- a/apps/desktop/src/main/bootstrap-controller.ts+++ b/apps/desktop/src/main/bootstrap-controller.ts@@ -19,6 +19,7 @@ import {DaemonManager,type DaemonStartInput} from './daemon-manager.js';+import { fetchDesktopRequest } from './desktop-network.js';import type { DesktopLogger } from './logger.js';import type { SettingsStore } from './settings-store.js';@@ -428,7 +429,7 @@ export class BootstrapController extends EventEmitter<BootstrapControllerEvents>async function probeDaemonHealth(connection: DaemonConnection): Promise<boolean> {try {- const response = await fetch(`${connection.address}/healthz`, {+ const response = await fetchDesktopRequest(`${connection.address}/healthz`, {signal: AbortSignal.timeout(1_500),cache: 'no-store'});diff --git a/apps/desktop/test/bootstrap-recovery.test.ts b/apps/desktop/test/bootstrap-recovery.test.tsindex c985c069..ac690f89 100644--- a/apps/desktop/test/bootstrap-recovery.test.ts+++ b/apps/desktop/test/bootstrap-recovery.test.ts@@ -1,11 +1,14 @@import { EventEmitter } from 'node:events';-import { describe, expect, it, vi } from 'vitest';+import { net } from 'electron';+import { afterEach, describe, expect, it, vi } from 'vitest';import { BootstrapController } from '../src/main/bootstrap-controller.js';import type { DaemonManager, DaemonStartInput } from '../src/main/daemon-manager.js';import type { DesktopLogger } from '../src/main/logger.js';import type { SettingsStore } from '../src/main/settings-store.js';import type { DaemonConnection } from '../src/shared/types.js';+vi.mock('electron', () => ({ net: { fetch: vi.fn() } }));+vi.mock('../src/main/codex-resolver.js', async importOriginal => ({...await importOriginal<typeof import('../src/main/codex-resolver.js')>(),resolveCodexEnvironment: vi.fn(async () => ({@@ -33,13 +36,9 @@ class FakeDaemon extends EventEmitter {this.connection = undefined;this.emit('connection', null);});- restart = vi.fn(async (input: DaemonStartInput) => {- await this.stop();- return await this.start(input);- });}-function setup(probeHealth: (connection: DaemonConnection) => Promise<boolean>) {+function setup(probeHealth?: (connection: DaemonConnection) => Promise<boolean>) {const daemon = new FakeDaemon();const logger: DesktopLogger = {info: vi.fn(),@@ -68,6 +67,59 @@ function setup(probeHealth: (connection: DaemonConnection) => Promise<boolean>)}describe('Desktop Runtime recovery', () => {+ afterEach(() => {+ vi.useRealTimers();+ vi.unstubAllGlobals();+ vi.clearAllMocks();+ });++ it('uses Electron networking for health probes when Node fetch fails with EINVAL', async () => {+ vi.useFakeTimers();+ const nodeFetch = vi.fn().mockRejectedValue(new Error('setSocketQoS EINVAL'));+ vi.stubGlobal('fetch', nodeFetch);+ vi.mocked(net.fetch).mockImplementation(async () => Response.json({ ok: true }));+ const { controller, daemon } = setup();+ await controller.start();++ try {+ controller.reportProxyFailure(daemon.currentConnection!);+ await vi.advanceTimersByTimeAsync(1_000);+ expect(net.fetch).toHaveBeenCalledExactlyOnceWith(+ 'http://127.0.0.1:60764/healthz',+ { signal: expect.any(AbortSignal), cache: 'no-store', credentials: 'omit' }+ );+ expect(nodeFetch).not.toHaveBeenCalled();+ expect(daemon.stop).not.toHaveBeenCalled();+ expect(daemon.start).toHaveBeenCalledTimes(1);+ expect(controller.currentState.phase).toBe('ready');+ } finally {+ await controller.stop();+ }+ });++ it.each([+ ['unhealthy HTTP status', () => Response.json({ ok: true }, { status: 503 })],+ ['unhealthy payload', () => Response.json({ ok: false })],+ ['invalid payload', () => new Response('invalid JSON')],+ ['network failure', () => { throw new Error('connection refused'); }]+ ])('still recovers after two Electron health probe failures: %s', async (_name, response) => {+ vi.useFakeTimers();+ vi.mocked(net.fetch).mockImplementation(async () => response());+ const { controller, daemon } = setup();+ await controller.start();++ try {+ controller.reportProxyFailure(daemon.currentConnection!);+ await vi.advanceTimersByTimeAsync(1_000);+ expect(net.fetch).toHaveBeenCalledTimes(2);+ expect(daemon.stop).toHaveBeenCalledTimes(1);+ expect(daemon.start).toHaveBeenCalledTimes(2);+ expect(controller.currentState.phase).toBe('ready');+ } finally {+ await controller.stop();+ }+ });+it('keeps a healthy daemon running after a transient proxy failure', async () => {const probeHealth = vi.fn(async () => true);const { controller, daemon } = setup(probeHealth);@@ -117,4 +169,61 @@ describe('Desktop Runtime recovery', () => {expect(controller.currentState.phase).toBe('ready');await controller.stop();});++ it('cancels health recovery while the old daemon is stopping', async () => {+ const { controller, daemon } = setup(vi.fn(async () => false));+ await controller.start();+ const ready = vi.fn();+ controller.on('ready', ready);+ let finishStop!: () => void;+ const oldDaemonStopped = new Promise<void>(resolve => { finishStop = resolve; });+ daemon.stop.mockImplementation(async () => {+ await oldDaemonStopped;+ daemon.connection = undefined;+ daemon.emit('connection', null);+ });++ controller.reportProxyFailure(daemon.currentConnection!);+ await vi.waitFor(() => expect(daemon.stop).toHaveBeenCalled(), { timeout: 2_000 });+ const shutdown = controller.stop();+ finishStop();+ await shutdown;+ await new Promise<void>(resolve => setImmediate(resolve));++ expect(daemon.start).toHaveBeenCalledTimes(1);+ expect(daemon.currentConnection).toBeUndefined();+ expect(ready).not.toHaveBeenCalled();+ });++ it('waits for an in-flight recovery startup and stops its late connection', async () => {+ const { controller, daemon } = setup(vi.fn(async () => true));+ await controller.start();+ const ready = vi.fn();+ controller.on('ready', ready);+ let finishStart!: () => void;+ const startup = new Promise<void>(resolve => { finishStart = resolve; });+ daemon.start.mockImplementationOnce(async () => {+ await startup;+ daemon.connection = { address: 'http://127.0.0.1:60765', token: 'replacement' };+ daemon.emit('connection', daemon.connection);+ return daemon.connection;+ });++ daemon.connection = undefined;+ daemon.emit('connection', null);+ daemon.emit('exit', { code: 1, reason: 'unexpected' });+ await vi.waitFor(() => expect(daemon.start).toHaveBeenCalledTimes(2));+ let stopped = false;+ const shutdown = controller.stop().then(() => { stopped = true; });+ try {+ await new Promise<void>(resolve => setImmediate(resolve));+ expect(stopped).toBe(false);+ } finally {+ finishStart();+ await shutdown;+ }++ expect(daemon.currentConnection).toBeUndefined();+ expect(ready).not.toHaveBeenCalled();+ });});diff --git a/apps/web/src/app/App.test.tsx b/apps/web/src/app/App.test.tsxindex a8a79022..22f2eccc 100644--- a/apps/web/src/app/App.test.tsx+++ b/apps/web/src/app/App.test.tsx@@ -7289,6 +7289,109 @@ describe('App', () => {expect(request.prompt).not.toContain('model catalog unavailable');});+ it.each(['browser', 'desktop'] as const)(+ 'retries workspace loading after a transient thread list failure in the %s host',+ async hostKind => {+ const hostBridge = createHostBridge();+ hostBridge.kind = hostKind;+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764', token: 'runtime-token'+ });+ let threadListCalls = 0;+ const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {+ const url = String(input);+ const projectResponse = handleDefaultProjectApiRequest(url, init);+ if (projectResponse !== undefined) return projectResponse;+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.endsWith('/schedules')) return jsonResponse({ schedules: [] });+ if (url.endsWith('/tasks?status=all&limit=50')) {+ return jsonResponse({ tasks: [], hasMore: false });+ }+ if (url.endsWith('/threads?status=active&limit=50')) {+ threadListCalls += 1;+ return threadListCalls === 1+ ? jsonResponse({ error: { code: 'TEMPORARY_ERROR', message: 'temporary' } }, { status: 503 })+ : jsonResponse({ threads: [] });+ }+ throw new Error(`Unexpected request: ${url}`);+ };++ render(<App fileService={createFileService()} hostBridge={hostBridge} runtimeFetch={runtimeFetch} />);+ await waitFor(() => expect(threadListCalls).toBe(1));+ const composer = await screen.findByRole('textbox', { name: '输入任务' });+ expect(composer).toBeDisabled();+ await waitFor(() => expect(composer).toBeEnabled(), { timeout: 4_000 });+ expect(threadListCalls).toBe(2);+ expect(screen.getByRole('status', { name: '本地运行内核正常' })).toBeInTheDocument();+ expect(screen.queryByRole('button', { name: '重试连接' })).not.toBeInTheDocument();+ }+ );++ it('retries workspace loading after a transient project migration failure', async () => {+ const hostBridge = createHostBridge();+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764', token: 'runtime-token'+ });+ let migrationCalls = 0;+ const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {+ const url = String(input);+ if (url.endsWith('/projects/migrations/local-storage-v1')) {+ migrationCalls += 1;+ if (migrationCalls === 1) {+ return jsonResponse({ error: { code: 'TEMPORARY_ERROR', message: 'temporary' } }, { status: 503 });+ }+ }+ const projectResponse = handleDefaultProjectApiRequest(url, init);+ if (projectResponse !== undefined) return projectResponse;+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.endsWith('/schedules')) return jsonResponse({ schedules: [] });+ if (url.endsWith('/tasks?status=all&limit=50')) {+ return jsonResponse({ tasks: [], hasMore: false });+ }+ if (url.endsWith('/threads?status=active&limit=50')) return jsonResponse({ threads: [] });+ throw new Error(`Unexpected request: ${url}`);+ };++ render(<App fileService={createFileService()} hostBridge={hostBridge} runtimeFetch={runtimeFetch} />);+ await waitFor(() => expect(migrationCalls).toBe(1));+ await screen.findByRole('status', { name: '本地运行内核正常' }, { timeout: 4_000 });+ expect(migrationCalls).toBe(2);+ expect(screen.getByRole('textbox', { name: '输入任务' })).toBeEnabled();+ });++ it('cancels the scheduled workspace retry when the app unmounts', async () => {+ const hostBridge = createHostBridge();+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764', token: 'runtime-token'+ });+ let migrationCalls = 0;+ const runtimeFetch = async (input: RequestInfo | URL) => {+ const url = String(input);+ const creatorResponse = handleDefaultCreatorApiRequest(url);+ if (creatorResponse !== undefined) return creatorResponse;+ if (url.endsWith('/projects/migrations/local-storage-v1')) {+ migrationCalls += 1;+ return jsonResponse({ error: { code: 'TEMPORARY_ERROR', message: 'temporary' } }, { status: 503 });+ }+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.endsWith('/schedules')) return jsonResponse({ schedules: [] });+ if (url.endsWith('/tasks?status=all&limit=50')) {+ return jsonResponse({ tasks: [], hasMore: false });+ }+ throw new Error(`Unexpected request: ${url}`);+ };++ const app = render(<App fileService={createFileService()} hostBridge={hostBridge} runtimeFetch={runtimeFetch} />);+ await waitFor(() => expect(migrationCalls).toBe(1));+ expect(screen.getByRole('textbox', { name: '输入任务' })).toBeDisabled();+ app.unmount();+ await new Promise(resolve => window.setTimeout(resolve, 2_100));+ expect(migrationCalls).toBe(1);+ });+it('keeps the current conversation and draft while reconnecting without a page reload', async () => {const hostBridge = createHostBridge();hostBridge.kind = 'desktop';diff --git a/apps/web/src/app/AppController.tsx b/apps/web/src/app/AppController.tsxindex 47c43e09..703abdc5 100644--- a/apps/web/src/app/AppController.tsx+++ b/apps/web/src/app/AppController.tsx@@ -1288,7 +1288,9 @@ export function AppController(props: AppControllerProps) {setRuntimeWorkspaceReady(false);const activeProjectService = projectService;const activeThreadService = threadService;+ let retryTimer: number | undefined;async function loadRuntimeWorkspace() {+ if (canceled) return;let loaded = false;try {const legacyProjects = parseLegacyLocalStorageProjects(@@ -1297,6 +1299,7 @@ export function AppController(props: AppControllerProps) {const migration = await activeProjectService.migrateLocalStorageV1({projects: legacyProjects});+ if (canceled) return;let [activeResponse, allResponse] = await Promise.all([activeProjectService.listProjects('active'),activeProjectService.listProjects('all')@@ -1313,6 +1316,7 @@ export function AppController(props: AppControllerProps) {]);if (canceled) return;} catch (error) {+ if (canceled) return;initialProjectError = getRuntimeErrorMessage(error,'无法自动创建默认项目,请手动添加项目'@@ -1372,7 +1376,14 @@ export function AppController(props: AppControllerProps) {setProjectLoadError('无法迁移或加载项目,请稍后重试');setThreadLoadError(undefined);} finally {- if (!canceled) setRuntimeWorkspaceReady(loaded);+ if (!canceled) {+ setRuntimeWorkspaceReady(loaded);+ if (!loaded) {+ retryTimer = window.setTimeout(() => {+ void loadRuntimeWorkspace();+ }, 2_000);+ }+ }}}@@ -1380,6 +1391,7 @@ export function AppController(props: AppControllerProps) {return () => {canceled = true;+ if (retryTimer !== undefined) window.clearTimeout(retryTimer);};}, [connectionState.status, hostBridge, projectService, threadService]);diff --git a/runtime/krillinai/internal/pipeline/subtitle.go b/runtime/krillinai/internal/pipeline/subtitle.goindex ac3c4f63..81b8055c 100644--- a/runtime/krillinai/internal/pipeline/subtitle.go+++ b/runtime/krillinai/internal/pipeline/subtitle.go@@ -93,7 +93,7 @@ func GenerateSubtitles(ctx context.Context, svc StageService, req SubtitleRequesreportSubtitleProgress(req, "processing_platform_captions", 25, "正在解析平台字幕")youtubeReq.VttFile = vttFile_, err = svc.ProcessYouTubeSubtitle(ctx, youtubeReq)- if err != nil {+ if err != nil && !errors.Is(err, service.ErrYouTubeCaptionInvalid) {return failSubtitleStage(req, manifest, ErrorKindRetryable, "platform_caption_processing_failed", err)}}@@ -118,10 +118,19 @@ func GenerateSubtitles(ctx context.Context, svc StageService, req SubtitleRequesreturn failSubtitleStage(req, manifest, ErrorKindRetryable, "platform_caption_access_failed", err)}if req.CaptionSource != CaptionSourceAny {- return failSubtitleStage(req, manifest, ErrorKindRetryable, "platform_caption_failed", err)+ code := "platform_caption_failed"+ if errors.Is(err, service.ErrYouTubeCaptionInvalid) {+ code = "platform_caption_invalid"+ }+ return failSubtitleStage(req, manifest, ErrorKindRetryable, code, err)}platformCaptionErr = err- manifest.Warnings = append(manifest.Warnings, "平台字幕不可用,回退到转录")+ fallbackMessage := "未找到可用的平台字幕,已自动切换到语音转录"+ if errors.Is(err, service.ErrYouTubeCaptionInvalid) {+ fallbackMessage = "平台字幕解析失败,已自动切换到语音转录"+ }+ manifest.Warnings = append(manifest.Warnings, fallbackMessage)+ reportSubtitleProgress(req, "fallback_to_transcription", 25, fallbackMessage)stepParam.VttSwitch = falseif req.PrepareVideo {stepParam.EmbedSubtitleVideoType = "all"diff --git a/runtime/krillinai/internal/pipeline/subtitle_test.go b/runtime/krillinai/internal/pipeline/subtitle_test.goindex a1325f2b..107d5cbd 100644--- a/runtime/krillinai/internal/pipeline/subtitle_test.go+++ b/runtime/krillinai/internal/pipeline/subtitle_test.go@@ -3,6 +3,7 @@ package pipelineimport ("context""errors"+ "fmt""krillin-ai/internal/service"subtitlestyle "krillin-ai/internal/subtitle_style""krillin-ai/internal/types"@@ -579,6 +580,65 @@ func TestPlatformTranslationFailureDoesNotDownloadOrTranscribe(t *testing.T) {}}+func TestUnusablePlatformCaptionsFallBackToAudio(t *testing.T) {+ fake := &fakeStageService{processErr: fmt.Errorf("%w: no usable VTT text", service.ErrYouTubeCaptionInvalid)}+ var messages []string+ response, err := GenerateSubtitles(context.Background(), fake, SubtitleRequest{+ Input: "https://www.youtube.com/watch?v=m5yrQMnc_jQ", Workdir: t.TempDir(), TaskID: "invalid-vtt",+ OriginLang: "en", TargetLang: "zh_cn", CaptionSource: CaptionSourceAny,+ ReportProgress: func(phase string, _ int, message string) {+ if phase == "fallback_to_transcription" {+ messages = append(messages, message)+ }+ },+ })+ if err != nil || !response.OK {+ t.Fatalf("response = %+v, error = %v", response, err)+ }+ if !reflect.DeepEqual(fake.calls, []string{"download-youtube", "process-youtube", "prepare", "audio"}) {+ t.Fatalf("calls = %v, want caption processing followed by audio transcription", fake.calls)+ }+ if !reflect.DeepEqual(fake.prepareVTT, []bool{false}) {+ t.Fatalf("prepare VttSwitch values = %v, want [false]", fake.prepareVTT)+ }+ manifest, err := LoadManifest(response.Workdir)+ if err != nil {+ t.Fatal(err)+ }+ if manifest.CaptionSource != "whisper" || !reflect.DeepEqual(manifest.Warnings, messages) || len(messages) != 1 {+ t.Fatalf("manifest = %+v, fallback messages = %v", manifest, messages)+ }+}++func TestUnusablePlatformCaptionsSignalDeferredTranscription(t *testing.T) {+ fake := &fakeStageService{processErr: service.ErrYouTubeCaptionInvalid}+ response, err := GenerateSubtitles(context.Background(), fake, SubtitleRequest{+ Input: "https://www.youtube.com/watch?v=abc", Workdir: t.TempDir(), TaskID: "invalid-vtt",+ CaptionSource: CaptionSourcePlatform,+ })+ if err == nil || response.Error.Code != "platform_caption_invalid" {+ t.Fatalf("response = %+v, error = %v", response, err)+ }+ if !reflect.DeepEqual(fake.calls, []string{"download-youtube", "process-youtube"}) {+ t.Fatalf("calls = %v, want platform-only attempt", fake.calls)+ }+}++func TestUnusableCaptionsPreserveAudioFallbackFailure(t *testing.T) {+ fake := &fakeStageService{+ processErr: fmt.Errorf("%w: invalid VTT timestamps", service.ErrYouTubeCaptionInvalid),+ audioErr: errors.New("transcription unavailable"),+ }+ response, err := GenerateSubtitles(context.Background(), fake, SubtitleRequest{+ Input: "https://www.youtube.com/watch?v=abc", Workdir: t.TempDir(), TaskID: "fallback-failed",+ CaptionSource: CaptionSourceAny,+ })+ if err == nil || response.Error.Code != "audio_transcription_failed" ||+ !strings.Contains(err.Error(), "invalid VTT timestamps") || !strings.Contains(err.Error(), "transcription unavailable") {+ t.Fatalf("response = %+v, error = %v", response, err)+ }+}+func TestPlatformAccessFailureDoesNotTriggerWhisperDownload(t *testing.T) {for _, captionSource := range []CaptionSource{CaptionSourceAny, CaptionSourcePlatform} {t.Run(string(captionSource), func(testCase *testing.T) {diff --git a/runtime/krillinai/internal/service/youtube_subtitle.go b/runtime/krillinai/internal/service/youtube_subtitle.goindex 4c2532ca..1ed88149 100644--- a/runtime/krillinai/internal/service/youtube_subtitle.go+++ b/runtime/krillinai/internal/service/youtube_subtitle.go@@ -6,6 +6,7 @@ import ("encoding/json""errors""fmt"+ "html""net/url""os""os/exec"@@ -26,6 +27,7 @@ import ()var ErrYouTubeCaptionAccess = errors.New("platform caption access failed")+var ErrYouTubeCaptionInvalid = errors.New("platform caption content is unusable")// VttWord 表示VTT文件中的一个单词及其时间戳信息type VttWord struct {@@ -511,17 +513,8 @@ func (s *YouTubeSubtitleService) findDownloadedSubtitleFile(taskBasePath, langua// 处理YouTube字幕文件,转换为标准格式并进行翻译func (s *YouTubeSubtitleService) processYouTubeSubtitle(ctx context.Context, req *YoutubeSubtitleReq) (string, error) {if req.VttFile == "" {- return "", fmt.Errorf("processYouTubeSubtitle: no original subtitle file found")+ return "", fmt.Errorf("%w: no original subtitle file found", ErrYouTubeCaptionInvalid)}- hasWordTimestamps, err := s.DetectVttFormat(req.VttFile)- if err != nil {- return "", fmt.Errorf("字幕格式检测失败: %w", err)- }- if !hasWordTimestamps {- return s.ProcessBlockLevelVtt(ctx, req)- }- log.GetLogger().Info("使用word-level VTT处理流程", zap.String("taskId", req.TaskId))-log.GetLogger().Info("processYouTubeSubtitle start",zap.String("taskId", req.TaskId),zap.String("subtitleFile", req.VttFile))@@ -531,6 +524,15 @@ func (s *YouTubeSubtitleService) processYouTubeSubtitle(ctx context.Context, reqreq.TaskPtr.SetProgress(10)}+ hasWordTimestamps, err := s.DetectVttFormat(req.VttFile)+ if err != nil {+ return "", fmt.Errorf("%w: 字幕格式检测失败: %w", ErrYouTubeCaptionInvalid, err)+ }+ if !hasWordTimestamps {+ return s.ProcessBlockLevelVtt(ctx, req)+ }+ log.GetLogger().Info("使用word-level VTT处理流程", zap.String("taskId", req.TaskId))+// 1. 提取VTT单词vttFilePath := req.VttFileif vttFilePath == "" {@@ -543,9 +545,12 @@ func (s *YouTubeSubtitleService) processYouTubeSubtitle(ctx context.Context, reqvttWords, err := s.ExtractWordsFromVtt(vttFilePath)if err != nil {- return "", fmt.Errorf("failed to extract VTT words: %w", err)+ return "", fmt.Errorf("%w: failed to extract VTT words: %w", ErrYouTubeCaptionInvalid, err)}log.GetLogger().Info("提取VTT单词完成", zap.Int("单词数", len(vttWords)))+ if len(vttWords) == 0 {+ return "", fmt.Errorf("%w: platform captions contained no usable text after filtering music, sound annotations and punctuation", ErrYouTubeCaptionInvalid)+ }// 更新进度:提取完成if req.TaskPtr != nil {@@ -560,7 +565,7 @@ func (s *YouTubeSubtitleService) processYouTubeSubtitle(ctx context.Context, reqsentences = s.groupWordsIntoSentences(vttWords)}if len(sentences) == 0 {- return "", fmt.Errorf("no sentences formed from VTT words")+ return "", fmt.Errorf("%w: no sentences formed from VTT words", ErrYouTubeCaptionInvalid)}log.GetLogger().Info("组织句子完成", zap.Int("句子数", len(sentences)))@@ -822,6 +827,8 @@ func (s *YouTubeSubtitleService) cleanVttText(text string) string {if text == "" {return text}+ text = html.UnescapeString(text)+ text = strings.NewReplacer("\u200b", "", "\u200c", "", "\u200d", "", "\u00a0", " ").Replace(text)// 先过滤音乐和其他提示标记(方括号内容)// 匹配 [music], [applause], [laughter], [inaudible] 等标记@@ -841,31 +848,9 @@ func (s *YouTubeSubtitleService) cleanVttText(text string) string {// 过滤常见的语气词(位于句首或独立出现时)// 匹配 Um, Uh, Er, Ah, Oh, Mm, Hmm 等,支持大小写- fillerWordsRegex := regexp.MustCompile(`(?i)^\s*(um|uh|er|ah|oh|mm|hmm|hm|eh)\s*[,,]?\s*`)+ fillerWordsRegex := regexp.MustCompile(`(?i)^\s*(um|uh|er|ah|oh|mm|hmm|hm|eh)\b\s*[,,]?\s*`)cleanedText = fillerWordsRegex.ReplaceAllString(cleanedText, "")- // HTML实体解码映射- htmlEntities := map[string]string{- ">>": "", // 大于号双引号 - 直接过滤掉- ">": ">", // 大于号- "<<": "<<", // 小于号双引号- "<": "<", // 小于号- "&": "&", // &符号- """: "\"", // 双引号- "'": "'", // 单引号- " ": " ", // 不间断空格- "'": "'", // 单引号的数字实体- """: "\"", // 双引号的数字实体- "​": "", // 零宽度空格- "‌": "", // 零宽度非连接符- "‍": "", // 零宽度连接符- }-- // 替换HTML实体- for entity, replacement := range htmlEntities {- cleanedText = strings.ReplaceAll(cleanedText, entity, replacement)- }-// 移除多余的空格cleanedText = strings.TrimSpace(cleanedText)@@ -3500,6 +3485,7 @@ func (s *YouTubeSubtitleService) ProcessBlockLevelVtt(ctx context.Context, req *if err != nil {return "", fmt.Errorf("VTT转SRT失败: %w", err)}+ defer os.Remove(tempSrtFile)log.GetLogger().Info("VTT转SRT完成", zap.String("srtFile", tempSrtFile))// 更新进度:VTT转换完成@@ -3507,14 +3493,28 @@ func (s *YouTubeSubtitleService) ProcessBlockLevelVtt(ctx context.Context, req *req.TaskPtr.SetProgress(30)}- // 2. 生成原文SRT文件(origin_language_srt.srt)- originSrtFile := filepath.Join(req.TaskBasePath, types.SubtitleTaskOriginLanguageSrtFileName)- // 直接复制临时SRT作为原文字幕- originData, err := os.ReadFile(tempSrtFile)+ // 2. 清理音频提示,只保留可用正文并重新编号。+ srtBlocks, err := util.ParseSrtFile(tempSrtFile)if err != nil {- return "", fmt.Errorf("读取临时SRT失败: %w", err)+ return "", fmt.Errorf("解析SRT文件失败: %w", err)+ }+ cleanedBlocks := make([]*util.SrtBlock, 0, len(srtBlocks))+ for _, block := range srtBlocks {+ block.OriginLanguageSentence = s.cleanVttText(block.OriginLanguageSentence)+ if block.OriginLanguageSentence == "" || s.isPurePunctuation(block.OriginLanguageSentence) || s.isAudioCue(block.OriginLanguageSentence) {+ continue+ }+ block.Index = len(cleanedBlocks) + 1+ cleanedBlocks = append(cleanedBlocks, block)+ }+ srtBlocks = cleanedBlocks+ if err := s.validateYouTubeSubtitleBlocks(srtBlocks, false); err != nil {+ return "", err}- err = os.WriteFile(originSrtFile, originData, 0644)++ // 3. 使用清理后的字幕生成原文产物。+ originSrtFile := filepath.Join(req.TaskBasePath, types.SubtitleTaskOriginLanguageSrtFileName)+ err = s.writeSrtBlocksToFile(srtBlocks, originSrtFile)if err != nil {return "", fmt.Errorf("写入原文SRT失败: %w", err)}@@ -3525,20 +3525,11 @@ func (s *YouTubeSubtitleService) ProcessBlockLevelVtt(ctx context.Context, req *req.TaskPtr.SetProgress(40)}- // 3. 解析SRT文件- srtBlocks, err := util.ParseSrtFile(tempSrtFile)- if err != nil {- return "", fmt.Errorf("解析SRT文件失败: %w", err)- }- if err := s.validateYouTubeSubtitleBlocks(srtBlocks, false); err != nil {- return "", err- }log.GetLogger().Info("解析SRT完成", zap.Int("字幕块数", len(srtBlocks)))if req.SourceOnly {if req.TaskPtr != nil {req.TaskPtr.SetProgress(100)}- _ = os.Remove(tempSrtFile)return originSrtFile, nil}@@ -3590,23 +3581,20 @@ func (s *YouTubeSubtitleService) ProcessBlockLevelVtt(ctx context.Context, req *zap.String("taskId", req.TaskId),zap.String("输出文件", bilingualSrtFile))- // 清理临时文件- os.Remove(tempSrtFile)-return bilingualSrtFile, nil}func (s *YouTubeSubtitleService) validateYouTubeSubtitleBlocks(blocks []*util.SrtBlock, translated bool) error {if len(blocks) == 0 {- return fmt.Errorf("字幕质量检查失败: 未生成有效字幕")+ return fmt.Errorf("%w: 字幕质量检查失败: 未生成有效字幕", ErrYouTubeCaptionInvalid)}for index, block := range blocks {if block == nil || strings.TrimSpace(block.OriginLanguageSentence) == "" {- return fmt.Errorf("字幕质量检查失败: 第%d条缺少原文", index+1)+ return fmt.Errorf("%w: 字幕质量检查失败: 第%d条缺少原文", ErrYouTubeCaptionInvalid, index+1)}start, end, err := s.parseSrtTimestamp(block.Timestamp)if err != nil || start < 0 || end <= start {- return fmt.Errorf("字幕质量检查失败: 第%d条时间区间无效", index+1)+ return fmt.Errorf("%w: 字幕质量检查失败: 第%d条时间区间无效", ErrYouTubeCaptionInvalid, index+1)}if translated && strings.TrimSpace(block.TargetLanguageSentence) == "" {return fmt.Errorf("字幕质量检查失败: 第%d条缺少译文", index+1)diff --git a/runtime/krillinai/internal/service/youtube_subtitle_routing_test.go b/runtime/krillinai/internal/service/youtube_subtitle_routing_test.goindex f8bc5f62..c5d1e440 100644--- a/runtime/krillinai/internal/service/youtube_subtitle_routing_test.go+++ b/runtime/krillinai/internal/service/youtube_subtitle_routing_test.go@@ -3,6 +3,7 @@ package serviceimport ("context""encoding/json"+ "errors""os""path/filepath""regexp"@@ -138,11 +139,14 @@ func TestProcessYouTubeSubtitleRejectsInvalidBlockVtt(test *testing.T) {"WEBVTT\n","WEBVTT\n\n00:00:00.000 --> 00:00:01.000\n\n","WEBVTT\n\n00:00:02.000 --> 00:00:01.000\nInvalid time interval.\n",+ "WEBVTT\n\n00:00:00.000 --> 00:00:01.000\n[music]\n",+ "WEBVTT\n\n00:00:00.000 --> 00:00:01.000\n[music]<00:00:00.500><c>[applause]</c>\n",+ "WEBVTT\n\nbroken timestamp\nBroken captions.\n",} {request := subtitleRoutingTestRequest(test, content)request.SourceOnly = true- if _, err := service.processYouTubeSubtitle(context.Background(), request); err == nil {- test.Fatal("空字幕或无效时间轴不应成功")+ if _, err := service.processYouTubeSubtitle(context.Background(), request); !errors.Is(err, ErrYouTubeCaptionInvalid) {+ test.Fatalf("不可用字幕应标记为无效平台字幕: %v", err)}if request.TaskPtr.ProcessPct == 100 {test.Fatal("不合格字幕不应报告完成")@@ -153,9 +157,78 @@ func TestProcessYouTubeSubtitleRejectsInvalidBlockVtt(test *testing.T) {func TestProcessYouTubeSubtitleRejectsMissingVtt(test *testing.T) {service := subtitleRoutingTestService(test)request := subtitleRoutingTestRequest(test, blockSubtitleRoutingFixture)- request.VttFile = filepath.Join(request.TaskBasePath, "missing.vtt")- if _, err := service.processYouTubeSubtitle(context.Background(), request); err == nil {- test.Fatal("格式检测失败不应默认按逐词字幕处理")+ for _, path := range []string{"", filepath.Join(request.TaskBasePath, "missing.vtt")} {+ request.VttFile = path+ if _, err := service.processYouTubeSubtitle(context.Background(), request); !errors.Is(err, ErrYouTubeCaptionInvalid) {+ test.Fatalf("缺少VTT应标记为无效平台字幕: %v", err)+ }+ }+}++func TestProcessBlockCaptionsFiltersAudioCuesAndPreservesSpeech(test *testing.T) {+ service := subtitleRoutingTestService(test)+ content := "WEBVTT\n\n00:00:00.000 --> 00:00:01.000\n[music]\n\n00:00:02.000 --> 00:00:03.000\n>> Mhm. [applause]\n\n00:00:04.000 --> 00:00:05.000\n[music] ♪\n\n00:00:06.000 --> 00:00:08.000\nUmbrellas & rain. (applause)\n"+ for _, sourceOnly := range []bool{true, false} {+ for _, targetFirst := range []bool{true, false} {+ test.Run(strconv.FormatBool(sourceOnly)+"/"+strconv.FormatBool(targetFirst), func(test *testing.T) {+ request := subtitleRoutingTestRequest(test, content)+ request.SourceOnly = sourceOnly+ request.TargetLanguageFirst = targetFirst+ if _, err := service.processYouTubeSubtitle(context.Background(), request); err != nil {+ test.Fatal(err)+ }+ originPath := filepath.Join(request.TaskBasePath, types.SubtitleTaskOriginLanguageSrtFileName)+ blocks, err := util.ParseSrtFile(originPath)+ if err != nil || len(blocks) != 2 {+ test.Fatalf("清理后的原文字幕=%v: %v", blocks, err)+ }+ for index, want := range []string{"Mhm.", "Umbrellas & rain."} {+ if blocks[index].Index != index+1 || blocks[index].OriginLanguageSentence != want {+ test.Fatalf("正文或序号改变: %+v", blocks[index])+ }+ }+ if blocks[0].Timestamp != "00:00:02,000 --> 00:00:03,000" || blocks[1].Timestamp != "00:00:06,000 --> 00:00:08,000" {+ test.Fatal("过滤不应改变有效字幕时间轴")+ }+ if !sourceOnly {+ for _, name := range []string{+ types.SubtitleTaskTargetLanguageSrtFileName,+ types.SubtitleTaskBilingualSrtFileName,+ filepath.Join("output", "origin_language.txt"),+ filepath.Join("output", "target_language.txt"),+ } {+ data, err := os.ReadFile(filepath.Join(request.TaskBasePath, name))+ if err != nil || !strings.Contains(string(data), "Mhm.") || !strings.Contains(string(data), "Umbrellas & rain.") || strings.Contains(string(data), "music") || strings.Contains(string(data), "applause") {+ test.Fatalf("产物未使用清理后的正文 %s: %s, %v", name, data, err)+ }+ }+ bilingual, err := util.ParseSrtFile(filepath.Join(request.TaskBasePath, types.SubtitleTaskBilingualSrtFileName))+ if err != nil || len(bilingual) != 2 || strings.HasPrefix(bilingual[0].OriginLanguageSentence, "测试译文:") != targetFirst {+ test.Fatalf("双语顺序或数量不符: %v, %v", bilingual, err)+ }+ }+ if _, err := os.Stat(filepath.Join(request.TaskBasePath, "temp_block_level.srt")); !os.IsNotExist(err) {+ test.Fatalf("临时文件未清理: %v", err)+ }+ })+ }+ }+}++func TestCleanVttTextPreservesWordsAndDecodesCues(test *testing.T) {+ service := subtitleRoutingTestService(test)+ for _, input := range []string{">> Mhm.", ">> Mhm.", ">> Mhm."} {+ if got := service.cleanVttText(input); got != "Mhm." {+ test.Fatalf("简短话语丢失: %q -> %q", input, got)+ }+ }+ for _, input := range []string{"Umbrellas", "Ohana", "Ernest"} {+ if got := service.cleanVttText(input); got != input {+ test.Fatalf("有效词语被误当成语气词: %q -> %q", input, got)+ }+ }+ if got := service.cleanVttText("[music] ​"); got != "" {+ test.Fatalf("编码后的音频提示未过滤: %q", got)}}@@ -175,8 +248,8 @@ func TestProcessYouTubeSubtitleDoesNotCompleteWithoutTextOutputs(test *testing.Tif err := os.WriteFile(filepath.Join(request.TaskBasePath, "output"), []byte("阻止创建文本目录"), 0644); err != nil {test.Fatal(err)}- if _, err := service.processYouTubeSubtitle(context.Background(), request); err == nil {- test.Fatal("必需文本产物无法生成时不应成功")+ if _, err := service.processYouTubeSubtitle(context.Background(), request); err == nil || errors.Is(err, ErrYouTubeCaptionInvalid) {+ test.Fatalf("产物写入失败应保留为处理错误: %v", err)}if request.TaskPtr.ProcessPct == 100 {test.Fatal("必需产物缺失时不应报告完成")@@ -197,6 +270,26 @@ func TestValidateYouTubeSubtitleBlocksRejectsMissingContent(test *testing.T) {}}+func TestSubtitleOutputFailuresAreNotInvalidCaptions(test *testing.T) {+ service := subtitleRoutingTestService(test)+ blocks := []*util.SrtBlock{{Timestamp: "00:00:00,000 --> 00:00:01,000", OriginLanguageSentence: "Hello."}}+ if err := service.validateYouTubeSubtitleBlocks(blocks, true); err == nil || errors.Is(err, ErrYouTubeCaptionInvalid) {+ test.Fatalf("缺少译文应保留为翻译输出错误: %v", err)+ }+ for _, name := range []string{"temp_block_level.srt", types.SubtitleTaskOriginLanguageSrtFileName} {+ test.Run(name, func(test *testing.T) {+ request := subtitleRoutingTestRequest(test, blockSubtitleRoutingFixture)+ request.SourceOnly = true+ if err := os.Mkdir(filepath.Join(request.TaskBasePath, name), 0755); err != nil {+ test.Fatal(err)+ }+ if _, err := service.processYouTubeSubtitle(context.Background(), request); err == nil || errors.Is(err, ErrYouTubeCaptionInvalid) {+ test.Fatalf("字幕写入失败应保留为处理错误: %v", err)+ }+ })+ }+}+func TestProcessYouTubeSubtitleProductionVttRegression(test *testing.T) {root := os.Getenv("KRILLIN_VTT_TASKS_DIR")if root == "" {diff --git a/runtime/krillinai/internal/service/youtube_subtitle_test.go b/runtime/krillinai/internal/service/youtube_subtitle_test.goindex 55263999..e3da9669 100644--- a/runtime/krillinai/internal/service/youtube_subtitle_test.go+++ b/runtime/krillinai/internal/service/youtube_subtitle_test.go@@ -2,6 +2,7 @@ package serviceimport ("context"+ "errors""krillin-ai/config""krillin-ai/internal/deps""krillin-ai/internal/storage"@@ -15,6 +16,42 @@ import ("testing")+func TestProcessYouTubeSubtitleClassifiesUnusableVTT(t *testing.T) {+ service := subtitleRoutingTestService(t)+ service.translator = nil+ for name, content := range map[string]string{+ "empty": "WEBVTT\n\n",+ "music-only": "WEBVTT\n\n00:00:00.000 --> 00:00:02.000\n[Music]\n\n",+ "block-text": "WEBVTT\nKind: captions\nLanguage: en\n\n00:00:11.840 --> 00:00:17.360\nuh these efforts by lawmakers to pass some form of \nAI regulation. There have been more than a hundred\n\n",+ "malformed": "WEBVTT\n\ninvalid --> timestamps\nNormal speech\n\n",+ } {+ t.Run(name, func(t *testing.T) {+ request := subtitleRoutingTestRequest(t, content)+ request.SourceOnly = true+ output, err := service.processYouTubeSubtitle(context.Background(), request)+ if name == "block-text" {+ if err != nil {+ t.Fatalf("有效整句字幕应成功: %v", err)+ }+ data, err := os.ReadFile(output)+ if err != nil || !strings.Contains(string(data), "AI regulation. There have been more than a hundred") {+ t.Fatalf("整句正文丢失: %s, %v", data, err)+ }+ return+ }+ if !errors.Is(err, ErrYouTubeCaptionInvalid) {+ t.Fatalf("不可用字幕应使用平台字幕无效分类: %v", err)+ }+ })+ }+ _, err := service.processYouTubeSubtitle(context.Background(), &YoutubeSubtitleReq{+ VttFile: filepath.Join(t.TempDir(), "missing.vtt"),+ })+ if !errors.Is(err, ErrYouTubeCaptionInvalid) {+ t.Fatalf("缺少VTT应使用平台字幕无效分类: %v", err)+ }+}+func TestSelectYouTubeSubtitleTrackPrefersManualOriginLanguage(t *testing.T) {metadata := youtubeSubtitleMetadata{Language: "en",