dsh-agnes-create 0.3.0 → 0.7.0

package/lib/index.js

@@ -6,10 +6,20 @@
  *   POST /agnes/generate      { prompt, size, ratio } → 生成并落盘
  *
  * 视频（异步任务制）
- *   POST /agnes/video         { prompt, seconds, ratio } → 提交，立刻返回 { videoId }
+ *   POST /agnes/video         { prompt, seconds, ratio, seed?, firstFrame?, lastFrame? }
+ *                             提交，立刻返回 { videoId }
+ *                             给了 firstFrame/lastFrame 就自动走 keyframe 模式
  *   GET  /agnes/video?id=…    查询一次状态；completed 时顺带下载落盘并返回 filename
  *                             （下载结果按 videoId 缓存，反复轮询不会重复下载）
  *
+ * 历史（宿主侧持久化，跨会话/重启都还在）
+ *   GET    /agnes/history     读回最近若干条
+ *   POST   /agnes/history     追加一条（生成完成后由前端调用）
+ *   DELETE /agnes/history     清空
+ *
+ * 结果收尾
+ *   POST /agnes/reveal        { name } → 在访达里显示该文件（只能是输出目录内的文件）
+ *
  * 媒体
  *   GET  /agnes/media?name=…  把已生成的图片/视频流回浏览器，视频支持 Range
  *   GET  /agnes/image?name=…  兼容旧链接，等价于 /agnes/media
@@ -18,15 +28,27 @@
  * 也监听 internal/service 事件。
  */
 
+import { execFile } from 'node:child_process';
+import { basename, join, resolve as resolvePath } from 'node:path';
+
 import {
   MODEL, VIDEO_MODEL, VIDEO_SECONDS, VIDEO_RATIOS, VIDEO_SIZE,
-  DEFAULT_BASE, SIZES, RATIOS,
-  generate, keyStatus, readMedia, resolvePaths, saveConfig,
+  DEFAULT_BASE, SIZES, RATIOS, MAX_REF_IMAGES, HISTORY_MAX,
+  generate, keyStatus, readMedia, resolvePaths, saveConfig, safeName,
   submitVideo, queryVideo, saveVideo,
+  readHistory, appendHistory, clearHistory,
+  listLibrary, fileExists,
 } from './agnes.js';
 
 export const name = 'dsh-agnes-create';
 
+/** 普通 JSON 请求（配置、视频）1 MB 够用。 */
+const BODY_LIMIT = 1_000_000;
+
+/** 图生图的参考图走 base64 data URI，必须单独放宽到 32 MB：
+ *  8 张 × 前端下采样后的约 300–600 KB，base64 膨胀 4/3，再留足余量。 */
+const REF_BODY_LIMIT = 32 * 1024 * 1024;
+
 function sendJson(res, data, status = 200) {
   res.writeHead(status, {
     'content-type': 'application/json; charset=utf-8',
@@ -35,20 +57,24 @@ function sendJson(res, data, status = 200) {
   res.end(JSON.stringify(data));
 }
 
-function readJson(req) {
+function readJson(req, limit = BODY_LIMIT) {
   return new Promise((resolve, reject) => {
     const chunks = [];
     let size = 0;
+    let aborted = false;
     req.on('data', (c) => {
+      if (aborted) return;
       size += c.length;
-      if (size > 1_000_000) {
-        reject(new Error('请求体过大'));
+      if (size > limit) {
+        aborted = true;
+        reject(new Error(`请求体过大（上限 ${(limit / 1024 / 1024).toFixed(0)} MB）`));
         req.destroy();
         return;
       }
       chunks.push(c);
     });
     req.on('end', () => {
+      if (aborted) return;
       const text = Buffer.concat(chunks).toString('utf8');
       if (text.trim() === '') return resolve({});
       try {
@@ -148,6 +174,7 @@ export function apply(ctx) {
             defaults: cfg.defaults,
             sizes: SIZES,
             ratios: RATIOS,
+            maxRefImages: MAX_REF_IMAGES,   // 图生图 / 多图合成的参考图上限
             videoSizes: [VIDEO_SIZE],
             videoSeconds: VIDEO_SECONDS,
             videoRatios: VIDEO_RATIOS,
@@ -210,7 +237,7 @@ export function apply(ctx) {
       handler: async (req, res) => {
         if (req.method !== 'POST') return sendJson(res, { ok: false, error: '需要 POST' }, 405);
         try {
-          const body = await readJson(req);
+          const body = await readJson(req, REF_BODY_LIMIT);
           if (typeof body.prompt !== 'string' || body.prompt.trim() === '') {
             return sendJson(res, { ok: false, error: '提示词不能为空' }, 400);
           }
@@ -219,10 +246,16 @@ export function apply(ctx) {
             size: body.size,
             ratio: body.ratio,
             model: body.model,
+            // 图生图 / 多图合成：参考图数组（data URI 或 http(s) 链接）。
+            // 校验在内核 normalizeRefs 里做，这里只负责透传。
+            images: body.images,
           });
           sendJson(res, { ...result, kind: 'image' });
         } catch (e) {
-          sendJson(res, { ok: false, error: errMessage(e) }, 500);
+          // 参考图参数不合法属于用户输入问题，用 400 区分于上游 500
+          const msg = errMessage(e);
+          const status = /参考图|images|prompt|size 必须|ratio 必须/.test(msg) ? 400 : 500;
+          sendJson(res, { ok: false, error: msg }, status);
         }
       },
     });
@@ -237,7 +270,8 @@ export function apply(ctx) {
 
           // POST = 提交任务
           if (req.method === 'POST') {
-            const body = await readJson(req);
+            // 关键帧是 base64 data URI，1 MB 装不下，所以和参考图共用 32 MB 上限
+            const body = await readJson(req, REF_BODY_LIMIT);
             if (typeof body.prompt !== 'string' || body.prompt.trim() === '') {
               return sendJson(res, { ok: false, error: '提示词不能为空' }, 400);
             }
@@ -245,8 +279,18 @@ export function apply(ctx) {
               prompt: body.prompt,
               seconds: body.seconds,
               ratio: body.ratio,
+              // 关键帧 / 种子：有就传，没有内核会退回纯文生视频
+              seed: body.seed,
+              firstFrame: body.firstFrame,
+              lastFrame: body.lastFrame,
+            });
+            return sendJson(res, {
+              ok: true,
+              videoId: sub.videoId,
+              taskId: sub.taskId,
+              model: sub.model,
+              mode: sub.mode,
             });
-            return sendJson(res, { ok: true, videoId: sub.videoId, taskId: sub.taskId, model: sub.model });
           }
 
           // GET = 查询一次状态
@@ -291,6 +335,106 @@ export function apply(ctx) {
       },
     });
 
+    /* ---------- 历史记录（落盘，跨会话保留） ---------- */
+    /* 历史里可能留着指向旧输出目录的记录（比如曾经把 outDir 改到别处）。
+       这里只把「文件此刻确实还在当前输出目录里」的条目交给界面，
+       顺手把过滤后的列表写回磁盘，免得陈旧记录一直躺在文件里。 */
+    const liveHistory = async () => {
+      const { entries } = await readHistory();
+      const { outDir } = await resolvePaths();
+      const keep = [];
+      for (const entry of entries) {
+        if (await fileExists(join(outDir, entry.filename))) keep.push(entry);
+      }
+      if (keep.length !== entries.length) {
+        try {
+          await clearHistory();
+          // appendHistory 是置顶语义，倒序写回才能保持原有顺序
+          for (let i = keep.length - 1; i >= 0; i -= 1) await appendHistory(keep[i]);
+        } catch {
+          // 写回失败不影响本次返回
+        }
+      }
+      return keep;
+    };
+
+    addRoute(webServer, {
+      kind: 'exact',
+      path: '/agnes/history',
+      handler: async (req, res) => {
+        try {
+          if (req.method === 'GET') {
+            const entries = await liveHistory();
+            const { file } = await readHistory();
+            return sendJson(res, { ok: true, entries, file, max: HISTORY_MAX });
+          }
+          if (req.method === 'POST') {
+            // 单条追加：前端每生成一张图/一段视频就来记一笔
+            const body = await readJson(req);
+            await appendHistory(body);
+            const entries = await liveHistory();
+            return sendJson(res, { ok: true, entries, max: HISTORY_MAX });
+          }
+          if (req.method === 'DELETE') {
+            await clearHistory();
+            return sendJson(res, { ok: true, entries: [], max: HISTORY_MAX });
+          }
+          return sendJson(res, { ok: false, error: '需要 GET / POST / DELETE' }, 405);
+        } catch (e) {
+          sendJson(res, { ok: false, error: errMessage(e) }, 400);
+        }
+      },
+    });
+
+    /* ---------- 输出目录清单：把已经存在的图/视频捞回界面 ---------- */
+    addRoute(webServer, {
+      kind: 'exact',
+      path: '/agnes/library',
+      handler: async (req, res) => {
+        try {
+          if (req.method !== 'GET') return sendJson(res, { ok: false, error: '需要 GET' }, 405);
+          const { outDir } = await resolvePaths();
+          const files = await listLibrary(outDir);
+          sendJson(res, {
+            ok: true,
+            outDir,
+            files,
+            images: files.filter((f) => f.kind === 'image').length,
+            videos: files.filter((f) => f.kind === 'video').length,
+          });
+        } catch (e) {
+          sendJson(res, { ok: false, error: errMessage(e) }, 500);
+        }
+      },
+    });
+
+    /* ---------- 在访达里显示结果文件 ---------- */
+    addRoute(webServer, {
+      kind: 'exact',
+      path: '/agnes/reveal',
+      handler: async (req, res) => {
+        try {
+          if (req.method !== 'POST') return sendJson(res, { ok: false, error: '需要 POST' }, 405);
+          const body = await readJson(req);
+          // safeName 只放行 [A-Za-z0-9._-]，顺带挡住路径穿越
+          const safe = safeName(typeof body.name === 'string' ? body.name : '');
+          if (safe === null) return sendJson(res, { ok: false, error: '非法文件名' }, 400);
+          const { outDir } = await resolvePaths();
+          const abs = resolvePath(outDir, safe);
+          // 双保险：解析后必须仍在输出目录里
+          if (!abs.startsWith(resolvePath(outDir) + '/')) {
+            return sendJson(res, { ok: false, error: '文件不在输出目录内' }, 400);
+          }
+          await new Promise((resolve, reject) => {
+            execFile('open', ['-R', abs], (err) => (err ? reject(err) : resolve()));
+          });
+          sendJson(res, { ok: true, path: abs });
+        } catch (e) {
+          sendJson(res, { ok: false, error: errMessage(e) }, 500);
+        }
+      },
+    });
+
     /* ---------- 媒体（图片 + 视频） ---------- */
     const mediaHandler = async (req, res) => {
       try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-agnes-create",
-  "version": "0.3.0",
-  "description": "Agnes 创作：在 DeepSeek Harness 里用 agnes-image-2.5-flash 出图、agnes-video-2.5-flash 出视频。侧边栏面板 + 提示词输入框，Key 与输出目录可在界面里配置。",
+  "version": "0.7.0",
+  "description": "Agnes 创作：在 DeepSeek Harness 里用 agnes-image-2.5-flash 出图（含图生图 / 多图合成）、agnes-video-2.5-flash 出视频（含首帧 / 尾帧图生视频与 seed）。侧边栏面板 + 提示词 + 参考图，结果内联展示并可复制路径 / 访达显示 / 下载；提示词会写进图片元数据，鼠标悬停即可查看与复制；可浏览输出目录里已有的图片与视频，历史落盘 24 条。",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -31,7 +31,14 @@
     "deepseek-harness",
     "agnes",
     "image-generation",
-    "video-generation"
+    "video-generation",
+    "image-to-image",
+    "img2img",
+    "multi-image",
+    "text-to-video",
+    "image-to-video",
+    "keyframe",
+    "seed"
   ],
   "engines": {
     "dsh": ">=0.2.2-rc.1"