dsh-ffmpeg 0.1.0 → 0.2.0

package/README.en.md

@@ -2,6 +2,8 @@
 
 # dsh-ffmpeg
 
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
+
 DSH (DeepSeek Harness) video-processing plugin: seven tools covering probing, cutting, concatenation, transcoding, subtitles, extraction and GIF creation — all powered by ffmpeg/ffprobe.
 
 ## Installation
@@ -10,7 +12,7 @@ DSH (DeepSeek Harness) video-processing plugin: seven tools covering probing, cu
 dsh plugin --profile web add dsh-ffmpeg
 ```
 
-ffmpeg must be installed locally (`ffmpeg -version` should work); use `ffmpegPath` / `ffprobePath` when it is not on PATH.
+ffmpeg must be installed locally (`ffmpeg -version` should work); use `ffmpegPath` / `ffprobePath`, or the `DSH_FFMPEG_PATH` / `DSH_FFPROBE_PATH` environment variables, when it is not on PATH.
 
 ## Configuration
 
@@ -20,8 +22,8 @@ Override the plugin row in your profile's `cordis.patch.yml` (defaults apply whe
 - id: ffmpeg
   name: 'dsh-ffmpeg'
   config:
-    # ffmpegPath: C:\tools\ffmpeg\bin\ffmpeg.exe   # explicit path when not on PATH
-    # ffprobePath: C:\tools\ffmpeg\bin\ffprobe.exe
+    # ffmpegPath: C:\tools\ffmpeg\bin\ffmpeg.exe   # explicit path (or DSH_FFMPEG_PATH)
+    # ffprobePath: C:\tools\ffmpeg\bin\ffprobe.exe # or DSH_FFPROBE_PATH
     timeoutMs: 300000                                # per-operation timeout (default 5 min, 10s - 2h)
     # overwrite: true                                 # allow overwriting outputs (default auto-suffix _1/_2)
 ```
@@ -30,7 +32,7 @@ Override the plugin row in your profile's `cordis.patch.yml` (defaults apply whe
 
 | Tool | Purpose | Key parameters |
 | :-- | :-- | :-- |
-| `ffmpeg_probe` | Probe media info (format/duration/resolution/fps/bitrate/audio/subtitle streams) | `input` required |
+| `ffmpeg_probe` | Probe media info (format/duration/resolution/fps/bitrate/audio/subtitle streams; multi-video files return a full videos list) | `input` required |
 | `ffmpeg_cut` | Cut a clip (stream copy by default, accurate re-encode optional) | `input` required; `start`/`end`/`duration` |
 | `ffmpeg_concat` | Concatenate 2-20 clips (stream copy for identical codecs / re-encode for mixed) | `inputs` array required |
 | `ffmpeg_encode` | Transcode with presets (bilibili 1080p/4K, vertical 1080p, web-720p) plus crf/fps/scale overrides | `input` required; `preset` optional |
@@ -51,16 +53,16 @@ ffmpeg_gif { input: E:\videos\raw.mp4, duration: 3, width: 480 }
 ## Safety
 
 - **No shell**: every argument is passed as its own argv element — user input cannot inject commands
-- **Runs on the official DSH subprocess service**: tree-scoped termination (timeout escalates SIGTERM → kill; taskkill /T on Windows), zero runtime dependencies
+- **Runs on the official DSH subprocess service**: the timeout AbortSignal now really drives tree-scoped termination (SIGTERM → kill; taskkill /T on Windows), zero runtime dependencies
 - **No accidental overwrites**: existing outputs get auto-suffixed; output == input is rejected
 - **Timeout clamps**: per-operation 10s - 2h; probes additionally capped at 60s
-- **Input validation**: time formats, preset enums, crf/fps/scale ranges are validated up front with actionable errors
+- **Input validation**: time formats, preset enums, crf/fps/scale ranges are validated up front; directory inputs are rejected and extension-less frame-sequence outputs are auto-fixed
 
 ## Development
 
 ```bash
 pnpm install
-pnpm test       # build + 50 tests, including a real-ffmpeg end-to-end suite (auto-skipped without ffmpeg)
+pnpm test       # build + 57 tests, including a real-ffmpeg end-to-end suite (auto-skipped without ffmpeg)
 ```
 
 ## License

package/README.md

@@ -2,6 +2,13 @@
 
 # dsh-ffmpeg
 
+> **你的 agent 会剪视频了**：探测/剪辑/拼接/转码/字幕/抽帧/GIF，七个工具一条命令。
+
+![npm version](https://img.shields.io/npm/v/dsh-ffmpeg?label=npm&color=blue) ![npm downloads](https://img.shields.io/npm/dm/dsh-ffmpeg) ![license](https://img.shields.io/npm/l/dsh-ffmpeg) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-ffmpeg?style=social)
+
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
+
+
 DSH（DeepSeek Harness）视频处理工具插件：七个工具覆盖探测、剪辑、拼接、转码、字幕、提取与 GIF 制作，全部由 ffmpeg/ffprobe 完成。
 
 ## 安装
@@ -10,7 +17,7 @@ DSH（DeepSeek Harness）视频处理工具插件：七个工具覆盖探测、
 dsh plugin --profile web add dsh-ffmpeg
 ```
 
-需要本机已安装 ffmpeg（`ffmpeg -version` 能出结果即可）；不在 PATH 上时用 `ffmpegPath`/`ffprobePath` 显式指定。
+需要本机已安装 ffmpeg（`ffmpeg -version` 能出结果即可）；不在 PATH 上时可用 `ffmpegPath`/`ffprobePath` 显式指定，或设置环境变量 `DSH_FFMPEG_PATH` / `DSH_FFPROBE_PATH`。
 
 ## 配置
 
@@ -20,8 +27,8 @@ dsh plugin --profile web add dsh-ffmpeg
 - id: ffmpeg
   name: 'dsh-ffmpeg'
   config:
-    # ffmpegPath: C:\tools\ffmpeg\bin\ffmpeg.exe   # 非 PATH 时显式指定
-    # ffprobePath: C:\tools\ffmpeg\bin\ffprobe.exe
+    # ffmpegPath: C:\tools\ffmpeg\bin\ffmpeg.exe   # 非 PATH 时显式指定（也可用 DSH_FFMPEG_PATH）
+    # ffprobePath: C:\tools\ffmpeg\bin\ffprobe.exe # 也可用 DSH_FFPROBE_PATH
     timeoutMs: 300000                                # 单次操作超时（默认 5 分钟，10 秒 - 2 小时）
     # overwrite: true                                 # 允许覆盖同名输出（默认自动加 _1/_2 序号）
 ```
@@ -30,7 +37,7 @@ dsh plugin --profile web add dsh-ffmpeg
 
 | 工具 | 作用 | 关键参数 |
 | :-- | :-- | :-- |
-| `ffmpeg_probe` | 探测媒体信息（格式/时长/分辨率/帧率/码率/音轨/字幕轨） | `input` 必填 |
+| `ffmpeg_probe` | 探测媒体信息（格式/时长/分辨率/帧率/码率/音轨/字幕轨；多视频流时返回完整 videos 列表） | `input` 必填 |
 | `ffmpeg_cut` | 剪辑片段（默认流拷贝秒级，可精确重编码） | `input` 必填；`start`/`end`/`duration` |
 | `ffmpeg_concat` | 拼接 2-20 个片段（同编码流拷贝 / 混合编码重编码） | `inputs` 数组必填 |
 | `ffmpeg_encode` | 转码（B 站 1080p/4K、竖屏 1080p、web-720p 预设 + crf/fps/scale 覆盖） | `input` 必填；`preset` 可选 |
@@ -51,18 +58,19 @@ ffmpeg_gif { input: E:\videos\raw.mp4, duration: 3, width: 480 }
 ## 安全设计
 
 - **无 shell**：所有参数以独立 argv 数组传递，用户输入不可能注入命令
-- **进程走 DSH 官方 subprocess 服务**：树级终止（超时自动 SIGTERM → 强杀，Windows taskkill /T），本插件零运行时依赖
+- **进程走 DSH 官方 subprocess 服务**：超时 AbortSignal 会真正触发树级终止（SIGTERM → 强杀，Windows taskkill /T），本插件零运行时依赖
 - **防覆写**：默认不覆盖同名文件（自动加序号），输出与输入相同直接拒绝
 - **超时钳制**：单次操作 10 秒 - 2 小时；探测额外限制 60 秒
-- **参数校验**：时间格式、预设枚举、crf/fps/scale 范围全部前置校验，错误带中文指引
+- **参数校验**：时间格式、预设枚举、crf/fps/scale 范围全部前置校验，输入目录、抽帧无扩展名输出等边界也有中文错误/自动修复
 
 ## 开发
 
 ```bash
 pnpm install
-pnpm test       # 构建 + 50 个测试（含真实 ffmpeg 端到端集成，缺 ffmpeg 自动跳过）
+pnpm test       # 构建 + 57 个测试（含真实 ffmpeg 端到端集成，缺 ffmpeg 自动跳过）
 ```
 
 ## License
 
 MIT
+

package/lib/config.d.ts

@@ -25,7 +25,7 @@ export interface ResolvedFfmpegConfig {
  * @param config - 插件行配置（可能为 undefined/null）。
  * @throws 配置值非法时抛出中文错误。
  */
-export declare function resolveConfig(config: FfmpegConfig | undefined | null): ResolvedFfmpegConfig;
+export declare function resolveConfig(config: FfmpegConfig | undefined | null, env?: NodeJS.ProcessEnv): ResolvedFfmpegConfig;
 /**
  * 解析时间参数：接受秒数（正数）或 HH:MM:SS[.mmm] 字符串。
  * 返回秒（浮点）；非法返回 null。

package/lib/config.js

@@ -11,10 +11,10 @@ const DEFAULT_GRACE_MS = 15000;
  * @param config - 插件行配置（可能为 undefined/null）。
  * @throws 配置值非法时抛出中文错误。
  */
-export function resolveConfig(config) {
+export function resolveConfig(config, env = process.env) {
     const cfg = config ?? {};
-    const ffmpegPath = typeof cfg.ffmpegPath === 'string' && cfg.ffmpegPath.trim() !== '' ? cfg.ffmpegPath.trim() : 'ffmpeg';
-    const ffprobePath = typeof cfg.ffprobePath === 'string' && cfg.ffprobePath.trim() !== '' ? cfg.ffprobePath.trim() : 'ffprobe';
+    const ffmpegPath = typeof cfg.ffmpegPath === 'string' && cfg.ffmpegPath.trim() !== '' ? cfg.ffmpegPath.trim() : (env.DSH_FFMPEG_PATH?.trim() || 'ffmpeg');
+    const ffprobePath = typeof cfg.ffprobePath === 'string' && cfg.ffprobePath.trim() !== '' ? cfg.ffprobePath.trim() : (env.DSH_FFPROBE_PATH?.trim() || 'ffprobe');
     let timeoutMs = DEFAULT_TIMEOUT_MS;
     if (cfg.timeoutMs !== undefined) {
         if (typeof cfg.timeoutMs !== 'number' || !Number.isFinite(cfg.timeoutMs) || cfg.timeoutMs <= 0) {

package/lib/exec.js

@@ -28,14 +28,14 @@ export function createSubprocessRunner(spawn, graceMs, defaultTimeoutMs) {
                     graceMs,
                     signal: controller.signal,
                 });
+                const outcome = await handle.done;
+                const stdout = handle.collected.stdout?.readFrom(0).text ?? '';
+                const stderr = handle.collected.stderr?.readFrom(0).text ?? '';
+                return { exitCode: outcome.exitCode, signal: outcome.signal, stdout, stderr };
             }
             finally {
                 clearTimeout(timer);
             }
-            const outcome = await handle.done;
-            const stdout = handle.collected.stdout?.readFrom(0).text ?? '';
-            const stderr = handle.collected.stderr?.readFrom(0).text ?? '';
-            return { exitCode: outcome.exitCode, signal: outcome.signal, stdout, stderr };
         },
     };
 }

package/lib/ffprobe.d.ts

@@ -30,7 +30,10 @@ export interface MediaInfo {
     durationSeconds: number | null;
     sizeBytes: number | null;
     bitrate: number | null;
+    /** 第一个视频流（保持旧字段兼容）。 */
     video: VideoStreamInfo | null;
+    /** 全部视频流（多机位/多角度视频可完整枚举）。 */
+    videos: VideoStreamInfo[];
     audio: AudioStreamInfo[];
     subtitles: SubtitleStreamInfo[];
 }

package/lib/ffprobe.js

@@ -52,20 +52,20 @@ export function parseProbeJson(text) {
     const root = (typeof raw === 'object' && raw !== null ? raw : {});
     const format = (typeof root.format === 'object' && root.format !== null ? root.format : {});
     const streams = Array.isArray(root.streams) ? root.streams : [];
-    let video = null;
+    const videos = [];
     const audio = [];
     const subtitles = [];
     for (const stream of streams) {
         const codecType = str(stream.codec_type);
-        if (codecType === 'video' && video === null) {
-            video = {
+        if (codecType === 'video') {
+            videos.push({
                 width: num(stream.width) ?? 0,
                 height: num(stream.height) ?? 0,
                 fps: parseFps(stream.avg_frame_rate) ?? parseFps(stream.r_frame_rate),
                 codec: str(stream.codec_name),
                 durationSeconds: num(stream.duration) ?? null,
                 bitrate: num(stream.bit_rate) ?? null,
-            };
+            });
         }
         else if (codecType === 'audio') {
             audio.push({
@@ -88,7 +88,8 @@ export function parseProbeJson(text) {
         durationSeconds: num(format.duration) ?? null,
         sizeBytes: num(format.size) ?? null,
         bitrate: num(format.bit_rate) ?? null,
-        video,
+        video: videos[0] ?? null,
+        videos,
         audio,
         subtitles,
     };

package/lib/paths.js

@@ -3,7 +3,7 @@
  *
  * @module dsh-ffmpeg/paths
  */
-import { existsSync } from 'node:fs';
+import { existsSync, statSync } from 'node:fs';
 import { basename, dirname, extname, join, resolve } from 'node:path';
 /** 校验输入文件存在且是文件；返回绝对路径。 */
 export function assertInputFile(input) {
@@ -11,6 +11,9 @@ export function assertInputFile(input) {
     if (!existsSync(absolute)) {
         throw new Error('输入文件不存在：' + input);
     }
+    if (!statSync(absolute).isFile()) {
+        throw new Error('输入路径不是文件：' + input);
+    }
     return absolute;
 }
 /** 清洗文件名中的危险字符。 */

package/lib/tools.js

@@ -5,6 +5,7 @@
  * @module dsh-ffmpeg/tools
  */
 import { rmSync, writeFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
 import { tmpdir } from 'node:os';
 import { basename, dirname, extname, join } from 'node:path';
 import { concatArgs, concatListContent, cutArgs, ENCODE_PRESETS, encodeArgs, extractArgs, fmtSeconds, gifPaletteArgs, gifUseArgs, probeArgs, subtitleArgs, } from './args.js';
@@ -102,6 +103,7 @@ const probeSchema = {
         sizeBytes: { type: 'number' },
         bitrate: { type: 'number' },
         video: videoStreamSchema,
+        videos: { type: 'array', items: videoStreamSchema },
         audio: { type: 'array', items: audioStreamSchema },
         subtitles: { type: 'array', items: subtitleStreamSchema },
     },
@@ -131,11 +133,13 @@ export function buildFfmpegTools(config, runner) {
             schema: probeSchema,
             render: buildTextRenderer((_args, value) => {
                 const rec = asRecord(value);
-                const video = asRecord(rec.video);
+                const videos = Array.isArray(rec.videos) ? rec.videos : [];
+                const video = videos.length > 0 ? asRecord(videos[0]) : asRecord(rec.video);
                 const lines = ['媒体信息（' + rec.input + '）：'];
                 lines.push('- 容器：' + rec.formatName + '，时长：' + (rec.durationSeconds ?? '未知') + ' 秒，大小：' + (rec.sizeBytes ?? '未知') + ' 字节');
-                if (rec.video !== null && rec.video !== undefined)
-                    lines.push('- 视频：' + video.codec + ' ' + video.width + 'x' + video.height + '，帧率：' + (video.fps ?? '未知'));
+                if (videos.length > 0) {
+                    lines.push('- 视频流 ' + videos.length + ' 个；主视频：' + video.codec + ' ' + video.width + 'x' + video.height + '，帧率：' + (video.fps ?? '未知'));
+                }
                 lines.push('- 音频流：' + (Array.isArray(rec.audio) ? rec.audio.length : 0) + ' 个，字幕流：' + (Array.isArray(rec.subtitles) ? rec.subtitles.length : 0) + ' 个');
                 return lines;
             }),
@@ -217,7 +221,7 @@ export function buildFfmpegTools(config, runner) {
             const firstExt = extname(absolute[0]) || '.mp4';
             const output = resolveOutputPath(absolute[0], optionalString(args, 'output'), '.concat', firstExt, cfg.overwrite);
             if (!reencode) {
-                const listPath = join(tmpdir(), 'dsh-ffmpeg-concat-' + Date.now() + '-' + Math.random().toString(36).slice(2, 8) + '.txt');
+                const listPath = join(tmpdir(), 'dsh-ffmpeg-concat-' + Date.now() + '-' + randomUUID().slice(0, 8) + '.txt');
                 writeFileSync(listPath, concatListContent(absolute), 'utf8');
                 try {
                     await runChecked(runner, concatArgs(cfg.ffmpegPath, { inputs: absolute, listFilePath: listPath, output, overwrite: cfg.overwrite, reencode: false }), timeout, 'ffmpeg 拼接');
@@ -354,7 +358,13 @@ export function buildFfmpegTools(config, runner) {
             else {
                 const explicit = optionalString(args, 'output');
                 if (explicit !== undefined) {
-                    output = explicit.includes('%') ? explicit : explicit.replace(/(\.[^.]+)$/, '-%03d$1');
+                    if (explicit.includes('%')) {
+                        output = explicit;
+                    }
+                    else {
+                        const explicitExt = extname(explicit);
+                        output = explicitExt === '' ? explicit + '-%03d.png' : explicit.slice(0, -explicitExt.length) + '-%03d' + explicitExt;
+                    }
                 }
                 else {
                     output = join(dirname(input), sanitizeName(basename(input, extname(input))) + '-%03d.png');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-ffmpeg",
-  "version": "0.1.0",
-  "description": "DSH 视频处理工具插件：ffmpeg_probe/cut/concat/encode/subtitle/extract/gif 七工具，进程走官方 subprocess 服务，零运行时依赖（ffmpeg 本体除外）。",
+  "version": "0.2.0",
+  "description": "DSH 视频处理工具插件：ffmpeg_probe/cut/concat/encode/subtitle/extract/gif 七工具，进程走官方 subprocess 服务，超时树级终止、环境变量路径回退与多视频流探测，零运行时依赖（ffmpeg 本体除外）。",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,7 +37,8 @@
     "plugin",
     "ffmpeg",
     "video",
-    "media"
+    "media",
+    "dsh-plugin"
   ],
   "license": "MIT",
   "engines": {
@@ -49,7 +50,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/STARDUSTLC666/dsh-ffmpeg"
+    "url": "git+https://github.com/STARDUSTLC666/dsh-ffmpeg.git"
   },
   "bugs": {
     "url": "https://github.com/STARDUSTLC666/dsh-ffmpeg/issues"