dsh-drawai 0.4.0 → 0.4.1

package/lib/index.js

@@ -40,6 +40,7 @@ import { getRoutingRuntime } from './routing/node-runtime.js'
 import { motionInput, motionInputKey, assertMotionEditable, applyMotionResult, isMotionNode, motionNodeData, motionSettings, mergeMotionSettings, isAudioNode, audioNodeData, audioNodeSettings, motionReferenceEdges, motionReferenceRole, unlinkedShotCards } from './motion-core.js'
 import { createAudioService } from './audio-service.js'
 import { frozenAudioFile, importAudioFile } from './audio-media.js'
+import { ffmpegState } from './ffmpeg-manager.js'
 import { shotCardCatalog, enforceMotionCards, motionCardContract, mgStyleCatalog, mgStyleKit, mgStyleSources, mgStyleFile, mgStyleFileSize } from './motion-library.js'
 import { searchShotCards, resolveShotStyle, shotCardData, isShotCardNode } from './shotcard-core.js'
 import { searchMgStyles, resolveMgStyle, mgStyleData, isMgStyleNode } from './mgstyle-core.js'
@@ -5515,6 +5516,9 @@ function sanitizeNewName(raw) {
       const drawioAbs = absoluteHint(mediaTarget, rawPath)
       const clip = sanitizeClipId(body.clip)
       try {
+        if (body.action === 'media-ffmpeg-status') {
+          sendJson(res, 200, { ok: true, ...ffmpegState() }); return
+        }
         if (body.action.startsWith('media-video-export-')) {
           const scope = { sessionId, drawioAbs, clip }
           let result
@@ -6752,7 +6756,7 @@ function sanitizeNewName(raw) {
         const next = job.kind === 'pilot' && job.status === 'done'
           ? '样片文件不会自动显示在画布：在当前画布页创建或复用独立「样片」视频节点，记下其 ID，然后调用 motion_render {action:"apply",nodeId:"样片节点 ID",jobId:"' + job.id + '",source:"pilot"}；核对结果并告知用户。'
           : undefined
-        return { summary: '渲染任务：' + job.status + (mix ? ' · ' + mix : ''), details: JSON.stringify({ ...job, ...(next ? { next } : {}) }) }
+        return { summary: '渲染任务：' + job.status + (job.message ? ' · ' + job.message : '') + (mix ? ' · ' + mix : ''), details: JSON.stringify({ ...job, ...(next ? { next } : {}) }) }
       }
       if (args.action === 'cancel') {
         if (policyFor(scope.sessionId)?.mode === 'read-only') throw new Error('当前会话为只读')
@@ -6845,7 +6849,7 @@ function sanitizeNewName(raw) {
       const job = motionJobs.create({ kind, dir, nodeId: node.id })
       const handle = renderProject(dir, { operation, frames: args.frames, frameRange: ranged ? args.range : undefined,
         output: outputPath(dir, outputName),
-        onProgress: (message) => motionJobs.progress(job, message.phase, message.progress) })
+        onProgress: (message) => motionJobs.progress(job, message.phase, message.progress, message.message) })
       motionJobs.attach(job, handle)
       const renderLine = handle.render ? describeRenderSettings(handle.render) : ''
       return { summary: '已开始渲染' + (kind === 'pilot' ? '样片' : '') + '（' + job.id + '）' + (renderLine ? ' · ' + renderLine : '')

package/lib/motion/apply.js

@@ -11,7 +11,7 @@ import { execFile } from 'node:child_process'
 import { promisify } from 'node:util'
 import { chmodSync, existsSync, statSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
-import { ffmpegBinary } from '../video-export.js'
+import { ensureFfmpeg } from '../ffmpeg-manager.js'
 import {
   allocateClipId,
   clipDirFor,
@@ -27,8 +27,9 @@ import {
 const exec = promisify(execFile)
 const MAX_SOURCE_BYTES = 512 * 1024 * 1024
 
-function ffmpeg(args, options = {}) {
-  return exec(ffmpegBinary(), args, {
+async function ffmpeg(args, options = {}) {
+  const binary = await ensureFfmpeg({ signal: options.signal })
+  return exec(binary, args, {
     windowsHide: true,
     timeout: 120000,
     maxBuffer: 64 * 1024 * 1024,

package/lib/motion/assets.js

@@ -13,7 +13,7 @@ import { promisify } from 'node:util'
 import { open as openFile } from 'node:fs/promises'
 import { chmodSync, closeSync, copyFileSync, existsSync, mkdirSync, openSync, readSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileSync } from 'node:fs'
 import { basename, extname, join } from 'node:path'
-import { ffmpegBinary } from '../video-export.js'
+import { ensureFfmpeg } from '../ffmpeg-manager.js'
 import { parseProjectJson } from './json.js'
 
 const exec = promisify(execFile)
@@ -27,8 +27,9 @@ const MAX_BYTES = 24 * 1024 * 1024
 const MAX_VIDEO_BYTES = 256 * 1024 * 1024
 export const MEDIA_EXT = new Set([...IMAGE_EXT, ...AUDIO_EXT, ...VIDEO_EXT, ...VECTOR_EXT])
 
-function run(args, options = {}) {
-  return exec(ffmpegBinary(), args, { windowsHide: true, timeout: 60000, maxBuffer: 8 * 1024 * 1024, ...options })
+async function run(args, options = {}) {
+  const binary = await ensureFfmpeg({ signal: options.signal })
+  return exec(binary, args, { windowsHide: true, timeout: 60000, maxBuffer: 8 * 1024 * 1024, ...options })
 }
 
 export function assetsDirectory(projectDir) {

package/lib/motion/beats.js

@@ -11,7 +11,7 @@
 import { execFile } from 'node:child_process'
 import { promisify } from 'node:util'
 import { existsSync } from 'node:fs'
-import { ffmpegBinary } from '../video-export.js'
+import { ensureFfmpeg } from '../ffmpeg-manager.js'
 
 const exec = promisify(execFile)
 const SAMPLE_RATE = 22050
@@ -20,7 +20,8 @@ const WINDOW = 1024
 
 export async function decodePcm(file) {
   if (!existsSync(file)) throw new Error('找不到音频文件：' + file)
-  const { stdout } = await exec(ffmpegBinary(), ['-hide_banner', '-loglevel', 'error', '-i', file, '-vn', '-ac', '1', '-ar', String(SAMPLE_RATE), '-f', 's16le', '-'], { encoding: 'buffer', windowsHide: true, timeout: 120000, maxBuffer: 256 * 1024 * 1024 })
+  const binary = await ensureFfmpeg()
+  const { stdout } = await exec(binary, ['-hide_banner', '-loglevel', 'error', '-i', file, '-vn', '-ac', '1', '-ar', String(SAMPLE_RATE), '-f', 's16le', '-'], { encoding: 'buffer', windowsHide: true, timeout: 120000, maxBuffer: 256 * 1024 * 1024 })
   return { pcm: stdout, sampleRate: SAMPLE_RATE, hop: HOP, window: WINDOW }
 }
 

package/lib/motion/collect.js

@@ -12,7 +12,7 @@
 //
 // 抓下来的每一条都带 source URL，交付时能说清"这张图哪来的"。
 
-import { openBrowser } from '@remotion/renderer'
+import { loadVideoModule } from './video-runtime.js'
 import { createHash } from 'node:crypto'
 import { mkdirSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
@@ -303,6 +303,7 @@ export async function collectPageAssets(projectDir, rawUrl, options = {}) {
   const minWidth = clamp(options.minWidth || 240, 40, 2000)
 
   mkdirSync(join(projectDir, '.out'), { recursive: true })
+  const { openBrowser } = await loadVideoModule('@remotion/renderer', options)
   const browser = await openBrowser('chrome', { browserExecutable: browserExecutable(), logLevel: 'error' })
   let scan
   try {
@@ -367,6 +368,7 @@ export async function gatherAssets(projectDir, options = {}) {
   mkdirSync(join(projectDir, '.out'), { recursive: true })
   const scans = []
   const failedPages = []
+  const { openBrowser } = await loadVideoModule('@remotion/renderer', options)
   const browser = await openBrowser('chrome', { browserExecutable: browserExecutable(), logLevel: 'error' })
   try {
     let index = 0

package/lib/motion/delivery.js

@@ -16,9 +16,13 @@ const POLISH = `#!/usr/bin/env node
 //   node tools/polish.mjs --web       平台版：1080p / 720p，crf 18，faststart
 //   node tools/polish.mjs --vertical  竖版：等比缩放 + 模糊底，抖音/Reels
 //   node tools/polish.mjs --loudness  只量响度，不产出文件
+//
+// FFmpeg 查找顺序：DRAWAI_FFMPEG_PATH → FFMPEG_PATH → PATH → DrawAI 缓存
+// (~/.dsh/drawai-ffmpeg/<平台>-<架构>/，可用 DRAWAI_FFMPEG_DIR 覆盖)。
 
 import { spawnSync } from 'node:child_process'
 import { existsSync, mkdirSync, readFileSync } from 'node:fs'
+import { homedir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -26,7 +30,31 @@ const here = dirname(fileURLToPath(import.meta.url))
 const project = resolve(here, '..')
 const source = join(project, '.out', 'film.mp4')
 const dist = join(project, 'dist')
-const ffmpeg = process.env.FFMPEG_PATH || 'ffmpeg'
+
+// 查找顺序与插件一致：显式路径 → 旧环境变量 → PATH → DrawAI 的独立缓存。
+// 显式路径无效时直接报错，不会悄悄换成别的 FFmpeg。
+function usable(candidate) {
+  if (!candidate) return false
+  const result = spawnSync(candidate, ['-hide_banner', '-version'], { stdio: 'ignore' })
+  return !result.error && result.status === 0
+}
+function resolveFfmpeg() {
+  const explicit = process.env.DRAWAI_FFMPEG_PATH
+  if (explicit) {
+    if (!usable(explicit)) {
+      console.error('DRAWAI_FFMPEG_PATH 指定的 FFmpeg 不可用：' + explicit + '。请修正这个路径，或删除这个环境变量，让脚本使用 PATH / DrawAI 缓存。')
+      process.exit(1)
+    }
+    return explicit
+  }
+  for (const candidate of [process.env.FFMPEG_PATH, 'ffmpeg']) if (usable(candidate)) return candidate
+  const cacheRoot = process.env.DRAWAI_FFMPEG_DIR || join(homedir(), '.dsh', 'drawai-ffmpeg')
+  const cached = join(cacheRoot, process.platform + '-' + process.arch, process.platform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg')
+  if (usable(cached)) return cached
+  console.error('找不到 FFmpeg：先在 DrawAI 里导出一次视频（首次使用会自动下载并校验），或把 ffmpeg 加入 PATH，或设置 DRAWAI_FFMPEG_PATH 指向可执行文件。')
+  process.exit(1)
+}
+const ffmpeg = resolveFfmpeg()
 
 if (!existsSync(source)) {
   console.error('找不到成片：' + source + '（先 motion_render start 渲整片）')

package/lib/motion/ffmpeg.js

@@ -6,11 +6,12 @@
 import { existsSync, openSync, closeSync, readFileSync } from 'node:fs'
 import { join, isAbsolute } from 'node:path'
 import { spawn } from 'node:child_process'
-import { ffmpegBinary } from '../video-export.js'
+import { ensureFfmpeg, ffmpegPathSync } from '../ffmpeg-manager.js'
 
-export function runFfmpeg(args, options = {}) {
+export async function runFfmpeg(args, options = {}) {
   const cwd = options.cwd || process.cwd()
   const logPath = isAbsolute(options.log || '') ? options.log : join(cwd, options.log || 'ff.log')
+  const binary = options.binary || await ensureFfmpeg({ signal: options.signal, onProgress: options.onProgress })
   return new Promise((resolve, reject) => {
     let fd
     try {
@@ -19,7 +20,7 @@ export function runFfmpeg(args, options = {}) {
       reject(error)
       return
     }
-    const child = spawn(ffmpegBinary(), ['-hide_banner', '-nostdin', '-y', ...args], {
+    const child = spawn(binary, ['-hide_banner', '-nostdin', '-y', ...args], {
       cwd, windowsHide: true, stdio: ['ignore', 'ignore', fd],
     })
     const timer = setTimeout(() => child.kill(), options.timeoutMs || 300000)
@@ -38,5 +39,5 @@ export function runFfmpeg(args, options = {}) {
 }
 
 export function ffmpegAvailable() {
-  return existsSync(ffmpegBinary())
+  return existsSync(ffmpegPathSync())
 }

package/lib/motion/jobs.js

@@ -62,9 +62,13 @@ export class RenderJobs {
   }
 
   // 进度只在内存里刷：每 1% 写一次盘既慢又没意义。
-  progress(job, phase, value) {
+  progress(job, phase, value, message) {
+    const changed = phase && phase !== job.phase
     if (phase) job.phase = phase
+    if (message) job.message = message
+    else if (changed) job.message = ''
     if (Number.isFinite(value)) job.progress = value
+    if (changed) this.save(job)
     return job
   }
 

package/lib/motion/preview.js

@@ -9,7 +9,7 @@ import { join } from 'node:path'
 import { createHash } from 'node:crypto'
 import { execFile } from 'node:child_process'
 import { promisify } from 'node:util'
-import { ffmpegBinary } from '../video-export.js'
+import { ensureFfmpeg } from '../ffmpeg-manager.js'
 import { renderProject, outputPath } from './render.js'
 import { readTimeline } from './project.js'
 
@@ -33,7 +33,8 @@ export async function contactSheet(images, options = {}) {
     const width = options.width === undefined ? 640 : Number(options.width)
     const filter = (width > 0 ? 'scale=' + width + ':-2:flags=lanczos,' : '')
       + 'tile=' + cols + 'x' + rows + ':padding=8:margin=8:color=0x101010'
-    await exec(ffmpegBinary(), ['-hide_banner', '-loglevel', 'error', '-y', '-i', join(work, 'frame-%d.png'),
+    const binary = await ensureFfmpeg()
+    await exec(binary, ['-hide_banner', '-loglevel', 'error', '-y', '-i', join(work, 'frame-%d.png'),
       '-frames:v', '1', '-vf', filter, output],
       { windowsHide: true, timeout: 60000 })
     if (!existsSync(output)) throw new Error('拼图失败')
@@ -50,7 +51,8 @@ function dirnameOf(file) {
 
 async function cropFile(file, crop) {
   const out = file.replace(/\.png$/i, '-crop.png')
-  await exec(ffmpegBinary(), ['-hide_banner', '-loglevel', 'error', '-y', '-i', file,
+  const binary = await ensureFfmpeg()
+  await exec(binary, ['-hide_banner', '-loglevel', 'error', '-y', '-i', file,
     '-vf', 'crop=' + crop.w + ':' + crop.h + ':' + crop.x + ':' + crop.y, out], { windowsHide: true, timeout: 60000 })
   return existsSync(out) ? out : file
 }

package/lib/motion/render.js

@@ -5,6 +5,7 @@
 //   2. 永远复用 bundle：预览和全片共用 .out/bundle/.drawai-bundle-key；
 //   3. 永远先出图：预览走 renderStill，几秒钟，不跑全片。
 
+import { videoRuntimeDirectory } from './video-runtime.js'
 import { fork } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { createHash } from 'node:crypto'
@@ -52,6 +53,7 @@ export function bundleKey(composition, projectDir) {
     walk()
   }
   hash.update(readFileSync(ENTRY))
+  hash.update(videoRuntimeDirectory())
   return hash.digest('hex')
 }
 
@@ -107,7 +109,7 @@ export function renderProject(dir, options = {}) {
   let cancelTimer
   const rendered = new Promise((resolve, reject) => {
     const finish = (fn, value) => { if (settled) return; settled = true; clearTimeout(cancelTimer); fn(value) }
-    const timeout = setTimeout(() => { child.kill(); finish(reject, new Error('渲染超过 ' + Math.round(timeoutFor(render, composition.durationFrames) / 60000) + ' 分钟，请拆小场景或在 timeline.json 的 render.timeoutMs 里放大预算')) }, options.timeoutMs || timeoutFor(render, composition.durationFrames))
+    const timeout = setTimeout(() => { child.kill(); finish(reject, new Error('渲染超过 ' + Math.round(timeoutFor(render, composition.durationFrames) / 60000) + ' 分钟，请拆小场景或在 timeline.json 的 render.timeoutMs 里放大预算')) }, options.timeoutMs || (timeoutFor(render, composition.durationFrames) + 11 * 60000))
     let stderr = ''
     child.stderr.on('data', (bytes) => { stderr = (stderr + bytes).slice(-4000) })
     child.on('message', (message) => {