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.

Result actions, sharing and second pass report failures and progress; update reminder keeps state

Bowen Xue65845ce8f683
diff --git a/scripts/test_freevideo_entry.mjs b/scripts/test_freevideo_entry.mjs
index b27a7be..05749a4 100644
--- a/scripts/test_freevideo_entry.mjs
+++ b/scripts/test_freevideo_entry.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
import {readFile} from 'node:fs/promises';
import test from 'node:test';
import {outputDownloadURL} from '../web/output_download.js';
-import {regenerateResult, upscaleResult} from '../web/studio_queue.js';
+import {regenerateResult, upscaleResult, createSecondPassQueue} from '../web/studio_queue.js';
import {referenceInputs} from '../web/prompt_references.js';
import {cleanOptionalPrompt, cleanOptionalWidgets} from '../web/optional_inputs.js';
@@ -36,7 +36,8 @@ test('main browser entry registers both views and preserves node hooks', async t
const document = {head: new Element('head'), createElement: tag => new Element(tag),
createRange: () => ({createContextualFragment: () => new Element('span')})};
const dependencies = {
- app, api, outputDownloadURL, regenerateResult, upscaleResult, referenceInputs, cleanOptionalPrompt, cleanOptionalWidgets,
+ app, api, outputDownloadURL, regenerateResult, upscaleResult, createSecondPassQueue, referenceInputs, cleanOptionalPrompt, cleanOptionalWidgets,
+ secondPassAction: () => new Element('button'),
createErrorPanel: () => ({element: new Element('error'), show() {}, clear() {}}),
errorText: value => String(value),
openStudio: node => opened.push(node),
@@ -96,6 +97,8 @@ test('main browser entry registers both views and preserves node hooks', async t
.replace("import { rememberPromptDraft, savePromptDraft, trackPromptDraft, watchPromptHistory, promptHistoryRestoring } from './prompt_draft.js';", 'const {rememberPromptDraft,savePromptDraft} = globalThis.__freevideoEntryTest; const trackPromptDraft = () => {}; const watchPromptHistory = () => {}; const promptHistoryRestoring = () => false;')
.replace("import { cleanOptionalWidgets, cleanOptionalPrompt } from './optional_inputs.js';", 'const {cleanOptionalWidgets,cleanOptionalPrompt} = globalThis.__freevideoEntryTest;')
.replace("import { regenerateResult, upscaleResult } from './studio_queue.js';", 'const {regenerateResult,upscaleResult} = globalThis.__freevideoEntryTest;')
+ .replace("import { regenerateResult, createSecondPassQueue } from './studio_queue.js';", 'const {regenerateResult,createSecondPassQueue} = globalThis.__freevideoEntryTest;')
+ .replace("import { secondPassAction } from './result_actions.js';", 'const {secondPassAction} = globalThis.__freevideoEntryTest;')
.replace("import { openImageEditor, icon } from './image_editor.js';", 'const {openImageEditor,icon} = globalThis.__freevideoEntryTest;')
.replace("import { installNavigation, refreshNavigation, preferredView } from './view_navigation.js';", 'const {installNavigation,refreshNavigation,preferredView} = globalThis.__freevideoEntryTest;')
.replace("import { imageGenerationSupported } from './image_generation.js';", 'const imageGenerationSupported = () => true;')
diff --git a/web/freevideo.js b/web/freevideo.js
index 7f8d40e..95a02ab 100644
--- a/web/freevideo.js
+++ b/web/freevideo.js
@@ -15,7 +15,8 @@ import { shareButton } from './share.js';
import { reportFileName } from './report_issue.js';
import { rememberPromptDraft, savePromptDraft, trackPromptDraft, watchPromptHistory, promptHistoryRestoring } from './prompt_draft.js';
import { cleanOptionalWidgets, cleanOptionalPrompt } from './optional_inputs.js';
-import { regenerateResult, upscaleResult } from './studio_queue.js';
+import { regenerateResult, createSecondPassQueue } from './studio_queue.js';
+import { secondPassAction } from './result_actions.js';
import { openImageEditor, icon } from './image_editor.js';
import { imageGenerationSupported } from './image_generation.js';
@@ -511,14 +512,10 @@ function resultPanel(node) {
links.append(shareButton(value, text));
links.append(el("span", value.result_cache_hit ? text("Reused previous result", "已复用上次结果") : value.conditioning_cache_hit ? text("Input cache reused", "已复用输入缓存") : text("Inputs encoded", "已编码输入"), "fv-mode"));
if (value.preview) {
- const upscale = el('button', text('Run second pass', '继续二采')); upscale.type = 'button';
- upscale.title = text('Continue from this preview: latent upscale, the second pass and a full-resolution decode.', '从这个预览接着跑:潜空间放大、二采,再以全分辨率解码。');
- upscale.onclick = async () => {
- upscale.disabled = true;
- try { await node.freevideoUpscaleResult(value); upscale.textContent = text('Queued', '已加入队列'); }
- catch (error) { upscale.disabled = false; node.freevideoShowFailure(error); }
- };
- links.append(upscale);
+ links.append(secondPassAction(text, async () => {
+ try { await node.freevideoUpscaleResult(value); }
+ catch (error) { node.freevideoShowFailure(error); throw error; }
+ }));
}
if (value.result_cache_hit) {
const again = el('button', text('Regenerate', '重新生成')); again.type = 'button';
@@ -548,12 +545,7 @@ function resultPanel(node) {
: text("VRAM: engine allocator peak. RAM: measured request processes, ", "显存为引擎分配器峰值,内存为请求进程实测,")) + (value.ram_metric || "unknown");
fitPanel();
};
- node.freevideoUpscaleResult = async value => {
- if (node.freevideoUpscaling) return;
- node.freevideoUpscaling = true;
- try { return await upscaleResult(api, node.id, value, async () => cleanOptionalPrompt(await app.graphToPrompt())); }
- finally { node.freevideoUpscaling = false; }
- };
+ node.freevideoUpscaleResult = createSecondPassQueue(api, () => node.id, async () => cleanOptionalPrompt(await app.graphToPrompt()));
node.freevideoRegenerateResult = async value => {
if (node.freevideoRegenerating) return;
node.freevideoRegenerating = true;
diff --git a/web/library.js b/web/library.js
index b79f229..90f4298 100644
--- a/web/library.js
+++ b/web/library.js
@@ -1,7 +1,7 @@
import { api } from '../../scripts/api.js';
import { closeDialog } from './motion.js';
import { resultActions, previewBadge } from './result_actions.js';
-import { extendSourceExists } from './studio_extend.js';
+import { videoUnavailableText } from './studio_extend.js';
import { topDialog } from './dialog_keys.js';
const style = document.createElement('link');
@@ -138,11 +138,10 @@ export function openLibrary(t, {upscale = null, selectedWork = null, extend = nu
media.append(player);
if (row.preview) media.append(previewBadge(row, t));
frame.append(media);
- player.addEventListener('error', async () => {
- if (!disposed && selected === row.video) {
- const note = el('p', t('This video is unavailable. Refresh if it was moved.', '视频暂时无法打开,若文件已移动请刷新。'), 'fv-library-message');
+ player.addEventListener('error', event => {
+ if (!disposed && selected === row.video && event.currentTarget === player) {
+ const note = el('p', videoUnavailableText(t), 'fv-library-message');
frame.replaceChildren(note);
- if (!await extendSourceExists(api, row) && selected === row.video) links.querySelector('.fv-action-extend')?.remove();
}
}, {once: true});
}
@@ -157,7 +156,12 @@ export function openLibrary(t, {upscale = null, selectedWork = null, extend = nu
if (!isCurrent()) return;
player?.pause();
const run = extend || (async (record, options) => (await import('./studio.js')).openExtendEditor(record, undefined, options));
- try { const editor = await run(saved, {isCurrent}); if (editor && !disposed) { dialog.close(); editor.element?.focus({preventScroll: true}); } }
+ try {
+ const editor = await run(saved, {isCurrent});
+ if (!editor && isCurrent()) throw new Error(t('Could not open the editor. Try again.', '无法打开剪辑,请重试。'));
+ if (editor && !disposed) { dialog.close(); editor.element?.focus({preventScroll: true}); }
+ return editor;
+ }
catch (error) { notice.textContent = error.message; }
},
secondPass: row.preview && upscale ? () => secondPass(row) : null,
@@ -189,9 +193,9 @@ export function openLibrary(t, {upscale = null, selectedWork = null, extend = nu
notice.textContent = '';
try {
await upscale(row);
- notice.textContent = t('Queued. The finished video appears here when the second pass is done.', '已加入队列,二采完成后成片会出现在作品里。');
+ if (!disposed && selected === row.video) notice.textContent = t('Queued. It appears in "Creations" when done.', '已加入队列,完成后在“作品”里。');
} catch (error) {
- notice.textContent = t('Could not start the second pass: ', '无法开始二采:') + error.message;
+ if (!disposed && selected === row.video) notice.textContent = t('Could not start the second pass: ', '无法开始二采:') + error.message;
throw error;
}
}
diff --git a/web/prompt_enhance.js b/web/prompt_enhance.js
index 8cd3c68..ab7e190 100644
--- a/web/prompt_enhance.js
+++ b/web/prompt_enhance.js
@@ -151,6 +151,7 @@ export function createPromptEnhancer({node, input, editor, api, context, setText
redo.title = versions.value.rewritten ? t('Rewrite again', '重新改写') : t('Rewrite', '改写');
redo.setAttribute('aria-label', redo.title);
cancel.hidden = !running || install.hidden === false; cancel.disabled = cancelling;
+ cancel.title = cancelling ? t('Cancelling…', '正在取消…') : '';
element.dataset.busy = String(Boolean(running));
element.dataset.enabled = String(Boolean(versions.value.enabled));
}
@@ -171,7 +172,9 @@ export function createPromptEnhancer({node, input, editor, api, context, setText
}
async function cancelJob() {
cancelling = true; consent?.(false); consent = null; render();
- if (job) await post('cancel', {job});
+ const request = running;
+ try { if (job) await post('cancel', {job}); }
+ catch (error) { if (running === request) { cancelling = false; render(); } throw error; }
}
cancel.onclick = () => cancelJob().catch(error => { show(errorText(error), 'error'); });
async function poll(action, body) {
@@ -181,7 +184,9 @@ export function createPromptEnhancer({node, input, editor, api, context, setText
if (disposed || cancelling) await post('cancel', {job});
try {
for (;;) {
+ if (disposed || cancelling) throw new Error('cancelled');
const row = await post('status', {job});
+ if (disposed || cancelling) throw new Error('cancelled');
if (row.rewrite_report_id) {
node.properties.freevideo_prompt_report = row.rewrite_report_id;
node.graph?.change();
@@ -215,12 +220,14 @@ export function createPromptEnhancer({node, input, editor, api, context, setText
waiting = true; show(errorText({message: 'prompt_required'}), 'note'); input.focus();
throw new Error('prompt_required');
}
+ cancelling = false;
const execute = async () => {
- cancelling = false;
+ if (disposed || cancelling) throw new Error('cancelled');
versions.value.useOriginal = false;
const scene = context(), key = versions.key(scene), original = versions.value.original, edits = versions.value.edits;
const reply = await api.fetchApi('/freevideo/prompt-vlm');
const info = await reply.json();
+ if (disposed || cancelling) throw new Error('cancelled');
if (!reply.ok) throw new Error(info.error);
token = info.token;
if (info.ram_bytes) ramBytes = info.ram_bytes;
@@ -246,7 +253,7 @@ export function createPromptEnhancer({node, input, editor, api, context, setText
running = Promise.resolve().then(execute).catch(error => {
if (!disposed) show(errorText(error), error?.message === 'cancelled' ? '' : 'error');
throw error;
- }).finally(() => { running = null; install.hidden = true; render(); });
+ }).finally(() => { running = null; cancelling = false; install.hidden = true; render(); });
render();
return running;
}
diff --git a/web/result_actions.js b/web/result_actions.js
index 2bbe5f2..e056248 100644
--- a/web/result_actions.js
+++ b/web/result_actions.js
@@ -58,16 +58,20 @@ function popover(menu, summary, onClose = () => {}) {
}
// The next step of a first-pass preview. `run` reports its own errors and throws.
-function secondPassAction(t, run) {
+export function secondPassAction(t, run) {
const button = action('button', t('Run second pass', '继续二采'), 'expand', 'fv-action-primary fv-action-second-pass');
const label = button.lastElementChild;
button.title = t('Continue from this preview: latent upscale, the second pass and a full-resolution decode.',
'从这个预览接着跑:潜空间放大、二采,再以全分辨率解码。');
button.onclick = async () => {
if (button.disabled) return;
- button.disabled = true;
- try { await run(); label.textContent = t('Queued', '已加入队列'); }
- catch { button.disabled = false; }
+ button.disabled = true; button.setAttribute('aria-busy', 'true');
+ label.textContent = button.title = t('Adding…', '正在添加…');
+ try { await run(); label.textContent = button.title = t('Queued', '已加入队列'); }
+ catch {
+ button.disabled = false;
+ label.textContent = button.title = t('Second pass did not start · Retry', '二采没有开始 · 重试');
+ } finally { button.removeAttribute('aria-busy'); }
};
return button;
}
@@ -117,14 +121,23 @@ export function resultActions(record, t, {diagnostic = null, secondPass = null,
}
if (extend && canExtend(record)) {
const button = action('button', extendText(t, 'action'), 'extend', 'fv-action-secondary fv-action-extend');
- button.hidden = true;
- extendSourceExists(api, record).then(exists => { button.hidden = !exists; });
+ const label = button.lastElementChild;
+ const available = exists => {
+ label.textContent = exists ? extendText(t, 'action') : t('Video unavailable · retry', '视频不可用 · 重试');
+ button.title = '';
+ };
+ extendSourceExists(api, record).then(available);
button.onclick = async () => {
if (button.disabled) return;
button.disabled = true;
+ button.title = t('Checking video…', '正在检查视频…');
try {
- if (!await extendSourceExists(api, record)) { button.hidden = true; return; }
- await extend(record);
+ const exists = await extendSourceExists(api, record); available(exists);
+ if (!exists) return;
+ if (await extend(record) === null) throw new Error(t('Could not open the editor. Try again.', '无法打开剪辑,请重试。'));
+ } catch (error) {
+ label.textContent = error.message || t('Could not open the editor. Try again.', '无法打开剪辑,请重试。');
+ button.title = label.textContent;
} finally { button.disabled = false; }
};
bar.append(button);
diff --git a/web/share.js b/web/share.js
index 622e90a..ddc034a 100644
--- a/web/share.js
+++ b/web/share.js
@@ -3,6 +3,7 @@ import {closeDialog} from './motion.js';
import {effortFor, effortName} from './sampling_effort.js';
import {fontCSS as bundledFontCSS, fontLoaded, loadFont} from './fonts.js';
import {shareLayout} from './share_layout.js';
+import {videoUnavailableText} from './studio_extend.js';
const css=document.createElement('link'); css.rel='stylesheet'; css.href=new URL('./share.css',import.meta.url).href; document.head.append(css);
const el=(tag,cls,text)=>{const e=document.createElement(tag);if(cls)e.className=cls;if(text)e.textContent=text;return e;};
@@ -95,7 +96,7 @@ export async function openShare(record,t){
const tabs=el('div','fv-share-tabs');tabs.setAttribute('role','tablist');
const indicator=el('span','fv-share-indicator');indicator.setAttribute('aria-hidden','true');tabs.append(indicator);
const slide=()=>{const b=tabs.querySelector('[aria-selected=true]');if(b)indicator.style.cssText=`transform:translateX(${b.offsetLeft-3}px);width:${b.offsetWidth}px`;};
- let kind='image',ready=false,busy=false,disposed=false,metadata,shape,template,first,logo,exported;
+ let kind='image',ready=false,busy=false,disposed=false,videoFailed=false,metadata,shape,template,first,logo,exported;
let exportRequest;
const abort=new AbortController();
const panel=el('div','fv-share-body'),preview=el('div','fv-share-preview'),canvas=el('canvas'),player=el('video');
@@ -108,16 +109,25 @@ export async function openShare(record,t){
const save=button(t('Save image','保存分享图'),download,'fv-primary');save.disabled=true;
const cancel=button(t('Cancel','取消'),()=>exportRequest?.abort());cancel.hidden=true;
footer.append(message,cancel,save);heading.append(title,tabs,close);dialog.append(heading,panel,footer);
+ const videoError=()=>{
+ if(disposed)return;
+ videoFailed=true;
+ if(kind==='video'&&!busy){message.textContent=videoUnavailableText(t);dialog.dataset.error='true';}
+ };
+ player.addEventListener('error',videoError);
const choose=next=>{
+ if(busy)return;
kind=next;tabs.querySelectorAll('button').forEach(b=>{
b.setAttribute('aria-selected',String(b.dataset.kind===kind));b.tabIndex=b.dataset.kind===kind?0:-1;
});
save.textContent=kind==='image'?t('Save image','保存分享图'):t('Save video','保存分享视频');
slide();
if(!ready)return;
+ message.textContent=kind==='video'&&videoFailed?videoUnavailableText(t):'';
+ if(kind==='video'&&videoFailed)dialog.dataset.error='true';else delete dialog.dataset.error;
drawShareCard(canvas,kind==='image'?first:null,logo,metadata,t);
player.hidden=kind!=='video';
- if(kind==='video')player.play().catch(()=>{});else player.pause();
+ if(kind==='video')player.play().catch(error=>{if(!['AbortError','NotAllowedError'].includes(error.name))videoError();});else player.pause();
};
for(const [name,label] of [['image',t('Image','图片')],['video',t('Video','视频')]]){
const b=button(label,()=>choose(name));b.dataset.kind=name;b.setAttribute('role','tab');b.setAttribute('aria-selected',String(name===kind));b.tabIndex=name===kind?0:-1;tabs.append(b);
@@ -129,13 +139,22 @@ export async function openShare(record,t){
};
async function download(){
if(!ready||busy)return;
- if(kind==='image'){
- canvas.toBlob(async blob=>{if(!blob||disposed)return;blob=await withGraph(blob,metadata?.graph);const url=URL.createObjectURL(blob);const a=el('a');a.href=url;a.download=`FreeVideo_share_${id.split('/')[1].slice(0,12)}.png`;a.click();setTimeout(()=>URL.revokeObjectURL(url),60000);},'image/png');return;
- }
- busy=true;save.disabled=true;cancel.hidden=false;tabs.querySelectorAll('button').forEach(b=>b.disabled=true);
- message.textContent=t('Preparing sharing video…','正在导出分享视频…');dialog.dataset.busy='true';
+ busy=true;save.disabled=true;cancel.hidden=kind==='image';tabs.querySelectorAll('button').forEach(b=>b.disabled=true);
+ message.textContent=kind==='image'?t('Saving the share image…','正在保存分享图…'):t('Exporting the share video…','正在导出分享视频…');
+ dialog.dataset.busy='true';delete dialog.dataset.error;
exportRequest=new AbortController();
try{
+ if(kind==='image'){
+ let blob=await new Promise((resolve,reject)=>{
+ canvas.toBlob(value=>value?resolve(value):reject(new Error('image_encoding_failed')),'image/png');
+ });
+ if(disposed)return;
+ blob=await withGraph(blob,metadata?.graph);
+ if(disposed)return;
+ const url=URL.createObjectURL(blob),a=el('a');
+ a.href=url;a.download=`FreeVideo_share_${id.split('/')[1].slice(0,12)}.png`;a.click();
+ setTimeout(()=>URL.revokeObjectURL(url),60000);message.textContent='';return;
+ }
if(!exported){
const response=await api.fetchApi('/freevideo/share/video',{method:'POST',headers:{'Content-Type':'application/json'},signal:exportRequest.signal,
body:JSON.stringify({id,template,rect:shape.rect})});
@@ -145,7 +164,11 @@ export async function openShare(record,t){
}
if(disposed)return;
const a=el('a');a.href=api.apiURL('/freevideo/share/video?'+new URLSearchParams(exported));a.download='';a.click();message.textContent='';
- }catch(error){if(!disposed)message.textContent=error.name==='AbortError'?'':error.message;}
+ }catch(error){if(!disposed){
+ message.textContent=kind==='image'?t('Could not save the share image. Try again.','分享图没有保存成功,请重试。')
+ :error.name==='AbortError'?'':error.message;
+ if(message.textContent)dialog.dataset.error='true';
+ }}
finally{busy=false;if(!disposed){save.disabled=false;cancel.hidden=true;delete dialog.dataset.busy;tabs.querySelectorAll('button').forEach(b=>b.disabled=false);}}
}
dialog.addEventListener('cancel',event=>{event.preventDefault();closeDialog(dialog);});
@@ -162,6 +185,6 @@ export async function openShare(record,t){
shape=drawShareCard(canvas,null,logo,metadata,t);template=canvas.toDataURL('image/png').split(',')[1];
preview.style.aspectRatio=`${shape.width}/${shape.height}`;
player.style.cssText=`left:${shape.rect[0]/shape.width*100}%;top:0;width:${shape.rect[2]/shape.width*100}%;height:${shape.rect[3]/shape.height*100}%`;
- ready=true;choose(kind);save.disabled=false;message.textContent='';
+ ready=true;choose(kind);save.disabled=false;
}catch(error){if(!disposed){message.textContent=error.message||t('Preview unavailable. Close and try again.','预览暂时无法读取,请关闭后重试。');dialog.dataset.error='true';}}
}
diff --git a/web/studio.js b/web/studio.js
index 83c9ec7..11b9f6f 100644
--- a/web/studio.js
+++ b/web/studio.js
@@ -31,7 +31,7 @@ import { createFirstRunGuide } from './first_run_guide.js';
import { createStudioLength, savedSeconds } from './studio_length.js?v=20261011-length';
import { firstFrameRow } from './first_frame_row.js';
import { createStudioChain, chainPosition, readChainResult, sumPartEstimates, singleRunSnapshot } from './studio_chain.js?v=20261011-length';
-import { createExtendState, extendText, extendSourceExists, readExtendRecord, extendSnapshot, mountExtendThumbnail } from './studio_extend.js';
+import { createExtendState, extendText, extendSourceExists, readExtendRecord, extendSnapshot, mountExtendThumbnail, videoUnavailableText } from './studio_extend.js';
const languageOverride = typeof location !== 'undefined'
? new URLSearchParams(location.search).get('freevideo_lang') : null;
@@ -330,7 +330,15 @@ export async function extendVideo(record, node = current?.node || app.graph?._no
export async function openExtendEditor(record, node = current?.node || app.graph?._nodes?.find(row => row.type === 'FreeVideoGenerate'),
{studio = current?.node === node ? current?.dialog : undefined, isCurrent} = {}) {
- if (!node || isCurrent?.() === false) return null;
+ if (isCurrent?.() === false) return null;
+ if (!node || !app.graph?._nodes?.includes(node)) {
+ node = app.graph?._nodes?.find(row => row.type === 'FreeVideoGenerate');
+ if (!node) {
+ node = globalThis.LiteGraph?.createNode('FreeVideoGenerate');
+ if (!node || !app.graph) throw new Error(t('Could not add the creation node. Try again.', '无法添加创作节点,请重试。'));
+ app.graph.add(node); app.graph.change?.();
+ }
+ }
const handle = await openEditorView(node, {studio, work: record, extend: true, isCurrent});
await handle?.ready;
return handle;
@@ -819,8 +827,11 @@ export function openStudio(node, {extendFrom = null} = {}) {
progress.updateReport({report_id: node.freevideoReportId});
stage.querySelector('video')?.pause(); stageMedia.replaceChildren();
const video = el('video'); video.src = view(r.video, 'output') + (r.version ? `&fv=${encodeURIComponent(r.version)}` : ''); video.controls = true; video.preload = 'metadata'; video.playsInline = true; stageMedia.append(video);
- video.addEventListener('error', async () => {
- if (!await extendSourceExists(api, r) && result === r) links.querySelector('.fv-action-extend')?.remove();
+ video.addEventListener('error', () => {
+ if (!disposed && result === r && video.isConnected) {
+ stageMedia.replaceChildren(el('p', videoUnavailableText(t), 'fv-note fv-video-problem'));
+ if (r.preview) stageMedia.append(previewBadge(r, t));
+ }
}, {once: true});
// A preview is marked on the picture itself; its timings describe only
// the half-resolution first pass, so they stay in the report.
diff --git a/web/studio_extend.js b/web/studio_extend.js
index 840a5e4..a8b1dfc 100644
--- a/web/studio_extend.js
+++ b/web/studio_extend.js
@@ -25,10 +25,22 @@ export function extendVideoURL(record) {
export async function extendSourceExists(api, record) {
if (!canExtend(record)) return false;
- try { return (await api.fetchApi(extendVideoURL(record), {method: 'HEAD'})).ok; }
- catch { return false; }
+ const url = extendVideoURL(record);
+ try {
+ if ((await api.fetchApi(url, {method: 'HEAD', signal: AbortSignal.timeout(10000)})).ok) return true;
+ } catch { /* HEAD can fail even when the browser can still read the video. */ }
+ try {
+ const response = await api.fetchApi(url, {method: 'GET', headers: {Range: 'bytes=0-0'},
+ signal: AbortSignal.timeout(10000)});
+ // A server may ignore Range. Release its stream without downloading the video.
+ await response.body?.cancel().catch(() => {});
+ return response.ok;
+ } catch { return false; }
}
+export const videoUnavailableText = t => t('This video cannot be opened. If you moved the file, refresh the page.',
+ '视频打不开,如果移动过文件,请刷新页面。');
+
export async function readExtendRecord(api, record) {
if (record.geometry?.width && record.geometry?.height && (record.geometry.seconds || record.geometry.frames)) return record;
let before = null;
diff --git a/web/studio_queue.js b/web/studio_queue.js
index 38b41f9..25a7bd7 100644
--- a/web/studio_queue.js
+++ b/web/studio_queue.js
@@ -60,6 +60,21 @@ export async function upscaleResult(api, nodeId, result, currentPrompt) {
return reply.prompt_id;
}
+// Each preview owns its submission outcome; another preview waits its turn.
+// Only duplicate clicks for the same pending preview share a promise.
+export function createSecondPassQueue(api, nodeId, currentPrompt) {
+ const pending = new Map();
+ let tail = Promise.resolve();
+ return result => {
+ const key = result?.video;
+ if (pending.has(key)) return pending.get(key);
+ const request = tail.catch(() => {}).then(() => upscaleResult(api, typeof nodeId === 'function' ? nodeId() : nodeId, result, currentPrompt))
+ .finally(() => { pending.delete(key); });
+ pending.set(key, request); tail = request;
+ return request;
+ };
+}
+
export function randomSeed() {
const bytes = crypto.getRandomValues(new Uint32Array(2));
return (bytes[0] & 0x1fffff) * 0x100000000 + bytes[1];
diff --git a/web/updates.js b/web/updates.js
index b40b70d..4daef65 100644
--- a/web/updates.js
+++ b/web/updates.js
@@ -168,7 +168,7 @@ export function createUpdateNotice(cn) {
} else if (failure) {
text = t('Open the FreeVideo launcher to update, or download the new version.', '请在 FreeVideo 启动器中更新,或下载新版。');
actions = true;
- } else if (candidate && dismissed !== identity(candidate)) {
+ } else if (candidate) {
text = t('FreeVideo update available', 'FreeVideo 有新版本') + ' · ' + displayVersion(candidate);
if (launcher?.status === 'error' && launcher.error) text += ' · ' + t('last attempt failed', '上次更新未完成');
actions = true;
@@ -184,7 +184,7 @@ export function createUpdateNotice(cn) {
const direct = !!launcher && !launcher.manual && !failure;
apply.hidden = !actions || !direct;
link.hidden = !actions || direct;
- dismiss.hidden = !actions;
+ dismiss.hidden = !actions || dismissed === identity(candidate);
stop.hidden = !(busy && phase === 'waiting' && !offline);
};
listeners.add(render); render();