dsh-remotion 0.4.1 → 0.5.0

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 [返回简介](README.md) · [使用说明](docs/USAGE.md) · [验证记录](docs/VALIDATION.md)
 
+## 0.5.0 (2026-10-05)
+
+- 增加可恢复工程归档，释放当前工程名额并完整保留素材与成品；禁止在另一个实例渲染期间移动工程，保留 Remotion 官方许可证提示。
+
 ## 0.4.1 (2026-10-03)
 
 - 视频工作台后台错误与任务阶段支持英文；切换语言重新展示失败引导，项目文字和原始引擎日志保留原文。

package/README.en.md

@@ -2,9 +2,11 @@
 
 [中文](README.md)
 
+![dsh-remotion whale girl plugin cover](https://raw.githubusercontent.com/STARDUSTLC666/dsh-remotion/master/assets/cover-whale-girl.png)
+
 Bring Remotion React video creation skills into DSH.
 
-[![npm](https://img.shields.io/npm/v/dsh-remotion)](https://www.npmjs.com/package/dsh-remotion) [![downloads](https://img.shields.io/npm/dm/dsh-remotion)](https://www.npmjs.com/package/dsh-remotion)
+[![npm](https://img.shields.io/npm/v/dsh-remotion)](https://www.npmjs.com/package/dsh-remotion) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-remotion-downloads.svg)](https://www.npmjs.com/package/dsh-remotion)
 
 ## What it does
 

package/README.md

@@ -2,9 +2,11 @@
 
 [English](README.en.md)
 
+![dsh-remotion 鲸鱼娘插件封面](https://raw.githubusercontent.com/STARDUSTLC666/dsh-remotion/master/assets/cover-whale-girl.png)
+
 把 Remotion 的 React 视频创作技能接入 DSH。
 
-[![npm](https://img.shields.io/npm/v/dsh-remotion)](https://www.npmjs.com/package/dsh-remotion) [![downloads](https://img.shields.io/npm/dm/dsh-remotion)](https://www.npmjs.com/package/dsh-remotion)
+[![npm](https://img.shields.io/npm/v/dsh-remotion)](https://www.npmjs.com/package/dsh-remotion) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-remotion-downloads.svg)](https://www.npmjs.com/package/dsh-remotion)
 
 ## 功能
 

package/docs/USAGE.en.md

@@ -2,6 +2,10 @@
 
 [Overview](../README.en.md) · [Changelog](../CHANGELOG.md) · [Validation](VALIDATION.md)
 
+## Current improvements
+
+Save before confirming an archive; restore it from Archived projects. Archives preserve data and disk usage. Up to 30 projects can be active; stop active jobs first.
+
 ## Installation
 
 ```bash

package/docs/USAGE.md

@@ -2,6 +2,10 @@
 
 [返回简介](../README.md) · [更新记录](../CHANGELOG.md) · [验证记录](VALIDATION.md)
 
+## 本次改进
+
+保存工程后确认归档，可在“已归档工程”恢复。归档不删除项目资料、不减少磁盘占用；最多 30 个当前工程。运行中的任务需先关闭。
+
 ## 安装
 
 ```bash

package/lib/client.js

@@ -7,6 +7,8 @@ window.__ModuleLoader__.load({ id: 'dsh-remotion', factory: require => {
     const message = typeof error === 'string' ? error : error?.message || String(error || '');
     if (!en || !/[\u3400-\u9fff]/.test(message)) return message;
     if (error?.status === 401) return 'Your session expired. Reopen DSH and try again.';
+    if (/先归档|已达 30/.test(message)) return 'The 30 active project slots are full. Archive another project before creating or restoring one.';
+    if (/已有预览或渲染/.test(message)) return 'Stop the active preview or cancel the render before archiving or restoring a project.';
     if (error?.status === 409 || /已.*更新|另一窗口|修订/.test(message)) return 'The project changed. Reopen the latest version and compare it with your preserved input.';
     if (/标题/.test(message)) return 'Enter a title up to 72 characters.';
     if (/时长/.test(message)) return 'Set a duration between 3 and 30 seconds.';
@@ -28,7 +30,7 @@ window.__ModuleLoader__.load({ id: 'dsh-remotion', factory: require => {
   }
   function urlFor(project, kind, extra = {}) { const url = new URL(route, document.baseURI); url.search = new URLSearchParams({ id: project.id, kind, ...extra }); return url.href; }
   function Workbench({ locale }) {
-    const [lang, setLang] = useState('zh'), [projects, setProjects] = useState([]), [environment, setEnvironment] = useState(null), [templates, setTemplates] = useState([]);
+    const [lang, setLang] = useState('zh'), [projects, setProjects] = useState([]), [archived, setArchived] = useState([]), [archiveReview, setArchiveReview] = useState(false), [environment, setEnvironment] = useState(null), [templates, setTemplates] = useState([]);
     const [project, setProject] = useState(cache.project), [fields, setFields] = useState(cache.fields || empty()), [dirty, setDirty] = useState(cache.dirty), [creating, setCreating] = useState(cache.creating);
     const [job, setJob] = useState(cache.job), [busy, setBusy] = useState(false), [error, setError] = useState(''), [notice, setNotice] = useState(''), [pending, setPending] = useState(null), [conflict, setConflict] = useState(false);
     const busyRef = useRef(false), fileRef = useRef(null), latest = useRef({ project, fields, dirty }); latest.current = { project, fields, dirty };
@@ -38,7 +40,7 @@ window.__ModuleLoader__.load({ id: 'dsh-remotion', factory: require => {
     useEffect(() => { cache = { project, fields, dirty, job, creating }; }, [project, fields, dirty, job, creating]);
     useEffect(() => { const exit = e => { if (latest.current.dirty) { e.preventDefault(); e.returnValue = ''; } }; window.addEventListener('beforeunload', exit); return () => window.removeEventListener('beforeunload', exit); }, []);
     async function refresh() {
-      const data = await api({ action: 'list' }); setProjects(data.projects); setEnvironment(data.environment); setTemplates(data.templates);
+      const data = await api({ action: 'list' }); setProjects(data.projects); setArchived(data.archivedProjects || []); setEnvironment(data.environment); setTemplates(data.templates);
       const current = latest.current, saved = !current.dirty && data.projects.find(row => row.id === current.project?.id);
       if (saved) { setProject(saved); setFields(fieldsOf(saved)); }
       setJob(previous => data.jobs.find(row => row.id === previous?.id) || data.jobs.filter(row => row.state === 'running').at(-1) || data.jobs.at(-1) || null);
@@ -59,7 +61,7 @@ window.__ModuleLoader__.load({ id: 'dsh-remotion', factory: require => {
       return () => { live = false; clearInterval(timer); };
     }, [job?.id, job?.state]);
     async function perform(fn) { if (busyRef.current) return; busyRef.current = true; setBusy(true); setError(''); setNotice(''); try { return await fn(); } catch (e) { setError(e); setConflict(e.status === 409); } finally { busyRef.current = false; setBusy(false); } }
-    async function open(id) { const next = await api({ action: 'get', id }); setProject(next); setFields(fieldsOf(next)); setCreating(false); setDirty(false); setConflict(false); setPending(null); }
+    async function open(id) { const next = await api({ action: 'get', id }); setProject(next); setFields(fieldsOf(next)); setCreating(false); setDirty(false); setConflict(false); setPending(null); setArchiveReview(false); }
     function navigate(target) { if (dirty) { setPending(target); return; } perform(() => move(target)); }
     async function move(target) { if (target === 'new') { setProject(null); setFields(empty()); setCreating(true); } else if (target === 'list') { setProject(null); setCreating(false); await refresh(); } else await open(target); setDirty(false); setPending(null); }
     async function save() { const next = await api(project ? { action: 'update', id: project.id, revision: project.revision, fields } : { action: 'create', fields }); setProject(next); setFields(fieldsOf(next)); setCreating(false); setDirty(false); setConflict(false); setNotice(t('工程已保存。', 'Project saved.')); await refresh(); return next; }
@@ -69,12 +71,16 @@ window.__ModuleLoader__.load({ id: 'dsh-remotion', factory: require => {
       const response = await fetch(new URL(route + '/upload', document.baseURI), { method: 'POST', credentials: 'same-origin', headers: { 'content-type': 'application/octet-stream', 'x-dsh-media': '1', 'x-project-id': project.id, 'x-project-revision': String(project.revision), 'x-file-name': encodeURIComponent(file.name) }, body: file }); const result = await response.json(); if (!response.ok || !result.ok) { const e = new Error(result.message); e.status = response.status; throw e; } setProject(result.value); setNotice(t('素材副本已保存，原文件未改变。', 'A media copy was saved; your original is unchanged.'));
     }); event.target.value = ''; }
     async function start(action) { await perform(async () => { if (action !== 'prepare' && dirty) throw new Error(t('请先保存修改。', 'Save changes first.')); setJob(await api({ action, id: project?.id, revision: project?.revision })); }); }
+    async function archiveProject() { await api({action:'archive',id:project.id,revision:project.revision,confirmed:true}); setArchiveReview(false); setProject(null); setCreating(false); setDirty(false); await refresh(); setNotice(t('工程已归档，素材和成品均保留，可在下方恢复。','Project archived. Media and output are preserved; restore it below.')); }
     const render = project?.renders?.[0], stale = render && render.revision !== project.revision;
     if (!environment) return h('div', { className: 'dmw' }, h('style', null, css), h('h2', null, title + t(' 视频工作台', ' video workbench')),
       error ? h(React.Fragment, null, h('p', { className: 'notice error', role: 'alert' }, mediaError(error, lang === 'en')), h('button', { disabled: busy, onClick: () => perform(refresh) }, t('重新读取项目', 'Reload projects'))) : h('p', { role: 'status' }, t('正在读取工程与渲染环境…', 'Loading projects and render environment…')));
     return h('div', { className: 'dmw' }, h('style', null, css), h('h2', null, title + t(' 视频工作台', ' video workbench')),
       h('p', { className: 'muted' }, t('模板 → 素材 → 官方预览 → 本机 MP4。工程与素材保存在 DSH 本地数据目录。', 'Template → media → official preview → local MP4. Projects stay in the local DSH data folder.')),
       error && h('div', { className: 'notice error', role: 'alert' }, mediaError(error, lang === 'en')), notice && h('div', { className: 'notice', role: 'status' }, notice),
+      archived.length > 0 && h('details', { className: 'card' }, h('summary', null, t('已归档工程', 'Archived projects') + ' (' + archived.length + ')'), h('p', {className:'muted'}, t('归档保留素材与成品，不占当前 30 个工程名额。恢复后可以继续编辑。','Archives retain media and output, freeing an active project slot. Restore to edit again.')), archived.map(p => h('div',{className:'bar',key:p.id}, h('strong',null,p.title), h('button',{disabled:busy||dirty||activeJob,onClick:()=>perform(async()=>{await api({action:'restore',id:p.id,revision:p.revision,confirmed:true});await refresh();await open(p.id);setNotice(t('工程已恢复。','Project restored.'))})},t('恢复工程','Restore project'))))),
+      project && !creating && h('div',{className:'bar'},h('button',{disabled:busy||dirty||activeJob,onClick:()=>setArchiveReview(true)},t('归档此工程','Archive this project'))),
+      project && archiveReview && h('div',{className:'card',role:'alert'},h('p',null,t('归档后将从当前项目列表移走；工程、上传素材和已导出 MP4 全部保留，可随时恢复。未保存修改需先处理。','Archiving removes this project from the active list. The project, uploaded media and exported MP4s are preserved and can be restored. Save or discard pending edits first.')),h('div',{className:'bar'},h('button',{disabled:busy||dirty||activeJob,onClick:()=>perform(archiveProject)},t('确认归档','Confirm archive')),h('button',{disabled:busy,onClick:()=>setArchiveReview(false)},t('取消归档','Cancel archive')))),
       pending && h('div', { className: 'card' }, h('p', null, t('有未保存内容，如何继续？', 'You have unsaved changes.')),
         h('div', { className: 'bar' }, h('button', { disabled: running, onClick: () => perform(async () => { await save(); await move(pending); }) }, t('保存后继续', 'Save and continue')), h('button', { disabled: running, onClick: () => perform(() => move(pending)) }, t('放弃修改并继续', 'Discard and continue')), h('button', { onClick: () => setPending(null) }, t('留在当前', 'Stay here')))),
       conflict && project && h('button', { disabled: running, onClick: () => { setPending(project.id); } }, t('重新打开最新版本（先处理当前输入）', 'Reopen latest version (review your current input first)')),

package/lib/media-store.d.ts

@@ -7,10 +7,12 @@ export declare class MediaStore {
     readonly root: string;
     constructor(engine: MediaEngine, root?: string);
     init(): Promise<void>;
-    path(id: string): Promise<string>;
+    path(id: string, archived?: boolean): Promise<string>;
     checkPath(path: string): Promise<void>;
-    get(id: string): Promise<MediaProject>;
-    list(): Promise<MediaProject[]>;
+    get(id: string, archived?: boolean): Promise<MediaProject>;
+    list(archived?: boolean): Promise<MediaProject[]>;
+    /** Move a complete managed project without deleting sources, assets or renders. */
+    archive(id: string, revision: unknown, restore?: boolean): Promise<MediaProject>;
     private write;
     create(value: unknown): Promise<MediaProject>;
     edit(id: string, revision: unknown, fn: (p: MediaProject) => Promise<void> | void, bump?: boolean): Promise<MediaProject>;

package/lib/media-store.js

@@ -16,9 +16,9 @@ export class MediaStore {
     root;
     constructor(engine, root) { this.root = resolve(root ?? join(process.env.DSH_HOME || join(homedir(), '.dsh'), 'data', 'dsh-' + engine)); }
     async init() { await mkdir(join(this.root, 'projects'), { recursive: true, mode: 0o700 }); }
-    async path(id) {
+    async path(id, archived = false) {
         await this.init();
-        const dir = join(this.root, 'projects', mediaId(id));
+        const dir = join(this.root, archived ? 'archives' : 'projects', mediaId(id));
         if ((await lstat(dir)).isSymbolicLink())
             throw new Error('项目目录不能是符号链接。');
         await this.checkPath(dir);
@@ -29,8 +29,8 @@ export class MediaStore {
         if (rel === '..' || rel.startsWith('..' + (process.platform === 'win32' ? '\\' : '/')) || isAbsolute(rel))
             throw new Error('文件不在本插件项目目录内。');
     }
-    async get(id) {
-        const file = join(await this.path(id), 'project.json');
+    async get(id, archived = false) {
+        const file = join(await this.path(id, archived), 'project.json');
         await this.checkPath(file);
         if ((await stat(file)).size > 65536)
             throw new Error('工程记录过大，请保留文件后检查。');
@@ -47,15 +47,47 @@ export class MediaStore {
             mediaId(r.id);
         return p;
     }
-    async list() {
+    async list(archived = false) {
         await this.init();
         const result = [];
-        for (const id of await readdir(join(this.root, 'projects'))) {
+        const folder = join(this.root, archived ? 'archives' : 'projects');
+        const ids = await readdir(folder).catch(error => { if (archived && error.code === 'ENOENT')
+            return []; throw error; });
+        for (const id of ids) {
             if (/^[0-9a-f-]{36}$/.test(id))
-                result.push(await this.get(id));
+                result.push(await this.get(id, archived));
         }
         return result.sort((a, b) => b.updated.localeCompare(a.updated));
     }
+    /** Move a complete managed project without deleting sources, assets or renders. */
+    async archive(id, revision, restore = false) {
+        await this.init();
+        const unlock = await lockfile.lock(join(this.root, 'projects'), { retries: { retries: 8, minTimeout: 30, maxTimeout: 60 } });
+        let release;
+        try {
+            const source = await this.path(id, restore);
+            release = await lockfile.lock(source, { retries: { retries: 8, minTimeout: 30, maxTimeout: 60 } });
+            const p = await this.get(id, restore);
+            if (revision !== p.revision)
+                throw new MediaConflict('工程已更新，请重新读取后再归档或恢复。');
+            if (restore && (await this.list()).length >= 30)
+                throw new MediaConflict('当前项目已达 30 个，请先归档其他项目再恢复。');
+            const folder = join(this.root, restore ? 'projects' : 'archives');
+            await mkdir(folder, { recursive: true });
+            await this.checkPath(folder);
+            const target = join(folder, mediaId(id));
+            if (await lstat(target).then(() => true, error => { if (error.code === 'ENOENT')
+                return false; throw error; }))
+                throw new Error('目标已有同编号工程，已保留两份文件，请先备份检查。');
+            await rename(source, target);
+            return p;
+        }
+        finally {
+            if (release)
+                await release();
+            await unlock();
+        }
+    }
     async write(p) {
         const dir = await this.path(p.id), temp = join(dir, randomUUID() + '.tmp');
         try {
@@ -71,7 +103,7 @@ export class MediaStore {
         const unlock = await lockfile.lock(join(this.root, 'projects'), { retries: { retries: 8, minTimeout: 30, maxTimeout: 60 } });
         try {
             if ((await this.list()).length >= 30)
-                throw new Error('工作台最多保存 30 个项目，请先备份现有工程。');
+                throw new Error('工作台最多保存 30 个当前项目，请先归档现有工程。');
             const p = { ...validateFields(value), id: randomUUID(), revision: 1, updated: new Date().toISOString(), assets: [], renders: [] };
             await mkdir(join(this.root, 'projects', p.id), { mode: 0o700 });
             await this.write(p);

package/lib/media-workbench.js

@@ -387,7 +387,7 @@ export class MediaWorkbench {
                 const v = JSON.parse(text);
                 switch (v.action) {
                     case 'list':
-                        value = { projects: await this.store.list(), templates: MEDIA_TEMPLATES, environment: await this.environment(), jobs: [...this.jobs.values()].map(j => structuredClone(j.view)) };
+                        value = { projects: await this.store.list(), archivedProjects: await this.store.list(true), templates: MEDIA_TEMPLATES, environment: await this.environment(), jobs: [...this.jobs.values()].map(j => structuredClone(j.view)) };
                         break;
                     case 'create':
                         value = await this.store.create(v.fields);
@@ -401,6 +401,28 @@ export class MediaWorkbench {
                     case 'removeAsset':
                         value = await this.store.removeAsset(mediaId(v.id), v.revision, mediaId(v.asset));
                         break;
+                    case 'archive':
+                    case 'restore': {
+                        if (v.confirmed !== true)
+                            throw new Error('请明确确认归档或恢复。');
+                        // The same slot covers jobs from another DSH process, so a project
+                        // cannot move while its render or preview still writes into it.
+                        const slot = join(this.store.root, 'workbench-slot');
+                        await this.store.init();
+                        await mkdir(slot, { recursive: true });
+                        const unlock = await lockfile.lock(slot, { retries: 0, stale: 30000, update: 10000 }).catch(error => {
+                            if (error.code === 'ELOCKED')
+                                throw new MediaConflict('已有预览或渲染正在运行，请先关闭预览或取消渲染，再归档或恢复工程。');
+                            throw error;
+                        });
+                        try {
+                            value = await this.store.archive(mediaId(v.id), v.revision, v.action === 'restore');
+                        }
+                        finally {
+                            await unlock();
+                        }
+                        break;
+                    }
                     case 'prepare':
                         value = await this.start('prepare');
                         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remotion",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "DSH 视频插件：Remotion 技能、模板与素材工作台、官方 Studio 预览和本地 MP4 导出。",
   "type": "module",
   "main": "lib/index.js",