Skip to content

Make videos on the computer you already own. FreeVideo runs MiniMax H3 in as little as 8 GB of VRAM and 16 GB of RAM, and adapts its acceleration path to your hardware.

The main page starts even when the editing view cannot load

Bowen Xue9b115e443ddc
diff --git a/freevideo_engine/comfy_editor.py b/freevideo_engine/comfy_editor.py
index f28a9ff..046e6e0 100644
--- a/freevideo_engine/comfy_editor.py
+++ b/freevideo_engine/comfy_editor.py
@@ -25,6 +25,7 @@ from urllib.parse import unquote, urlencode, urlsplit
from .comfy_library import _ID, _plain, _video
from .system import windows
from .editor_frames import frame_not_after, last_frame_end
+from .editor_limits import PROJECT_BYTES
from .editor_speed import validate_clip, register_reverse
from .editor_transport import marker_fields
from .editor_audio import clip_fields, track_fields
@@ -322,8 +323,6 @@ def validate(record):
raise ValueError('Invalid replacement bounds')
transactions.append(dict(part=raw['part'], originals=originals, clips=clips, rolledBack=raw['rolledBack']))
result['replacements'] = transactions
- if len(json.dumps(result, ensure_ascii=True).encode()) > BODY_BYTES:
- raise ValueError('Project is too large')
return result
@@ -373,19 +372,22 @@ def _read_json(path, limit=BODY_BYTES):
def _read_project(root, identity):
- record = validate(_read_json(_project_path(root, identity), BODY_BYTES + 256))
+ record = validate(_read_json(_project_path(root, identity), PROJECT_BYTES))
if record['id'] != identity:
raise ValueError('Project id does not match its folder')
return record
-def _write(path, record):
+def _write(path, record, *, limit=None):
+ data = (json.dumps(record, ensure_ascii=True, allow_nan=False) + '\n').encode('utf-8')
+ if limit is not None and len(data) > limit:
+ raise ValueError('Project is too large')
temporary = None
try:
- with tempfile.NamedTemporaryFile(mode='w', encoding='utf-8', errors='backslashreplace', newline='\n',
+ with tempfile.NamedTemporaryFile(mode='wb',
prefix=path.name + '.', suffix='.tmp', dir=path.parent, delete=False) as stream:
temporary = Path(stream.name)
- stream.write(json.dumps(record, ensure_ascii=True, allow_nan=False) + '\n')
+ stream.write(data)
stream.flush()
os.fsync(stream.fileno())
for attempt in range(8):
@@ -440,7 +442,7 @@ def save(output_directory, record, create=None, operation=None):
stored = _read_project(output_directory, record['id'])
except FileNotFoundError as error:
raise MissingProject('Saved project unavailable') from error
- receipt = _read_json(path, BODY_BYTES + 256).get('_save', {})
+ receipt = _read_json(path, PROJECT_BYTES).get('_save', {})
if operation is not None and receipt.get('operation') == operation:
if receipt.get('digest') != digest:
raise ValueError('Save operation reused with different content')
@@ -456,13 +458,13 @@ def save(output_directory, record, create=None, operation=None):
retained['_save'] = dict(operation=operation, digest=digest)
try:
if fresh:
- _write(staging / 'project.json', retained)
+ _write(staging / 'project.json', retained, limit=PROJECT_BYTES)
if create is not None:
_write(staging / 'create.json', dict(create=create))
_project_path(output_directory, record['id'])
os.rename(staging, path.parent)
else:
- _write(path, retained)
+ _write(path, retained, limit=PROJECT_BYTES)
finally:
if fresh and staging.exists():
shutil.rmtree(staging)
diff --git a/freevideo_engine/editor_export.py b/freevideo_engine/editor_export.py
index 655a34b..ee09950 100644
--- a/freevideo_engine/editor_export.py
+++ b/freevideo_engine/editor_export.py
@@ -24,6 +24,7 @@ from pathlib import Path
from .editor_frames import display_frame, frame_not_after, last_frame_end
from .comfy_continuation import audio_lead_in, apply_audio_lead_in
+from .editor_limits import PROJECT_BYTES
from .editor_text import is_text_track, has_text_data, validate_text_project, paint_project, check_export_text, MissingGlyphs
from . import editor_export_options
from .editor_speed import validate_clip, changed as speed_changed, audio_changed, independent_join, VideoReader, AudioReader
@@ -802,10 +803,10 @@ def _output_root():
return Path(folder_paths.get_output_directory()).resolve()
-def _read_json(path):
+def _read_json(path, limit=_RECORD_BYTES):
with path.open('rb') as stream:
- value = stream.read(_RECORD_BYTES + 1)
- if len(value) > _RECORD_BYTES:
+ value = stream.read(limit + 1)
+ if len(value) > limit:
raise ValueError('Record too large')
return json.loads(value)
@@ -841,7 +842,7 @@ def load_project(identity, revision=None):
raise ExportConflict(record['revision'])
return copy.deepcopy(record)
root = output / 'FreeVideo' / '.editor' / 'projects'
- record = _read_json(_contained(root, root / identity / 'project.json'))
+ record = _read_json(_contained(root, root / identity / 'project.json'), PROJECT_BYTES)
if revision is not None and record['revision'] != revision:
raise ExportConflict(record['revision'])
return record
diff --git a/freevideo_engine/editor_limits.py b/freevideo_engine/editor_limits.py
new file mode 100644
index 0000000..96b571d
--- /dev/null
+++ b/freevideo_engine/editor_limits.py
@@ -0,0 +1,4 @@
+"""Shared byte limit for a complete saved editor project, including its receipt."""
+
+# Keep the existing reader's allowance for the atomic save receipt.
+PROJECT_BYTES = 8 * 1024 * 1024 + 256
diff --git a/scripts/test_freevideo_entry.mjs b/scripts/test_freevideo_entry.mjs
index bede18c..764e3b4 100644
--- a/scripts/test_freevideo_entry.mjs
+++ b/scripts/test_freevideo_entry.mjs
@@ -76,7 +76,7 @@ test('main browser entry registers both views and preserves node hooks', async t
}
try {
let source = await readFile(new URL('../web/freevideo.js', import.meta.url), 'utf8');
- source = source.replace("import { openEditorView } from './editor_entry.js';", 'const openEditorView = (...args) => globalThis.__freevideoEntryTest.openEditorView?.(...args);');
+ source = source.replace("import { openEditorView } from './editor_loader.js';", 'const openEditorView = (...args) => globalThis.__freevideoEntryTest.openEditorView?.(...args);');
source = source
.replace("import { createErrorPanel, errorText } from './error_panel.js';", 'const {createErrorPanel,errorText} = globalThis.__freevideoEntryTest;')
.replace('import { app } from "../../scripts/app.js";', 'const {app} = globalThis.__freevideoEntryTest;')
@@ -145,11 +145,11 @@ test('main browser entry registers both views and preserves node hooks', async t
extension.afterConfigureGraph();
assert.equal(restored[0].node, node);
assert.ok(restored[0].studio, 'restore opens the studio before the editor');
- dependencies.openEditorView = () => { throw new Error('editor unavailable'); };
- const oldError = console.error; console.error = () => {};
- try { extension.afterConfigureGraph(); } finally { console.error = oldError; }
- assert.equal(opened.at(-1), node, 'editor failure leaves the restored studio available');
+ // The lazy loader owns failed imports: it notifies, reports through onFailure and resolves null.
+ dependencies.openEditorView = async (node, options) => { options.onFailure(new Error('editor unavailable')); return null; };
+ extension.afterConfigureGraph(); await Promise.resolve();
assert.ok(window.__freevideoHealth.some(row => row.where === 'editor'));
+ assert.equal(opened.at(-1), node, 'editor failure leaves the restored studio available');
rememberedView = 'nodes';
const count = opened.length; extension.afterConfigureGraph();
assert.equal(opened.length, count, 'remembered Nodes does not open either dialog');
diff --git a/web/editor.js b/web/editor.js
index a3d9290..77e4723 100644
--- a/web/editor.js
+++ b/web/editor.js
@@ -141,7 +141,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
tracksHost.inert = genHost.inert = true; title.disabled = true;
// CSS delays the pending indication; fast opens stay at full opacity.
tracksHost.classList.add('fv-ed-pending'); genHost.classList.add('fv-ed-pending');
- let discardOnSwitch = false, initialSelection = null;
+ let discardOnSwitch = false, initialSelection = null, offerInitial = null;
let viewKey = null, viewReady = false;
let library = null, closing = false, closePromise = null, exportSnapshot = null, lastSeed = null, projectEpoch = 0;
let disposed = false, suppressSave = false, savedContent = '', initializing = true, tracks = null, genbar = null, adjustPanel = null, exportStatus = null, pointerEditing = false, deferredStamp = null;
@@ -193,10 +193,17 @@ export function openEditor({api, app, from = null, panel = {}, components: given
}
const store = createEditorStore(api, {t, notify, standIn: given?.generationStandIn, onGenerationReady: ready => {
if (disposed) return;
- genHost.hidden = !ready; element.dataset.generationReady = String(ready);
+ generationAsked = true; genHost.hidden = !ready; element.dataset.generationReady = String(ready);
+ settleGenbar(); if (ready) offerInitial?.();
tracks?.refresh?.(); genbar?.update(mostRecentJob ? barJob(jobStatuses.get(mostRecentJob)) : null);
updateTransport(); adjustPanel?.update();
}});
+ // Until the server has answered, the bar keeps its place but cannot be used.
+ let generationAsked = store.generationAvailable, loaded = false;
+ const settleGenbar = () => {
+ const waiting = !loaded || !generationAsked;
+ genHost.inert = waiting || !store.generationAvailable; genHost.classList.toggle('fv-ed-pending', waiting);
+ };
store.generationReady();
const queue = store.createSaveQueue({get record() { return state.record; },
adopt(value) {
@@ -320,7 +327,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
viewKey = record.id || key || 'draft:' + (globalThis.crypto?.randomUUID?.() || `${Date.now()}-${Math.random()}`);
let remembered = editorViews.get(viewKey);
if (!remembered) try { remembered = JSON.parse(localStorage.getItem(viewPrefix + viewKey)); } catch {}
- initialSelection = null;
+ initialSelection = offerInitial = null;
projectEpoch++;
player.pause(); for (const stop of jobWatchers.values()) stop(); jobWatchers.clear(); jobStatuses.clear(); progress.clear(); runProgress.clear(); progressConnection?.reset();
mostRecentJob = null; genbar?.update(null); queue.reset(record); stopExport?.(); stopExport = null; exportStatus = exportSnapshot = null; exportButton.textContent = t('Export', '导出');
@@ -358,7 +365,9 @@ export function openEditor({api, app, from = null, panel = {}, components: given
// A restored edit remains usable offline with its existing placeholders.
await completeSources().catch(error); if (disposed) return; recoverJobs();
state.restoreView(remembered);
- if (!state.selection && state.record.tracks.every(track => !track.clips.length)) selectInitial();
+ // Also when generating is confirmed only after the edit has opened.
+ offerInitial = () => { if (epoch === projectEpoch && !state.selection && state.record.tracks.every(track => !track.clips.length)) selectInitial(); };
+ offerInitial();
genbar?.setText(typeof remembered?.text === 'string' ? remembered.text : '');
tracks?.setScrollLeft(remembered?.scrollLeft);
viewReady = true; updateTransport();
@@ -810,7 +819,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
} catch (value) { error(value); }
if (closing || disposed) return;
initializing = false; savedContent = content(state.record); player.refresh();
- genHost.inert = false; genHost.classList.remove('fv-ed-pending');
+ loaded = true; settleGenbar();
updateTop(); updateTransport();
const [trackResult, componentResult] = await componentsReady; if (closing || disposed) return;
// Optional progress components may fail without taking the tracks with them.
@@ -849,9 +858,9 @@ export function openEditor({api, app, from = null, panel = {}, components: given
// Every exit (including close and partial failure) settles readiness.
// After a completed start the saved baseline is already set; edits made since must stay unsaved.
if (initializing) { initializing = false; savedContent = content(state.record); }
- title.disabled = false; genHost.inert = toolbar.inert = false;
+ title.disabled = false; toolbar.inert = false; loaded = true; settleGenbar();
tracksHost.inert = !tracks;
- for (const host of [tracksHost, genHost, toolbar]) host.classList.remove('fv-ed-pending');
+ for (const host of [tracksHost, toolbar]) host.classList.remove('fv-ed-pending');
if (!closing && !disposed) { player.refresh(); updateTop(); updateTransport(); }
});
updateTop(); return handle;
diff --git a/web/editor_loader.js b/web/editor_loader.js
new file mode 100644
index 0000000..8221aea
--- /dev/null
+++ b/web/editor_loader.js
@@ -0,0 +1,24 @@
+// Keep this adapter independent of the editing module graph: even a parse or
+// evaluation error in that graph must leave the current workspace usable.
+import {app} from '../../scripts/app.js';
+
+export async function openEditorView(node, options) {
+ try {
+ const entry = await import('./editor_entry.js');
+ return entry.openEditorView(node, options);
+ } catch (error) {
+ console.warn('FreeVideo edit view:', error);
+ const language = new URLSearchParams(location.search).get('freevideo_lang');
+ const cn = language === 'zh' || (language !== 'en' && String(navigator.language || '').toLowerCase().startsWith('zh'));
+ const detail = cn ? '没有完成,请重试' : 'Could not complete. Try again.';
+ // The native modal is above the host's toast layer. Also use the
+ // workspace's existing failure status so the message stays visible.
+ const status = options?.studio?.querySelector('.fv-status');
+ if (status) { status.dataset.error = 'true'; status.textContent = detail; }
+ app.extensionManager?.toast?.add({severity: 'error', summary: 'FreeVideo', detail, life: 9000});
+ options?.onFailure?.(error);
+ // Do not retain a rejected promise. Each click tries import again;
+ // browsers may still retain the failed module URL until a page reload.
+ return null;
+ }
+}
diff --git a/web/editor_store.js b/web/editor_store.js
index 7115957..01cdb74 100644
--- a/web/editor_store.js
+++ b/web/editor_store.js
@@ -227,7 +227,7 @@ export function mediaURL(api, value) {
export function createEditorStore(api, {t = en => en, notify = () => {}, onGenerationReady = () => {}, clock = clockDefault, pollMs = 2000, standIn: injected = null} = {}) {
const sources = new Map(), sourceReads = new Map(), watchers = new Set(), pollers = new Set(), once = new Set();
let recovered = null, capabilityPoll = null;
- let generationAvailable = true, generationProbe = null;
+ let generationAvailable = false, generationGone = false, generationProbe = null, generationRetry = null, generationAttempts = 0;
let disposed = false; const uploads = new Set();
const session = holdSession();
const notice = (key, en, zh) => { if (!once.has(key)) { once.add(key); notify(t(en, zh)); } };
@@ -255,10 +255,17 @@ export function createEditorStore(api, {t = en => en, notify = () => {}, onGener
return () => { poller.dispose(); pollers.delete(poller); };
}
function generationAbsent() {
- if (!generationAvailable) return;
+ generationGone = true; generationRetry?.dispose();
generationAvailable = false;
if (!disposed) onGenerationReady(false);
}
+ function askGenerationAgain() {
+ const delay = [2000, 5000, 15000, 30000][generationAttempts++];
+ if (delay === undefined) return;
+ const timer = clock.setTimeout(() => { retry.dispose(); store.generationReady(); }, delay);
+ const retry = generationRetry = {dispose() { clock.clearTimeout(timer); pollers.delete(retry); if (generationRetry === retry) generationRetry = null; }};
+ pollers.add(retry);
+ }
// Optional adapter (or factory): startChain, owns, chain, chainAction, and
// optional restoreSources. Production callers provide none.
const standIn = typeof injected === 'function'
@@ -268,23 +275,31 @@ export function createEditorStore(api, {t = en => en, notify = () => {}, onGener
get generationAvailable() { return !!standIn || generationAvailable; },
generationReady() {
if (standIn) return Promise.resolve(true);
- if (!generationAvailable) return Promise.resolve(false);
- // One bounded request per store, shared by concurrent callers. Only
- // an explicit 404 hides generation; outages leave the editor usable.
+ if (generationAvailable || generationGone || disposed) return Promise.resolve(generationAvailable);
+ // Generating stays off until the list of long videos answers in its
+ // expected shape. One bounded request at a time, shared by concurrent
+ // callers; a missing route is final, an error or timeout is asked again.
+ // Every answer is reported, so the page can stop waiting for the first.
return generationProbe ||= (async () => {
const controller = new AbortController();
- let timer, finish;
+ let timer, finish, answer = null;
const timeout = new Promise(resolve => { finish = resolve; timer = clock.setTimeout(() => {
- controller.abort(); resolve(true);
+ controller.abort(); resolve(null);
}, 5000); });
- const probe = {dispose() { clock.clearTimeout(timer); controller.abort(); finish(true); pollers.delete(probe); }};
+ const probe = {dispose() { clock.clearTimeout(timer); controller.abort(); finish(null); pollers.delete(probe); }};
pollers.add(probe);
try {
- const ready = await Promise.race([Promise.resolve().then(() => request('/freevideo/chains', {signal: controller.signal}))
- .then(response => response.status !== 404, () => true), timeout]);
- if (!ready && !disposed) generationAbsent();
- return generationAvailable;
- } finally { probe.dispose(); }
+ // true: present; false: no such route; null: no usable answer.
+ answer = await Promise.race([Promise.resolve().then(() => request('/freevideo/chains', {signal: controller.signal}))
+ .then(async response => response.status === 404 ? false
+ : response.ok && Array.isArray((await response.json())?.chains) ? true : null)
+ .catch(() => null), timeout]);
+ } finally { probe.dispose(); generationProbe = null; }
+ if (disposed || generationGone) return false;
+ if (answer === false) generationAbsent();
+ else if (answer) { generationAvailable = true; onGenerationReady(true); }
+ else { askGenerationAgain(); onGenerationReady(false); }
+ return generationAvailable;
})();
},
async recoverOutbox() {
diff --git a/web/freevideo.js b/web/freevideo.js
index 1dae408..7e39aa7 100644
--- a/web/freevideo.js
+++ b/web/freevideo.js
@@ -1,7 +1,7 @@
import { createErrorPanel, errorText } from './error_panel.js';
import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js";
-import { openEditorView } from './editor_entry.js';
+import { openEditorView } from './editor_loader.js';
import { openStudio, loraPanel, loraWarning, promptGuide } from "./studio.js";
import { createGenerationProgress, referenceTrimText, thermalText, encoderFileText, encoderFilePath } from './generation_progress.js';
import { createProgressConnection } from './progress_connection.js';
@@ -650,8 +650,7 @@ app.registerExtension({
if (node) requestAnimationFrame(() => {
const studio = showStudio(node);
if (studio && rememberedView === 'editor') {
- try { openEditorView(node, {studio}); }
- catch (error) { console.error('FreeVideo edit view:', error); health({type: 'error', where: 'editor', error}); }
+ void openEditorView(node, {studio, onFailure: error => health({type: 'error', where: 'editor', error})});
}
});
}
diff --git a/web/health.js b/web/health.js
index ff247be..191050c 100644
--- a/web/health.js
+++ b/web/health.js
@@ -15,7 +15,7 @@ const launchVisit = query.get('freevideo') === 'launch';
// Every script this folder ships; a test keeps the list in step with web/*.js.
export const MODULES = ['agent_activity.js', 'agent_connect.js', 'agent_session.js', 'browser_extension.js', 'capability_view.js', 'compatibility.js', 'error_panel.js', 'first_run_guide.js', 'fonts.js', 'freevideo.js', 'generation_progress.js',
'editor.js', 'editor_actions.js', 'editor_adjust.js', 'editor_adjust_picture.js', 'editor_picture_fields.js', 'editor_picture_session.js', 'editor_preview_picture.js', 'editor_entry.js', 'editor_export_dialog.js', 'editor_genbar.js', 'editor_geometry.js', 'editor_library.js', 'editor_menu.js', 'editor_model.js', 'editor_frame.js', 'editor_player.js', 'editor_room.js', 'editor_select.js', 'editor_state.js', 'editor_store.js', 'editor_tracks.js', 'editor_generation.js', 'editor_transport.js', 'editor_transport_model.js', 'editor_audio.js', 'editor_audio_model.js', 'editor_audio_notes.js', 'editor_audio_replace.js', 'editor_audio_rules.js', 'editor_speed.js', 'editor_speed_model.js',
- 'editor_text_coverage.js', 'editor_text.js', 'editor_text_model.js', 'editor_text_layout.js', 'editor_notes.js', 'editor_icons.js', 'dialog_keys.js', 'frame_sizes.js', 'health.js', 'image_commands.js', 'image_editor.js', 'image_editor_engine.js', 'launcher.js', 'library.js', 'motion.js', 'output_download.js', 'port_notice.js', 'preview_scene.js',
+ 'editor_loader.js', 'editor_text_coverage.js', 'editor_text.js', 'editor_text_model.js', 'editor_text_layout.js', 'editor_notes.js', 'editor_icons.js', 'dialog_keys.js', 'frame_sizes.js', 'health.js', 'image_commands.js', 'image_editor.js', 'image_editor_engine.js', 'launcher.js', 'library.js', 'motion.js', 'output_download.js', 'port_notice.js', 'preview_scene.js',
'progress_connection.js', 'prompt_draft.js', 'prompt_enhance.js', 'prompt_references.js', 'report_issue.js', 'studio_recent.js',
'result_actions.js', 'sampling_effort.js', 'setup.js', 'share.js', 'share_layout.js', 'studio.js', 'studio_queue.js', 'studio_size.js',
'toolbar_position.js', 'updates.js', 'view_navigation.js', 'wordmark.js'];
diff --git a/web/studio.js b/web/studio.js
index 4a9456e..621ec51 100644
--- a/web/studio.js
+++ b/web/studio.js
@@ -21,7 +21,7 @@ import { createPromptEnhancer } from './prompt_enhance.js';
import { rememberPromptDraft } from './prompt_draft.js';
import { canvasDimensions, imageSizeSelection } from './studio_size.js';
import { createCapabilityView } from './capability_view.js';
-import { openEditorView } from './editor_entry.js';
+import { openEditorView } from './editor_loader.js';
import { frameShapes, frameSize } from './frame_sizes.js';
import { createFirstRunGuide } from './first_run_guide.js';
diff --git a/web/view_navigation.js b/web/view_navigation.js
index 1b1453a..878b60f 100644
--- a/web/view_navigation.js
+++ b/web/view_navigation.js
@@ -3,6 +3,7 @@ import { openSetup } from './setup.js';
import { wordmark } from './wordmark.js';
import { createUpdateNotice, createVersionInfo } from './updates.js';
import { makeMovable } from './toolbar_position.js';
+import { openEditorView } from './editor_loader.js';
const languageOverride = typeof location !== 'undefined'
? new URLSearchParams(location.search).get('freevideo_lang') : null;
@@ -78,7 +79,7 @@ export function installNavigation(openStudio) {
const settings = document.createElement('button'); settings.type = 'button';
settings.textContent = t('Settings', '设置'); settings.className = 'fv-view-settings'; settings.onclick = openSetup;
row.append(grip, brand, viewSwitch('nodes', openCreativeWorkspace, () => {}, () => choose(node =>
- import('./editor_entry.js').then(({openEditorView}) => openEditorView(node)))), createVersionInfo(cn).element, settings); toolbar.append(row);
+ openEditorView(node))), createVersionInfo(cn).element, settings); toolbar.append(row);
let shown = false;
try { shown = localStorage.getItem('freevideo.view-guide') === '1'; } catch { /* Show once this session. */ }
if (!shown) {