dsh-drawai 0.4.0 → 0.4.2

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/demo-assets-lock.js

@@ -0,0 +1,10 @@
+// 由 tools/build-demo-assets-pack.mjs 生成，勿手改。
+export const DEMO_ASSETS_LOCK = {
+  "version": "v1",
+  "file": "drawai-demo-assets-v1.tar.gz",
+  "bytes": 169794,
+  "sha256": "05a6fb947cb71bf51af309134d3d83a978dd5a6eb1ce1799779eb4346d519bce",
+  "files": 1,
+  "rawBytes": 549376,
+  "builtAt": "2026-11-08T16:48:01.972Z"
+}

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/mgstyles/vendor/README.md

@@ -0,0 +1,28 @@
+# vendored demo 依赖
+
+`upstream/demos/*/index.html` 的 importmap 和 `<script src>` 指向 `/node_modules/*`。这些包不在
+视频运行时（`src/motion/runtime/package.json`）的依赖里，装到用户机器上就无从服务，于是
+`mg_style action:"frames"` 直接报「依赖没装在本机」（issue #27）。
+
+这里按**原包内路径**放好被引用的构建产物，`src/motion/style-frames.js` 在服务 `/node_modules/*`
+时先查视频运行时、再回落到本目录，所以用户什么都不用装。
+
+```
+modules/<包名>/<包内原路径>
+```
+
+| 包 | 版本 | 文件 | 许可证 |
+| --- | --- | --- | --- |
+| d3 | 7.9.0 | `d3/dist/d3.min.js` | ISC（见 `d3/LICENSE`） |
+| topojson-client | 3.1.0 | `topojson-client/dist/topojson-client.min.js` | ISC（见 `topojson-client/LICENSE`） |
+| opentype.js | 1.3.4 | `opentype.js/dist/opentype.mjs` | MIT（见 `opentype.js/LICENSE`） |
+| simplex-noise | 4.0.3 | `simplex-noise/dist/esm/simplex-noise.js` | MIT（见 `simplex-noise/LICENSE`） |
+
+- 只用到的文件放进来了，没有整包拷（约 780 KB）。
+- 目录叫 `modules` 而不是 `node_modules`：npm 打包会无条件跳过任何名为 `node_modules` 的目录，
+  那样 vendored 文件进不了 tarball。`.gitignore` / `.npmignore` 里给了 `dist/` 的例外规则，
+  否则这几个文件会被当成构建产物忽略。
+- `opentype.js` 1.3.4 的 ESM 构建叫 `dist/opentype.module.js`，demo 按 `dist/opentype.mjs` 引用，
+  所以这里用前者的内容放到后者的文件名下；升级时按同样规则替换。
+- `three` 不在这里：视频运行时的依赖清单已包含 three 0.183.2，`/node_modules/three/*` 由运行时提供。
+- 升级包时同步改本表版本号，并重跑 `node tools/check-package.mjs`（它校验这几个文件是否存在）。

package/lib/motion/mgstyles/vendor/modules/d3/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2010-2023 Mike Bostock
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.