dsh-drawai 0.4.0 → 0.4.2

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/style-kernel.js

@@ -152,9 +152,16 @@ var DASH_PRESETS = {
 /** 线型枚举顺序。 */
 var DASH_KINDS = ['solid', 'dashed', 'dotted']
 
-/** 箭头枚举 → style 键。none 是缺省（drawio 里键缺省就不画箭头），落盘即删键。 */
+/**
+ * 箭头枚举 → style 键。
+ *
+ * `none` 必须**显式写 `endArrow=none`**：drawio 的 defaultEdge 自带
+ * `endArrow=classic`（`mxStylesheet.createDefaultEdgeStyle`），删键只会让这条边
+ * 回落到缺省，箭头反而又长出来。`=none` 才是在合并后的样式里把这个键删掉
+ * （`mxStylesheet.getCellStyle`：value 为 `none` 时 delete），从而真的不画。
+ */
 var ARROW_PRESETS = {
-  none: null,
+  none: { endArrow: 'none' },
   end: { endArrow: 'classic' },
   both: { endArrow: 'classic', startArrow: 'classic' },
   start: { startArrow: 'classic' },
@@ -655,7 +662,10 @@ function arrowValueIsSet(value) {
 
 /** style → 箭头枚举。 */
 function arrowFromStyle(style) {
-  var end = arrowValueIsSet(styleGet(style, 'endArrow', null))
+  // 按 drawio 的**有效样式**算：mxStylesheet.getCellStyle 会先把 defaultEdge 合进来，
+  // 而 defaultEdge 自带 endArrow=classic —— 所以缺键不是"没有箭头"，是有 classic。
+  // startArrow 不在 defaultEdge 里，缺键才是真的没有。
+  var end = arrowValueIsSet(styleGet(style, 'endArrow', 'classic'))
   var start = arrowValueIsSet(styleGet(style, 'startArrow', null))
   if (end && start) return 'both'
   if (end) return 'end'
@@ -663,12 +673,12 @@ function arrowFromStyle(style) {
   return 'none'
 }
 
-/** 箭头枚举 → style。none 即删键（= drawio 缺省不画）。 */
+/** 箭头枚举 → style。none 写 `endArrow=none`；null/undefined 才是"删键回落到 drawio 缺省"。 */
 function styleWithArrow(style, kind) {
   var cleared = stylePatch(style, { endArrow: null, startArrow: null })
-  if (kind === null || kind === undefined || kind === 'none') return cleared
+  if (kind === null || kind === undefined) return cleared
   var preset = ARROW_PRESETS[kind]
-  if (preset === undefined || preset === null) return cleared
+  if (preset === undefined) return cleared
   return stylePatch(cleared, preset)
 }
 

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.2",
   "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"
   }
 }