dsh-remotion 0.3.4 → 0.4.1

package/lib/client.js

@@ -0,0 +1,105 @@
+// Shared original browser source. build-client substitutes the engine identity.
+window.__ModuleLoader__.load({ id: 'dsh-remotion', factory: require => {
+  const React = require('react'), { useState, useEffect, useRef } = React, h = React.createElement;
+  const engine = 'remotion', title = engine === 'hyperframes' ? 'HyperFrames' : 'Remotion', route = 'api/dsh-' + engine + '/workbench';
+
+  function mediaError(error, en) {
+    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 (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.';
+    if (/正文/.test(message)) return 'Use body text up to 360 characters.';
+    if (/素材|PNG|JPEG|MP3|WAV|MP4/.test(message)) return 'Check the media format and file contents. Each asset must be ≤20 MB; a project supports 12 assets and 40 MB total, with one audio and one video background.';
+    if (/任务|官方|FFmpeg|Chrome|环境/.test(message)) return 'The official task did not finish. Open the job log and check the render environment, then retry. Your project is preserved.';
+    if (/工程记录|项目目录|文件/.test(message)) return 'The project files could not be read safely. Back them up and check their location and permissions before retrying.';
+    return 'The operation failed. Check the DSH logs and reload the project before retrying; your input is preserved.';
+  }
+
+  let cache = { project: null, fields: null, dirty: false, job: null, creating: false };
+  const empty = () => ({ template: 'title', title: '', body: '', format: 'landscape', duration: 8 });
+  const fieldsOf = p => ({ template: p.template, title: p.title, body: p.body, format: p.format, duration: p.duration });
+  const css = `.dmw{font:14px/1.6 system-ui,sans-serif;color:var(--fg,#142D39);min-width:0;padding:8px}.dmw *{box-sizing:border-box}.dmw h2{margin:0;font-size:23px}.dmw h3{font-size:17px;margin:8px 0}.dmw .muted{color:var(--fg-muted,#677881);font-size:13px}.dmw .bar{display:flex;flex-wrap:wrap;gap:8px;align-items:center;margin:12px 0}.dmw button,.dmw .button{font:inherit;color:inherit;background:var(--bg-surface,#fff);border:1px solid var(--border,#c8d6d9);border-radius:9px;padding:8px 12px;cursor:pointer;white-space:normal;text-decoration:none}.dmw button.primary{background:#df5639;border-color:#df5639;color:white}.dmw button:disabled{opacity:.45;cursor:default}.dmw input:not([type=file]),.dmw textarea,.dmw select{font:inherit;color:inherit;width:100%;border:1px solid var(--border,#b9cccd);border-radius:8px;padding:9px;background:var(--bg,#fff)}.dmw label{display:block;margin:10px 0 4px}.dmw .card{border:1px solid var(--border,#ccd7d6);border-radius:12px;padding:14px;margin:12px 0;min-width:0;background:var(--bg-surface,#fff)}.dmw .notice{border-radius:8px;padding:10px;margin:10px 0;background:#eef5ed;color:#28573e;overflow-wrap:anywhere}.dmw .error{background:#fff0ec;color:#943b27}.dmw .row{display:grid;grid-template-columns:1fr 1fr;gap:14px}.dmw .projects{display:grid;gap:8px}.dmw .projects button{text-align:left;width:100%}.dmw img{width:90px;height:70px;object-fit:contain}.dmw .assets{display:flex;flex-direction:column;gap:8px}.dmw .asset{display:flex;gap:10px;align-items:center;flex-wrap:wrap}.dmw video{width:100%;max-height:400px;background:#142D39;border-radius:10px}.dmw pre{white-space:pre-wrap;overflow-wrap:anywhere;font-size:12px;margin:8px 0;max-height:220px;overflow:auto}.dmw :focus-visible{outline:3px solid #79CDB4;outline-offset:2px}[role=dialog]:has(.dmw){width:min(1160px,calc(100vw - 40px))!important;max-width:1160px!important}@media(max-width:700px){.dmw{padding:3px}.dmw .row{grid-template-columns:1fr}[role=dialog]:has(.dmw){width:100%!important;max-width:100%!important;flex-direction:column!important}[role=dialog]:has(.dmw)>nav+div{min-width:0;width:100%}[role=dialog]:has(.dmw)>nav+div>div:has(.dmw){padding:12px!important;min-width:0}[role=dialog]:has(.dmw) nav{width:100%!important;flex-basis:auto!important;border-right:0;max-height:170px;overflow:auto}[role=dialog]:has(.dmw) nav>div:has(>button){display:flex;flex-direction:row!important;flex-wrap:wrap;gap:4px}}`;
+  async function api(body) {
+    const response = await fetch(new URL(route, document.baseURI), { method: 'POST', credentials: 'same-origin', headers: { 'content-type': 'application/json', 'x-dsh-media': '1' }, body: JSON.stringify(body) });
+    let data; try { data = await response.json() } catch { throw new Error('无法读取插件响应，请检查是否已经重启 DSH。') }
+    if (!response.ok || !data.ok) { const error = new Error(data.message || '操作未完成'); error.status = response.status; throw error; } return data.value;
+  }
+  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 [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 };
+    const t = (zh, en) => lang === 'en' ? en : zh, activeJob = job?.state === 'running', running = busy || activeJob && job.kind !== 'prepare';
+    const stage = lang === 'en' ? ({ '下载环境': 'Preparing environment', '检查 FFmpeg': 'Checking FFmpeg', '下载官方依赖': 'Downloading official dependencies', '检查官方环境': 'Checking official CLI', '检查或下载 Chrome': 'Checking or downloading Chrome', '下载专用渲染浏览器': 'Downloading the official rendering browser', '准备修订快照': 'Preparing saved revision', '启动官方预览': 'Starting official preview', '官方预览已就绪': 'Official preview is ready', '检查合成': 'Checking composition', '渲染 MP4': 'Rendering MP4', '已完成': 'Completed', '已取消': 'Cancelled', '已取消；工程已保留': 'Cancelled; project preserved', '官方任务未完成，请展开运行记录后重试。工程已保留。': 'The official task failed. Open the job log and retry; your project is preserved.', '未找到 FFmpeg，请安装并加入 PATH，重启 DSH 后重试。工程已保留。': 'FFmpeg was not found. Install it, add it to PATH, then restart DSH and retry; your project is preserved.' }[job?.stage] || mediaError(job?.stage, true)) : job?.stage;
+    useEffect(() => { const update = () => setLang(String(locale?.getSnapshot?.().active || '').startsWith('en') ? 'en' : 'zh'); update(); return locale?.subscribe?.(update); }, [locale]);
+    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 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);
+    }
+    useEffect(() => { refresh().catch(e => setError(e)); }, []);
+    useEffect(() => {
+      if (!job || job.state !== 'running') return;
+      let live = true, polling = false;
+      const timer = setInterval(async () => {
+        if (polling) return; polling = true;
+        try {
+          const next = await api({ action: 'job', job: job.id }); if (!live) return;
+          // Refresh output before the terminal state tears down this polling effect.
+          if (next.state !== 'running') await refresh();
+          else setJob(next);
+        } catch (e) { if (live) { setError(e); setJob(null); } } finally { polling = false; }
+      }, 1000);
+      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); }
+    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; }
+    async function upload(event) { const file = event.target.files?.[0]; if (!file) return; await perform(async () => {
+      if (!project || dirty) throw new Error(t('请先保存工程，再上传素材。', 'Save your project before uploading media.'));
+      if (file.size > 20 * 1024 * 1024) throw new Error(t('单个素材不能超过 20 MB。', 'Each asset must be at most 20 MB.'));
+      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 })); }); }
+    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),
+      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)')),
+      h('details', { className: 'card', open: !environment?.ready }, h('summary', null, t('渲染环境', 'Render environment') + (environment?.ready ? t(' · 已准备', ' · ready') : t(' · 首次需下载', ' · first download required'))),
+        h('p', { className: 'muted' }, t(environment?.hint, 'First use downloads the official CLI. ' + (engine === 'hyperframes' ? 'Windows uses the official rendering browser; other platforms reuse installed Chrome when available. FFmpeg must be in PATH.' : 'Installed Chrome is reused; a browser is downloaded when needed. Remotion retains its official license.'))), engine === 'remotion' && h('p', null, h('a', { href: 'https://www.remotion.dev/license', target: '_blank', rel: 'noreferrer' }, t('查看 Remotion 使用许可证', 'Read the Remotion license'))),
+        h('button', { disabled: busy || activeJob, onClick: () => start('prepare') }, environment?.ready ? t('重新检查 / 修复环境', 'Check / repair environment') : t('准备渲染环境', 'Prepare render environment'))),
+      job && h('div', { className: job.state === 'failed' ? 'card notice error' : 'card', role: job.state === 'failed' ? 'alert' : 'status' }, h('strong', null, t('任务状态：', 'Job status: ') + stage), job.url && h('p', null, h('a', { className: 'button', href: job.url, target: '_blank', rel: 'noreferrer' }, t('打开官方 Studio 预览', 'Open official Studio preview'))),
+        job.state === 'running' && h('button', { disabled: busy, onClick: () => perform(async () => { await api({ action: 'cancel', job: job.id }); setNotice(t('已请求停止；正在关闭本次任务。', 'Stopping this job.')); }) }, job.kind === 'preview' ? t('停止预览，返回编辑', 'Stop preview and return to editing') : t('取消任务', 'Cancel job')),
+        h('details', null, h('summary', null, t('查看运行记录', 'Show job log')), h('pre', null, job.lines.join('\n')))),
+      !project && !creating ? h(React.Fragment, null, h('div', { className: 'bar' }, h('button', { className: 'primary', disabled: running, onClick: () => navigate('new') }, t('新建视频', 'New video')), h('button', { disabled: running, onClick: () => perform(refresh) }, t('刷新项目', 'Refresh projects'))),
+        projects.length ? h('div', { className: 'projects' }, projects.map(p => h('button', { key: p.id, disabled: running, onClick: () => navigate(p.id) }, h('strong', null, p.title), h('div', { className: 'muted' }, p.duration + t(' 秒 · 修订 ', ' sec · revision ') + p.revision)))) : h('div', { className: 'card' }, h('h3', null, t('还没有视频工程', 'No video projects yet')), h('p', null, t('点击“新建视频”，先选模板并保存。环境准备可以稍后进行。', 'Choose New video, select a template and save. You can prepare the render environment later.')))) :
+      h(React.Fragment, null, h('div', { className: 'bar' }, h('button', { disabled: running, onClick: () => navigate('list') }, t('返回项目', 'Back to projects')), project && h('span', { className: 'muted' }, t('修订 ', 'Revision ') + project.revision), dirty && h('span', null, t('有未保存修改', 'Unsaved changes'))),
+        h('div', { className: 'card' }, h('h3', null, t('1. 模板与内容', '1. Template and content')),
+          h('label', { htmlFor: engine + '-template' }, t('模板', 'Template')), h('select', { id: engine + '-template', disabled: running, value: fields.template, onChange: e => { setFields({ ...fields, template: e.target.value }); setDirty(true); } }, templates.map(row => h('option', { key: row.id, value: row.id }, lang === 'en' ? row.en : row.zh))),
+          h('label', { htmlFor: engine + '-title' }, t('标题（最多 72 字符）', 'Title (up to 72 characters)')), h('input', { id: engine + '-title', value: fields.title, disabled: running, maxLength: 72, onChange: e => { setFields({ ...fields, title: e.target.value }); setDirty(true); } }),
+          h('label', { htmlFor: engine + '-body' }, t('正文（轮播时每行对应一页）', 'Body (one line per slideshow page)')), h('textarea', { id: engine + '-body', value: fields.body, disabled: running, maxLength: 360, rows: 4, onChange: e => { setFields({ ...fields, body: e.target.value }); setDirty(true); } }),
+          h('div', { className: 'row' }, h('div', null, h('label', { htmlFor: engine + '-format' }, t('画幅', 'Canvas')), h('select', { id: engine + '-format', value: fields.format, disabled: running, onChange: e => { setFields({ ...fields, format: e.target.value }); setDirty(true); } }, ['landscape','portrait','square'].map((key, i) => h('option', { key, value: key }, [t('横屏 16:9', 'Landscape 16:9'),t('竖屏 9:16', 'Portrait 9:16'),t('正方形', 'Square')][i])))), h('div', null, h('label', { htmlFor: engine + '-duration' }, t('时长（3–30 秒）', 'Duration (3–30 seconds)')), h('input', { id: engine + '-duration', type: 'number', min: 3, max: 30, value: fields.duration, disabled: running, onChange: e => { setFields({ ...fields, duration: Number(e.target.value) }); setDirty(true); } }))),
+          h('div', { className: 'bar' }, h('button', { className: 'primary', disabled: running || project && !dirty, onClick: () => perform(save) }, t('保存工程', 'Save project')), project && h('button', { disabled: running || !dirty, onClick: () => { setFields(fieldsOf(project)); setDirty(false); setError(''); } }, t('取消修改', 'Discard changes')))),
+        project && h('div', { className: 'card' }, h('h3', null, t('2. 素材', '2. Media')), h('p', { className: 'muted' }, t('PNG/JPEG 图片、一个背景音频和一个静音背景视频；每个 ≤20 MB，总共 ≤40 MB。轮播按上传顺序，每张至少两秒。', 'PNG/JPEG images, one background audio and one muted background video; each ≤20 MB, total ≤40 MB. Slideshow follows upload order, at least two seconds per image.')),
+          h('label', { htmlFor: engine + '-asset' }, t('上传素材副本', 'Upload a media copy')), h('input', { ref: fileRef, id: engine + '-asset', type: 'file', accept: '.png,.jpg,.jpeg,.mp3,.wav,.mp4', disabled: running || dirty, onChange: upload }),
+          h('div', { className: 'assets' }, project.assets.map(a => h('div', { className: 'asset', key: a.id }, a.kind === 'image' && h('img', { src: urlFor(project, 'asset', { asset: a.id }), alt: a.name }), h('span', null, a.name + ' · ' + Math.ceil(a.bytes / 1024) + ' KB'), h('button', { disabled: running || dirty, onClick: () => perform(async () => { setProject(await api({ action: 'removeAsset', id: project.id, revision: project.revision, asset: a.id })); }) }, t('移除上传副本', 'Remove uploaded copy')))))),
+        project && h('div', { className: 'card' }, h('h3', null, t('3. 预览与成品', '3. Preview and output')), h('p', { className: 'muted' }, t('保存后在官方 Studio 检查画面。关闭本次预览后再编辑或导出。MP4 按已保存修订生成；渲染不会占用前台窗口。', 'Check the saved project in official Studio. Stop this preview before editing or exporting. MP4 uses the saved revision and renders in the background.')),
+          h('div', { className: 'bar' }, h('button', { disabled: running || dirty || !environment?.ready, onClick: () => start('preview') }, t('启动官方预览', 'Start official preview')), h('button', { className: 'primary', disabled: running || dirty || !environment?.ready, onClick: () => start('render') }, t('导出 MP4', 'Export MP4')), h('a', { className: 'button', href: urlFor(project, 'source'), download: '' }, t('备份可编辑工程', 'Back up editable project'))),
+          render ? h(React.Fragment, null, h('p', { className: stale ? 'notice error' : 'muted' }, t('此 MP4 来自修订 ', 'This MP4 uses revision ') + render.revision + (stale ? t('，工程已有更新，请重新导出。', '; your project has newer changes. Export again.') : t('，请播放检查最终画面。', '. Play it to check the final output.'))), h('video', { controls: true, preload: 'metadata', src: urlFor(project, 'mp4', { render: render.id }) }), h('p', null, h('a', { className: 'button', href: urlFor(project, 'mp4', { render: render.id, download: '1' }), download: '' }, t('下载这份 MP4', 'Download this MP4')))) : h('p', { className: 'muted' }, t('尚无 MP4 成品。预览成功后点击“导出 MP4”。', 'No MP4 yet. Check the preview, then choose Export MP4.')))));
+  }
+  function apply(ctx) { let locale; try { locale = ctx.get?.('locale') || ctx.locale; } catch {} ctx.slots.inject('settings.section', () => ctx.slots.register({ name: 'settings.section', id: 'dsh-' + engine, order: engine === 'hyperframes' ? 62 : 63, label: () => title, inject: () => ({ locale }) }, Workbench)); }
+  return { inject: ['slots','locale'], apply };
+} });

package/lib/index.d.ts

@@ -1,4 +1,7 @@
 import { type SkillsPluginContext } from './skill-bundle.js';
+export { MediaWorkbench } from './media-workbench.js';
+export { MediaStore } from './media-store.js';
+export { MEDIA_TEMPLATES, MEDIA_VERSIONS } from './media-templates.js';
 export { parseSkillFile } from './skill-bundle.js';
 export type { SkillRegistration, SkillsPluginContext } from './skill-bundle.js';
 export declare const name = "remotion-skills";

package/lib/index.js

@@ -5,6 +5,10 @@
  */
 import { fileURLToPath } from 'node:url';
 import { createSkillBundle } from './skill-bundle.js';
+import { installMediaWorkbench } from './media-workbench.js';
+export { MediaWorkbench } from './media-workbench.js';
+export { MediaStore } from './media-store.js';
+export { MEDIA_TEMPLATES, MEDIA_VERSIONS } from './media-templates.js';
 export { parseSkillFile } from './skill-bundle.js';
 export const name = 'remotion-skills';
 export const inject = ['skills', 'tools'];
@@ -35,4 +39,4 @@ const bundle = createSkillBundle({
 /** Re-read and validate disk resources; runtime state is checked by the health tool. */
 export function checkBundledSkills() { return bundle.checkFiles(); }
 /** Register this package's skills and its read-only health tool. */
-export function apply(ctx) { bundle.apply(ctx); }
+export function apply(ctx) { bundle.apply(ctx); installMediaWorkbench(ctx, 'remotion'); }

package/lib/media-store.d.ts

@@ -0,0 +1,25 @@
+import { type MediaEngine, type MediaProject, type MediaAsset } from './media-templates.js';
+export declare function mediaId(value: unknown): string;
+export declare class MediaConflict extends Error {
+    status: number;
+}
+export declare class MediaStore {
+    readonly root: string;
+    constructor(engine: MediaEngine, root?: string);
+    init(): Promise<void>;
+    path(id: string): Promise<string>;
+    checkPath(path: string): Promise<void>;
+    get(id: string): Promise<MediaProject>;
+    list(): Promise<MediaProject[]>;
+    private write;
+    create(value: unknown): Promise<MediaProject>;
+    edit(id: string, revision: unknown, fn: (p: MediaProject) => Promise<void> | void, bump?: boolean): Promise<MediaProject>;
+    update(id: string, revision: unknown, value: unknown): Promise<MediaProject>;
+    assetBytes(id: string, asset: MediaAsset): Promise<Buffer>;
+    upload(id: string, revision: unknown, name: string, bytes: Buffer): Promise<MediaProject>;
+    removeAsset(id: string, revision: unknown, assetId: string): Promise<MediaProject>;
+    snapshot(id: string, revision: unknown): Promise<{
+        project: MediaProject;
+        assets: Map<string, Buffer>;
+    }>;
+}

package/lib/media-store.js

@@ -0,0 +1,174 @@
+import { randomUUID } from 'node:crypto';
+import { mkdir, readFile, writeFile, rename, readdir, stat, lstat, unlink, realpath } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { join, resolve, relative, isAbsolute, extname } from 'node:path';
+import lockfile from 'proper-lockfile';
+import { validateFields } from './media-templates.js';
+export function mediaId(value) {
+    if (typeof value !== 'string' || !/^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/.test(value))
+        throw new Error('项目或任务编号无效。');
+    return value;
+}
+export class MediaConflict extends Error {
+    status = 409;
+}
+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) {
+        await this.init();
+        const dir = join(this.root, 'projects', mediaId(id));
+        if ((await lstat(dir)).isSymbolicLink())
+            throw new Error('项目目录不能是符号链接。');
+        await this.checkPath(dir);
+        return dir;
+    }
+    async checkPath(path) {
+        const base = await realpath(this.root), actual = await realpath(path), rel = relative(base, actual);
+        if (rel === '..' || rel.startsWith('..' + (process.platform === 'win32' ? '\\' : '/')) || isAbsolute(rel))
+            throw new Error('文件不在本插件项目目录内。');
+    }
+    async get(id) {
+        const file = join(await this.path(id), 'project.json');
+        await this.checkPath(file);
+        if ((await stat(file)).size > 65536)
+            throw new Error('工程记录过大，请保留文件后检查。');
+        const p = JSON.parse(await readFile(file, 'utf8'));
+        validateFields(p);
+        if (p.id !== id || !Number.isInteger(p.revision) || p.revision < 1 || !Array.isArray(p.assets) || p.assets.length > 12 || !Array.isArray(p.renders))
+            throw new Error('工程记录损坏；原文件已保留。');
+        for (const a of p.assets) {
+            mediaId(a.id);
+            if (!new RegExp('^' + a.id + '\\.(png|jpg|mp3|wav|mp4)$').test(a.file))
+                throw new Error('素材记录无效。');
+        }
+        for (const r of p.renders)
+            mediaId(r.id);
+        return p;
+    }
+    async list() {
+        await this.init();
+        const result = [];
+        for (const id of await readdir(join(this.root, 'projects'))) {
+            if (/^[0-9a-f-]{36}$/.test(id))
+                result.push(await this.get(id));
+        }
+        return result.sort((a, b) => b.updated.localeCompare(a.updated));
+    }
+    async write(p) {
+        const dir = await this.path(p.id), temp = join(dir, randomUUID() + '.tmp');
+        try {
+            await writeFile(temp, JSON.stringify(p, null, 2), { flag: 'wx', mode: 0o600 });
+            await rename(temp, join(dir, 'project.json'));
+        }
+        finally {
+            await unlink(temp).catch(() => { });
+        }
+    }
+    async create(value) {
+        await this.init();
+        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 个项目，请先备份现有工程。');
+            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);
+            return p;
+        }
+        finally {
+            await unlock();
+        }
+    }
+    async edit(id, revision, fn, bump = true) {
+        const dir = await this.path(id);
+        const unlock = await lockfile.lock(dir, { retries: { retries: 8, minTimeout: 30, maxTimeout: 60 } });
+        try {
+            const p = await this.get(id);
+            if (revision !== undefined && revision !== p.revision)
+                throw new MediaConflict('工程已在另一窗口更新。你的输入仍保留，请重新打开最新版本后比较。');
+            await fn(p);
+            if (bump)
+                p.revision++;
+            p.updated = new Date().toISOString();
+            await this.write(p);
+            return p;
+        }
+        finally {
+            await unlock();
+        }
+    }
+    async update(id, revision, value) { return this.edit(id, revision, p => { Object.assign(p, validateFields(value)); }); }
+    async assetBytes(id, asset) {
+        const file = join(await this.path(id), 'assets', asset.file);
+        await this.checkPath(file);
+        if ((await stat(file)).size !== asset.bytes || asset.bytes > 20 * 1024 * 1024)
+            throw new Error('素材已改变，请重新上传并检查。');
+        return readFile(file);
+    }
+    async upload(id, revision, name, bytes) {
+        if (!bytes.length || bytes.length > 20 * 1024 * 1024)
+            throw new Error('单个素材需为 1 字节–20 MB。');
+        const ext = extname(name).toLowerCase(), isPng = bytes.subarray(0, 8).equals(Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]));
+        const isJpg = bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255;
+        let kind, suffix;
+        if (ext === '.png' && isPng) {
+            kind = 'image';
+            suffix = '.png';
+        }
+        else if (['.jpg', '.jpeg'].includes(ext) && isJpg) {
+            kind = 'image';
+            suffix = '.jpg';
+        }
+        else if (ext === '.wav' && bytes.toString('ascii', 0, 4) === 'RIFF' && bytes.toString('ascii', 8, 12) === 'WAVE') {
+            kind = 'audio';
+            suffix = '.wav';
+        }
+        else if (ext === '.mp3' && (bytes.toString('ascii', 0, 3) === 'ID3' || bytes[0] === 255 && (bytes[1] & 224) === 224)) {
+            kind = 'audio';
+            suffix = '.mp3';
+        }
+        else if (ext === '.mp4' && bytes.toString('ascii', 4, 8) === 'ftyp') {
+            kind = 'video';
+            suffix = '.mp4';
+        }
+        else
+            throw new Error('仅支持内容与扩展名一致的 PNG、JPEG、MP3、WAV 或 MP4。');
+        return this.edit(id, revision, async (p) => {
+            if (p.assets.length >= 12 || p.assets.reduce((n, a) => n + a.bytes, 0) + bytes.length > 40 * 1024 * 1024)
+                throw new Error('每个项目最多 12 个素材、合计 40 MB。');
+            if (kind !== 'image' && p.assets.some(a => a.kind === kind))
+                throw new Error(kind === 'audio' ? '已有背景音频，请先移除再替换。' : '已有背景视频，请先移除再替换。');
+            const assetId = randomUUID(), dir = join(await this.path(id), 'assets');
+            await mkdir(dir, { recursive: true });
+            const asset = { id: assetId, name: name.replace(/[\x00-\x1f/\\]/g, '_').slice(0, 100), file: assetId + suffix, kind, bytes: bytes.length };
+            await writeFile(join(dir, asset.file), bytes, { flag: 'wx', mode: 0o600 });
+            p.assets.push(asset);
+        });
+    }
+    async removeAsset(id, revision, assetId) {
+        let file;
+        const p = await this.edit(id, revision, async (p) => { const a = p.assets.find(a => a.id === mediaId(assetId)); if (!a)
+            throw new Error('素材不存在。'); file = join(await this.path(id), 'assets', a.file); p.assets = p.assets.filter(a => a.id !== assetId); });
+        // Unlink only this managed upload, never a source file or a resolved link target.
+        if (file)
+            await unlink(file).catch(() => { });
+        return p;
+    }
+    async snapshot(id, revision) {
+        const dir = await this.path(id), unlock = await lockfile.lock(dir, { retries: { retries: 8, minTimeout: 30, maxTimeout: 60 } });
+        try {
+            const project = await this.get(id);
+            if (project.revision !== revision)
+                throw new MediaConflict('项目已更新，请保存并重新预览。');
+            const assets = new Map();
+            for (const a of project.assets)
+                assets.set(a.file, await this.assetBytes(id, a));
+            return { project, assets };
+        }
+        finally {
+            await unlock();
+        }
+    }
+}

package/lib/media-templates.d.ts

@@ -0,0 +1,52 @@
+/** Original managed templates. Visual identity: templates/DESIGN.md. */
+export type MediaEngine = 'hyperframes' | 'remotion';
+export interface MediaAsset {
+    id: string;
+    name: string;
+    file: string;
+    kind: 'image' | 'audio' | 'video';
+    bytes: number;
+}
+export interface MediaFields {
+    template: string;
+    title: string;
+    body: string;
+    format: string;
+    duration: number;
+}
+export interface MediaProject extends MediaFields {
+    id: string;
+    revision: number;
+    updated: string;
+    assets: MediaAsset[];
+    renders: Array<{
+        id: string;
+        revision: number;
+        bytes: number;
+        created: string;
+    }>;
+}
+export declare const MEDIA_VERSIONS: {
+    readonly hyperframes: "0.8.114";
+    readonly remotion: "4.0.532";
+    readonly gsap: "3.14.2";
+};
+export declare const MEDIA_TEMPLATES: readonly [{
+    readonly id: "title";
+    readonly zh: "标题卡";
+    readonly en: "Title card";
+    readonly description: "一句标题、一段介绍，适合开场与通知。";
+}, {
+    readonly id: "product";
+    readonly zh: "产品介绍";
+    readonly en: "Product card";
+    readonly description: "深色画布与一张主图，适合产品亮点。";
+}, {
+    readonly id: "slideshow";
+    readonly zh: "图文轮播";
+    readonly en: "Slideshow";
+    readonly description: "上传的图片依次展示，正文每行对应一页。";
+}];
+export declare const MEDIA_FORMATS: Record<string, [number, number]>;
+export declare function validateFields(value: unknown): MediaFields;
+export declare function projectSources(p: MediaProject, engine: MediaEngine): Record<string, string>;

package/lib/media-templates.js

@@ -0,0 +1,91 @@
+export const MEDIA_VERSIONS = { hyperframes: '0.8.114', remotion: '4.0.532', gsap: '3.14.2' };
+export const MEDIA_TEMPLATES = [
+    { id: 'title', zh: '标题卡', en: 'Title card', description: '一句标题、一段介绍，适合开场与通知。' },
+    { id: 'product', zh: '产品介绍', en: 'Product card', description: '深色画布与一张主图，适合产品亮点。' },
+    { id: 'slideshow', zh: '图文轮播', en: 'Slideshow', description: '上传的图片依次展示，正文每行对应一页。' },
+];
+export const MEDIA_FORMATS = { landscape: [1280, 720], portrait: [720, 1280], square: [720, 720] };
+export function validateFields(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        throw new Error('请填写项目内容。');
+    const v = value;
+    if (!MEDIA_TEMPLATES.some(row => row.id === v.template))
+        throw new Error('请选择支持的模板。');
+    if (typeof v.title !== 'string' || !v.title.trim() || v.title.length > 72)
+        throw new Error('标题需为 1–72 个字符。');
+    if (typeof v.body !== 'string' || v.body.length > 360)
+        throw new Error('正文最多 360 个字符。');
+    if (typeof v.format !== 'string' || !Object.hasOwn(MEDIA_FORMATS, v.format))
+        throw new Error('请选择支持的画幅。');
+    if (typeof v.duration !== 'number' || !Number.isInteger(v.duration) || v.duration < 3 || v.duration > 30)
+        throw new Error('时长需为 3–30 整秒。');
+    return { template: v.template, title: v.title.trim(), body: v.body.trim(), format: v.format, duration: v.duration };
+}
+const escapeHtml = (text) => text.replace(/[&<>"']/g, char => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[char]));
+export function projectSources(p, engine) {
+    const [width, height] = MEDIA_FORMATS[p.format];
+    const images = p.assets.filter(a => a.kind === 'image'), audio = p.assets.find(a => a.kind === 'audio'), video = p.assets.find(a => a.kind === 'video');
+    const count = p.template === 'slideshow' ? Math.max(images.length, 1) : 1;
+    if (p.duration < count * 2)
+        throw new Error(`轮播 ${count} 张图片至少需要 ${count * 2} 秒，请增加时长。`);
+    const dark = p.template === 'product', portrait = width <= height;
+    const copyWidth = (width - (portrait ? 96 : 128)) * (!portrait && images.length ? .51 : 1);
+    const copyHeight = (height - (portrait ? 120 : 112)) * (portrait && images.length ? .55 : 1) - 36;
+    // Conservatively fit full-width CJK characters and explicit newlines in the safe area.
+    const linesAt = (text, size) => text.split('\n').reduce((n, line) => n + Math.max(1, Math.ceil([...line].length / Math.max(1, Math.floor(copyWidth / size)))), 0);
+    let titleSize = Math.round((portrait ? 52 : 68) * (p.title.length > 40 ? .72 : p.title.length > 24 ? .85 : 1));
+    let bodySize = p.body.length > 200 ? 21 : 27;
+    const bodies = count > 1 ? p.body.split('\n').slice(0, count) : [p.body];
+    const fits = () => 42 + linesAt(p.title, titleSize) * titleSize * 1.15 + 22 + Math.max(...bodies.map(body => linesAt(body, bodySize) * bodySize * 1.6)) <= copyHeight;
+    while (!fits() && (bodySize > 16 || titleSize > 28)) {
+        if (bodySize > 16)
+            bodySize--;
+        else
+            titleSize--;
+    }
+    if (!fits())
+        throw new Error('文字超过此画幅的可读空间。请缩短正文或分成轮播页后再导出。');
+    if (count > 1 && p.body.split('\n').length > count)
+        throw new Error('正文行数多于轮播图片数，请增加图片或合并文字。');
+    const css = `@font-face{font-family:"Microsoft YaHei";src:local("Microsoft YaHei")}*{box-sizing:border-box}body{margin:0;font-family:system-ui,"Microsoft YaHei",sans-serif} #root{position:relative;width:${width}px;height:${height}px;overflow:hidden;background:${dark ? '#142D39' : '#FFF8ED'};color:${dark ? '#FFF8ED' : '#142D39'}} .scene{position:absolute;inset:0;padding:${portrait ? '60px 48px' : '56px 64px'};display:flex;${portrait ? 'flex-direction:column;' : ''}align-items:center;justify-content:center;gap:36px} .copy{flex:1;min-width:0;width:100%} .eyebrow{color:#F26445;font-size:18px;letter-spacing:4px;font-weight:700;margin-bottom:18px} h1{font-size:${titleSize}px;line-height:1.15;margin:0;overflow-wrap:anywhere} p{font-size:${bodySize}px;line-height:1.6;margin:22px 0 0;white-space:pre-line;overflow-wrap:anywhere} .visual{${portrait ? 'height:40%;width:100%;' : 'width:45%;height:80%;'}flex-shrink:0;object-fit:contain;border-radius:18px} .accent{position:absolute;left:0;top:0;width:14px;height:100%;background:#F26445} .page{position:absolute;right:40px;bottom:22px;font-size:18px;opacity:.65}`;
+    const design = `# Design\nOriginal DSH managed templates.\n\nPaper #FFF8ED; ink #142D39; coral #F26445; mint #79CDB4. Local system-ui / Microsoft YaHei. Safe margins, wrapped text, deterministic entrances. No remote fonts, random or infinite animation.\n`;
+    const info = { ...p, width, height, fps: 24, titleSize, bodySize, dark, portrait };
+    const sources = {
+        'project.json': JSON.stringify(p, null, 2), 'DESIGN.md': design,
+        'README.md': `# ${p.title.replace(/[\r\n]/g, ' ')}\n\nManaged ${engine} project, revision ${p.revision}.\n\nRun npm install, then npm run preview or npm run render. Media files are local copies in public/assets. Generated template code is MIT. Renderer dependencies keep their own licenses; Remotion: https://www.remotion.dev/license .\n`,
+    };
+    if (engine === 'hyperframes') {
+        sources['meta.json'] = JSON.stringify({ id: p.id, name: p.title, createdAt: p.updated }, null, 2);
+        sources['hyperframes.json'] = JSON.stringify({ $schema: 'https://hyperframes.heygen.com/schema/hyperframes.json', paths: { blocks: 'compositions', components: 'compositions/components', assets: 'public/assets' }, media: { autoProxy: true } }, null, 2);
+        let clips = '';
+        for (let i = 0; i < count; i++) {
+            const start = i * p.duration / count, duration = p.duration / count;
+            const body = count > 1 ? (p.body.split('\n')[i] ?? '') : p.body;
+            const scene = 'scene-' + i;
+            clips += `<div id="${scene}" class="clip" data-composition-id="${scene}" data-composition-src="compositions/${scene}.html" data-start="${start}" data-duration="${duration}" data-track-index="1" style="position:absolute;inset:0;width:100%;height:100%"></div>`;
+            sources['compositions/' + scene + '.html'] = `<!doctype html><html lang="zh"><head><meta charset="utf-8"><style>${css}#root{background:transparent}</style></head><body><div id="root" data-composition-id="${scene}" data-start="0" data-duration="${duration}" data-width="${width}" data-height="${height}"><div class="scene"><div class="copy"><div class="eyebrow">${escapeHtml(p.template.toUpperCase())}</div><h1 id="title-${i}">${escapeHtml(p.title)}</h1><p id="body-${i}">${escapeHtml(body)}</p></div>${images.length ? `<img class="visual" src="public/assets/${images[i % images.length].file}" alt="">` : ''}<div class="page">${i + 1} / ${count}</div></div><div class="accent" data-layout-ignore></div></div><script src="vendor/gsap.min.js"></script><script>window.__timelines=window.__timelines||{};const tl=gsap.timeline({paused:true});tl.to({},{duration:${duration}},0);tl.from('#title-${i}',{y:24,opacity:0,duration:.45},.08);tl.from('#body-${i}',{y:16,opacity:0,duration:.4},.2);window.__timelines['${scene}']=tl;</script></body></html>`;
+        }
+        const media = `${video ? `<video id="bg-video" class="clip" style="position:absolute;inset:0;width:100%;height:100%;opacity:.22;object-fit:cover" src="public/assets/${video.file}" muted playsinline data-start="0" data-duration="${p.duration}" data-track-index="0"></video>` : ''}${audio ? `<audio id="music" class="clip" src="public/assets/${audio.file}" data-start="0" data-duration="${p.duration}" data-track-index="2" data-volume="0.4"></audio>` : ''}`;
+        sources['index.html'] = `<!doctype html><html lang="zh"><head><meta charset="utf-8"><style>${css}</style></head><body><div id="root" data-composition-id="managed-video" data-start="0" data-duration="${p.duration}" data-width="${width}" data-height="${height}" data-fps="24">${media}${clips}</div><script src="vendor/gsap.min.js"></script><script>window.__timelines=window.__timelines||{};const tl=gsap.timeline({paused:true});tl.to({},{duration:${p.duration}},0);window.__timelines['managed-video']=tl;</script></body></html>`;
+        sources['setup.mjs'] = `import{mkdirSync,copyFileSync}from'node:fs';mkdirSync('vendor',{recursive:true});copyFileSync('node_modules/gsap/dist/gsap.min.js','vendor/gsap.min.js');\n`;
+        sources['package.json'] = JSON.stringify({ private: true, type: 'module', dependencies: { hyperframes: MEDIA_VERSIONS.hyperframes, gsap: MEDIA_VERSIONS.gsap }, scripts: { prepare: 'node setup.mjs', preview: 'hyperframes preview --no-open --foreground', render: 'hyperframes browser ensure && hyperframes render --workers 1 --no-best-effort --strict --output final.mp4 --fps 24' } }, null, 2);
+    }
+    else {
+        sources['data.json'] = JSON.stringify(info);
+        sources['src/index.jsx'] = `import React from 'react';
+import {registerRoot,Composition,AbsoluteFill,Img,Audio,OffthreadVideo,staticFile,useCurrentFrame,interpolate} from 'remotion';
+import data from '../data.json';
+function Video(){const frame=useCurrentFrame();const photos=data.assets.filter(a=>a.kind==='image'),music=data.assets.find(a=>a.kind==='audio'),video=data.assets.find(a=>a.kind==='video');const count=data.template==='slideshow'?Math.max(photos.length,1):1;const length=data.duration*24/count;const page=Math.min(count-1,Math.floor(frame/length));const local=frame-page*length;const opacity=interpolate(local,[0,12,length-10,length],[0,1,1,0],{extrapolateLeft:'clamp',extrapolateRight:'clamp'});const body=count>1?(data.body.split('\\n')[page]||''):data.body;
+return <AbsoluteFill style={{background:data.dark?'#142D39':'#FFF8ED',color:data.dark?'#FFF8ED':'#142D39',fontFamily:'system-ui,Microsoft YaHei,sans-serif'}}>
+{video&&<OffthreadVideo muted src={staticFile('assets/'+video.file)} style={{position:'absolute',width:'100%',height:'100%',objectFit:'cover',opacity:.22}}/>}
+<div style={{position:'absolute',inset:0,padding:data.portrait?'60px 48px':'56px 64px',display:'flex',flexDirection:data.portrait?'column':'row',alignItems:'center',justifyContent:'center',gap:36,opacity}}>
+<div style={{flex:1,minWidth:0,width:'100%'}}><div style={{color:'#F26445',fontSize:18,letterSpacing:4,fontWeight:700,marginBottom:18}}>{data.template.toUpperCase()}</div><h1 style={{fontSize:data.titleSize,lineHeight:1.15,margin:0,overflowWrap:'anywhere'}}>{data.title}</h1><p style={{fontSize:data.bodySize,lineHeight:1.6,marginTop:22,whiteSpace:'pre-line',overflowWrap:'anywhere'}}>{body}</p></div>
+{photos.length>0&&<Img src={staticFile('assets/'+photos[page%photos.length].file)} style={{width:data.portrait?'100%':'45%',height:data.portrait?'40%':'80%',flexShrink:0,objectFit:'contain',borderRadius:18}}/>}</div>
+<div style={{position:'absolute',left:0,top:0,width:14,height:'100%',background:'#F26445'}}/><div style={{position:'absolute',right:40,bottom:22,fontSize:18,opacity:.65}}>{page+1} / {count}</div>{music&&<Audio src={staticFile('assets/'+music.file)} volume={.4}/>}</AbsoluteFill>}
+const Root=()=> <Composition id="ManagedVideo" component={Video} durationInFrames={data.duration*24} fps={24} width={data.width} height={data.height}/>;
+registerRoot(Root);
+`;
+        sources['package.json'] = JSON.stringify({ private: true, dependencies: { '@remotion/cli': MEDIA_VERSIONS.remotion, remotion: MEDIA_VERSIONS.remotion, react: '18.3.1', 'react-dom': '18.3.1' }, scripts: { preview: 'remotion studio src/index.jsx --no-open', render: 'remotion render src/index.jsx ManagedVideo final.mp4 --concurrency 1 --codec h264' } }, null, 2);
+    }
+    return sources;
+}

package/lib/media-workbench.d.ts

@@ -0,0 +1,42 @@
+import { MediaStore } from './media-store.js';
+import { type MediaEngine } from './media-templates.js';
+interface MediaJob {
+    id: string;
+    kind: 'prepare' | 'preview' | 'render';
+    projectId?: string;
+    revision?: number;
+    state: 'running' | 'done' | 'failed' | 'cancelled';
+    stage: string;
+    lines: string[];
+    url?: string;
+    output?: string;
+}
+export declare class MediaWorkbench {
+    readonly engine: MediaEngine;
+    readonly store: MediaStore;
+    readonly route: string;
+    readonly runtime: string;
+    private jobs;
+    private disposed;
+    constructor(engine: MediaEngine, root?: string);
+    private browserFile;
+    environment(): Promise<{
+        ready: boolean;
+        version: string;
+        node: string;
+        hint: string;
+    }>;
+    job(id: string): MediaJob;
+    private log;
+    private stopChild;
+    private run;
+    private cli;
+    start(kind: MediaJob['kind'], id?: string, revision?: unknown): Promise<MediaJob>;
+    private execute;
+    cancel(id: string): MediaJob;
+    dispose(): void;
+    private guard;
+    fetch(request: Request): Promise<Response>;
+}
+export declare function installMediaWorkbench(ctx: any, engine: MediaEngine): MediaWorkbench;
+export {};