Skip to content

The open-source full-stack studio for Opus 5.5 motion video. Reverse engineering for any video. Code video with HTML: recreate, edit and render. BYOA + BYOK · Motion.md · Images, Video, Music & Voice.

fix: name exported video files after the project (#348)

open-design-crew[bot]1b23a49562a5
diff --git a/editor-server.ts b/editor-server.ts
index 1e7fcfa7..d3ba33cc 100644
--- a/editor-server.ts
+++ b/editor-server.ts
@@ -1,3 +1,4 @@
+import { renderFilenameStem } from './shared/render-name.ts';
import { request } from 'node:http';
import { readFile } from 'node:fs/promises';
import path from 'node:path';
@@ -31,15 +32,7 @@ export async function serveEditorFile(url: URL, res: ServerResponse): Promise<bo
/** Suggest a portable name without changing the immutable render's storage path. */
export function renderDownloadDisposition(title: string | undefined, extension: string): string {
- const cleaned = (title ?? '').toWellFormed().normalize('NFC')
- .replace(/[<>:"/\\|?*\u0000-\u001f\u007f]/gu, '_').trim();
- let stem = '';
- for (const char of cleaned) {
- if (Buffer.byteLength(stem + char, 'utf8') > 200) break;
- stem += char;
- }
- stem = stem.replace(/[. ]+$/u, '') || 'OpenMotion';
- if (/^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(stem)) stem = '_' + stem;
+ const stem = renderFilenameStem(title);
const encoded = encodeURIComponent(stem + extension).replace(/['()*]/g, char =>
'%' + char.charCodeAt(0).toString(16).toUpperCase());
return `attachment; filename="OpenMotion${extension}"; filename*=UTF-8''${encoded}`;
diff --git a/mcp-tools.ts b/mcp-tools.ts
index dd6d2fe4..7d5d3f6a 100644
--- a/mcp-tools.ts
+++ b/mcp-tools.ts
@@ -215,7 +215,7 @@ export async function callTool(name: string, args: Record<string, unknown> = {},
}
if (!job.expected) throw new Error('旧导出任务没有快照规格记录,请重新导出已检查的工程版本后再校验。');
const expected = { ...job.expected, audio: (args.audio ?? job.expected.audio) as ExportExpectation['audio'] };
- return { jobId: job.id, revision: job.revision, ...await verifyExport(path.join(store.directory, 'exports', job.id + '.mp4'), expected) };
+ return { jobId: job.id, revision: job.revision, ...await verifyExport(store.exportPath(job), expected) };
}
if (name === 'motion_apply_template') {
if (typeof args.templateId !== 'string') throw new Error('需要 templateId');
diff --git a/server.ts b/server.ts
index af93864f..732b7f05 100644
--- a/server.ts
+++ b/server.ts
@@ -73,7 +73,7 @@ export async function renderNext(store: WorkspaceStore, runtimeRoot: string, tra
await stage('checking');
const lint = await inspectProject(runtimeRoot, directory, 'lint', control.signal);
if (lint.exitCode) throw new Error('Hyperframes lint 失败:' + JSON.stringify(lint.result));
- const output = path.join(store.directory, 'exports', job.id + '.mp4');
+ const output = store.exportPath(job);
await mkdir(path.dirname(output), { recursive: true });
// The service owns this job; a short-lived Agent client must not cancel it.
await stage('rendering');
@@ -99,7 +99,7 @@ export async function renderNext(store: WorkspaceStore, runtimeRoot: string, tra
if (!job) throw error;
await recordDiagnostic(store.directory, { kind: 'export_failed', jobId: job.id, projectId: job.projectId,
message: error instanceof Error ? error.message : 'Render failed' });
- await rm(path.join(store.directory, 'exports', job.id + '.mp4'), { force: true });
+ await rm(store.exportPath(job), { force: true });
const current = await store.job(job.id);
if (current && ['running', 'cancelling'].includes(current.state)) await store.finishExport(job.id, job.token!, error instanceof Error ? error.message : '渲染失败');
} finally {
@@ -519,7 +519,7 @@ export async function handler(req: IncomingMessage, res: ServerResponse, store =
if (download && req.method === 'GET') {
const job = await store.job(download[1]);
if (!job || job.id !== download[1] || job.state !== 'completed') return json(res, 404, { error: '视频尚未完成或任务不存在' });
- const filename = path.join(store.directory, 'exports', job.id + '.mp4');
+ const filename = store.exportPath(job);
res.writeHead(200, { 'Content-Type': 'video/mp4', 'Content-Length': (await stat(filename)).size, 'Content-Disposition': renderDownloadDisposition(store.projectCatalog().projects.find(p => p.id === (job.projectId ?? store.projectId))?.title, '.mp4') });
await new Promise<void>((resolve, reject) => {
const stream = createReadStream(filename);
diff --git a/shared/render-name.ts b/shared/render-name.ts
new file mode 100644
index 00000000..82eea221
--- /dev/null
+++ b/shared/render-name.ts
@@ -0,0 +1,12 @@
+export function renderFilenameStem(title: string | undefined): string {
+ const cleaned = (title ?? '').toWellFormed().normalize('NFC')
+ .replace(/[<>:"/\\|?*\u0000-\u001f\u007f]/gu, '_').trim();
+ let stem = '';
+ for (const char of cleaned) {
+ if (Buffer.byteLength(stem + char, 'utf8') > 200) break;
+ stem += char;
+ }
+ stem = stem.replace(/[. ]+$/u, '') || 'OpenMotion';
+ if (/^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(stem)) stem = '_' + stem;
+ return stem;
+}
diff --git a/shared/workspace-studio.ts b/shared/workspace-studio.ts
index f8abb6d9..a26fd571 100644
--- a/shared/workspace-studio.ts
+++ b/shared/workspace-studio.ts
@@ -1,3 +1,6 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { lstatSync, writeFileSync, unlinkSync } from 'node:fs';
+import { renderFilenameStem } from './render-name.ts';
import { createServer } from 'node:http';
import { createRequire } from 'node:module';
import { mkdir, readFile, readdir, writeFile } from 'node:fs/promises';
@@ -24,6 +27,7 @@ export async function startWorkspaceStudio(runtimeRoot: string, dataDirectory: s
if (typeof createStudioServer !== 'function') throw new Error('Hyperframes workspace host factory is unavailable');
const { getRequestListener } = await import(pathToFileURL(require.resolve('@hono/node-server')).href);
const { Hono } = await import(pathToFileURL(require.resolve('hono')).href);
+ const { serveStatic } = await import(pathToFileURL(require.resolve('@hono/node-server/serve-static')).href);
const { bodyLimit } = await import(pathToFileURL(require.resolve('hono/body-limit')).href);
const coreRoot = path.dirname(require.resolve('@hyperframes/core/package.json'));
const core = JSON.parse(await readFile(path.join(coreRoot, 'package.json'), 'utf8'));
@@ -48,7 +52,44 @@ export async function startWorkspaceStudio(runtimeRoot: string, dataDirectory: s
const host = createStudioServer({ projectDir: scoped.projectDirectory, projectName: id,
origin: () => origin, historyRoot });
const nativeApp = host.app;
+ const renderRequest = new AsyncLocalStorage<{ filename?: string }>();
+ const startRender = host.adapter.startRender.bind(host.adapter);
+ host.adapter.startRender = (options: { outputPath: string }) => {
+ const request = renderRequest.getStore();
+ if (!request) return startRender(options);
+ const directory = path.dirname(options.outputPath);
+ const extension = path.extname(options.outputPath);
+ const title = renderFilenameStem(scoped.projectCatalog().projects.find(project => project.id === id)?.title);
+ // Native history and deletion share one metadata file across all formats.
+ // Reserve that stem before starting the worker, including concurrent submissions.
+ for (let n = 0; ; n++) {
+ const stem = n ? title + ' (' + n + ')' : title;
+ if (['.mp4', '.mov', '.webm', '.gif'].some(ext => lstatSync(path.join(directory, stem + ext), { throwIfNoEntry: false }))) continue;
+ const metadata = path.join(directory, stem + '.meta.json');
+ try { writeFileSync(metadata, '{}', { flag: 'wx' }); }
+ catch (error) { if ((error as NodeJS.ErrnoException).code === 'EEXIST') continue; throw error; }
+ request.filename = stem + extension;
+ try { return startRender({ ...options, outputPath: path.join(directory, request.filename) }); }
+ catch (error) { unlinkSync(metadata); throw error; }
+ }
+ };
host.app = new Hono().get('/api/fonts', async c => c.json({ fonts: await fonts.families() }))
+ .post('/api/projects/:id/render', c => {
+ const result: { filename?: string } = {};
+ return renderRequest.run(result, async () => {
+ const response = await nativeApp.fetch(c.req.raw);
+ if (!response.ok || !result.filename) return response;
+ return c.json({ ...await response.json(), filename: result.filename });
+ });
+ })
+ .get('/api/projects/:id/renders/file/:filename', async c => {
+ const filename = c.req.param('filename');
+ if (/[\/\\\x00]/.test(filename) || !/\.(mp4|mov|webm|gif)$/i.test(filename)) return c.notFound();
+ const directory = path.join(scoped.projectDirectory, 'renders');
+ if (!lstatSync(directory, { throwIfNoEntry: false })?.isDirectory() ||
+ !lstatSync(path.join(directory, filename), { throwIfNoEntry: false })?.isFile()) return c.notFound();
+ return serveStatic({ root: directory, path: filename })(c, () => c.notFound());
+ })
.get('/api/fonts/file', async c => {
const family = c.req.query('family');
if (!family) return c.json({ error: 'family parameter required' }, 400);
diff --git a/studio/src/components/renders/RenderQueueItem.tsx b/studio/src/components/renders/RenderQueueItem.tsx
index ef012526..31b6f6de 100644
--- a/studio/src/components/renders/RenderQueueItem.tsx
+++ b/studio/src/components/renders/RenderQueueItem.tsx
@@ -31,7 +31,7 @@ export const RenderQueueItem = memo(function RenderQueueItem({
const [confirmingDelete, setConfirmingDelete] = useState(false);
// Direct file URL — serves from disk, survives server restarts
- const fileSrc = buildProjectApiPath(projectId, `/renders/file/${job.filename}`);
+ const fileSrc = buildProjectApiPath(projectId, `/renders/file/${encodeURIComponent(job.filename)}`);
const handleOpen = useCallback(() => {
window.open(fileSrc, "_blank");
diff --git a/studio/src/components/renders/useRenderQueue.ts b/studio/src/components/renders/useRenderQueue.ts
index 6d8ce9c9..3343fa5d 100644
--- a/studio/src/components/renders/useRenderQueue.ts
+++ b/studio/src/components/renders/useRenderQueue.ts
@@ -14,6 +14,7 @@ import { studioApiFetch, studioProjectUrl } from "../../utils/studioApiFetch";
export interface RenderJob {
id: string;
+ nativeJobId?: string;
status: "rendering" | "complete" | "failed" | "cancelled";
progress: number;
stage?: string;
@@ -320,7 +321,7 @@ export function useRenderQueue(
addSessionJob(failedJob, settings);
return;
}
- const { jobId } = await res.json();
+ const { jobId: nativeJobId, filename } = await res.json();
const FORMAT_EXT: Record<string, string> = {
mp4: ".mp4",
@@ -329,18 +330,20 @@ export function useRenderQueue(
gif: ".gif",
};
const ext = FORMAT_EXT[format] ?? ".mp4";
+ const jobId = filename ? filename.slice(0, -ext.length) : nativeJobId;
const job: RenderJob = {
+ nativeJobId,
id: jobId,
status: "rendering",
progress: 0,
- filename: `${jobId}${ext}`,
+ filename: filename ?? `${jobId}${ext}`,
createdAt: startTime,
};
addSessionJob(job, settings);
activeJobRef.current = jobId;
// Track progress via SSE
- const es = new EventSource(studioProjectUrl(`/api/render/${jobId}/progress`, projectId));
+ const es = new EventSource(studioProjectUrl(`/api/render/${encodeURIComponent(nativeJobId)}/progress`, projectId));
eventSourceRef.current = es;
es.addEventListener("progress", (event) => {
@@ -403,7 +406,8 @@ export function useRenderQueue(
),
);
try {
- const res = await studioApiFetch(`/api/render/${jobId}/cancel`, { method: "POST" });
+ const nativeId = jobs.find(job => job.id === jobId)?.nativeJobId ?? jobId;
+ const res = await studioApiFetch(`/api/render/${encodeURIComponent(nativeId)}/cancel`, { method: "POST" });
if (!res.ok && res.status !== 404) {
setActionError("Couldn't cancel on the server. The render may still be running.");
return;
@@ -422,7 +426,7 @@ export function useRenderQueue(
setActionError("Couldn't reach the server to cancel. The render may still be running.");
}
},
- [closeActiveEventSource, loadRenders],
+ [closeActiveEventSource, loadRenders, jobs],
);
const deleteRender = useCallback(
@@ -430,7 +434,7 @@ export function useRenderQueue(
setActionError(null);
closeActiveEventSource(jobId);
try {
- const res = await studioApiFetch(`/api/render/${jobId}`, { method: "DELETE" });
+ const res = await studioApiFetch(`/api/render/${encodeURIComponent(jobId)}`, { method: "DELETE" });
if (!res.ok) {
setActionError("Couldn't delete the render. It's still on disk.");
return;
diff --git a/tests/phase1-runtime.test.ts b/tests/phase1-runtime.test.ts
index 24d63527..465c9d02 100644
--- a/tests/phase1-runtime.test.ts
+++ b/tests/phase1-runtime.test.ts
@@ -57,7 +57,7 @@ test('real phase1 MCP, active Studio history, confirmed running cancellation and
assert.ok(['cancelling', 'cancelled'].includes(cancelled.job.state));
const stopped = await waitFor(p.projectId, long.job.id, job => job.state === 'cancelled');
assert.equal(stopped.state, 'cancelled');
- await assert.rejects(access(path.join(store.directory, 'exports', long.job.id + '.mp4')));
+ await assert.rejects(access(store.exportPath(long.job)));
saved = await call('openmotion_edit_project', { projectId: p.projectId, requestId: 'short', expectedRevision: p.revision, expectedVersionId: p.version.versionId, files: [{ path: 'index.html', content: film() }] });
const exportArgs = { projectId: p.projectId, requestId: 'short-export', expectedRevision: saved.revision, versionId: saved.version.versionId, audio: 'silent' };
const requested = await call('openmotion_export_request', exportArgs);
diff --git a/tests/shared-editor-crash.mjs b/tests/shared-editor-crash.mjs
index 32e2b624..d694d677 100644
--- a/tests/shared-editor-crash.mjs
+++ b/tests/shared-editor-crash.mjs
@@ -88,7 +88,7 @@ async function run(stage) {
jobId = submitted.job.id;
const jobFile = path.join(root, 'export.json');
const archive = path.join(root, 'jobs', jobId, 'job.json');
- const output = path.join(root, 'exports', jobId + '.mp4');
+ const output = path.join(root, 'exports', jobId, submitted.job.outputName);
const deadline = Date.now() + 90_000;
let before;
while (Date.now() < deadline) {
diff --git a/tests/verify-export.test.ts b/tests/verify-export.test.ts
index 9c8a835a..8e64e113 100644
--- a/tests/verify-export.test.ts
+++ b/tests/verify-export.test.ts
@@ -103,8 +103,8 @@ test('MCP verification binds job ID/revision and preserves snapshot specificatio
const expected = await snapshotExportExpectation(pluginRoot, store.snapshotDirectory(requested.id));
assert.deepEqual(expected, { ...spec, audio: 'optional' });
assert.deepEqual((await store.job())!.expected, expected);
- await mkdir(path.join(directory, 'exports'));
- clip(path.join(directory, 'exports', requested.id + '.mp4'));
+ await mkdir(path.dirname(store.exportPath(requested)), { recursive: true });
+ clip(store.exportPath(requested));
await store.finishExport(requested.id, claimed.token!);
await rm(store.snapshotDirectory(requested.id), { recursive: true });
const report = await callTool('openmotion_verify_export', { jobId: requested.id, expectedRevision: saved.revision, audio: 'silent' }, store) as any;
diff --git a/workspace.ts b/workspace.ts
index 58aaa843..f931b375 100644
--- a/workspace.ts
+++ b/workspace.ts
@@ -1,3 +1,4 @@
+import { renderFilenameStem } from './shared/render-name.ts';
import { createHash } from 'node:crypto';
import { isAssetFileWithinLimit } from './shared/asset-limits.ts';
import { createReadStream, existsSync, readFileSync } from 'node:fs';
@@ -28,7 +29,7 @@ export type FileEdit = { path: string; content: string };
export type SavedProject = { id: string; title: string; templateId?: string; createdAt?: number; openedAt?: number };
export type ProjectCatalog = { activeId: string; projects: SavedProject[]; sessions?: CreativeSession[]; activeSessionId?: string };
export type ExportJob = { id: string; projectId?: string; versionId?: string; requestId?: string; phase1?: boolean; stage?: string; verification?: unknown; revision: string; state: 'pending' | 'running' | 'cancelling' | 'cancelled' | 'completed' | 'failed';
- createdAt: number; expiresAt: number; token?: string; workerPid?: number; file?: string; error?: string; expected?: ExportExpectation };
+ createdAt: number; expiresAt: number; token?: string; workerPid?: number; file?: string; outputName?: string; error?: string; expected?: ExportExpectation };
export class Conflict extends Error { constructor() { super('工程已经被 Studio 或 Agent 更新,请重新读取 revision 后再修改。'); } }
export function projectPath(name: string): string {
@@ -358,6 +359,9 @@ export class WorkspaceStore {
} finally { await rm(staging, { recursive: true, force: true }); }
}
+ exportPath(job: ExportJob) {
+ return job.outputName ? path.join(this.directory, 'exports', job.id, job.outputName) : path.join(this.directory, 'exports', job.id + '.mp4');
+ }
async job(id?: string): Promise<ExportJob | null> {
if (id && !/^[a-f0-9-]{36}$/.test(id)) throw new Error('无效的导出任务编号');
try {
@@ -381,7 +385,7 @@ export class WorkspaceStore {
await this.saveJob(job);
}
if (job?.state === 'completed') {
- try { if (!(await stat(path.join(this.directory, 'exports', job.id + '.mp4'))).size) throw new Error('empty'); }
+ try { if (!(await stat(this.exportPath(job))).size) throw new Error('empty'); }
catch { job.state = 'failed'; job.error = '导出文件已不存在,请重新导出'; delete job.file; await this.saveJob(job); }
}
if (job) { delete job.token; delete job.workerPid; }
@@ -400,6 +404,7 @@ export class WorkspaceStore {
if (previous && ['pending', 'running', 'cancelling'].includes(previous.state) && previous.expiresAt > Date.now() && (previous.state === 'pending' || alive(previous.workerPid))) throw new Error('EXPORT_BUSY: 已有导出任务正在等待或运行');
const { audio, ...identity } = options;
const job: ExportJob = { ...identity, id: crypto.randomUUID(), projectId: this.projectId, revision: expectedRevision, state: 'pending', stage: 'queued', createdAt: Date.now(), expiresAt: Date.now() + 30 * 60_000 };
+ job.outputName = renderFilenameStem(this.projectCatalog().projects.find(project => project.id === this.projectId)?.title) + '.mp4';
const snapshot = this.snapshotDirectory(job.id);
try {
for (const file of current.project.files) {
@@ -432,9 +437,9 @@ export class WorkspaceStore {
job.state = 'cancelled'; job.stage = 'cancelled'; delete job.token; delete job.workerPid;
await this.saveJob(job); return job;
}
- if (!error && !(await stat(path.join(this.directory, 'exports', id + '.mp4'))).size) throw new Error('Hyperframes 未生成视频');
+ if (!error && !(await stat(this.exportPath(job))).size) throw new Error('Hyperframes 未生成视频');
job.state = error ? 'failed' : 'completed'; job.stage = job.state;
- if (error) job.error = error.slice(-2000); else job.file = 'exports/' + id + '.mp4';
+ if (error) job.error = error.slice(-2000); else job.file = path.relative(this.directory, this.exportPath(job)).split(path.sep).join('/');
delete job.token; delete job.workerPid;
await this.saveJob(job); return job;
});