🎬 火宝短剧 - 基于AI的一站式短剧生成平台 《一句话生成完整短剧,从剧本到成片全自动化》 Huobao Drama - An AI-Powered End-to-End Short Drama Generator "One Sentence to Complete Drama: Fully Automated from Script to Final Video"
TypeScript
fix: improve video recovery, desktop startup and default chat selection
Connorae409eae5922
diff --git a/backend/src/db/schema.ts b/backend/src/db/schema.tsindex 9549ff3..ec5ba67 100644--- a/backend/src/db/schema.ts+++ b/backend/src/db/schema.ts@@ -200,6 +200,10 @@ export const stylePresets = sqliteTable('style_presets', {// 统一生成任务表:图片/视频生成共用,type 区分,生成参数存 params(JSON)export const sysTask = sqliteTable('sys_task', {id: integer('id').primaryKey({ autoIncrement: true }),+ configId: integer('config_id'),+ configBaseUrl: text('config_base_url'),+ stage: text('stage'),+ errorCode: text('error_code'),type: text('type').notNull(), // image | videostoryboardId: integer('storyboard_id'),dramaId: integer('drama_id'),diff --git a/backend/src/db/sqlite-schema.ts b/backend/src/db/sqlite-schema.tsindex ac18882..f2f25f1 100644--- a/backend/src/db/sqlite-schema.ts+++ b/backend/src/db/sqlite-schema.ts@@ -378,6 +378,11 @@ export function initSqliteSchema(sqlite: Database.Database) {for (const statement of sqliteSchemaStatements) {sqlite.exec(statement)}+ // 兼容已安装的桌面版;仅增加任务恢复元数据,不改写历史生成结果。+ const taskColumns = new Set((sqlite.prepare('PRAGMA table_info(sys_task)').all() as { name: string }[]).map(c => c.name))+ for (const [name, type] of Object.entries({ config_id: 'INTEGER', config_base_url: 'TEXT', stage: 'TEXT', error_code: 'TEXT' })) {+ if (!taskColumns.has(name)) sqlite.exec(`ALTER TABLE sys_task ADD COLUMN ${name} ${type}`)+ }const insertSeed = sqlite.prepare(SEED_SQL)const upgradeSeed = sqlite.prepare(UPGRADE_SQL)const removeSeed = sqlite.prepare(REMOVE_SQL)diff --git a/backend/src/index.ts b/backend/src/index.tsindex 87ebc39..6ce57e1 100644--- a/backend/src/index.ts+++ b/backend/src/index.ts@@ -24,9 +24,7 @@ import settings from './routes/settings.js'import storage from './routes/storage.js'import serverUpdate from './routes/serverUpdate.js'import { requestLogger, errorHandler } from './middleware/logger.js'-import { db, schema } from './db/index.js'-import { eq } from 'drizzle-orm'-import { now } from './utils/response.js'+import { resumeInterruptedTasks } from './services/generation.js'import { DATA_ROOT } from './utils/paths.js'const __dirname = path.dirname(fileURLToPath(import.meta.url))@@ -88,15 +86,6 @@ app.get('*', serveStatic({ root: distPath, path: 'index.html' }))const port = Number(process.env.PORT || 5679)console.log(`🚀 Huobao Drama TS server on http://localhost:${port}`)-// 进程重启后内存中的轮询线程全部丢失,残留的 processing 任务永远不会完成,-// 启动时统一标记为 failed,避免前端一直显示"生成中"-db.update(schema.sysTask)- .set({ status: 'failed', errorMsg: '服务重启,生成任务中断,请重试', updatedAt: now() })- .where(eq(schema.sysTask.status, 'processing'))- .then(res => {- const affected = res?.changes ?? 0- if (affected > 0) console.log(`🔁 已清理 ${affected} 个中断的生成任务`)- })- .catch(err => console.error('清理中断任务失败:', err?.message))+await resumeInterruptedTasks()serve({ fetch: app.fetch, port })diff --git a/backend/src/routes/tasks.ts b/backend/src/routes/tasks.tsindex 700e0a4..2461742 100644--- a/backend/src/routes/tasks.ts+++ b/backend/src/routes/tasks.ts@@ -1,14 +1,31 @@import { Hono } from 'hono'-import { eq } from 'drizzle-orm'+import { and, desc, eq } from 'drizzle-orm'import { db, schema } from '../db/index.js'import { success, created, badRequest } from '../utils/response.js'-import { generateImage, generateVideo } from '../services/generation.js'+import { generateImage, generateVideo, recoverVideoTask } from '../services/generation.js'+import { safeTaskError } from '../services/video-download.js'import { getActiveConfig, getConfigById } from '../services/ai.js'import { getDramaStylePrompt } from '../services/style-preset.js'import { logTaskError, logTaskPayload, logTaskStart, logTaskSuccess } from '../utils/task-logger.js'const app = new Hono()+app.post('/:id/recover', async c => {+ try {+ await recoverVideoTask(Number(c.req.param('id')))+ return success(c, { id: Number(c.req.param('id')) })+ } catch (error) { return badRequest(c, safeTaskError(error)) }+})++app.get('/:id/diagnostics', async c => {+ const [task] = await db.select().from(schema.sysTask).where(eq(schema.sysTask.id, Number(c.req.param('id'))))+ if (!task) return badRequest(c, '任务不存在')+ return success(c, { id: task.id, upstreamTaskId: task.taskId, provider: task.provider, model: task.model,+ status: task.status, stage: task.stage, errorCode: task.errorCode, error: safeTaskError(task.errorMsg),+ hasResult: !!task.resultUrl, hasLocalFile: !!task.localPath, createdAt: task.createdAt, updatedAt: task.updatedAt,+ version: process.env.HUOBAO_VERSION || 'development' })+})+type TaskType = 'image' | 'video'const WAN_MEDIA_TYPES = new Set([@@ -118,6 +135,15 @@ app.post('/', async (c) => {const videoBody = type === 'video' ? normalizeVideoRequest(body) : nulltry {+ if (type === 'video' && body.storyboard_id) {+ const [latest] = await db.select().from(schema.sysTask).where(and(+ eq(schema.sysTask.type, 'video'), eq(schema.sysTask.storyboardId, Number(body.storyboard_id))+ )).orderBy(desc(schema.sysTask.id)).limit(1)+ if (latest?.status === 'processing') return badRequest(c, '该分镜已有运行中的任务,请等待结果')+ if (latest?.status === 'failed' && body.force_new !== true) {+ return badRequest(c, '请先恢复原任务;重新生成需明确确认可能再次计费')+ }+ }// 请求显式指定 config_id(工作台模型下拉跨厂商切换)时优先;// 未指定才回退到集锁定配置,避免锁定配置与所选模型错配(如锁定 Seedance 却传 MiniMax 模型名)let configId: number | undefined = body.config_id@@ -173,6 +199,7 @@ app.post('/', async (c) => {configId,}): await generateVideo({+ forceNew: body.force_new === true,storyboardId: body.storyboard_id,dramaId: body.drama_id,prompt: videoPrompt,@@ -232,6 +259,8 @@ app.get('/', async (c) => {// DELETE /tasks/:idapp.delete('/:id', async (c) => {const id = Number(c.req.param('id'))+ const [task] = await db.select().from(schema.sysTask).where(eq(schema.sysTask.id, id))+ if (task?.status === 'processing') return badRequest(c, '任务运行中,暂不能删除')await db.delete(schema.sysTask).where(eq(schema.sysTask.id, id))return success(c)})diff --git a/backend/src/services/adapters/minimax-video.ts b/backend/src/services/adapters/minimax-video.tsindex 3a27e17..6090fbc 100644--- a/backend/src/services/adapters/minimax-video.ts+++ b/backend/src/services/adapters/minimax-video.ts@@ -109,13 +109,13 @@ export class MiniMaxVideoAdapter implements VideoProviderAdapter {}parseGenerateResponse(result: any): VideoGenResponse {- if (result.task_id) {- return { isAsync: true, taskId: String(result.task_id) }- }+ const taskId = result.task_id ?? result.task?.id+ const state = result.task?.status ?? result.statusconst videoUrl = result.task?.content?.url || result.content?.url || result.video_url- if (videoUrl) {- return { isAsync: false, videoUrl }+ if (videoUrl && (!state || state === 'succeeded')) {+ return { isAsync: false, videoUrl, taskId: taskId == null ? undefined : String(taskId), duration: result.task?.duration ?? result.duration }}+ if (taskId != null) return { isAsync: true, taskId: String(taskId) }throw new Error('No task_id or video url in response')}@@ -139,6 +139,7 @@ export class MiniMaxVideoAdapter implements VideoProviderAdapter {return {status: 'completed',videoUrl: task.content?.url || task.video_url,+ duration: task.duration,}}if (status === 'failed' || status === 'cancelled') {@@ -147,7 +148,7 @@ export class MiniMaxVideoAdapter implements VideoProviderAdapter {const code = err && typeof err === 'object' && err.code ? `[${err.code}] ` : ''return { status: 'failed', error: `${code}${msg}` }}- return { status: status || 'processing' }+ return { status: 'processing', stage: task.delivery?.status === 'transferring' ? 'transferring' : undefined }}extractVideoUrl(result: any): string | null {diff --git a/backend/src/services/adapters/types.ts b/backend/src/services/adapters/types.tsindex 0103c3c..714194e 100644--- a/backend/src/services/adapters/types.ts+++ b/backend/src/services/adapters/types.ts@@ -74,6 +74,7 @@ export interface ProviderRequest {}export interface AIConfig {+ id?: numberprovider: stringbaseUrl: stringapiKey: string@@ -130,10 +131,12 @@ export interface VideoGenResponse {isAsync: booleantaskId?: stringvideoUrl?: string+ duration?: number}export interface VideoPollResponse {status: 'pending' | 'processing' | 'completed' | 'failed'+ stage?: 'transferring'videoUrl?: stringduration?: numbererror?: stringdiff --git a/backend/src/services/ai.ts b/backend/src/services/ai.tsindex 22e5600..ccc1a47 100644--- a/backend/src/services/ai.ts+++ b/backend/src/services/ai.ts@@ -9,6 +9,7 @@ import { joinProviderUrl } from './adapters/url.js'export type ServiceType = 'text' | 'image' | 'video'export interface AIConfig {+ id?: numberprovider: stringbaseUrl: stringapiKey: string@@ -87,6 +88,7 @@ export async function getActiveConfig(serviceType: ServiceType): Promise<AIConfi})}return {+ id: active.id,provider: active.provider || '',baseUrl: active.baseUrl,apiKey: active.apiKey,@@ -140,6 +142,7 @@ export async function getConfigById(id: number): Promise<AIConfig | null> {})}return {+ id: row.id,provider: row.provider || '',baseUrl: row.baseUrl,apiKey: row.apiKey,diff --git a/backend/src/services/generation.ts b/backend/src/services/generation.tsindex c513355..a362ce1 100644--- a/backend/src/services/generation.ts+++ b/backend/src/services/generation.ts@@ -3,7 +3,10 @@* 创建(processing) → 适配器构建请求 → 同步完成或异步轮询 → 下载落盘 → 回写业务表*/import { db, getInsertId, schema } from '../db/index.js'-import { eq } from 'drizzle-orm'+import { and, desc, eq, gt } from 'drizzle-orm'+import fs from 'node:fs'+import { getAbsolutePath } from '../utils/storage.js'+import { downloadVideo, safeTaskError } from './video-download.js'import { getActiveConfig, getConfigById } from './ai.js'import { now } from '../utils/response.js'import { downloadFile, fetchImageAsCompressedDataUrl, generateImageThumb, readImageAsCompressedDataUrl, readImageAsDataUrl, saveBase64Image } from '../utils/storage.js'@@ -14,6 +17,14 @@ import { logTaskError, logTaskPayload, logTaskProgress, logTaskStart, logTaskSuctype TaskType = 'image' | 'video'+const activeTasks = new Set<number>()+const videoSubmissions = new Set<number>()+function runBackground(id: number, job: () => Promise<void>) {+ if (activeTasks.has(id)) return+ activeTasks.add(id)+ void job().catch(error => failTask(id, safeTaskError(error))).finally(() => activeTasks.delete(id))+}+const taskLabel = (type: TaskType) => (type === 'image' ? 'ImageTask' : 'VideoTask')// 轮询节奏:图片 5s×120(上限 10 分钟);视频 10s×300@@ -58,6 +69,7 @@ interface GenerateVideoParams {promptExtend?: booleanwatermark?: booleanconfigId?: number+ forceNew?: boolean}export async function generateImage(params: GenerateImageParams): Promise<number> {@@ -99,51 +111,64 @@ export async function generateImage(params: GenerateImageParams): Promise<number}export async function generateVideo(params: GenerateVideoParams): Promise<number> {- // 指定配置(集锁定)可能已停用/删除/厂商收敛,失效时回退到当前启用配置- const config = params.configId- ? (await getConfigById(params.configId)) ?? await getActiveConfig('video')- : await getActiveConfig('video')- if (!config) throw new Error('未配置视频模型,请先到「设置」页添加并启用 AI 服务')-- const id = await createTask('video', config, {- storyboardId: params.storyboardId,- dramaId: params.dramaId,- prompt: params.prompt,- model: params.model || config.model,- }, {- referenceMode: params.referenceMode || 'reference',- imageUrl: params.imageUrl,- firstFrameUrl: params.firstFrameUrl,- lastFrameUrl: params.lastFrameUrl,- referenceImageUrls: params.referenceImageUrls,- referenceVideoUrls: params.referenceVideoUrls,- referenceAudioUrls: params.referenceAudioUrls,- referenceFileUrl: params.referenceFileUrl,- referenceLinkUrl: params.referenceLinkUrl,- generateAudio: params.generateAudio === false ? 0 : 1,- duration: params.duration,- aspectRatio: params.aspectRatio,- // 统一存为项目内部格式,各适配器再转换为官方大小写与枚举。- resolution: normalizeStoredVideoResolution(params.resolution),- seed: params.seed,- promptExtend: params.promptExtend,- watermark: params.watermark,- })+ const storyboardId = params.storyboardId+ if (storyboardId && videoSubmissions.has(storyboardId)) throw new Error('该分镜正在提交任务,请勿重复点击')+ if (storyboardId) videoSubmissions.add(storyboardId)+ try {+ if (storyboardId) {+ const [latest] = await db.select().from(schema.sysTask).where(and(eq(schema.sysTask.type, 'video'), eq(schema.sysTask.storyboardId, storyboardId)))+ .orderBy(desc(schema.sysTask.id)).limit(1)+ if (latest?.status === 'processing') throw new Error('该分镜已有运行中的任务,请等待结果')+ if (latest?.status === 'failed' && params.forceNew !== true) throw new Error('请先恢复原任务;重新生成需确认可能再次计费')+ }+ // 指定配置(集锁定)可能已停用/删除/厂商收敛,失效时回退到当前启用配置+ const config = params.configId+ ? (await getConfigById(params.configId)) ?? await getActiveConfig('video')+ : await getActiveConfig('video')+ if (!config) throw new Error('未配置视频模型,请先到「设置」页添加并启用 AI 服务')++ const id = await createTask('video', config, {+ storyboardId: params.storyboardId,+ dramaId: params.dramaId,+ prompt: params.prompt,+ model: params.model || config.model,+ }, {+ referenceMode: params.referenceMode || 'reference',+ imageUrl: params.imageUrl,+ firstFrameUrl: params.firstFrameUrl,+ lastFrameUrl: params.lastFrameUrl,+ referenceImageUrls: params.referenceImageUrls,+ referenceVideoUrls: params.referenceVideoUrls,+ referenceAudioUrls: params.referenceAudioUrls,+ referenceFileUrl: params.referenceFileUrl,+ referenceLinkUrl: params.referenceLinkUrl,+ generateAudio: params.generateAudio === false ? 0 : 1,+ duration: params.duration,+ aspectRatio: params.aspectRatio,+ // 统一存为项目内部格式,各适配器再转换为官方大小写与枚举。+ resolution: normalizeStoredVideoResolution(params.resolution),+ seed: params.seed,+ promptExtend: params.promptExtend,+ watermark: params.watermark,+ })- logTaskStart('VideoTask', 'enqueue', {- id,- provider: config.provider,- storyboardId: params.storyboardId,- dramaId: params.dramaId,- referenceMode: params.referenceMode || 'reference',- duration: params.duration || 5,- })- logTaskPayload('VideoTask', 'enqueue params', {- id,- config: { provider: config.provider, model: config.model, baseUrl: config.baseUrl },- params,- })- return id+ logTaskStart('VideoTask', 'enqueue', {+ id,+ provider: config.provider,+ storyboardId: params.storyboardId,+ dramaId: params.dramaId,+ referenceMode: params.referenceMode || 'reference',+ duration: params.duration || 5,+ })+ logTaskPayload('VideoTask', 'enqueue params', {+ id,+ config: { provider: config.provider, model: config.model, baseUrl: config.baseUrl },+ params,+ })+ return id+ } finally {+ if (storyboardId) videoSubmissions.delete(storyboardId)+ }}async function createTask(@@ -165,6 +190,9 @@ async function createTask(type,...fields,provider: config.provider,+ configId: config.id,+ configBaseUrl: config.baseUrl,+ stage: 'submitting',params: JSON.stringify(params),status: 'processing',createdAt: ts,@@ -172,10 +200,7 @@ async function createTask(})const id = getInsertId(res)- processTask(id, config).catch(err => {- logTaskError(taskLabel(type), 'process', { id, error: err.message })- console.error(`${taskLabel(type)} ${id} failed:`, err)- })+ runBackground(id, () => processTask(id, config))return id}@@ -271,6 +296,13 @@ async function processTask(id: number, config: AIConfig) {signal: AbortSignal.timeout(600_000),})+ // Firemux 在响应头提供内部任务编号;即使 JSON 响应体中断也能查询原任务。+ const gatewayTaskId = resp.headers.get('X-Firemux-Task-Id') || resp.headers.get('X-Huobao-Task-Id')+ if (type === 'video' && gatewayTaskId) {+ await markPolling(id, gatewayTaskId)+ record.taskId = gatewayTaskId+ }+if (!resp.ok) throw new Error(`API error ${resp.status}: ${await resp.text()}`)const result = await resp.json() as anylogTaskPayload(label, 'response payload', { id, provider: config.provider, result })@@ -297,37 +329,45 @@ async function processTask(id: number, config: AIConfig) {}await markPolling(id, taskId)- pollTask(record, config, taskId!)+ await pollTask(record, config, taskId!)return}const adapter = getVideoAdapter(config.provider)- const { isAsync, taskId, videoUrl } = adapter.parseGenerateResponse(result)+ const { isAsync, taskId, videoUrl, duration } = adapter.parseGenerateResponse(result)+ if (taskId) {+ await markPolling(id, taskId)+ record.taskId = taskId+ }if (!isAsync && videoUrl) {logTaskProgress(label, 'sync-complete', { id, videoUrl })- await handleVideoComplete(record, videoUrl, params.duration)+ await handleVideoComplete(record, videoUrl, duration ?? params.duration)return}await markPolling(id, taskId)- pollTask(record, config, taskId!)+ await pollTask(record, config, taskId!)} catch (err: any) {- await failTask(id, err.message)+ const [current] = await db.select().from(schema.sysTask).where(eq(schema.sysTask.id, id))+ const uncertain = current?.type === 'video' && !current.taskId && !current.resultUrl+ && (err instanceof TypeError || /timeout|abort|No task_id|API error 5/i.test(err.message))+ await failTask(id, safeTaskError(err), uncertain ? 'submission_unknown' : undefined)}}async function markPolling(id: number, taskId: string | undefined) {await db.update(schema.sysTask)- .set({ taskId, status: 'processing', updatedAt: now() })+ .set({ taskId, stage: 'polling', status: 'processing', updatedAt: now() }).where(eq(schema.sysTask.id, id))logTaskProgress('SysTask', 'poll-start', { id, taskId })}-async function failTask(id: number, message: string) {+async function failTask(id: number, message: string, code?: string) {+ message = safeTaskError(message)logTaskError('SysTask', 'failed', { id, error: message })await db.update(schema.sysTask)- .set({ status: 'failed', errorMsg: message, updatedAt: now() })+ .set({ status: 'failed', errorMsg: safeTaskError(message), ...(code ? { errorCode: code } : {}), updatedAt: now() }).where(eq(schema.sysTask.id, id))}@@ -369,6 +409,9 @@ async function pollTask(record: SysTaskRecord, config: AIConfig, taskId: string)// 图片/视频 PollResponse 结构不同,这里统一按 any 取值后按 type 分支const pollResp: any = adapter.parsePollResponse(result)+ if (type === 'video' && pollResp.stage === 'transferring') {+ await db.update(schema.sysTask).set({ stage: 'transferring', updatedAt: now() }).where(eq(schema.sysTask.id, record.id))+ }if (pollResp.status === 'completed') {if (type === 'image') {@@ -394,7 +437,9 @@ async function pollTask(record: SysTaskRecord, config: AIConfig, taskId: string)}if (pollResp.status === 'failed') {// 上游明确失败(如内容审核拦截)属终态:立即落库,不重试不等待超时- await failTask(record.id, pollResp.error || 'Generation failed')+ const deliveryFailed = /video_transfer_failed/.test(pollResp.error || '')+ if (deliveryFailed) await db.update(schema.sysTask).set({ stage: 'transferring' }).where(eq(schema.sysTask.id, record.id))+ await failTask(record.id, pollResp.error || 'Generation failed', deliveryFailed ? 'delivery_failed' : 'generation_failed')return}} catch (err: any) {@@ -459,19 +504,90 @@ async function writeBackImageAssets(record: SysTaskRecord, localPath: string) {}async function handleVideoComplete(record: SysTaskRecord, videoUrl: string, duration: number | null | undefined) {- const localPath = await downloadFile(videoUrl, 'videos')- // 海报帧供列表/封面展示,避免前端为显示首帧缓冲整个视频- await extractVideoPoster(localPath)- await db.update(schema.sysTask)- .set({ resultUrl: videoUrl, localPath, status: 'completed', completedAt: now(), updatedAt: now() })+ // 先落库地址与实际时长;后续下载失败仍可恢复,且不重新提交生成。+ const params = { ...parseTaskParams(record.params), resultDuration: duration }+ await db.update(schema.sysTask).set({ resultUrl: videoUrl, params: JSON.stringify(params),+ stage: 'downloading', status: 'processing', errorCode: null, errorMsg: null, updatedAt: now() }).where(eq(schema.sysTask.id, record.id))+ try {+ const localPath = record.localPath && fs.existsSync(getAbsolutePath(record.localPath))+ ? record.localPath : await downloadVideo(videoUrl, record.id)+ await db.update(schema.sysTask).set({ localPath, stage: 'saving', updatedAt: now() }).where(eq(schema.sysTask.id, record.id))+ await extractVideoPoster(localPath)+ // 完成状态与业务回写原子提交;恢复旧任务不能覆盖用户后来生成的视频。+ db.transaction(tx => {+ const newer = record.storyboardId ? tx.select({ id: schema.sysTask.id }).from(schema.sysTask)+ .where(and(eq(schema.sysTask.storyboardId, record.storyboardId), eq(schema.sysTask.type, 'video'), gt(schema.sysTask.id, record.id))).get() : null+ if (record.storyboardId && !newer) tx.update(schema.storyboards)+ .set({ videoUrl: localPath, duration: duration || undefined, updatedAt: now() })+ .where(eq(schema.storyboards.id, record.storyboardId)).run()+ tx.update(schema.sysTask).set({ localPath, status: 'completed', stage: 'completed', errorCode: null,+ errorMsg: null, completedAt: now(), updatedAt: now() }).where(eq(schema.sysTask.id, record.id)).run()+ })+ } catch (error) {+ await failTask(record.id, safeTaskError(error), 'delivery_failed')+ }+}- logTaskSuccess('VideoTask', 'downloaded', { id: record.id, localPath, storyboardId: record.storyboardId, duration })+async function recoveryConfig(record: SysTaskRecord): Promise<AIConfig> {+ if (record.configId) {+ const config = await getConfigById(record.configId)+ if (config && config.provider === record.provider && config.baseUrl === record.configBaseUrl) return config+ throw new Error('原视频服务配置已删除、停用或地址变更,请恢复原配置')+ }+ // 旧任务只在同厂商唯一配置时恢复,绝不任意换服务商查询。+ const rows = (await db.select().from(schema.aiServiceConfigs)).filter(c => c.isActive && c.serviceType === 'video' && c.provider === record.provider)+ if (rows.length === 1) {+ const config = await getConfigById(rows[0].id)+ if (config) return config+ }+ throw new Error('历史任务无法确定原服务配置,请先核对配置')+}- if (record.storyboardId) {- await db.update(schema.storyboards)- .set({ videoUrl: localPath, duration: duration || undefined, updatedAt: now() })- .where(eq(schema.storyboards.id, record.storyboardId))+export async function recoverVideoTask(id: number): Promise<void> {+ const [record] = await db.select().from(schema.sysTask).where(eq(schema.sysTask.id, id))+ if (!record || record.type !== 'video') throw new Error('视频任务不存在')+ if (activeTasks.has(id) || record.status === 'completed') return+ if (!record.resultUrl && !record.taskId) throw new Error('未保存上游任务编号,请先核对上游记录,勿重复生成')+ if (record.errorCode === 'generation_failed') throw new Error('上游已确认生成失败,无法恢复原任务')+ // 在任何异步配置读取前获取锁,重复点击不会启动多个下载。+ activeTasks.add(id)+ try {+ const config = record.taskId && !record.resultUrl ? await recoveryConfig(record) : null+ await db.update(schema.sysTask).set({ status: 'processing', errorMsg: null, errorCode: null,+ stage: record.resultUrl ? 'downloading' : record.stage === 'transferring' || record.errorCode === 'delivery_failed' ? 'transferring' : 'polling', updatedAt: now() }).where(eq(schema.sysTask.id, id))+ void (async () => {+ if (record.resultUrl) {+ await handleVideoComplete(record, record.resultUrl, parseTaskParams(record.params).resultDuration)+ const [fresh] = await db.select().from(schema.sysTask).where(eq(schema.sysTask.id, id))+ if (fresh?.status !== 'failed' || !record.taskId) return+ // 签名链接可能过期:重新查询原任务拿新地址。+ }+ const originalConfig = config ?? await recoveryConfig(record)+ // Firemux 的交付恢复是独立接口;只在其明确返回交付失败时调用。+ if (record.provider === 'minimax' && (record.errorCode === 'delivery_failed' || record.stage === 'transferring') && !record.resultUrl) {+ const req = getVideoAdapter('minimax').buildPollRequest(originalConfig, record.taskId!)+ const resp = await fetch(`${req.url}/recover`, { method: 'POST', headers: req.headers, signal: AbortSignal.timeout(30_000) })+ if (!resp.ok) throw new Error(`Video delivery recovery HTTP ${resp.status}`)+ }+ await markPolling(id, record.taskId!)+ await pollTask(record, originalConfig, record.taskId!)+ })().catch(error => failTask(id, safeTaskError(error), 'recovery_failed')).finally(() => activeTasks.delete(id))+ } catch (error) {+ activeTasks.delete(id)+ throw error+ }+}++export async function resumeInterruptedTasks() {+ const tasks = await db.select().from(schema.sysTask).where(eq(schema.sysTask.status, 'processing')).orderBy(desc(schema.sysTask.id))+ for (const task of tasks) {+ if (task.type === 'video' && (task.taskId || task.resultUrl)) {+ try { await recoverVideoTask(task.id) } catch (error) { await failTask(task.id, safeTaskError(error), 'recovery_failed') }+ } else {+ await failTask(task.id, task.type === 'video' ? '服务中断,提交结果待确认,请先核对上游记录' : '服务重启,生成任务中断,请重试',+ task.type === 'video' ? 'submission_unknown' : 'interrupted')+ }}}diff --git a/backend/src/services/video-download.ts b/backend/src/services/video-download.tsnew file mode 100644index 0000000..7588e7a--- /dev/null+++ b/backend/src/services/video-download.ts@@ -0,0 +1,70 @@+import fs from 'node:fs'+import path from 'node:path'+import { Readable, Transform } from 'node:stream'+import { pipeline } from 'node:stream/promises'+import { STORAGE_ROOT } from '../utils/paths.js'++export class VideoDownloadError extends Error {+ constructor(public code: string, message: string, public retryable = false) { super(message) }+}++/** 不把 API key、签名链接带到诊断文本、日志或剪贴板。 */+export function safeTaskError(error: unknown): string {+ return String(error instanceof Error ? error.message : error || 'Unknown failure')+ .replace(/https?:\/\/[^\s"'<>]+/gi, '[URL omitted]')+ .replace(/(Bearer\s+)\S+/gi, '$1[redacted]')+ .replace(/((?:api[_-]?key|signature|token|secret)\s*["']?\s*[:=]\s*["']?)[^\s,"'}&]+/gi, '$1[redacted]')+ .replace(/\bsk-[\w-]+/g, '[redacted]')+ .slice(0, 600)+}++/** 下载到临时文件,校验容器头后原子改名;同任务重复恢复不会新增媒体文件。 */+export async function downloadVideo(url: string, taskId: number, options: {+ root?: string; attempts?: number; timeoutMs?: number; retryDelayMs?: number; maxBytes?: number+} = {}): Promise<string> {+ const parsed = new URL(url)+ if (!['http:', 'https:'].includes(parsed.protocol)) throw new VideoDownloadError('download_url', 'Invalid video URL protocol')+ const root = options.root ?? STORAGE_ROOT+ const dir = path.join(root, 'videos')+ await fs.promises.mkdir(dir, { recursive: true })+ const partial = path.join(dir, `task-${taskId}.part`)+ const attempts = options.attempts ?? 3+ const maxBytes = options.maxBytes ?? 512 * 1024 * 1024+ for (let attempt = 0; attempt < attempts; attempt++) {+ try {+ const signal = AbortSignal.timeout(options.timeoutMs ?? 120_000)+ const resp = await fetch(url, { signal })+ if (!resp.ok) {+ await resp.body?.cancel()+ throw new VideoDownloadError('download_http', `Video download HTTP ${resp.status}`, [408, 429].includes(resp.status) || resp.status >= 500)+ }+ if (Number(resp.headers.get('content-length')) > maxBytes) {+ await resp.body?.cancel()+ throw new VideoDownloadError('download_size', 'Video exceeds download size limit')+ }+ if (!resp.body) throw new VideoDownloadError('download_empty', 'Empty video response', true)+ let bytes = 0+ let head = Buffer.alloc(0)+ const validator = new Transform({ transform(chunk, _encoding, callback) {+ bytes += chunk.length+ if (head.length < 16) head = Buffer.concat([head, chunk.subarray(0, 16 - head.length)])+ if (bytes > maxBytes) return callback(new VideoDownloadError('download_size', 'Video exceeds download size limit'))+ callback(null, chunk)+ } })+ await pipeline(Readable.fromWeb(resp.body as any), validator, fs.createWriteStream(partial), { signal })+ const mp4 = head.length >= 12 && head.toString('ascii', 4, 8) === 'ftyp'+ const webm = head.length >= 4 && head.readUInt32BE(0) === 0x1a45dfa3+ if (!mp4 && !webm) throw new VideoDownloadError('download_format', 'Response is not an MP4 or WebM video')+ const name = `task-${taskId}.${webm ? 'webm' : 'mp4'}`+ await fs.promises.rename(partial, path.join(dir, name))+ return `static/videos/${name}`+ } catch (error) {+ await fs.promises.rm(partial, { force: true })+ const retryable = error instanceof VideoDownloadError ? error.retryable+ : error instanceof TypeError || ['TimeoutError', 'AbortError'].includes((error as Error).name)+ if (!retryable || attempt === attempts - 1) throw error+ await new Promise(resolve => setTimeout(resolve, (options.retryDelayMs ?? 1000) * 2 ** attempt))+ }+ }+ throw new VideoDownloadError('download_failed', 'Video download failed')+}diff --git a/backend/src/utils/task-logger.ts b/backend/src/utils/task-logger.tsindex e53c2f7..08068fa 100644--- a/backend/src/utils/task-logger.ts+++ b/backend/src/utils/task-logger.ts@@ -44,15 +44,17 @@ function formatMeta(meta?: Record<string, unknown>) {export function redactUrl(rawUrl: string) {try {const url = new URL(rawUrl)- for (const key of ['key', 'api_key', 'apikey', 'token', 'access_token']) {- if (url.searchParams.has(key)) {+ for (const key of [...url.searchParams.keys()]) {+ if (/key|token|sign|credential|secret/i.test(key)) {url.searchParams.set(key, '***')}}+ if (url.username) url.username = '***'+ if (url.password) url.password = '***'return url.toString()} catch {return rawUrl- .replace(/([?&](?:key|api_key|apikey|token|access_token)=)[^&]+/gi, '$1***')+ .replace(/([?&](?:key|api_key|apikey|token|access_token|sign|signature|sig)=)[^&]+/gi, '$1***')}}diff --git a/backend/tests/text-model-selection.test.ts b/backend/tests/text-model-selection.test.tsnew file mode 100644index 0000000..94e74b6--- /dev/null+++ b/backend/tests/text-model-selection.test.ts@@ -0,0 +1,25 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import { resolveTextModelSelection } from '../../frontend/app/utils/text-model-selection.js'++const options = [+ { key: 'gemini/gemini-flash', model: 'gemini-flash', configId: 7 },+ { key: 'openai/gemini-flash', model: 'gemini-flash', configId: 12 },+ { key: 'openai/vendor/model', model: 'vendor/model', configId: 12 },+]++test('default chat selection sends the displayed model and its configuration in JSON', () => {+ const selected = resolveTextModelSelection(options, '')+ const request = JSON.parse(JSON.stringify({ model: selected.model, config_id: selected.configId }))+ assert.deepEqual(request, { model: 'gemini-flash', config_id: 7 })+})+test('explicit selection keeps the provider/configuration and model names containing slashes', () => {+ assert.deepEqual(resolveTextModelSelection(options, 'openai/gemini-flash'), { model: 'gemini-flash', configId: 12 })+ assert.deepEqual(resolveTextModelSelection(options, 'openai/vendor/model'), { model: 'vendor/model', configId: 12 })+})+test('default follows updated options; stale selections fall back as the picker does', () => {+ assert.deepEqual(resolveTextModelSelection(options.slice(1), ''), { model: 'gemini-flash', configId: 12 })+ assert.deepEqual(resolveTextModelSelection(options, 'removed/model'), { model: 'gemini-flash', configId: 7 })+ assert.deepEqual(resolveTextModelSelection(options, 'vendor/model'), { model: 'vendor/model', configId: 12 })+ assert.deepEqual(resolveTextModelSelection([], ''), { model: undefined, configId: undefined })+})diff --git a/backend/tests/video-delivery.test.ts b/backend/tests/video-delivery.test.tsnew file mode 100644index 0000000..9d2ae1a--- /dev/null+++ b/backend/tests/video-delivery.test.ts@@ -0,0 +1,67 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import fs from 'node:fs/promises'+import os from 'node:os'+import path from 'node:path'+import http from 'node:http'+import { downloadVideo, safeTaskError } from '../src/services/video-download.ts'+import { MiniMaxVideoAdapter } from '../src/services/adapters/minimax-video.ts'++const video = Buffer.concat([Buffer.from([0,0,0,24]), Buffer.from('ftypisom'), Buffer.alloc(32)])+async function serve(handler: http.RequestListener) {+ const server = http.createServer(handler)+ await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve))+ const url = `http://127.0.0.1:${(server.address() as any).port}`+ return { url, close: () => new Promise<void>(resolve => server.close(() => resolve())) }+}++test('MiniMax preserves task ID and actual duration for the supplied response contract', () => {+ const adapter = new MiniMaxVideoAdapter()+ const result = { task: { id: '2109166298120097792', status: 'succeeded', duration: 12, content: { url: 'https://files.example/content?signature=test' } } }+ assert.deepEqual(adapter.parseGenerateResponse(result), { isAsync: false, taskId: result.task.id, videoUrl: result.task.content.url, duration: 12 })+ assert.equal(adapter.parsePollResponse(result).duration, 12)+ assert.deepEqual(adapter.parseGenerateResponse({ task: { id: 'stored-task', status: 'running' } }), { isAsync: true, taskId: 'stored-task' })+ assert.equal(adapter.parseGenerateResponse({ task_id: 'stored-task', ...result }).isAsync, false)+})++test('extensionless MP4 downloads atomically and transient HTTP errors retry', async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), 'video-download-'))+ let requests = 0+ const server = await serve((_req, res) => { if (++requests === 1) { res.writeHead(503).end('temporary'); return }; res.end(video) })+ try {+ assert.equal(await downloadVideo(server.url + '/content?signature=test', 2, { root, retryDelayMs: 1 }), 'static/videos/task-2.mp4')+ assert.equal(requests, 2)+ assert.deepEqual(await fs.readFile(path.join(root, 'videos/task-2.mp4')), video)+ assert.deepEqual(await fs.readdir(path.join(root, 'videos')), ['task-2.mp4'])+ } finally { await server.close(); await fs.rm(root, { recursive: true, force: true }) }+})++test('invalid bodies, size limits and permanent HTTP failures leave no partial files', async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), 'video-invalid-'))+ const server = await serve((req, res) => {+ if (req.url === '/missing') { res.writeHead(404).end(); return }+ if (req.url === '/large') { res.end(video); return }+ res.end('<html>expired signature</html>')+ })+ try {+ for (const [url, maxBytes] of [['/missing', 1000], ['/html', 1000], ['/large', 16]] as const) {+ await assert.rejects(downloadVideo(server.url + url, 3, { root, maxBytes, retryDelayMs: 1 }))+ assert.deepEqual(await fs.readdir(path.join(root, 'videos')), [])+ }+ } finally { await server.close(); await fs.rm(root, { recursive: true, force: true }) }+})++test('a stalled body times out and does not leave a partial file', async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), 'video-timeout-'))+ const server = await serve((_req, res) => { res.writeHead(200); res.write(video) })+ try {+ await assert.rejects(downloadVideo(server.url, 4, { root, attempts: 1, timeoutMs: 30 }))+ assert.deepEqual(await fs.readdir(path.join(root, 'videos')), [])+ } finally { await server.close(); await fs.rm(root, { recursive: true, force: true }) }+})++test('diagnostics remove signed URLs and credentials', () => {+ const error = safeTaskError('fetch failed https://files.example/content?signature=hidden Bearer secret api_key=secret sk-hidden')+ assert.doesNotMatch(error, /signature=hidden|Bearer secret|api_key=secret|sk-hidden/)+ assert.match(error, /fetch failed/)+})diff --git a/backend/tests/video-recovery.test.ts b/backend/tests/video-recovery.test.tsnew file mode 100644index 0000000..3efa353--- /dev/null+++ b/backend/tests/video-recovery.test.ts@@ -0,0 +1,106 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import fs from 'node:fs/promises'+import os from 'node:os'+import path from 'node:path'+import http from 'node:http'+import { eq } from 'drizzle-orm'++// Isolated DB/storage; never read or modify user tasks/configurations.+const root = await fs.mkdtemp(path.join(os.tmpdir(), 'huobao-recovery-'))+process.env.SQLITE_PATH = path.join(root, 'tasks.sqlite3')+process.env.HUOBAO_DATA_DIR = root+process.env.STORAGE_PATH = path.join(root, 'static')+process.env.MYSQL_AUTO_IMPORT = 'false'+process.env.FFMPEG_BIN = '/usr/bin/false'+process.env.FFPROBE_BIN = '/usr/bin/false'+const { db, schema } = await import('../src/db/index.ts')+const { generateVideo, recoverVideoTask, resumeInterruptedTasks } = await import('../src/services/generation.ts')+const tasksRoute = (await import('../src/routes/tasks.ts')).default+let submissionCount = 0, downloads = 0, recoveryCalls = 0, available = false, brokenResponse = false+const video = Buffer.concat([Buffer.from([0,0,0,24]), Buffer.from('ftypisom'), Buffer.alloc(32)])+const server = http.createServer((req, res) => {+ if (req.method === 'POST' && req.url?.endsWith('/recover')) { recoveryCalls++; res.end('{}'); return }+ if (req.url?.startsWith('/v2/query/')) { res.end(JSON.stringify({ task: { id:'upstream-1', status:'succeeded', duration:12, content:{url:base+'/content'} } })); return }+ if (req.url === '/expired') { res.writeHead(403).end(); return }+ if (req.method === 'POST' && brokenResponse) { submissionCount++; res.setHeader('X-Firemux-Task-Id','gateway-known'); res.end('{invalid'); return }+ if (req.method === 'POST') { submissionCount++; res.setHeader('Content-Type','application/json'); res.end(JSON.stringify({ task: { id:'upstream-1', status:'succeeded', duration:12, content:{url:base+'/content'} } })); return }+ downloads+++ if (!available) { res.writeHead(404).end(); return }+ res.end(video)+})+await new Promise<void>(resolve => server.listen(0,'127.0.0.1',resolve))+const base = `http://127.0.0.1:${(server.address() as any).port}`+const ts = new Date().toISOString()+const config = db.insert(schema.aiServiceConfigs).values({ serviceType:'video', provider:'minimax', name:'test', baseUrl:base, apiKey:'test-secret', model:'["MiniMax-H3"]', createdAt:ts, updatedAt:ts }).returning().get()+const sb = db.insert(schema.storyboards).values({ episodeId:1,storyboardNumber:1,createdAt:ts,updatedAt:ts }).returning().get()+const row = (id:number) => db.select().from(schema.sysTask).where(eq(schema.sysTask.id,id)).get()!+async function waitFor(id:number, status:string) {+ const deadline=Date.now()+15000+ while(Date.now()<deadline) { if(row(id).status===status) return row(id); await new Promise(r=>setTimeout(r,10)) }+ assert.fail(`Task ${id} did not reach ${status}: ${JSON.stringify(row(id))}`)+}++test('failed download preserves completed upstream result; concurrent recovery does not generate again', async () => {+ const attempts=await Promise.allSettled([0,1].map(()=>generateVideo({storyboardId:sb.id,prompt:'test',configId:config.id,duration:6})))+ assert.equal(attempts.filter(r=>r.status==='rejected').length,1)+ const id=(attempts.find(r=>r.status==='fulfilled') as PromiseFulfilledResult<number>).value+ const failed=await waitFor(id,'failed')+ assert.equal(failed.taskId,'upstream-1'); assert.equal(failed.resultUrl,base+'/content')+ assert.equal(failed.stage,'downloading'); assert.equal(failed.errorCode,'delivery_failed')+ assert.equal(failed.configId,config.id)+ assert.equal(submissionCount,1)+ const blocked=await tasksRoute.request('/',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({type:'video',storyboard_id:sb.id,prompt:'again'})})+ assert.equal(blocked.status,400)+ available=true+ await Promise.all([recoverVideoTask(id),recoverVideoTask(id),recoverVideoTask(id)])+ const completed=await waitFor(id,'completed')+ assert.equal(completed.localPath,`static/videos/task-${id}.mp4`)+ assert.equal(submissionCount,1); assert.equal(downloads,2)+ assert.equal(db.select().from(schema.storyboards).where(eq(schema.storyboards.id,sb.id)).get()!.duration,12)+ const diagnostics=await tasksRoute.request(`/${id}/diagnostics`)+ const data=await diagnostics.text()+ assert.doesNotMatch(data,/test-secret|127\.0\.0\.1|\/content/)+})++test('restart resumes persisted results, leaves unknown submissions for manual review, and does not overwrite newer videos',async()=>{+ const older=db.insert(schema.sysTask).values({type:'video',storyboardId:sb.id,provider:'minimax',resultUrl:base+'/content',status:'processing',params:'{"resultDuration":9}',createdAt:ts,updatedAt:ts}).returning().get()+ const latest=db.insert(schema.sysTask).values({type:'video',storyboardId:sb.id,status:'completed',createdAt:ts,updatedAt:ts}).returning().get()+ db.update(schema.storyboards).set({videoUrl:'static/videos/newer.mp4'}).where(eq(schema.storyboards.id,sb.id)).run()+ const unknown=db.insert(schema.sysTask).values({type:'video',status:'processing',createdAt:ts,updatedAt:ts}).returning().get()+ await resumeInterruptedTasks()+ await waitFor(older.id,'completed')+ assert.equal(row(unknown.id).errorCode,'submission_unknown')+ assert.equal(row(latest.id).status,'completed')+ assert.equal(db.select().from(schema.storyboards).where(eq(schema.storyboards.id,sb.id)).get()!.videoUrl,'static/videos/newer.mp4')+ assert.equal(submissionCount,1)+ await assert.rejects(recoverVideoTask(unknown.id),/未保存上游任务编号/)+})++test('expired signed result is refreshed through the original task query without generating',async()=>{+ const task=db.insert(schema.sysTask).values({type:'video',provider:'minimax',configId:config.id,configBaseUrl:base,+ taskId:'upstream-1',resultUrl:base+'/expired',status:'failed',errorCode:'delivery_failed',createdAt:ts,updatedAt:ts}).returning().get()+ const before=submissionCount+ await recoverVideoTask(task.id)+ const done=await waitFor(task.id,'completed')+ assert.equal(done.resultUrl,base+'/content');assert.equal(submissionCount,before)+})++test('Firemux delivery recovery calls only its recovery endpoint and task query',async()=>{+ const task=db.insert(schema.sysTask).values({type:'video',provider:'minimax',configId:config.id,configBaseUrl:base,+ taskId:'upstream-1',status:'failed',errorCode:'delivery_failed',createdAt:ts,updatedAt:ts}).returning().get()+ const before=submissionCount+ await recoverVideoTask(task.id);await waitFor(task.id,'completed')+ assert.equal(recoveryCalls,1);assert.equal(submissionCount,before)+})++test('response header preserves recovery ID when response JSON is interrupted; changed configuration is rejected',async()=>{+ brokenResponse=true+ const id=await generateVideo({prompt:'test',configId:config.id})+ await waitFor(id,'failed');assert.equal(row(id).taskId,'gateway-known')+ db.update(schema.aiServiceConfigs).set({baseUrl:'https://different.example'}).where(eq(schema.aiServiceConfigs.id,config.id)).run()+ await assert.rejects(recoverVideoTask(id),/原视频服务配置/)+ db.update(schema.aiServiceConfigs).set({baseUrl:base}).where(eq(schema.aiServiceConfigs.id,config.id)).run()+})++test.after(async()=>{ await new Promise<void>(resolve=>server.close(()=>resolve())); await fs.rm(root,{recursive:true,force:true}) })diff --git a/desktop/assets/starting.html b/desktop/assets/starting.htmlnew file mode 100644index 0000000..578ba0a--- /dev/null+++ b/desktop/assets/starting.html@@ -0,0 +1,22 @@+<!doctype html>+<html lang="zh-CN">+<meta charset="utf-8">+<meta name="viewport" content="width=device-width, initial-scale=1">+<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'">+<title>火宝短剧</title>+<style>+ body { margin: 0; min-height: 100vh; display: grid; place-items: center; background: #f6f7fb; color: #262b36; font: 16px/1.7 system-ui, sans-serif; }+ main { max-width: 34rem; padding: 32px; text-align: center; }+ h1 { font-size: 24px; margin: 0 0 12px; }+ p { color: #596274; margin: 6px 0; }+ .spinner { width: 28px; height: 28px; margin: 0 auto 24px; border: 3px solid #e2e5ec; border-top-color: #e88329; border-radius: 50%; animation: spin 1s linear infinite; }+ @keyframes spin { to { transform: rotate(360deg); } }+ @media (prefers-reduced-motion: reduce) { .spinner { animation: none; } }+</style>+<main role="status">+ <div class="spinner" aria-hidden="true"></div>+ <h1>正在启动火宝短剧</h1>+ <p>正在准备本地服务,首次启动可能需要一些时间。</p>+ <p>无需重复点击图标。启动失败时会提示原因和日志位置。</p>+</main>+</html>diff --git a/desktop/diagnostics/windows-diagnostics.cmd b/desktop/diagnostics/windows-diagnostics.cmdnew file mode 100644index 0000000..8ab63cd--- /dev/null+++ b/desktop/diagnostics/windows-diagnostics.cmd@@ -0,0 +1,5 @@+@echo off+setlocal+powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0windows-diagnostics.ps1" -AppPath "%~1"+echo.+pausediff --git a/desktop/diagnostics/windows-diagnostics.ps1 b/desktop/diagnostics/windows-diagnostics.ps1new file mode 100644index 0000000..58c388a--- /dev/null+++ b/desktop/diagnostics/windows-diagnostics.ps1@@ -0,0 +1,63 @@+param([string]$AppPath)+$ErrorActionPreference = 'Stop'+$stamp = Get-Date -Format 'yyyyMMdd-HHmmss'+$out = Join-Path ([Environment]::GetFolderPath('Desktop')) "HuobaoDrama-diagnostics-$stamp"+New-Item -ItemType Directory -Path $out -Force | Out-Null+$report = Join-Path $out 'report.txt'+function Report([string]$text) { $text | Out-File -FilePath $report -Append -Encoding utf8; Write-Host $text }+try {+ Report "HuobaoDrama Windows startup diagnostics - $stamp"+ Report "OS: $([Environment]::OSVersion.VersionString) | 64-bit OS: $([Environment]::Is64BitOperatingSystem)"+ Report "PowerShell: $($PSVersionTable.PSVersion)"+ if (-not $AppPath) {+ $candidates = @(+ (Join-Path $PSScriptRoot 'HuobaoDrama.exe'),+ (Join-Path $env:LOCALAPPDATA 'Programs\HuobaoDrama\HuobaoDrama.exe'),+ (Join-Path $env:LOCALAPPDATA 'Programs\huobao-drama-desktop\HuobaoDrama.exe'),+ (Join-Path $env:ProgramFiles 'HuobaoDrama\HuobaoDrama.exe')+ )+ foreach ($key in @('HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*', 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*', 'HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*')) {+ Get-ItemProperty $key -ErrorAction SilentlyContinue | Where-Object { $_.DisplayName -like '*HuobaoDrama*' } | ForEach-Object {+ Report "Installed: $($_.DisplayName) $($_.DisplayVersion)"+ if ($_.InstallLocation) { $candidates += Join-Path $_.InstallLocation 'HuobaoDrama.exe' }+ }+ }+ $AppPath = $candidates | Where-Object { Test-Path -LiteralPath $_ -PathType Leaf } | Select-Object -First 1+ }+ if (-not $AppPath -or -not (Test-Path -LiteralPath $AppPath -PathType Leaf)) {+ Report 'Application not found. Place these two diagnostic files beside HuobaoDrama.exe, then run the CMD file again. You can also drag HuobaoDrama.exe onto the CMD file.'+ } else {+ $AppPath = (Resolve-Path -LiteralPath $AppPath).Path+ $install = Split-Path -Parent $AppPath+ Report "Executable: $AppPath"+ Report "File version: $((Get-Item -LiteralPath $AppPath).VersionInfo.FileVersion)"+ foreach ($relative in @('resources\app.asar','resources\frontend\index.html','resources\bin\ffmpeg.exe','resources\bin\ffprobe.exe','resources\app.asar.unpacked\node_modules\better-sqlite3\build\Release\better_sqlite3.node','resources\app.asar.unpacked\node_modules\@img\sharp-win32-x64\lib\sharp-win32-x64.node')) {+ $file = Join-Path $install $relative+ Report "Resource $relative : $(Test-Path -LiteralPath $file -PathType Leaf)"+ }+ $running = @(Get-Process -Name HuobaoDrama -ErrorAction SilentlyContinue)+ if ($running.Count -gt 0) {+ Report 'Existing HuobaoDrama processes found; no new instance launched and no processes terminated.'+ foreach ($p in $running) { Report "PID=$($p.Id) Responding=$($p.Responding) Window=$($p.MainWindowTitle)" }+ Report 'If no window is visible, end HuobaoDrama in Task Manager and run this diagnostic again.'+ } else {+ $env:ELECTRON_ENABLE_LOGGING = '1'+ # A shell-level ELECTRON_RUN_AS_NODE makes the GUI executable act as Node.+ Report "Inherited ELECTRON_RUN_AS_NODE: $env:ELECTRON_RUN_AS_NODE"+ Remove-Item Env:ELECTRON_RUN_AS_NODE -ErrorAction SilentlyContinue+ $chromium = Join-Path $out 'chromium.log'+ $p = Start-Process -FilePath $AppPath -WorkingDirectory $install -ArgumentList @('--enable-logging', "--log-file=`"$chromium`"") -RedirectStandardOutput (Join-Path $out 'stdout.log') -RedirectStandardError (Join-Path $out 'stderr.log') -PassThru+ Report "Launched PID=$($p.Id). Observing for 15 seconds; the application will not be terminated."+ Start-Sleep -Seconds 15+ $p.Refresh()+ if ($p.HasExited) { Report "Exited: code=$($p.ExitCode)" }+ else { Report "Still running: Responding=$($p.Responding) Window=$($p.MainWindowTitle)" }+ }+ }+ $startup = Join-Path $env:APPDATA 'HuobaoDrama\logs\startup.log'+ if (Test-Path -LiteralPath $startup) { Copy-Item -LiteralPath $startup -Destination $out }+ $events = @(Get-WinEvent -FilterHashtable @{LogName='Application';StartTime=(Get-Date).AddMinutes(-20);Level=2} -MaxEvents 100 -ErrorAction SilentlyContinue | Where-Object { $_.Message -match 'HuobaoDrama|huobao-backend' })+ if ($events.Count -gt 0) { $events | Select-Object TimeCreated,ProviderName,Id,Message | Format-List | Out-File (Join-Path $out 'windows-events.txt') -Encoding utf8 }+} catch { Report "Diagnostic error: $($_.Exception.Message)" }+Report "Send the folder on your Desktop to support: $out"+Start-Process explorer.exe -ArgumentList "`"$out`""diff --git "a/desktop/diagnostics/\344\275\277\347\224\250\350\257\264\346\230\216.txt" "b/desktop/diagnostics/\344\275\277\347\224\250\350\257\264\346\230\216.txt"new file mode 100644index 0000000..d330426--- /dev/null+++ "b/desktop/diagnostics/\344\275\277\347\224\250\350\257\264\346\230\216.txt"@@ -0,0 +1,21 @@+火宝短剧 Windows 启动诊断++这是诊断工具,不是安装包,适用于已经安装但打不开的火宝短剧。++1. 将整个压缩包解压到一个文件夹,不要直接在压缩包里运行。+2. 双击 windows-diagnostics.cmd,等待约 15 秒。+3. 程序会打开桌面上新建的 HuobaoDrama-diagnostics-日期时间 文件夹。+4. 把这个文件夹压缩后发给开发者。++如果提示 Application not found:+右键火宝短剧快捷方式,选择“打开文件所在的位置”。+把 windows-diagnostics.cmd 和 windows-diagnostics.ps1 一起放到 HuobaoDrama.exe 旁,再双击 CMD。+也可以把实际的 HuobaoDrama.exe 拖到 windows-diagnostics.cmd 上。++如果提示 Existing HuobaoDrama processes found:+工具已经记录正在运行的进程,不会强行关闭它们。+如果没有窗口,先在任务管理器结束 HuobaoDrama,再运行诊断工具。++工具会读取安装资源是否存在、进程状态、启动输出及最近与火宝相关的应用错误事件。+不会清空项目数据库、删除视频、重装程序或自动结束进程。+不要双击 PS1 文件;使用 CMD 入口。diff --git a/desktop/electron-builder.yml b/desktop/electron-builder.ymlindex 8195ac4..0623e15 100644--- a/desktop/electron-builder.yml+++ b/desktop/electron-builder.yml@@ -18,7 +18,7 @@ asarUnpack:extraResources:- { from: resources/frontend, to: frontend }- { from: resources/workspace-template, to: workspace-template }- # ${os} 宏:darwin → bin-darwin/(无扩展名二进制),win32 → bin-win32/(.exe),+ # ${os} 宏:mac → bin-mac/(无扩展名二进制),win → bin-win/(.exe),# 各自只带本平台的 ffmpeg/ffprobe- { from: "resources/bin-${os}", to: bin }npmRebuild: truediff --git a/desktop/scripts/after-pack.mjs b/desktop/scripts/after-pack.mjsindex ba068f1..b08fc64 100644--- a/desktop/scripts/after-pack.mjs+++ b/desktop/scripts/after-pack.mjs@@ -13,6 +13,7 @@import fs from 'node:fs'import path from 'node:path'import { fileURLToPath } from 'node:url'+import { validateWindowsPackage, assertWindowsX64 } from './validate-windows-package.mjs'const WIN_BIN = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'build', 'win-bin', 'better_sqlite3.node')@@ -41,8 +42,10 @@ export default async function afterPack(context) {'better-sqlite3', 'build', 'Release', 'better_sqlite3.node',)if (!fs.existsSync(target)) throw new Error(`未找到待替换的 better_sqlite3.node: ${target}`)+ assertWindowsX64(WIN_BIN)fs.copyFileSync(WIN_BIN, target)// 顺手清掉宿主机平台预编译残留(bindings 不会命中,但白占体积)fs.rmSync(path.join(path.dirname(path.dirname(path.dirname(target))), 'bin'), { recursive: true, force: true })console.log(`[after-pack] win32 better_sqlite3.node 已替换为 PE 二进制 (${(fs.statSync(target).size / 1024 / 1024).toFixed(1)}MB)`)+ validateWindowsPackage(resourcesDir, context.packager.info.framework.version)}diff --git a/desktop/scripts/build-main.mjs b/desktop/scripts/build-main.mjsindex e1a8d62..8b2c57e 100644--- a/desktop/scripts/build-main.mjs+++ b/desktop/scripts/build-main.mjs@@ -5,6 +5,7 @@import { build } from 'esbuild'import path from 'path'import { fileURLToPath } from 'url'+import fs from 'node:fs'const __dirname = path.dirname(fileURLToPath(import.meta.url))@@ -22,3 +23,5 @@ await build({sourcemap: true,logLevel: 'info',})++fs.copyFileSync(path.resolve(__dirname, '../assets/starting.html'), path.resolve(__dirname, '../dist/starting.html'))diff --git a/desktop/scripts/validate-windows-package.mjs b/desktop/scripts/validate-windows-package.mjsnew file mode 100644index 0000000..70742ce--- /dev/null+++ b/desktop/scripts/validate-windows-package.mjs@@ -0,0 +1,37 @@+import fs from 'node:fs'+import path from 'node:path'+import { createRequire } from 'node:module'+const require = createRequire(import.meta.url)+const asar = require('@electron/asar')+const { getAbi } = require('node-abi')++export function assertWindowsX64(file) {+ const bytes = fs.readFileSync(file)+ const offset = bytes.length >= 64 ? bytes.readUInt32LE(60) : 0+ if (bytes.toString('ascii', 0, 2) !== 'MZ' || offset < 64 || offset + 6 > bytes.length+ || bytes.toString('ascii', offset, offset + 4) !== 'PE\0\0' || bytes.readUInt16LE(offset + 4) !== 0x8664) {+ throw new Error(`不是 Windows x64 PE 二进制:${file}`)+ }+ return bytes+}++export function validateWindowsPackage(resourcesDir, electronVersion) {+ const archive = path.join(resourcesDir, 'app.asar')+ for (const file of ['dist/main.js', 'dist/preload.js', 'dist/starting.html', 'build/backend.mjs']) {+ if (!asar.extractFile(archive, file).length) throw new Error(`安装包内容为空:${file}`)+ }+ for (const file of ['frontend/index.html', 'workspace-template/prompts/storyboard_breaker.md']) {+ if (!fs.statSync(path.join(resourcesDir, file)).isFile()) throw new Error(`安装包资源缺失:${file}`)+ }+ const nativeRoot = path.join(resourcesDir, 'app.asar.unpacked/node_modules')+ const sqlite = assertWindowsX64(path.join(nativeRoot, 'better-sqlite3/build/Release/better_sqlite3.node'))+ const abi = getAbi(electronVersion, 'electron')+ if (!sqlite.includes(Buffer.from(`node_register_module_v${abi}\0`))) {+ throw new Error(`Windows SQLite 原生模块与 Electron ${electronVersion} (ABI ${abi}) 不匹配`)+ }+ for (const file of ['sharp-win32-x64.node', 'libvips-42.dll', 'libvips-cpp-8.17.3.dll']) {+ assertWindowsX64(path.join(nativeRoot, '@img/sharp-win32-x64/lib', file))+ }+ for (const file of ['ffmpeg.exe', 'ffprobe.exe']) assertWindowsX64(path.join(resourcesDir, 'bin', file))+ console.log(`[package-check] Windows x64 启动资源完整;SQLite ABI ${abi} ✓`)+}diff --git a/desktop/src/main.ts b/desktop/src/main.tsindex 68bd0b9..f0a89e4 100644--- a/desktop/src/main.ts+++ b/desktop/src/main.ts@@ -1,8 +1,8 @@/*** Electron 主进程 — 桌面壳*- * 职责:读存储配置 → 取空闲端口 → 准备 userData 目录(数据 + workspace 模板)→- * utilityProcess.fork 拉起后端(esbuild bundle)→ 轮询健康检查 → 开窗口。+ * 职责:显示启动页 → 读存储配置 / 取空闲端口 → 准备数据与 workspace →+ * utilityProcess.fork 拉起后端 → 有截止时间的健康检查 → 窗口切入应用页面。* 后端与窗口同源(http://127.0.0.1:<port>),前端全部相对路径,无 CORS 问题。** 后端可重启(startBackend):存储位置迁移 = 停后端 → 搬文件 → 换 currentDataDir →@@ -16,6 +16,7 @@ import * as fsp from 'fs/promises'import * as path from 'path'import { registerMigrationIpc } from './migrate'import { registerUpdater, markQuitting } from './updater'+import { createStartupLog, redactStartupLog, waitForBackend } from './startup'// 主进程打 CJS 产物,__dirname 天然可用(import.meta.url 在 CJS 下为 undefined)declare const __dirname: string@@ -35,13 +36,48 @@ let quitting = falselet backendRestarting = falselet backendPort = 0let currentDataDir = ''+let backendReady = false+let fatalReported = false+let backendStartupTail = ''// userData 显式按模式区分:打包版 / dev 版互不干扰(数据库、上传文件、单实例锁均隔离),// 不依赖 package.json 命名(打包后与 dev 同名会导致单实例锁误杀)-app.setPath('userData', path.join(+const userDataDir = path.join(app.getPath('appData'),app.isPackaged ? 'HuobaoDrama' : 'HuobaoDrama-Dev',-))+)+try {+ fs.mkdirSync(userDataDir, { recursive: true })+ app.setPath('userData', userDataDir)+} catch (error) {+ dialog.showErrorBox('火宝短剧启动失败', `无法准备用户目录:${userDataDir}\n${(error as Error).message}`)+ app.exit(1)+}++const startupLog = createStartupLog(path.join(app.getPath('userData'), 'logs'))+startupLog.write(`launch version=${app.getVersion()} platform=${process.platform} arch=${process.arch} electron=${process.versions.electron} pid=${process.pid}`)++function failStartup(error: unknown) {+ if (fatalReported || quitting) return+ fatalReported = true+ const message = redactStartupLog(error instanceof Error ? error.message : error)+ startupLog.write(`fatal: ${error instanceof Error ? error.stack : error}`)+ showMainWindow()+ dialog.showErrorBox('火宝短剧启动失败', `${message}\n\n启动日志:${startupLog.file}\n请将此日志发给技术支持,无需删除项目数据。`)+ app.quit()+}+process.on('uncaughtException', failStartup)+process.on('unhandledRejection', failStartup)+app.on('child-process-gone', (_event, details) => {+ startupLog.write(`child-process-gone: ${JSON.stringify(details)}`)+})++function showMainWindow() {+ if (!mainWindow || mainWindow.isDestroyed()) return+ if (mainWindow.isMinimized()) mainWindow.restore()+ mainWindow.show()+ mainWindow.focus()+}// 从终端启动时若父进程管道关闭(如 `| head` 退出/终端关闭),转发后端日志会写出// EPIPE 且属于异步回调抛出,try/catch 拦不住,会弹 "write EPIPE" 未捕获异常框@@ -50,16 +86,16 @@ process.stderr.on('error', () => {})if (!app.requestSingleInstanceLock()) {// 双开会抢 SQLite 写锁;让已有实例聚焦窗口即可+ startupLog.write('second launch: handing off to existing instance')app.quit()} else {app.on('second-instance', () => {- if (mainWindow) {- if (mainWindow.isMinimized()) mainWindow.restore()- mainWindow.focus()- }+ startupLog.write('second-instance: showing existing window')+ showMainWindow()})+ app.on('activate', showMainWindow)// utilityProcess 要求 app ready 之后才能创建- app.whenReady().then(bootstrap)+ app.whenReady().then(bootstrap).catch(failStartup)}function getFreePort(): Promise<number> {@@ -73,19 +109,9 @@ function getFreePort(): Promise<number> {})}-async function waitHealthy(port: number, timeoutMs = 15000): Promise<void> {- const deadline = Date.now() + timeoutMs- let lastErr: unknown = null- while (Date.now() < deadline) {- try {- const res = await fetch(`http://127.0.0.1:${port}/api/v1/health`)- if (res.ok) return- } catch (err) {- lastErr = err- }- await new Promise(r => setTimeout(r, 300))- }- throw new Error(`后端启动超时: ${String(lastErr)}`)+async function waitHealthy(port: number, timeoutMs = 60_000): Promise<void> {+ await waitForBackend(port, timeoutMs, () => quitting || fatalReported)+ backendReady = true}// ---- 存储配置(userData/storage-config.json,必须在数据目录之外) ----@@ -167,6 +193,8 @@ function stopBackend(): Promise<void> {}function startBackend(): void {+ backendReady = false+ backendStartupTail = ''const resources = resolveResourceDir()const env: NodeJS.ProcessEnv = {...process.env,@@ -188,16 +216,29 @@ function startBackend(): void {env,serviceName: 'huobao-backend',stdio: 'pipe',+ cwd: currentDataDir,+ })+ const child = backend+ startupLog.write(`backend forked from ${BACKEND_BUNDLE}`)+ child.on('spawn', () => startupLog.write(`backend spawned pid=${child.pid}`))+ child.stdout?.on('data', chunk => {+ process.stdout.write(`[backend] ${chunk}`)+ if (!backendReady) startupLog.write(`[backend] ${chunk}`)+ })+ child.stderr?.on('data', chunk => {+ process.stderr.write(`[backend] ${chunk}`)+ if (!backendReady) {+ const safe = redactStartupLog(String(chunk))+ backendStartupTail = (backendStartupTail + safe).slice(-3000)+ startupLog.write(`[backend stderr] ${safe}`)+ }})- console.log(`[main] backend forked from ${BACKEND_BUNDLE}`)- backend.stdout?.on('data', chunk => process.stdout.write(`[backend] ${chunk}`))- backend.stderr?.on('data', chunk => process.stderr.write(`[backend] ${chunk}`))- backend.on('exit', code => {- backend = null+ child.on('exit', code => {+ if (backend === child) backend = null+ startupLog.write(`backend exited code=${code} restarting=${backendRestarting}`)// 迁移/重启期间的退出是预期行为,由调用方接管if (!quitting && !backendRestarting) {- dialog.showErrorBox('火宝短剧', `后台服务异常退出(code ${code}),应用即将关闭。请重新启动。`)- app.quit()+ failStartup(new Error(`后台服务异常退出(code ${code})。${backendStartupTail ? '\n' + backendStartupTail : ''}`))}})}@@ -209,17 +250,22 @@ function createWindow() {width: 1440,height: 900,title: '火宝短剧',- show: false,+ show: true,+ backgroundColor: '#f6f7fb',webPreferences: {preload: path.join(__dirname, 'preload.js'),},})- mainWindow.once('ready-to-show', () => mainWindow?.show())+ mainWindow.once('ready-to-show', showMainWindow)+ mainWindow.webContents.on('render-process-gone', (_event, details) => failStartup(new Error(`界面进程退出:${details.reason} (${details.exitCode})`)))+ mainWindow.webContents.on('unresponsive', () => startupLog.write('renderer unresponsive'))// 页面标题自带产品名,避免文件路径兜底标题mainWindow.on('page-title-updated', e => e.preventDefault())mainWindow.on('closed', () => { mainWindow = null })// 外链一律交给系统浏览器:应用内不弹新窗(如设置页「前往 api.firemux.cn 获取 Key」)- const isAppUrl = (url: string) => url.startsWith(`http://127.0.0.1:${backendPort}`)+ const isAppUrl = (url: string) => {+ try { return new URL(url).origin === `http://127.0.0.1:${backendPort}` } catch { return false }+ }mainWindow.webContents.setWindowOpenHandler(({ url }) => {if (/^https?:\/\//i.test(url) && !isAppUrl(url)) void shell.openExternal(url)return { action: 'deny' }@@ -230,7 +276,7 @@ function createWindow() {e.preventDefault()if (/^https?:\/\//i.test(url)) void shell.openExternal(url)})- return mainWindow.loadURL(`http://127.0.0.1:${backendPort}`)+ return mainWindow.loadFile(path.join(__dirname, 'starting.html'))}// ---- 启动 ----@@ -240,9 +286,11 @@ let currentFrontendDist = ''async function bootstrap() {try {+ await createWindow()+ if (quitting) returnbackendPort = await getFreePort()const userData = app.getPath('userData')- console.log(`[main] port=${backendPort} userData=${userData}`)+ startupLog.write(`port=${backendPort} userData=${userData}`)// 存储配置最先读(决定数据目录);配置损坏时回退默认且不阻断启动currentDataDir = loadStorageConfig()@@ -255,20 +303,26 @@ async function bootstrap() {currentWorkspaceDir = app.isPackaged? path.join(userData, 'workspace'): templateDir+ startupLog.write('preparing workspace')if (app.isPackaged) syncWorkspaceTemplate(templateDir, currentWorkspaceDir)currentFrontendDist = app.isPackaged? path.join(resources, 'frontend'): path.join(REPO_ROOT, 'frontend', '.output', 'public')+ if (!fs.existsSync(BACKEND_BUNDLE)) throw new Error('安装资源缺失:build/backend.mjs')+ if (!fs.existsSync(path.join(currentFrontendDist, 'index.html'))) throw new Error('安装资源缺失:frontend/index.html')+ if (quitting) returnstartBackend()await waitHealthy(backendPort)- console.log('[main] backend healthy, opening window')- await createWindow()+ if (quitting || fatalReported || !mainWindow || mainWindow.isDestroyed()) return+ backendReady = true+ startupLog.write('backend healthy, loading application')+ await mainWindow.loadURL(`http://127.0.0.1:${backendPort}`)+ showMainWindow()+ startupLog.write('application loaded')} catch (err) {- console.error('[main] 启动失败:', err)- dialog.showErrorBox('火宝短剧', `启动失败:\n${(err as Error)?.message || err}`)- app.quit()+ failStartup(err)}}diff --git a/desktop/src/startup.ts b/desktop/src/startup.tsnew file mode 100644index 0000000..9541920--- /dev/null+++ b/desktop/src/startup.ts@@ -0,0 +1,69 @@+import * as http from 'node:http'+import * as fs from 'node:fs'+import * as path from 'node:path'++/** 每次探测都有独立的硬截止时间,包含连接成功但服务端一直不回包的情况。 */+function probeHealth(port: number, timeoutMs: number): Promise<void> {+ return new Promise((resolve, reject) => {+ const request = http.get({ hostname: '127.0.0.1', port, path: '/api/v1/health', agent: false }, response => {+ response.resume()+ if (response.statusCode === 200) finish()+ else finish(new Error(`Health HTTP ${response.statusCode}`))+ })+ const timer = setTimeout(() => {+ const error = new Error('Health request timed out')+ request.destroy(error)+ finish(error)+ }, timeoutMs)+ let finished = false+ function finish(error?: Error) {+ if (finished) return+ finished = true+ clearTimeout(timer)+ if (error) reject(error)+ else resolve()+ }+ request.on('error', finish)+ })+}++export async function waitForBackend(port: number, timeoutMs = 60_000, shouldStop = () => false): Promise<void> {+ const deadline = Date.now() + timeoutMs+ let lastError = ''+ while (Date.now() < deadline) {+ if (shouldStop()) throw new Error('启动已取消')+ try {+ await probeHealth(port, Math.min(1000, Math.max(1, deadline - Date.now())))+ return+ } catch (error) { lastError = (error as Error).message }+ const remaining = deadline - Date.now()+ if (remaining > 0) await new Promise(resolve => setTimeout(resolve, Math.min(300, remaining)))+ }+ throw new Error(`后台服务在 ${Math.round(timeoutMs / 1000)} 秒内未就绪:${lastError}`)+}++export function redactStartupLog(value: unknown): string {+ return String(value instanceof Error ? value.stack || value.message : value)+ .replace(/https?:\/\/[^\s"'<>]+/gi, '[URL omitted]')+ .replace(/(Bearer\s+)\S+/gi, '$1[redacted]')+ .replace(/((?:api[_-]?key|signature|token|secret)\s*["']?\s*[:=]\s*["']?)[^\s,"'}&]+/gi, '$1[redacted]')+ .replace(/\bsk-[\w-]+/g, '[redacted]')+}++/** 只记录启动和进程状态,不记录业务请求。保留上一份日志,写失败不影响应用。 */+export function createStartupLog(directory: string) {+ const file = path.join(directory, 'startup.log')+ try {+ fs.mkdirSync(directory, { recursive: true })+ if (fs.existsSync(file) && fs.statSync(file).size > 2 * 1024 * 1024) {+ fs.rmSync(`${file}.previous`, { force: true })+ fs.renameSync(file, `${file}.previous`)+ }+ } catch { /* 主进程失败提示仍可提供错误信息 */ }+ return {+ file,+ write(message: unknown) {+ try { fs.appendFileSync(file, `${new Date().toISOString()} ${redactStartupLog(message).slice(0, 16_384)}\n`) } catch { /* best effort */ }+ },+ }+}diff --git a/desktop/tests/main-startup.test.mjs b/desktop/tests/main-startup.test.mjsnew file mode 100644index 0000000..be5aefe--- /dev/null+++ b/desktop/tests/main-startup.test.mjs@@ -0,0 +1,78 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import fs from 'node:fs'+import vm from 'node:vm'+import { EventEmitter } from 'node:events'+import { createRequire } from 'node:module'+const require = createRequire(import.meta.url)+const code = fs.readFileSync(new URL('../dist/main.js', import.meta.url), 'utf8')++async function boot(mode = 'pending') {+ const windows = [], errors = [], logs = [], timers = new Map()+ let requests = 0, forks = 0, now = 0, timerId = 0+ const app = new EventEmitter()+ Object.assign(app, { isPackaged: true, getPath: () => '/mock/user', setPath() {}, getVersion: () => 'test', requestSingleInstanceLock: () => true, whenReady: () => Promise.resolve(), quit() { app.emit('before-quit') } })+ class Window extends EventEmitter {+ constructor(options) {+ super(); this.visible = options.show !== false; this.options = options; this.destroyed = false+ this.webContents = new EventEmitter(); this.webContents.setWindowOpenHandler = () => {}; windows.push(this)+ }+ show() { this.visible = true }+ focus() { this.focused = true }+ isMinimized() { return false }+ isDestroyed() { return this.destroyed }+ loadFile(file) { this.loadedFile = file; return Promise.resolve() }+ loadURL(url) { this.loadedURL = url; return mode === 'page-failure' ? Promise.reject(new Error('ERR_CONNECTION_RESET')) : Promise.resolve() }+ }+ const child = new EventEmitter(); child.stdout = new EventEmitter(); child.stderr = new EventEmitter(); child.kill = () => {}+ const electron = { app, BrowserWindow: Window, dialog: { showErrorBox: (...args) => errors.push(args) }, ipcMain: { handle() {} }, shell: {}, utilityProcess: { fork() { forks++; return child } } }+ const filesystem = { existsSync: p => !/storage-config|template-version|startup.log/.test(p), mkdirSync() {}, cpSync() {}, writeFileSync() {}, appendFileSync: (_p, s) => logs.push(s) }+ const fakeProcess = new EventEmitter()+ Object.assign(fakeProcess, { platform: 'win32', arch: 'x64', env: {}, versions: { electron: '37.10.3' }, pid: 123, resourcesPath: '/mock/resources', stdout: new EventEmitter(), stderr: new EventEmitter() })+ fakeProcess.stdout.write = fakeProcess.stderr.write = () => true+ const net = { createServer() { const s = new EventEmitter(); s.listen = (_p, _h, fn) => fn(); s.address = () => ({port: 43210}); s.close = fn => fn(); return s } }+ const http = { get(_opts, callback) {+ requests+++ const request = new EventEmitter(); request.destroy = err => request.emit('error', err)+ if (mode !== 'pending') queueMicrotask(() => callback({ statusCode: 200, resume() {} }))+ return request+ } }+ const context = vm.createContext({ require: name => name === 'electron' ? electron : /^(node:)?fs$/.test(name) ? filesystem : /^(node:)?net$/.test(name) ? net : name === 'node:http' ? http : require(name),+ process: fakeProcess, __dirname: '/mock/resources/app.asar/dist', module: {exports:{}}, exports: {}, console: {log(){},warn(){},error(){}}, Buffer, URL,+ Date: class extends Date { static now() { return now } },+ setTimeout: (fn, ms) => { const t = { id: ++timerId, at: now + ms, fn, unref() {} }; timers.set(t.id,t); return t },+ clearTimeout: t => timers.delete(t?.id),+ })+ vm.runInContext(code, context)+ async function flush() { for(let i=0;i<50;i++) await Promise.resolve() }+ await flush()+ return { windows, errors, logs, app, child, requests: () => requests, forks: () => forks, flush,+ async expireHealth() { now=60_001; for(const t of [...timers.values()]) if(t.at <= now && t.at <= 1000) {timers.delete(t.id);t.fn()} await flush() } }+}++test('startup window is visible while health check hangs; deadline yields one actionable error', async () => {+ const p=await boot(); assert.equal(p.forks(),1); assert.equal(p.requests(),1)+ assert.equal(p.windows.length,1); assert.equal(p.windows[0].visible,true)+ assert.match(p.windows[0].loadedFile,/starting.html$/)+ await p.expireHealth()+ assert.equal(p.errors.length,1); assert.match(p.errors[0][1],/startup.log/)+})+test('successful page load shows window without ready-to-show and a second launch unhides it', async () => {+ const p=await boot('healthy'); assert.match(p.windows[0].loadedURL,/127.0.0.1:43210/)+ assert.equal(p.windows[0].visible,true)+ p.windows[0].visible=false; p.app.emit('second-instance')+ assert.equal(p.windows[0].visible,true); assert.equal(p.windows[0].focused,true); assert.equal(p.errors.length,0)+})+test('backend early exit reports once and includes startup stderr and log location', async () => {+ const p=await boot(); p.child.stderr.emit('data',Buffer.from('Cannot load native module'))+ p.child.emit('exit',1); await p.expireHealth()+ assert.equal(p.errors.length,1); assert.match(p.errors[0][1],/Cannot load native module/)+ assert.ok(p.logs.some(s=>s.includes('backend exited')))+})+test('page load failure reports a visible error instead of leaving a hidden window', async () => {+ const p=await boot('page-failure'); assert.equal(p.errors.length,1)+ assert.match(p.errors[0][1],/ERR_CONNECTION_RESET/)+})+test('closing while backend starts cancels silently', async () => {+ const p=await boot(); p.app.quit(); await p.expireHealth(); assert.equal(p.errors.length,0)+})diff --git a/desktop/tests/startup.test.ts b/desktop/tests/startup.test.tsnew file mode 100644index 0000000..dfcb109--- /dev/null+++ b/desktop/tests/startup.test.ts@@ -0,0 +1,44 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import http from 'node:http'+import fs from 'node:fs'+import os from 'node:os'+import path from 'node:path'+import { waitForBackend, createStartupLog } from '../src/startup.js'++async function withServer(handler: http.RequestListener, fn: (port: number) => Promise<void>) {+ const server = http.createServer(handler)+ await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve))+ try { await fn((server.address() as import('node:net').AddressInfo).port) }+ finally { server.closeAllConnections(); await new Promise<void>(resolve => server.close(() => resolve())) }+}+test('a health server that accepts connections but never responds hits the overall deadline', async () => {+ await withServer(() => {}, async port => {+ const started = Date.now()+ await assert.rejects(waitForBackend(port, 80), /未就绪/)+ assert.ok(Date.now() - started < 1000, 'must not wait for fetch/OS default timeout')+ })+})+test('health failures are retried and a subsequent successful response finishes startup', async () => {+ let count = 0+ await withServer((_request, response) => { response.writeHead(++count === 1 ? 503 : 200).end() }, async port => {+ await waitForBackend(port, 1000)+ assert.equal(count, 2)+ })+})+test('quitting prevents more health requests', async () => {+ await assert.rejects(waitForBackend(1, 1000, () => true), /取消/)+})+test('startup log preserves errors but removes signed URLs and credentials and rotates', () => {+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'huobao-startup-log-'))+ try {+ fs.writeFileSync(path.join(dir, 'startup.log'), 'x'.repeat(2 * 1024 * 1024 + 1))+ const log = createStartupLog(dir)+ log.write('failure https://example.com/file?signature=private-signature Bearer private-token api_key=private-key')+ const text = fs.readFileSync(log.file, 'utf8')+ assert.match(text, /failure/)+ assert.doesNotMatch(text, /private-|https:/)+ assert.ok(fs.existsSync(log.file + '.previous'))+ assert.ok(text.length < 500)+ } finally { fs.rmSync(dir, { recursive: true, force: true }) }+})diff --git a/desktop/tests/windows-package.test.mjs b/desktop/tests/windows-package.test.mjsnew file mode 100644index 0000000..1bf718e--- /dev/null+++ b/desktop/tests/windows-package.test.mjs@@ -0,0 +1,20 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import fs from 'node:fs'+import os from 'node:os'+import path from 'node:path'+import { assertWindowsX64 } from '../scripts/validate-windows-package.mjs'++test('Windows packaging rejects host Mach-O, truncated PE and x86 binaries', () => {+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'huobao-pe-test-'))+ const file = path.join(dir, 'module.node')+ try {+ for (const bytes of [Buffer.from([0xcf,0xfa,0xed,0xfe]), Buffer.from('MZ'), Buffer.alloc(64)]) {+ fs.writeFileSync(file,bytes);assert.throws(()=>assertWindowsX64(file),/Windows x64 PE/)+ }+ const bytes=Buffer.alloc(128);bytes.write('MZ');bytes.writeUInt32LE(64,60);bytes.write('PE\0\0',64);bytes.writeUInt16LE(0x14c,68)+ fs.writeFileSync(file,bytes);assert.throws(()=>assertWindowsX64(file),/Windows x64 PE/)+ bytes.writeUInt16LE(0x8664,68);fs.writeFileSync(file,bytes)+ assert.deepEqual(assertWindowsX64(file),bytes)+ } finally { fs.rmSync(dir,{recursive:true,force:true}) }+})diff --git a/docs/video-delivery-implementation.md b/docs/video-delivery-implementation.mdnew file mode 100644index 0000000..0a0f175--- /dev/null+++ b/docs/video-delivery-implementation.md@@ -0,0 +1,100 @@+# 视频交付与任务恢复实施方案++采用 Firemux 按渠道异步转存,加短剧端下载恢复。先保存已生成的结果,再进行交付;恢复操作只查询已有任务、下载已有文件,不提交新的生成请求。MiniMax 响应保持 `task.status`、`task.content.url` 结构,保留实际时长。++## 问题依据与处理链路++提供的响应能确认上游任务已成功,但不能确认用户电脑已经下载成功。原实现先下载视频,再保存 result_url;下载异常会使整个本地任务失败,且丢失可供补下载的地址。原 MiniMax 同步响应解析也未保存嵌套 task.id 和实际 duration。这些代码问题足以解释“上游成功、本地失败”的现象;缺少用户电脑日志,无法认定具体网络故障是超时、DNS、签名过期还是其他原因。++当前链路为 Vue/Nuxt 制作页面 → Hono/TypeScript 任务服务 → SQLite sys_task → 厂商适配器 → Firemux Spring Boot 网关 → 上游模型。视频成功后经本地文件存储和 FFmpeg 海报处理回写分镜。新增 Firemux 交付队列使用 MySQL 和已有 COS 配置,把上游媒体下载从用户电脑转移到服务端;短剧端仍需下载自有链接以供本地播放和导出。++实施分为三层:保留直链模式作为兼容开关;对指定渠道启用服务端异步转存;客户端始终具备补下载、重查原任务和重启恢复。自有链接也可能下载失败,因此服务端转存与客户端恢复需要同时保留。++## 实施范围++| 部分 | 实现 | 交付位置 |+| --- | --- | --- |+| Firemux | MiniMax 后台转存、租约抢占、有限重试、签名链接、交付恢复接口 | 相邻 firemux 仓库的 gateway/delivery |+| 短剧后端 | 保存任务来源和生成结果、原子下载、恢复接口、启动恢复、诊断接口 | backend/src/services/generation.ts、video-download.ts |+| 短剧前端 | URL 在线预览及链接、本地视频自动切换、单条与批量恢复、显式重新生成确认、持续状态同步、复制诊断 | frontend/app/views/drama/episode.vue |++Firemux 开关关闭时保持上游链接直连;启用后可限制到指定渠道。流式代理和客户端自动多地址竞速不在此次实现范围内。++## 状态与数据++短剧端继续使用 `processing/completed/failed` 状态,以兼容已有页面和查询接口。新增 `stage` 表示 `submitting/polling/transferring/downloading/saving/completed`,新增 `error_code` 表示交付失败、上游明确失败、提交结果未知或恢复失败。++`sys_task` 增加 `config_id`、`config_base_url`,只记录配置来源,不复制密钥。旧 SQLite 启动时幂等增加字段。MiniMax 同步结果中的 `task.id`、响应头中的 Firemux 内部任务 ID、实际 duration 都会保留。视频 URL 在下载前保存,实际时长保存到 params.resultDuration。++生成配置已删除、停用或地址变化时,不任意改用其他配置查询。历史任务没有配置 ID 时,仅允许使用同厂商唯一启用的视频配置;配置不明确时停止恢复并提示核对。++Firemux 增加独立 `video_delivery_task` 表,保存来源地址、对象 key、状态、次数、下一次执行时间和租约。生成原始状态、原始响应及账单保持原状。对外查询视图反映交付状态:++| 生成状态 | 交付状态 | MiniMax 查询状态 | 行为 |+| --- | --- | --- | --- |+| 已成功 | 等待或转存中 | running | 不返回上游链接,继续查询 |+| 已成功 | 可下载 | succeeded | 返回新签名的自有存储链接 |+| 已成功 | 转存失败 | failed,error.code=video_transfer_failed | delivery.generation_status=succeeded,允许恢复交付 |++同步上游成功响应也可转为待交付响应,并额外提供顶层 task_id,兼容旧客户端。每次查询签发有效期最多一小时的链接;对象可用期限默认到生成完成后的第六天,不承诺永久保存。++## 视频展示++任务已有 result_url、尚未完成本地保存时,播放器使用返回 URL,并显示可直接打开的完整链接和“恢复下载”。在线播放加载失败时保留链接及恢复入口。下载完成后自动切换本地文件,并隐藏临时链接提示。HTTP(S) 地址不添加本地路径前缀,保留签名查询参数;临时链接不写为分镜主视频,拼接导出仍使用已保存的视频。历史视频预览同样正确识别远程地址。++## 恢复接口++- `POST /api/v1/tasks/:id/recover`:短剧端只恢复已有任务。已有地址先补下载,失败且有任务 ID 时重新查询;没有地址和任务 ID 的记录拒绝恢复。+- `GET /api/v1/tasks/:id/diagnostics`:返回阶段、错误码、任务编号、厂商、模型和时间,移除密钥及签名链接。+- `POST /minimax/v2/query/video_generation/{taskId}/recover`:Firemux 在验证原任务归属后重置失败的交付任务,不调用生成或计费服务。+- 原 `POST /api/v1/tasks`:同分镜已有运行中任务时拒绝;存在失败任务时,必须显式传入 `force_new: true` 才允许新生成。页面会提示可能再次计费。++同进程重复恢复由任务锁合并。完成状态与分镜回写在 SQLite 事务内提交;如果同一分镜已创建更晚的视频任务,恢复旧任务只保留历史视频,不覆盖分镜主视频。运行中任务不允许删除。++## 下载与转存策略++短剧端每次下载最长 120 秒,最多三次尝试,瞬时网络错误及 HTTP 408/429/5xx 退避重试。HTTP 4xx、格式错误、大小超限及本地文件错误不盲目重试。流式写入 `.part` 文件,校验 MP4/WebM 文件头后原子改名,最大 512 MiB;失败清理临时文件。没有扩展名的视频 URL 也会落为正确的 `.mp4` 或 `.webm`。++Firemux 默认每实例最多两个交付任务并行,每个任务有数据库租约;默认扫描周期十秒,租约十五分钟,异常退出后由过期租约恢复。下载总时限 120 秒,独立 COS 客户端每次请求时限 120 秒,不由 SDK 隐式重试。整个一次执行预算低于租约期限。++自动转存最多尝试五次,退避上限五分钟。对象 key 由内部任务 ID 确定;上传成功而数据库写回失败时,下次复用已存在对象。上传时设置 video/mp4 并校验远端对象大小。失败只保留安全错误码,不将带签名 URL 写入诊断日志。++默认只允许 HTTPS 的 files.metaso.cn 下载源;重定向逐跳验证,DNS 解析拒绝私有、回环和链路本地地址,不向视频地址发送渠道鉴权信息。需要新增 CDN 域名时显式加入允许列表。++## 验收场景++1. 使用提供的 MiniMax 成功响应,正确解析任务 ID、地址与实际 12 秒时长。+2. 上游成功、本地下载失败,任务仍保留地址与来源;恢复后生成请求次数不增加。+3. 同时多次恢复,仅执行一次下载;文件下载中断不残留可见的半成品。+4. 服务重启,有结果的任务恢复;没有上游编号的中断提交保留为待核对。+5. 恢复旧任务不覆盖新视频;诊断信息不泄露签名链接和密钥。+6. Firemux 转存等待期间隐藏源地址,完成后使用自有签名链接;失败不改变生成记录。+7. 两个工作实例同时抢占只有一个成功;旧租约不能覆盖新租约结果;过期对象不再签发有效链接。+8. 开关关闭或渠道不匹配时,原有返回内容不变。++## 上线顺序++1. Firemux 执行 `backend/src/main/resources/sql/20261013_video_delivery.sql`,先保持功能开关关闭并发布后端。+2. 发布带任务恢复功能的短剧前后端;桌面版需重新构建后端和前端资源,源码变更不会更新用户已安装版本。+3. 检查 COS 配置、存储桶权限与生命周期,确保 video-delivery/ 前缀至少保留七天。+4. 在 Firemux 测试环境或小范围渠道开启转存,验证自有链接下载、Range 播放和真实文件大小。+5. 观察转存成功率、排队时间、失败次数与磁盘使用,确认后逐步扩展渠道。++Firemux 的环境变量、回滚和运维命令见相邻仓库 `deploy/video-delivery-rollout.md`。没有执行生产迁移、开启生产开关或真实视频生成。++## 本次验证结果(2026-10-13)++- 短剧任务恢复、下载和适配器测试共 13 项通过;后端 TypeScript 检查、前端静态构建通过。+- Firemux 转存、存储、原有轮询回归及数据库集成测试共 18 项通过。数据库集成使用独立临时 MySQL 9.5,验证并发抢占、过期租约恢复和旧执行者不能覆盖新结果;部署目标 MySQL 8 仍需发布环境验证。+- Playwright 使用独立 SQLite、模拟配置和本地生成的测试视频,验证诊断复制、重新生成计费提示、补下载完成后自动显示历史视频和播放器。恢复期间仅调用恢复接口,任务总数未增加。+- 选取的原有结构检查有 3 项失败;在未改动 HEAD 上复现同样失败,涉及已删除的 mysql-schema.ts、旧前端模型路径匹配和旧 Firemux 域名断言,不是此次新增回归。+- URL 展示补充验收:浏览器验证远程链接保留签名参数且可播放;点击恢复下载后无需刷新页面,播放器自动切换 /static/videos/task-1.mp4,并隐藏远程链接区域。仅发生恢复请求,没有新增生成请求。+- 尚未执行真实 COS/CDN 上传和播放、生产数据库迁移或桌面安装包发布。这些属于上述灰度上线验收步骤。++## 历史任务边界++客户已有任务如果保存了任务编号或视频地址,可以尝试恢复。没有这些信息时,不能仅凭账单截图关联回本地分镜。已失效的上游签名链接如果查询接口不能刷新,也无法保证找回原视频;此时应先人工核对上游记录。++## 回滚++Firemux 设置 GATEWAY_VIDEO_DELIVERY_ENABLED=false 并重启即可恢复返回原始链接,保留交付表供后续恢复和诊断。新 SQLite 字段均为可空附加字段,回退应用代码时无需删列。不要删除已保存的任务 ID、result_url 或本地媒体文件。diff --git a/frontend/app/composables/useApi.ts b/frontend/app/composables/useApi.tsindex de13851..600753a 100644--- a/frontend/app/composables/useApi.ts+++ b/frontend/app/composables/useApi.ts@@ -92,6 +92,8 @@ export const propAPI = {// 统一生成任务(图片/视频):POST 带 type 字段,列表按 type 过滤export const taskAPI = {generate: (d: any) => api.post('/tasks', d),+ recover: (id: number) => api.post(`/tasks/${id}/recover`),+ diagnostics: (id: number) => api.get(`/tasks/${id}/diagnostics`),get: (id: number) => api.get(`/tasks/${id}`),del: (id: number) => api.del(`/tasks/${id}`),list: (params?: { type?: 'image' | 'video'; drama_id?: number; storyboard_id?: number }) => {diff --git a/frontend/app/composables/useToast.ts b/frontend/app/composables/useToast.tsindex d44620b..94d8b2e 100644--- a/frontend/app/composables/useToast.ts+++ b/frontend/app/composables/useToast.ts@@ -41,7 +41,7 @@ export function mapError(err: unknown, opts?: { fallback?: string }): string {const msg = messageOf(err).trim()if (!msg) return opts?.fallback ? t(opts.fallback) : t('errors.unknown')- if (err instanceof TypeError && NETWORK_RE.test(msg)) return t('errors.network')+ if (NETWORK_RE.test(msg)) return t('errors.network')if (err instanceof SyntaxError || NONJSON_RE.test(msg)) return t('errors.server')if (MODERATION_RE.test(msg)) return t('errors.moderation')if (AUTH_RE.test(msg)) return t('errors.auth')diff --git a/frontend/app/locales/en.json b/frontend/app/locales/en.jsonindex dedcf47..b77d02e 100644--- a/frontend/app/locales/en.json+++ b/frontend/app/locales/en.json@@ -859,6 +859,24 @@"smooth": "Smooth","hd": "HD","uhd": "UHD"+ },+ "recovery": {+ "remotePreview": "Video generated, but not saved locally yet. Play online or open the link below. Playback switches to the local file after download.",+ "remoteUnavailable": "Online preview could not load. Try opening the link or resuming the download; the link may have expired.",+ "restoreDownload": "Resume download",+ "localDownloadFailed": "Generated · Download failed",+ "restore": "Recover video",+ "newGeneration": "Generate again",+ "downloadFailed": "Video generated; delivery or saving failed. Recover the video.",+ "unknownSubmission": "Submission uncertain. Check the upstream task before generating again.",+ "downloading": "Video generated; downloading",+ "diagnostics": "Copy diagnostics",+ "copied": "Diagnostics copied",+ "confirmNew": "This submits a new generation task and may incur another charge. Continue?",+ "restoreFailed": "Recover videos ({n})",+ "transferring": "Video generated; transferring",+ "awaitingDelivery": "Video generated; awaiting delivery",+ "restoreHint": "Recover the existing task instead of generating again"}},"errors": {diff --git a/frontend/app/locales/ja.json b/frontend/app/locales/ja.jsonindex acd42a1..abfd415 100644--- a/frontend/app/locales/ja.json+++ b/frontend/app/locales/ja.json@@ -859,6 +859,24 @@"smooth": "標準","hd": "高画質","uhd": "超高画質"+ },+ "recovery": {+ "remotePreview": "動画は生成済みですが、まだローカルに保存されていません。オンライン再生または下のリンクをご利用ください。ダウンロード後はローカル動画に切り替わります。",+ "remoteUnavailable": "オンラインプレビューを読み込めません。リンクを開くか、ダウンロードを再開してください。リンクの有効期限が切れている可能性があります。",+ "restoreDownload": "ダウンロードを再開",+ "localDownloadFailed": "生成済み · ダウンロード失敗",+ "restore": "動画を復旧",+ "newGeneration": "再生成",+ "downloadFailed": "動画は生成済みですが配信または保存に失敗しました。復旧してください。",+ "unknownSubmission": "送信結果が不明です。再生成前に上流のタスクを確認してください。",+ "downloading": "動画生成済み・ダウンロード中",+ "diagnostics": "診断情報をコピー",+ "copied": "診断情報をコピーしました",+ "confirmNew": "新しい生成タスクを送信します。再度料金が発生する可能性があります。続行しますか?",+ "restoreFailed": "動画を復旧 ({n})",+ "transferring": "動画生成済み・転送中",+ "awaitingDelivery": "動画生成済み・配信待ち",+ "restoreHint": "既存のタスクを復旧し、重複生成を避けます"}},"errors": {diff --git a/frontend/app/locales/ko.json b/frontend/app/locales/ko.jsonindex 9e3c4e5..c46a630 100644--- a/frontend/app/locales/ko.json+++ b/frontend/app/locales/ko.json@@ -859,6 +859,24 @@"smooth": "표준","hd": "고화질","uhd": "초고화질"+ },+ "recovery": {+ "remotePreview": "영상이 생성되었지만 아직 로컬에 저장되지 않았습니다. 온라인으로 재생하거나 아래 링크를 여세요. 다운로드가 완료되면 로컬 영상으로 전환됩니다.",+ "remoteUnavailable": "온라인 미리보기를 불러올 수 없습니다. 링크를 열거나 다운로드를 재개하세요. 링크가 만료되었을 수 있습니다.",+ "restoreDownload": "다운로드 재개",+ "localDownloadFailed": "생성됨 · 다운로드 실패",+ "restore": "영상 복구",+ "newGeneration": "다시 생성",+ "downloadFailed": "영상은 생성되었지만 전달 또는 저장에 실패했습니다. 복구해 주세요.",+ "unknownSubmission": "제출 결과가 불확실합니다. 다시 생성하기 전에 원본 작업을 확인하세요.",+ "downloading": "영상 생성 완료, 다운로드 중",+ "diagnostics": "진단 정보 복사",+ "copied": "진단 정보를 복사했습니다",+ "confirmNew": "새 생성 작업을 제출하며 추가 요금이 발생할 수 있습니다. 계속할까요?",+ "restoreFailed": "영상 복구 ({n})",+ "transferring": "영상 생성 완료, 전송 중",+ "awaitingDelivery": "영상 생성 완료, 전달 대기 중",+ "restoreHint": "기존 작업을 복구하여 중복 생성을 방지하세요"}},"errors": {diff --git a/frontend/app/locales/zh.json b/frontend/app/locales/zh.jsonindex 0df0067..8fb5b02 100644--- a/frontend/app/locales/zh.json+++ b/frontend/app/locales/zh.json@@ -859,6 +859,24 @@"smooth": "流畅","hd": "高清","uhd": "超清"+ },+ "recovery": {+ "remotePreview": "视频已生成,暂未保存到本地。可在线播放或打开下方链接,下载完成后自动切换本地视频。",+ "remoteUnavailable": "在线预览无法加载,可尝试打开链接或恢复下载;链接可能已过期。",+ "restoreDownload": "恢复下载",+ "localDownloadFailed": "已生成 · 本地下载失败",+ "restore": "恢复视频",+ "newGeneration": "重新生成",+ "downloadFailed": "视频已生成,交付或保存失败,请恢复视频",+ "unknownSubmission": "提交结果待确认,请先核对上游记录",+ "downloading": "视频已生成,下载中",+ "diagnostics": "复制诊断信息",+ "copied": "诊断信息已复制",+ "confirmNew": "重新生成会提交新的任务,可能再次计费。确定继续吗?",+ "restoreFailed": "恢复视频({n})",+ "transferring": "视频已生成,转存中",+ "awaitingDelivery": "视频已生成,等待交付",+ "restoreHint": "恢复已有任务,避免重复生成"}},"errors": {diff --git a/frontend/app/utils/text-model-selection.ts b/frontend/app/utils/text-model-selection.tsnew file mode 100644index 0000000..b065ed1--- /dev/null+++ b/frontend/app/utils/text-model-selection.ts@@ -0,0 +1,13 @@+interface TextModelOption {+ key: string+ model: string+ configId: number+}++/** 默认项显示 options[0],请求也必须使用同一模型及其配置,避免后端再次选型。 */+export function resolveTextModelSelection(options: TextModelOption[], selectedKey: string) {+ const selected = options.find(option => option.key === selectedKey)+ ?? options.find(option => option.model === selectedKey) // 兼容旧版存储的裸模型名+ ?? options[0]+ return { model: selected?.model, configId: selected?.configId }+}diff --git a/frontend/app/views/drama/episode.vue b/frontend/app/views/drama/episode.vueindex 79a608d..5d405bc 100644--- a/frontend/app/views/drama/episode.vue+++ b/frontend/app/views/drama/episode.vue@@ -498,9 +498,9 @@<svg v-else width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg>{{ videoPromptBatch.running ? t('episode.sb.promptProgress', { done: videoPromptBatch.completed, total: videoPromptBatch.total }) : (videoSelectMode && selectedVideoSbIds.length ? t('episode.sb.promptSelected', { n: selectedVideoSbIds.length }) : t('episode.sb.batchPrompts')) }}</button>- <button v-if="videoTaskFailedCount" class="btn btn-sm video-retry-failed" @click="retryFailedVideos">+ <button v-if="recoverableVideoCount" class="btn btn-sm video-retry-failed" @click="retryFailedVideos"><svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/></svg>- {{ t('episode.vid.retryFailed', { n: videoTaskFailedCount }) }}+ {{ t('episode.recovery.restoreFailed', { n: recoverableVideoCount }) }}</button><button class="btn btn-sm" :class="{ 'is-on': videoSelectMode }" @click="toggleVideoSelectMode">{{ videoSelectMode ? t('episode.vid.selectDone', { n: selectedVideoSbIds.length }) : t('episode.vid.select') }}@@ -591,7 +591,11 @@</template></div><div v-if="task.error" class="video-task-error" :title="task.error">- {{ mapError(task.error) }}+ {{ videoErrorLabel(task.id, task.error) }}+ <div class="flex gap-2">+ <button class="btn btn-sm" @click.stop="copyVideoDiagnostics(task.id)">{{ t('episode.recovery.diagnostics') }}</button>+ <button v-if="canRecoverVideo(task.id)" class="btn btn-sm" @click.stop="genVid(task.storyboard, { forceNew: true })">{{ t('episode.recovery.newGeneration') }}</button>+ </div><div v-if="videoModerationHint(task.error)" class="video-task-error-hint">{{ videoModerationHint(task.error) }}</div></div></div>@@ -701,15 +705,17 @@<span v-if="selectedSb.duration" class="video-player-sub">{{ selectedSb.duration }}s</span></div><button- v-if="previewVideoUrl"+ v-if="previewVideoUrl && !playerIsRemote"class="btn btn-sm btn-primary"@click="setAsMainVideo">{{ t('episode.vid.setMain') }}</button><a- v-if="previewVideoUrl || hasVid(selectedSb)"- :href="'/' + (previewVideoUrl || getVideoUrl(selectedSb))"+ v-if="playerVideoUrl"+ :href="playerVideoUrl"+ :target="playerIsRemote ? '_blank' : undefined"+ rel="noopener noreferrer"downloadclass="btn btn-sm">@@ -719,10 +725,11 @@</div><div class="video-player-stage"><video- v-if="previewVideoUrl || hasVid(selectedSb)"- :key="previewVideoUrl || getVideoUrl(selectedSb)"- :src="'/' + (previewVideoUrl || getVideoUrl(selectedSb))"- :poster="posterOf('/' + (previewVideoUrl || getVideoUrl(selectedSb))) || undefined"+ v-if="playerVideoUrl"+ :key="playerVideoUrl"+ :src="playerVideoUrl"+ :poster="playerIsRemote ? undefined : posterOf(playerVideoUrl) || undefined"+ @error="playerLoadFailed = true"controlspreload="metadata"playsinline@@ -731,18 +738,24 @@<div v-else class="video-player-empty"><svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"><polygon points="23 7 16 12 23 17 23 7"/><rect x="1" y="5" width="15" height="14" rx="2" ry="2"/></svg><div class="video-player-empty-copy">- <div class="video-player-empty-title">{{ videoTaskState(selectedSb) === 'pending' ? t('episode.vid.emptyGenerating') : t('episode.vid.emptyNoVideo') }}</div>- <div class="video-player-empty-desc">{{ videoTaskState(selectedSb) === 'pending' ? t('episode.vid.emptyGeneratingDesc') : t('episode.vid.emptyNoVideoDesc') }}</div>+ <div class="video-player-empty-title">{{ videoAwaitingDelivery(selectedSb) ? t('episode.recovery.awaitingDelivery') : videoTaskState(selectedSb) === 'pending' ? t('episode.vid.emptyGenerating') : t('episode.vid.emptyNoVideo') }}</div>+ <div class="video-player-empty-desc">{{ videoAwaitingDelivery(selectedSb) || canRecoverVideo(selectedSb?.id) ? t('episode.recovery.restoreHint') : videoTaskState(selectedSb) === 'pending' ? t('episode.vid.emptyGeneratingDesc') : t('episode.vid.emptyNoVideoDesc') }}</div></div><buttonv-if="videoTaskState(selectedSb) !== 'pending'"class="btn btn-primary btn-sm video-player-empty-action"@click="genVid(selectedSb)">- {{ t('episode.vid.generateVideo') }}+ {{ videoTaskActionLabel(selectedSb) }}</button></div></div>+ <div v-if="playerIsRemote" class="video-remote-source">+ <span>{{ t('episode.recovery.remotePreview') }}</span>+ <a :href="playerVideoUrl" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ playerVideoUrl }}</a>+ <span v-if="playerLoadFailed">{{ t('episode.recovery.remoteUnavailable') }}</span>+ <button v-if="!previewVideoUrl && canRecoverVideo(selectedSb?.id)" class="btn btn-sm" @click="recoverVideo(selectedSb)">{{ t('episode.recovery.restoreDownload') }}</button>+ </div></aside><div v-if="sbVideoHistory.length" class="video-player-history">@@ -760,7 +773,7 @@@click="previewHistoryVideo(h)"@keydown.enter.prevent="previewHistoryVideo(h)">- <video :src="'/' + taskVideoPath(h)" :poster="posterOf('/' + taskVideoPath(h)) || undefined" preload="none" muted playsinline tabindex="-1" />+ <video :src="videoSourceUrl(taskVideoPath(h))" :poster="posterOf(videoSourceUrl(taskVideoPath(h))) || undefined" preload="none" muted playsinline tabindex="-1" /><span class="video-history-time">{{ formatHistoryTime(taskCreatedAt(h)) }}</span><span v-if="isCurrentVideo(h)" class="video-history-badge">{{ t('episode.vid.current') }}</span><button v-else type="button" class="video-history-del" :title="t('episode.vid.deleteRecord')" @click.stop="removeHistoryVideo(h)">×</button>@@ -1060,6 +1073,10 @@</div><div v-if="row.errorMsg" class="video-task-error" :title="row.errorMsg">{{ mapError(row.errorMsg) }}+ <div v-if="row.kind === 'video'" class="flex gap-2">+ <button v-if="row.recoverable" class="btn btn-sm" @click.stop="recoverTask(row.id, row.storyboardId)">{{ t('episode.recovery.restore') }}</button>+ <button class="btn btn-sm" @click.stop="copyTaskDiagnostics(row.id)">{{ t('episode.recovery.diagnostics') }}</button>+ </div><div v-if="row.kind === 'video' && videoModerationHint(row.errorMsg)" class="video-task-error-hint">{{ videoModerationHint(row.errorMsg) }}</div></div></div>@@ -1437,6 +1454,7 @@ import {import { api, dramaAPI, episodeAPI, storyboardAPI, characterAPI, sceneAPI, propAPI, taskAPI, mergeAPI, aiConfigAPI, uploadAPI } from '~/composables/useApi'import { startTour, autoTour } from '~/composables/useTour'import { useAgent } from '~/composables/useAgent'+import { resolveTextModelSelection } from '~/utils/text-model-selection'import { toastError, mapError, MODERATION_RE } from '~/composables/useToast'import LocaleSwitcher from '~/components/LocaleSwitcher.vue'@@ -1591,9 +1609,9 @@ function toggleSidebar() {: localStorage.removeItem(SIDEBAR_COLLAPSED_KEY)} catch { /* 静默 */ }}-/** 顶栏文本模型覆盖参数:未选择时为 undefined,后端回退到 Agent/文本配置默认 */-function chatModelOverride() { return bareModelName(chatModel.value) || undefined }-function chatConfigId() { return ownerConfigId(textModelOptions.value, chatModel.value) }+/** 默认项也传出界面显示的模型和所属配置,覆盖 Agent 文件中的其他默认模型。 */+function chatModelOverride() { return resolveTextModelSelection(textModelOptions.value, chatModel.value).model }+function chatConfigId() { return resolveTextModelSelection(textModelOptions.value, chatModel.value).configId }const pendingCharImageIds = ref([])const pendingSceneImageIds = ref([])const pendingPropImageIds = ref([])@@ -1958,15 +1976,72 @@ function videoTaskState(sb) {return 'ready'}+function latestVideoTask(id) {+ return genTasks.value.filter(task => task.type === 'video' && task.storyboard_id === id)+ .sort((a, b) => b.id - a.id)[0]+}+const recoverableVideoCount = computed(() => sbs.value.filter(sb => canRecoverVideo(sb.id)).length)+function canRecoverVideo(id) {+ const task = latestVideoTask(id)+ return !!task && task.status === 'failed' && task.error_code !== 'generation_failed'+ && !!(task.task_id || task.result_url)+}+function videoAwaitingDelivery(sb) {+ const task = latestVideoTask(sb?.id)+ return !!task && (!!task.result_url || task.error_code === 'delivery_failed' || task.stage === 'transferring')+}+function videoErrorLabel(id, error) {+ const task = latestVideoTask(id)+ if (task?.error_code === 'delivery_failed' || (task?.result_url && task?.status === 'failed')) return t('episode.recovery.downloadFailed')+ if (task?.error_code === 'submission_unknown') return t('episode.recovery.unknownSubmission')+ return mapError(error)+}+async function copyVideoDiagnostics(id) {+ const task = latestVideoTask(id)+ if (task) await copyTaskDiagnostics(task.id)+}+async function copyTaskDiagnostics(taskId) {+ try {+ const info = await taskAPI.diagnostics(taskId)+ await navigator.clipboard.writeText(JSON.stringify(info, null, 2))+ toast.success(t('episode.recovery.copied'))+ } catch (error) { toastError(error) }+}+async function recoverVideo(sb) {+ const task = latestVideoTask(sb.id)+ if (!task) return+ return recoverTask(task.id, sb.id)+}+async function recoverTask(taskId, storyboardId) {+ if (isPendingVideo(storyboardId)) return+ if (storyboardId) pendingVideoIds.value.push(storyboardId)+ try {+ await taskAPI.recover(taskId)+ delete failedVideoMessages.value[storyboardId]+ await refresh()+ pollVideoGeneration(taskId, storyboardId)+ } catch (error) {+ pendingVideoIds.value = pendingVideoIds.value.filter(id => id !== storyboardId)+ toastError(error)+ }+}+function videoTaskStatusLabel(sb) {const state = videoTaskState(sb)if (state === 'done') return t('episode.status.done')- if (state === 'pending') return t('episode.status.generating')+ if (state === 'pending') {+ const stage = latestVideoTask(sb.id)?.stage+ return stage === 'downloading' ? t('episode.recovery.downloading')+ : stage === 'transferring' ? t('episode.recovery.transferring') : t('episode.status.generating')+ }+ if (state === 'failed' && latestVideoTask(sb?.id)?.result_url) return t('episode.recovery.localDownloadFailed')if (state === 'failed') return t('episode.status.failed')return t('episode.status.todo')}function videoTaskActionLabel(sb) {+ if (canRecoverVideo(sb?.id)) return t('episode.recovery.restore')+ if (latestVideoTask(sb?.id)?.status === 'failed') return t('episode.recovery.newGeneration')const state = videoTaskState(sb)if (state === 'done') return t('episode.asset.regen')if (state === 'pending') return t('episode.asset.generating')@@ -2151,8 +2226,8 @@ function batchVideos() {: sbs.value.filter(s => !hasVid(s))openBatchVideoConfirm(pool)}-function retryFailedVideos() {- openBatchVideoConfirm(sbs.value.filter(s => videoTaskState(s) === 'failed'))+async function retryFailedVideos() {+ await Promise.allSettled(sbs.value.filter(sb => canRecoverVideo(sb.id)).map(recoverVideo))}function confirmBatchVideos() {const targets = [...batchVideoConfirm.value.targets]@@ -2217,7 +2292,7 @@ async function loadGenTasks() {// 分镜已有视频(失败后重试成功)时不再报历史错误if (hasVid(sbs.value.find(s => s.id === sbId))) continueif (t.status === 'processing') pending.add(sbId)- else if (t.status === 'failed') failed[sbId] = t.error_msg || t('episode.status.failed')+ else if (t.status === 'failed') failed[sbId] = t.error_msg || 'Task failed'}// 刚点击提交、任务记录尚未加载出来的本地状态保留,避免状态闪退for (const id of pendingVideoIds.value) if (!latestBySb.has(id)) pending.add(id)@@ -2277,6 +2352,8 @@ const genTaskRows = computed(() => {model: t.model || '',status: t.status || 'processing',errorMsg: t.error_msg || '',+ storyboardId: t.storyboard_id,+ recoverable: t.type === 'video' && t.error_code !== 'generation_failed' && !!(t.task_id || t.result_url),previewUrl: t.local_path || t.result_url || '',prompt: t.prompt || '',createdAt: t.created_at || '',@@ -2329,12 +2406,15 @@ function genTaskDuration(row) {return ms >= 60000 ? `${Math.floor(ms / 60000)}m${Math.round((ms % 60000) / 1000)}s` : `${Math.round(ms / 1000)}s`}-// 抽屉打开且有进行中任务时,4s 轮询;关闭或全部结束时停止-watch([taskDrawer, genTaskActiveCount], ([open, active]) => {+// 后端任务在刷新/重启后仍可能运行,工作台持续同步,不依赖抽屉是否打开。+let refreshingTasks = false+watch(genTaskActiveCount, active => {stopGenTasksPolling()- if (open && active > 0) {- genTasksTimer = setInterval(loadGenTasks, 4000)- }+ if (active > 0) genTasksTimer = setInterval(async () => {+ if (refreshingTasks) return+ refreshingTasks = true+ try { await refresh() } finally { refreshingTasks = false }+ }, 4000)})const productionBlockMessage = computed(() => {@@ -2981,7 +3061,22 @@ function hasVid(s) { return !!getVideoUrl(s) }// ===== 分镜视频历史(一个分镜可能生成多个视频,sys_task 留存全部记录)=====const sbVideoHistory = ref([])-const previewVideoUrl = ref('') // 正在预览的历史视频(相对路径);空 = 预览当前主视频+const previewVideoUrl = ref('') // 空表示当前分镜;历史视频可以是本地路径或远程 URL+const playerLoadFailed = ref(false)+function videoSourceUrl(value) {+ if (!value) return ''+ return /^https?:\/\//i.test(value) ? value : '/' + value.replace(/^\/+/, '')+}+// 未保存完成的新结果先在线播放;下载完成后 refresh 回写的本地视频自动接替。+// 不把临时签名 URL 写入分镜主视频,避免影响本地拼接导出。+const playerVideoUrl = computed(() => {+ if (previewVideoUrl.value) return videoSourceUrl(previewVideoUrl.value)+ const task = latestVideoTask(selectedSb.value?.id)+ const pendingResult = task && task.status !== 'completed' ? taskVideoPath(task) : ''+ return videoSourceUrl(pendingResult || getVideoUrl(selectedSb.value))+})+const playerIsRemote = computed(() => /^https?:\/\//i.test(playerVideoUrl.value))+watch(playerVideoUrl, () => { playerLoadFailed.value = false })// 注意:/tasks 返回原始行(camelCase),/episodes/:id/generation-tasks 返回 snake_case,两种命名都兼容function taskVideoPath(t) { return t?.local_path || t?.localPath || t?.result_url || t?.resultUrl || '' }@@ -3007,7 +3102,7 @@ function previewHistoryVideo(t) {async function setAsMainVideo() {const sb = selectedSb.value- if (!sb || !previewVideoUrl.value) return+ if (!sb || !previewVideoUrl.value || playerIsRemote.value) returntry {await storyboardAPI.update(sb.id, { video_url: previewVideoUrl.value })sb.video_url = previewVideoUrl.value@@ -3252,6 +3347,10 @@ function uploadAssetImage(kind, id) {}async function genVid(sb, opts = {}) {+ if (!opts.forceNew && canRecoverVideo(sb.id)) return recoverVideo(sb)+ const latest = latestVideoTask(sb.id)+ const forceNew = opts.forceNew || latest?.status === 'failed'+ if (forceNew && !window.confirm(t('episode.recovery.confirmNew'))) returnconst referenceImages = getShotReferenceImages(sb)// 参考素材完全来自分镜绑定的角色/场景/道具图片const params = {@@ -3272,7 +3371,7 @@ async function genVid(sb, opts = {}) {try {delete failedVideoMessages.value[sb.id]if (!isPendingVideo(sb.id)) pendingVideoIds.value.push(sb.id)- const generation = await taskAPI.generate({ type: 'video', ...params })+ const generation = await taskAPI.generate({ type: 'video', ...params, force_new: !!forceNew })if (!opts.silent) toast.success(t('episode.vid.generating'))await refresh()pollVideoGeneration(generation?.id, sb.id)@@ -3318,12 +3417,8 @@ async function pollVideoGeneration(generationId, storyboardId) {}} catch {}}- pendingVideoIds.value = pendingVideoIds.value.filter(item => item !== storyboardId)- failedVideoMessages.value = {- ...failedVideoMessages.value,- [storyboardId]: t('episode.vid.genTimeout'),- }- toast.error(t('episode.vid.genTimeout'))+ // 页面等待结束不代表上游失败;后续由任务列表轮询继续跟踪。+ await loadGenTasks()}async function doMerge(ids) {const storyboardIds = Array.isArray(ids) ? ids : undefined@@ -4648,6 +4743,17 @@ onMounted(() => setTimeout(() => autoTour('episode', EPISODE_TOUR, t), 900))gap: 16px;align-items: start;}+.video-remote-source {+ display: flex;+ flex-direction: column;+ align-items: flex-start;+ gap: 8px;+ padding: 12px;+ font-size: 12px;+ color: var(--text-2);+}+.video-remote-source a { max-width: 100%; overflow-wrap: anywhere; color: var(--accent); }+.video-player-history {min-height: 0;padding: 8px 12px 10px;