dsh-drawai 0.4.0 → 0.4.1

package/lib/motion/runtime/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "drawai-video-runtime",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "@react-three/fiber": "9.5.0",
+    "@remotion/bundler": "4.0.484",
+    "@remotion/motion-blur": "4.0.484",
+    "@remotion/renderer": "4.0.484",
+    "@remotion/three": "4.0.484",
+    "react": "19.2.7",
+    "react-dom": "19.2.7",
+    "remotion": "4.0.484",
+    "three": "0.183.2"
+  }
+}

package/lib/motion/style-frames.js

@@ -6,7 +6,7 @@
  * 打开 demos/<slug>/index.html，按 cues.json 的时间点调 renderAt(t) 截帧，交给模型当
  * 对照物。缺字体/纸纹时用占位资源兜底，并记在 notes 里，不假装素材齐全。
  */
-import {openBrowser} from '@remotion/renderer'
+import { loadVideoModule, ensureVideoRuntime } from './video-runtime.js'
 import {existsSync,mkdirSync,readFileSync,statSync,writeFileSync} from 'node:fs'
 import {createServer} from 'node:http'
 import {extname,join,normalize,resolve,sep} from 'node:path'
@@ -25,7 +25,7 @@ const DEMO_FONT_ALIASES = {
 // 上游 demo 的 importmap 指向 /node_modules/three/...、/node_modules/opentype.js/...，
 // 但这些包只在插件根目录的 node_modules 里。旧版只服务 upstream 目录，于是模块 404、
 // window.__ready 永不置真，最后报了句"没有在 120 秒内就绪"——错误信息指向了完全错误的地方。
-const MODULES = fileURLToPath(new URL('../../node_modules', import.meta.url))
+
 
 const MIME = {
   '.html': 'text/html; charset=utf-8', '.js': 'text/javascript', '.mjs': 'text/javascript',
@@ -101,16 +101,16 @@ function pickTimes(slug, count, explicit, duration) {
 
 // demo 的 importmap 指向 /node_modules/*，只有真装在本机的包才服务得出来。
 // 缺包时页面会静默卡在模块加载阶段，等到超时也只会说"没就绪"—— 这里提前查，几十毫秒就报清缺什么。
-function missingModules(slug) {
+function missingModules(slug, modules) {
   const html = join(UPSTREAM, 'demos', slug, 'index.html')
   let text = ''
   try { text = readFileSync(html, 'utf8') } catch { return [] }
   const refs = [...text.matchAll(/["'](\/node_modules\/[^"']+)["']/g)].map((match) => match[1])
-  return [...new Set(refs)].filter((ref) => !existsSync(join(MODULES, ref.slice('/node_modules/'.length))))
+  return [...new Set(refs)].filter((ref) => !existsSync(join(modules, ref.slice('/node_modules/'.length))))
 }
 
-function startStaticServer(misses) {
-  const roots = {vendor: resolve(MODULES), upstream: resolve(UPSTREAM)}
+function startStaticServer(misses, modules) {
+  const roots = {vendor: resolve(modules), upstream: resolve(UPSTREAM)}
   return new Promise((done) => {
     const server = createServer((req, res) => {
       try {
@@ -181,16 +181,19 @@ export async function captureStyleFrames({slug, times: explicitTimes, count = 8,
   if (typeof slug !== 'string' || !/^[a-z0-9][a-z0-9-]*$/i.test(slug)) throw new Error('slug 无效：' + slug)
   const demo = join(UPSTREAM, 'demos', slug)
   if (!existsSync(join(demo, 'index.html'))) throw new Error('这个风格没有可截帧的上游 demo：' + slug + '（只有说明、没有 index.html）')
-  const missing = missingModules(slug)
+  const runtime = await ensureVideoRuntime({signal})
+  const modules = join(runtime, 'node_modules')
+  const { openBrowser } = await loadVideoModule('@remotion/renderer', {signal})
+  const missing = missingModules(slug, modules)
   if (missing.length) {
     throw new Error('这个 demo 的依赖没装在本机（' + missing.join(', ') + '），页面加载不到模块，截不了帧。'
       + '三条路：① 改用 action:"source" 读 demos/' + slug + '/ 下的源码与 cues.json 反推动效（多数情况够用）；'
-      + '② 在插件目录跑 `npm i --no-save opentype.js simplex-noise topojson-client d3` 后重试（这几个包只为截参考帧，不进 package.json）；'
+      + '② 检查独立视频运行环境中的额外依赖（' + modules + '）；'
       + '③ 换一个不依赖它们的 demo。')
   }
 
   const misses = []
-  const server = await startStaticServer(misses)
+  const server = await startStaticServer(misses, modules)
   const port = server.address().port
   const executable = findChrome(browserExecutable)
   signal?.throwIfAborted()

package/lib/motion/video-runtime.js

@@ -0,0 +1,192 @@
+// Isolated video dependencies: no Remotion/esbuild is loaded or installed at plugin startup.
+import { spawn, spawnSync } from 'node:child_process'
+import { createHash, randomUUID } from 'node:crypto'
+import { createRequire } from 'node:module'
+import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, isAbsolute, join, relative, resolve, parse } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const localRequire = createRequire(import.meta.url)
+const MANIFEST = fileURLToPath(new URL('./runtime/package.json', import.meta.url))
+const LOCK = fileURLToPath(new URL('./runtime/package-lock.json', import.meta.url))
+const fingerprint = createHash('sha256').update(readFileSync(LOCK)).digest('hex')
+const spec = JSON.parse(readFileSync(MANIFEST, 'utf8'))
+const key = `v1-${process.platform}-${process.arch}-node${process.versions.node.split('.')[0]}-${fingerprint.slice(0, 12)}`
+const pending = new Map()
+
+function waitForInitialization(work, signal) {
+  if (!signal) return work
+  signal.throwIfAborted()
+  return new Promise((done, fail) => {
+    const abort = () => fail(signal.reason || new Error('已取消视频环境初始化'))
+    signal.addEventListener('abort', abort, { once: true })
+    work.then(done, fail).finally(() => signal.removeEventListener('abort', abort))
+  })
+}
+
+export function videoRuntimeDirectory() {
+  const directory = resolve(process.env.DRAWAI_VIDEO_RUNTIME_DIR || join(homedir(), '.dsh', 'drawai-video-runtime', key))
+  if ([parse(directory).root, resolve(homedir()), resolve(process.cwd())].includes(directory))
+    throw new Error('视频运行环境必须使用独立子目录')
+  return directory
+}
+
+export function videoRuntimeRequire(directory = videoRuntimeDirectory()) {
+  return createRequire(join(directory, 'package.json'))
+}
+
+function validate(directory, native = false) {
+  const require = videoRuntimeRequire(directory)
+  for (const [name, version] of Object.entries(spec.dependencies)) {
+    let file
+    try { file = require.resolve(name + '/package.json') } catch (error) {
+      if (error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') throw error
+      let parent = dirname(require.resolve(name))
+      while (dirname(parent) !== parent) {
+        const candidate = join(parent, 'package.json')
+        if (existsSync(candidate) && JSON.parse(readFileSync(candidate, 'utf8')).name === name) { file = candidate; break }
+        parent = dirname(parent)
+      }
+      if (!file) throw new Error('缺少视频依赖清单：' + name)
+    }
+    const rel = relative(realpathSync(join(directory, 'node_modules')), realpathSync(file))
+    if (isAbsolute(rel) || rel === '..' || rel.startsWith('..' + (process.platform === 'win32' ? '\\' : '/')))
+      throw new Error('视频依赖未安装在独立目录：' + name)
+    if (JSON.parse(readFileSync(file, 'utf8')).version !== version) throw new Error('视频依赖版本不匹配：' + name)
+  }
+  if (!native) return
+  // Validate in a child so Windows DLL handles and cached module paths don't
+  // pin the staging directory while it is atomically renamed into the cache.
+  const checked = spawnSync(process.execPath, ['-e',
+    "const r=require('node:module').createRequire(process.argv[1]);const b=r('@remotion/bundler');r('@remotion/renderer');if(!b.BundlerInternals.esbuild.transformSync('const n: number = 1',{loader:'ts'}).code)process.exit(1)",
+    join(directory, 'package.json')], { windowsHide: true, encoding: 'utf8', timeout: 90000,
+    env: { ...process.env, ELECTRON_RUN_AS_NODE: '1' } })
+  if (checked.status !== 0) throw new Error('视频二进制验证失败：' + (checked.error?.message || checked.stderr))
+}
+
+export function videoRuntimeState() {
+  const directory = videoRuntimeDirectory()
+  try {
+    const ready = JSON.parse(readFileSync(join(directory, '.ready.json'), 'utf8'))
+    if (ready.fingerprint !== fingerprint || ready.key !== key) return { ready: false, directory }
+    validate(directory)
+    return { ready: true, directory }
+  } catch { return { ready: false, directory } }
+}
+
+function install(directory, { signal, onProgress }) {
+  const cli = join(dirname(localRequire.resolve('npm/package.json')), 'bin', 'npm-cli.js')
+  const registry = process.env.DRAWAI_RUNTIME_REGISTRY || 'https://registry.npmjs.org'
+  const url = new URL(registry)
+  if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password) throw new Error('视频依赖 registry 地址无效')
+  return new Promise((done, fail) => {
+    const child = spawn(process.execPath, [cli, 'ci', '--ignore-scripts', '--include=optional', '--no-audit', '--no-fund',
+      '--registry=' + url.href, '--fetch-retries=1', '--fetch-timeout=30000', '--loglevel=error'], {
+      cwd: directory, windowsHide: true, stdio: ['ignore', 'ignore', 'pipe'],
+      env: { ...process.env, ELECTRON_RUN_AS_NODE: '1', NODE_ENV: 'production', npm_config_ignore_scripts: 'true' },
+    })
+    let stderr = '', settled = false
+    const abort = () => child.kill()
+    const timer = setTimeout(() => child.kill(), 10 * 60000)
+    const progress = setInterval(() => onProgress?.({ phase: 'runtime-installing', message: '正在下载和校验视频依赖，首次初始化可能需要数分钟' }), 5000)
+    const finish = error => {
+      if (settled) return
+      settled = true; clearTimeout(timer); clearInterval(progress); signal?.removeEventListener('abort', abort)
+      if (signal?.aborted) fail(signal.reason || new Error('已取消视频环境初始化'))
+      else if (error) fail(error)
+      else done()
+    }
+    child.stderr.on('data', chunk => { stderr = (stderr + chunk).slice(-3000) })
+    child.on('error', finish)
+    child.on('close', code => finish(code === 0 ? null : new Error('视频依赖安装失败（' + code + '）：' + stderr)))
+    signal?.addEventListener('abort', abort, { once: true })
+    if (signal?.aborted) abort()
+  })
+}
+
+async function initialize({ signal, onProgress }) {
+  const directory = videoRuntimeDirectory(), lock = directory + '.lock'
+  if (existsSync(directory)) {
+    const previous = JSON.parse(readFileSync(join(directory, 'package.json'), 'utf8'))
+    if (previous.name !== spec.name) throw new Error('缓存位置包含其他文件，请指定独立目录')
+  }
+  mkdirSync(dirname(directory), { recursive: true })
+  // Coordinate independent render workers. A dead owner's lock is recoverable.
+  let ownsLock = false
+  const deadline = Date.now() + 11 * 60000
+  while (!ownsLock) {
+    signal?.throwIfAborted()
+    try {
+      mkdirSync(lock)
+      ownsLock = true
+      writeFileSync(join(lock, 'owner.json'), JSON.stringify({ pid: process.pid, at: Date.now() }))
+    } catch (error) {
+      if (ownsLock || error.code !== 'EEXIST') throw error
+      try {
+        const owner = JSON.parse(readFileSync(join(lock, 'owner.json'), 'utf8'))
+        if (!Number.isInteger(owner.pid) || owner.pid <= 0) throw new Error('invalid lock owner')
+        try { process.kill(owner.pid, 0) } catch (e) {
+          if (e.code === 'ESRCH') { rmSync(lock, { recursive: true, force: true }); continue }
+        }
+      } catch {
+        // Recover if the installer crashed between mkdir and writing its owner.
+        if (existsSync(lock) && Date.now() - statSync(lock).mtimeMs > 30000) {
+          rmSync(lock, { recursive: true, force: true }); continue
+        }
+      }
+      if (Date.now() > deadline) throw new Error('等待其他视频环境初始化超时，请重试')
+      onProgress?.({ phase: 'runtime-installing', message: '正在等待共享视频运行环境就绪' })
+      await new Promise(done => setTimeout(done, 500))
+    }
+  }
+  const staging = directory + '.tmp-' + randomUUID()
+  try {
+    if (videoRuntimeState().ready) return directory
+    onProgress?.({ phase: 'runtime-installing', message: '首次使用：正在初始化独立视频运行环境' })
+    signal?.throwIfAborted()
+    mkdirSync(staging)
+    writeFileSync(join(staging, 'package.json'), readFileSync(MANIFEST))
+    writeFileSync(join(staging, 'package-lock.json'), readFileSync(LOCK))
+    await install(staging, { signal, onProgress })
+    signal?.throwIfAborted()
+    onProgress?.({ phase: 'runtime-checking', message: '正在验证视频运行环境' })
+    validate(staging, true)
+    writeFileSync(join(staging, '.ready.json'), JSON.stringify({ fingerprint, key }))
+    // Only replace this cache after installation and native-binary validation succeed.
+    if (existsSync(directory)) {
+      const previous = JSON.parse(readFileSync(join(directory, 'package.json'), 'utf8'))
+      if (previous.name !== spec.name) throw new Error('缓存位置包含其他文件，请指定独立目录')
+      rmSync(directory, { recursive: true, force: true })
+    }
+    renameSync(staging, directory)
+    onProgress?.({ phase: 'runtime-ready', message: '视频运行环境已就绪，后续离线复用' })
+    return directory
+  } finally {
+    rmSync(staging, { recursive: true, force: true })
+    rmSync(lock, { recursive: true, force: true })
+  }
+}
+
+export async function ensureVideoRuntime(options = {}) {
+  options.signal?.throwIfAborted()
+  const state = videoRuntimeState()
+  if (state.ready) return state.directory
+  // A caller's cancellation must not cancel another caller's shared initialization.
+  if (pending.has(state.directory)) {
+    try { await waitForInitialization(pending.get(state.directory), options.signal) } catch { /* Another caller may have cancelled. */ }
+    options.signal?.throwIfAborted()
+    return ensureVideoRuntime(options)
+  }
+  const work = initialize({ ...options, onProgress: options.onProgress || (event => console.error('[drawai] ' + event.message)) }).catch(error => {
+    throw new Error('视频运行环境未就绪：' + error.message + '\n联网后重试当前操作即可重新初始化。可用 DRAWAI_RUNTIME_REGISTRY 设置镜像，DRAWAI_VIDEO_RUNTIME_DIR 设置缓存目录。', { cause: error })
+  }).finally(() => pending.delete(state.directory))
+  pending.set(state.directory, work)
+  return work
+}
+
+export async function loadVideoModule(name, options = {}) {
+  if (!Object.hasOwn(spec.dependencies, name)) throw new Error('不支持的视频模块：' + name)
+  const directory = await ensureVideoRuntime(options)
+  return videoRuntimeRequire(directory)(name)
+}

package/lib/motion-capture.js

@@ -1,5 +1,5 @@
 /* 由 tools/build.mjs 生成 —— 请勿直接编辑；改 src/ 下的源文件。 */
-import {openBrowser} from '@remotion/renderer'
+import { loadVideoModule } from './motion/video-runtime.js'
 import {existsSync,mkdirSync,writeFileSync} from 'node:fs'
 import {join} from 'node:path'
 import {randomUUID,createHash} from 'node:crypto'
@@ -12,6 +12,7 @@ export async function captureMotionPage(args,{directory,signal,browserExecutable
   if(!Array.isArray(args.elements??[])||(args.elements||[]).length>20||!Array.isArray(args.steps??[])||(args.steps||[]).length>16)throw new Error('单页最多20个切片、16个操作')
   const executable=[browserExecutable,process.env.DRAWAI_CHROME_PATH,'C:/Program Files/Google/Chrome/Application/chrome.exe','C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe'].find(p=>p&&existsSync(p))
   signal?.throwIfAborted()
+  const { openBrowser } = await loadVideoModule('@remotion/renderer', {signal})
   const browser=await openBrowser('chrome',{browserExecutable:executable,logLevel:'error'})
   const abort=()=>{void browser.close({silent:true}).catch(()=>{})};signal?.addEventListener('abort',abort,{once:true})
   try{

package/lib/motion-film-review.js

@@ -3,11 +3,11 @@ import {mkdirSync,readFileSync,readdirSync,writeFileSync} from 'node:fs'
 import {join} from 'node:path'
 import {execFile} from 'node:child_process'
 import {promisify} from 'node:util'
-import {ffmpegBinary} from './video-export.js'
+import {ensureFfmpeg} from './ffmpeg-manager.js'
 import {agentHash,agentAtomicJson} from './motion-agent-files.js'
 import {streamAgentTurn,agentMessage} from './motion-agent-protocol.js'
 const exec=promisify(execFile)
-const run=(args,signal)=>exec(ffmpegBinary(),['-hide_banner','-nostdin',...args],{windowsHide:true,signal,timeout:180000,maxBuffer:8*1024*1024})
+const run=async(args,signal)=>{const binary=await ensureFfmpeg({signal});return exec(binary,['-hide_banner','-nostdin',...args],{windowsHide:true,signal,timeout:180000,maxBuffer:8*1024*1024})}
 
 // Decode the actual delivered file, including its final mixed audio. Visual
 // semantics use ordered contact sheets; listening is a separate human verdict.

package/lib/motion-project.js

@@ -2,14 +2,13 @@
 import { existsSync, mkdirSync, writeFileSync, readFileSync, realpathSync } from 'node:fs'
 import { join, dirname, resolve, relative, isAbsolute } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { createRequire } from 'node:module'
+import { videoRuntimeRequire } from './motion/video-runtime.js'
 import { validateMotionSources, sceneComponentPath } from './motion-source.js'
 import { shotcraftModuleMap } from './motion-library.js'
 import { enforceMotionCards } from './motion-library.js'
 import { enforceMgStyle } from './motion-library.js'
 import { validateMotionPlan } from './motion-core.js'
 import { parseProjectJson } from './motion/json.js'
-const require = createRequire(import.meta.url)
 
 // Agent projects are edited on disk. Read their sources before validating or
 // building; never restore a stale inline source over an agent's changes.
@@ -74,7 +73,15 @@ export function prepareMotionProject(composition, directory, options = {}) {
     })
   } }
   alias['@drawai/motion$'] = fileURLToPath(new URL('./motion/reference-media.jsx', import.meta.url))
-  const modules = [...new Set(['react', 'remotion', '@remotion/motion-blur'].map((name) => dirname(require.resolve(name + '/package.json')).replace(/[\\/]@remotion[\\/][^\\/]+$/, '').replace(/[\\/](?:react|remotion)$/, '')))]
-  return { entryPoint, webpackOverride: (config) => ({ ...config, plugins: [...(config.plugins || []), libraryImports], resolve: { ...config.resolve,
-    alias: { ...config.resolve?.alias, ...alias }, modules: [...modules, ...(config.resolve?.modules || ['node_modules'])] } }) }
+  // Resolve the runtime lazily: creating a project only writes its files, and
+  // the video runtime may not be initialized yet (it is installed on first use).
+  const runtimeModules = () => {
+    const require = videoRuntimeRequire(options.runtimeDirectory)
+    return [...new Set(['react', 'remotion', '@remotion/motion-blur'].map((name) => dirname(require.resolve(name + '/package.json')).replace(/[\\/]@remotion[\\/][^\\/]+$/, '').replace(/[\\/](?:react|remotion)$/, '')))]
+  }
+  return { entryPoint, webpackOverride: (config) => {
+    const modules = runtimeModules()
+    return { ...config, plugins: [...(config.plugins || []), libraryImports], resolve: { ...config.resolve,
+      alias: { ...config.resolve?.alias, ...alias }, modules: [...modules, ...(config.resolve?.modules || ['node_modules'])] } }
+  } }
 }

package/lib/motion-render-worker.js

@@ -1,6 +1,5 @@
 /* 由 tools/build.mjs 生成 —— 请勿直接编辑；改 src/ 下的源文件。 */
-import { bundle } from '@remotion/bundler'
-import { openBrowser, selectComposition, renderMedia, renderStill, makeCancelSignal } from '@remotion/renderer'
+import { ensureVideoRuntime, videoRuntimeRequire } from './motion/video-runtime.js'
 import { existsSync, rmSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { dirname, join, relative, isAbsolute, resolve } from 'node:path'
 import { createHash } from 'node:crypto'
@@ -8,16 +7,25 @@ import { prepareMotionProject } from './motion-project.js'
 import { runFfmpeg } from './motion/ffmpeg.js'
 
 let cancelled = false, running = false
-const { cancelSignal, cancel } = makeCancelSignal()
+const runtimeAbort = new AbortController()
+let cancel = () => {}
 const send = (message) => { if (process.connected) process.send(message) }
 process.on('message', async (request) => {
-  if (request.type === 'cancel') { cancelled = true; cancel(); return }
+  if (request.type === 'cancel') { cancelled = true; runtimeAbort.abort(new Error('已取消动效生成')); cancel(); return }
   if (running) return
   running = true
   let browser
   const outDir = request.bundleDir || join(dirname(request.output), 'bundle')
   const cacheFile = join(outDir, '.drawai-bundle-key')
   try {
+    const runtimeDirectory = await ensureVideoRuntime({signal:runtimeAbort.signal, onProgress:message => send({type:'progress', ...message, progress:0})})
+    if (cancelled) throw new Error('已取消动效生成')
+    const require = videoRuntimeRequire(runtimeDirectory)
+    const { bundle } = require('@remotion/bundler')
+    const { openBrowser, selectComposition, renderMedia, renderStill, makeCancelSignal } = require('@remotion/renderer')
+    const cancellation = makeCancelSignal()
+    const cancelSignal = cancellation.cancelSignal
+    cancel = cancellation.cancel
     // 同一个工程连续预览/渲染时复用上次的 bundle：预览从 30 秒降到 3 秒，
     // 改一个场景文件只会让 key 变化一次。request.bundleKey 由调用方按源码计算。
     const reuse = request.reuseBundle === true && request.bundleKey && existsSync(join(outDir, 'index.html'))
@@ -27,7 +35,7 @@ process.on('message', async (request) => {
       serveUrl = outDir
       send({ type: 'progress', phase: 'bundling', progress: .1 })
     } else {
-      const project = prepareMotionProject(request.composition, request.projectDirectory || join(dirname(request.output), 'project'), {preserveSources:request.preserveSources===true})
+      const project = prepareMotionProject(request.composition, request.projectDirectory || join(dirname(request.output), 'project'), {preserveSources:request.preserveSources===true, runtimeDirectory})
       serveUrl = await bundle({ ...project, outDir, ignoreRegisterRootWarning: true,
         publicDir: request.publicDir, onProgress: (progress) => send({ type: 'progress', phase: 'bundling', progress: progress / 100 * .1 }) })
       const index = join(outDir, 'index.html')

package/lib/motion-vision.js

@@ -4,7 +4,7 @@ import { relative, isAbsolute, 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'
 const exec=promisify(execFile)
 
 export async function loadFrozenReferenceImages(input,assets,publicDir,options) {
@@ -29,7 +29,8 @@ export async function loadFrozenReferenceImages(input,assets,publicDir,options)
       if(fraction===null){data=await readFile(path);mediaType=asset.src.endsWith('jpg')?'image/jpeg':asset.src.endsWith('webp')?'image/webp':'image/png'}
       else{
         // Video snapshots describe appearance; two stills are not motion analysis.
-        const {stdout}=await exec(ffmpegBinary(),['-hide_banner','-loglevel','error','-ss',String(fraction),'-i',path,'-frames:v','1','-vf','scale=1280:-2','-f','image2pipe','-vcodec','png','pipe:1'],{encoding:'buffer',windowsHide:true,timeout:30000,maxBuffer:8*1024*1024,signal})
+        const binary=await ensureFfmpeg({signal})
+        const {stdout}=await exec(binary,['-hide_banner','-loglevel','error','-ss',String(fraction),'-i',path,'-frames:v','1','-vf','scale=1280:-2','-f','image2pipe','-vcodec','png','pipe:1'],{encoding:'buffer',windowsHide:true,timeout:30000,maxBuffer:8*1024*1024,signal})
         data=stdout;mediaType='image/png';name=asset.src+'-'+fraction+'.png'
       }
       const attachment=await attachments.saveImage({data,mediaType,name})

package/lib/shotcard-reference.js

@@ -4,7 +4,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 { motionCardContract } from './motion-library.js'
 const exec = promisify(execFile)
 
@@ -30,7 +30,7 @@ export async function prepareReferenceFrames(composition, directory, options = {
         }
         writeFileSync(video + '.tmp', Buffer.concat(chunks)); renameSync(video + '.tmp', video)
       }
-      const binary = options.ffmpegPath || ffmpegBinary()
+      const binary = options.ffmpegPath || await ensureFfmpeg({ signal: options.signal })
       let info = ''
       try { const probe = await exec(binary, ['-hide_banner', '-i', video], { windowsHide: true, timeout: 15000, signal: options.signal }); info = probe.stderr }
       catch (error) { info = error.stderr || ''; if (!info) throw error }

package/lib/video-export.js

@@ -6,9 +6,9 @@ import { Worker } from 'node:worker_threads'
 import { copyFile } from 'node:fs/promises'
 import { existsSync, mkdirSync, mkdtempSync, rmSync, renameSync, statSync, openSync, readSync, closeSync, realpathSync, readFileSync, writeFileSync, readdirSync } from 'node:fs'
 import { join, relative, isAbsolute, extname, dirname, basename } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { clipDirFor, readManifest, findSourceFile, sanitizeClipId } from './media.js'
 import { createPerformanceLog } from './performance-log.js'
+import { ensureFfmpeg, ffmpegPathSync } from './ffmpeg-manager.js'
 
 function runFfmpeg(binary, args, signal, progress) {
   return new Promise((resolve, reject) => {
@@ -36,17 +36,14 @@ function runFfmpeg(binary, args, signal, progress) {
   })
 }
 
+/** 同步近似值，只给「还没异步准备过」的旧路径兜底；真正导出走 ensureFfmpeg。 */
 export function ffmpegBinary() {
-  if (process.env.DRAWAI_FFMPEG_PATH) return process.env.DRAWAI_FFMPEG_PATH
-  // Development checkout only; published packages use the configured binary or PATH.
-  const local = fileURLToPath(new URL('../_local/bin/' + (process.platform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'), import.meta.url))
-  return existsSync(local) ? local : 'ffmpeg'
+  return ffmpegPathSync()
 }
 
 export function createVideoExportManager(options = {}) {
   const jobs = new Map()
   let closed = false
-  const binary = options.ffmpegPath || ffmpegBinary()
   const historyRoot = (path) => join(dirname(path), '.drawai-cache', 'video-export-history')
   const ended = (job) => ['done', 'error', 'interrupted'].includes(job.status)
   function migrationRecords(scope) {
@@ -60,7 +57,7 @@ export function createVideoExportManager(options = {}) {
   }
   function persist(job) {
     const root = historyRoot(job.drawioAbs); mkdirSync(root, { recursive: true })
-    const record = Object.fromEntries(['sessionId', 'drawioAbs', 'clip', 'token', 'status', 'time', 'next', 'encoded', 'format', 'kind', 'w', 'h', 'fps', 'count', 'bytes', 'savedPath', 'error'].map((key) => [key, job[key]]))
+    const record = Object.fromEntries(['sessionId', 'drawioAbs', 'clip', 'token', 'status', 'time', 'next', 'encoded', 'format', 'kind', 'w', 'h', 'fps', 'count', 'bytes', 'savedPath', 'error', 'message'].map((key) => [key, job[key]]))
     const file = join(root, job.token + '.json')
     writeFileSync(file + '.tmp', JSON.stringify(record)); renameSync(file + '.tmp', file)
   }
@@ -87,7 +84,7 @@ export function createVideoExportManager(options = {}) {
   function view(job) {
     return { token: job.token, status: job.status, count: job.count, received: job.next, encoded: job.encoded,
       clip: job.clip, fps: job.fps, w: job.w, h: job.h, bytes: job.bytes || 0, error: job.error || '', format: job.format,
-      background: true, path: job.savedPath || null,
+      message: job.message || '', background: true, path: job.savedPath || null,
       performanceEnabled: job.perf.enabled, performanceId: job.perf.id }
   }
   function owned(scope, token) {
@@ -99,6 +96,7 @@ export function createVideoExportManager(options = {}) {
   }
   async function remove(job) {
     jobs.delete(job.token)
+    job.removed = true
     job.control.abort()
     if (job.preflight) await job.preflight.catch(() => {})
     if (job.promise) await job.promise.catch(() => {})
@@ -138,6 +136,26 @@ export function createVideoExportManager(options = {}) {
   async function runJob(job) {
     let release
     try {
+      // Resolve FFmpeg inside the task: the first use may download it, and a
+      // later retry must not keep using a path cached when the host started.
+      job.status = 'preparing'
+      job.message = '正在准备 FFmpeg…'
+      persist(job)
+      job.binary = options.ffmpegPath || await ensureFfmpeg({
+        signal: job.control.signal,
+        onProgress: (event) => { if (event?.message) job.message = event.message },
+      })
+      if (job.control.signal.aborted) throw new Error('已取消视频导出')
+      job.status = 'queued'
+      job.message = ''
+      persist(job)
+      // Probe the actual output path and encoder before uploading any large frames.
+      job.preflight = runFfmpeg(job.binary, ['-hide_banner', '-nostdin', '-loglevel', 'error', '-y', '-f', 'lavfi', '-i', 'color=white:s=2x2:r=1',
+        '-frames:v', '1', '-c:v', job.format === 'mp4' ? 'libx264' : job.format === 'gif' ? 'gif' : 'libvpx-vp9', '-threads', '1', job.output], job.control.signal)
+      const probeDone = job.perf.start('encoderPreflight')
+      try { await job.preflight }
+      catch (error) { throw new Error('导出预检查失败（目录：' + job.temp + '）：' + error.message) }
+      finally { probeDone() }
       release = await options.slots?.acquire(job.control.signal)
       job.status = 'rendering'
       persist(job)
@@ -159,8 +177,10 @@ export function createVideoExportManager(options = {}) {
       persist(job)
       job.perf.finish('done')
     } catch (error) {
-      job.status = closed ? 'interrupted' : 'error'; job.error = String(error.message || error); job.time = Date.now()
-      persist(job)
+      if (!job.removed) {
+        job.status = closed ? 'interrupted' : 'error'; job.error = String(error.message || error); job.message = ''; job.time = Date.now()
+        persist(job)
+      }
       job.perf.finish(job.control.signal.aborted ? 'cancelled' : 'failed')
     } finally { release?.(); rmSync(job.temp, { recursive: true, force: true }) }
   }
@@ -199,11 +219,11 @@ export function createVideoExportManager(options = {}) {
         paletteArgs.push('-filter_complex', gifWhite + '[opaque]palettegen=max_colors=256:reserve_transparent=0:stats_mode=full[palette]', '-map', '[palette]',
           '-frames:v', '1', '-threads', '1', '-update', '1', join(job.temp, 'palette.png'))
         const paletteDone = job.perf.start('gifPaletteGenerate')
-        try { await runFfmpeg(binary, paletteArgs, job.control.signal) }
+        try { await runFfmpeg(job.binary, paletteArgs, job.control.signal) }
         finally { paletteDone() }
       }
       const encodeDone = job.perf.start('ffmpegEncode')
-      try { await runFfmpeg(binary, args, job.control.signal, (frame) => { job.encoded = frame }) }
+      try { await runFfmpeg(job.binary, args, job.control.signal, (frame) => { job.encoded = frame }) }
       finally { encodeDone() }
       if (job.kind === 'svg' && job.encoded !== job.count) throw new Error('输出帧数不完整：预期 ' + job.count + '，实际 ' + job.encoded)
       job.bytes = statSync(job.output).size
@@ -265,14 +285,6 @@ export function createVideoExportManager(options = {}) {
           next: 0, received: 0, encoded: 0, status: 'queued', time: Date.now(), control: new AbortController(), output: join(temp, 'output.' + format) }
         jobs.set(job.token, job)
         persist(job)
-        // Probe the actual output path and encoder before uploading any large frames.
-        job.preflight = runFfmpeg(binary, ['-hide_banner', '-nostdin', '-loglevel', 'error', '-y', '-f', 'lavfi', '-i', 'color=white:s=2x2:r=1',
-          '-frames:v', '1', '-c:v', format === 'mp4' ? 'libx264' : format === 'gif' ? 'gif' : 'libvpx-vp9', '-threads', '1', job.output], job.control.signal)
-        const probeDone = perf.start('encoderPreflight')
-        try { await job.preflight }
-        catch (error) { throw new Error('导出预检查失败（目录：' + temp + '）：' + error.message) }
-        finally { probeDone() }
-        if (closed || job.control.signal.aborted) throw new Error('视频导出服务已关闭')
         job.promise = runJob(job)
         return view(job)
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-drawai",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "description": "DSH 右侧栏的可编辑画布 + AI 语义绘图工具（diagram_apply / diagram_read），直接读写原生 .drawio 文件",
   "license": "MIT",
@@ -22,10 +22,12 @@
     "test:audio-ui": "node tools/check-audio-ui.mjs",
     "watch": "node tools/watch.mjs",
     "check": "node tools/check-package.mjs",
-    "test": "node tools/check-media-package.mjs && node tools/check-motion-session.mjs && node tools/check-motion-host.mjs && node tools/check-motion-canvas-spec.mjs && node tools/check-motion-json-bom.mjs && node tools/check-motion-pilot-host.mjs && node tools/check-motion-boundaries.mjs && node tools/check-motion-cache-fetch.mjs && node tools/check-media-library-host.mjs && node tools/check-motion-ui.mjs && node tools/check-native-canvas.mjs && node tools/check-adaptive-palette.mjs && node tools/check-auto-save.mjs && node tools/check-drawing-queue.mjs && node tools/check-background-tasks.mjs && node tools/check-background-ui.mjs && node tools/check-trace-optimization.mjs && node tools/check-performance.mjs && node tools/check-mxfile.mjs && node tools/check-routing.mjs && node tools/check-route-preview.mjs && node tools/check-host.mjs && node tools/check-render.mjs && node tools/check-component.mjs && node tools/check-text-copy.mjs && node tools/check-image-export.mjs && node tools/check-canvas-sessions.mjs && node tools/check-trace.mjs && node tools/check-media.mjs && node tools/check-video-player.mjs && node tools/check-image-trace.mjs && node tools/check-video-trace.mjs && node tools/check-video-reuse.mjs && node tools/check-video-audio.mjs && node tools/check-video-export.mjs && node tools/check-video-import.mjs && node tools/check-node-labels.mjs && node tools/check-imagegen-disabled.mjs && node tools/check-imagegen.mjs",
+    "test": "node tools/check-video-runtime.mjs && node tools/check-ffmpeg-manager.mjs && node tools/check-media-package.mjs && node tools/check-motion-session.mjs && node tools/check-motion-host.mjs && node tools/check-motion-canvas-spec.mjs && node tools/check-motion-json-bom.mjs && node tools/check-motion-pilot-host.mjs && node tools/check-motion-boundaries.mjs && node tools/check-motion-cache-fetch.mjs && node tools/check-media-library-host.mjs && node tools/check-motion-ui.mjs && node tools/check-native-canvas.mjs && node tools/check-adaptive-palette.mjs && node tools/check-auto-save.mjs && node tools/check-drawing-queue.mjs && node tools/check-background-tasks.mjs && node tools/check-background-ui.mjs && node tools/check-trace-optimization.mjs && node tools/check-performance.mjs && node tools/check-mxfile.mjs && node tools/check-routing.mjs && node tools/check-route-preview.mjs && node tools/check-host.mjs && node tools/check-render.mjs && node tools/check-component.mjs && node tools/check-text-copy.mjs && node tools/check-image-export.mjs && node tools/check-canvas-sessions.mjs && node tools/check-trace.mjs && node tools/check-media.mjs && node tools/check-video-player.mjs && node tools/check-image-trace.mjs && node tools/check-video-trace.mjs && node tools/check-video-reuse.mjs && node tools/check-video-audio.mjs && node tools/check-video-export.mjs && node tools/check-video-import.mjs && node tools/check-node-labels.mjs && node tools/check-imagegen-disabled.mjs && node tools/check-imagegen.mjs",
     "bench:performance": "node tools/benchmark-performance.mjs",
     "test:shotcards-render": "node tools/check-shotcard-render.mjs",
-    "test:shotcards-ui": "node tools/check-shotcards-ui.mjs"
+    "test:shotcards-ui": "node tools/check-shotcards-ui.mjs",
+    "test:video-runtime": "node tools/check-video-runtime.mjs",
+    "test:ffmpeg": "node tools/check-ffmpeg-manager.mjs"
   },
   "exports": {
     ".": "./lib/index.js",
@@ -54,18 +56,10 @@
   "dependencies": {
     "@babel/parser": "7.28.5",
     "@babel/traverse": "7.28.5",
-    "@react-three/fiber": "9.5.0",
-    "@remotion/bundler": "4.0.484",
-    "@remotion/motion-blur": "4.0.484",
-    "@remotion/renderer": "4.0.484",
-    "@remotion/three": "4.0.484",
     "@resvg/resvg-js": "^2.6.2",
     "parse5": "7.3.0",
     "postcss": "8.5.32",
-    "react": "19.2.7",
-    "react-dom": "19.2.7",
-    "remotion": "4.0.484",
-    "three": "0.183.2"
+    "npm": "10.9.4"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-tools": ">=0.1.0-rc.1 <0.1.0 || >=0.1.5-rc.1 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0"
@@ -82,5 +76,16 @@
         "@deepseek-ai/dsh-api-workspace-files"
       ]
     }
+  },
+  "devDependencies": {
+    "@react-three/fiber": "9.5.0",
+    "@remotion/bundler": "4.0.484",
+    "@remotion/motion-blur": "4.0.484",
+    "@remotion/renderer": "4.0.484",
+    "@remotion/three": "4.0.484",
+    "react": "19.2.7",
+    "react-dom": "19.2.7",
+    "remotion": "4.0.484",
+    "three": "0.183.2"
   }
 }