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.
TypeScript agent-skillsagentic-aiai-agentsai-videobyokclaude-codecodexdeepseek-harnessdsh-plugingenerative-ailocal-firstmcpmotionmotion-graphicsmultimodalopenmotionreverse-engineeringvideo-editingvideo-generationworkbuddy
Fix template preview recovery after returning from source
qindong3fe82ff35cf1
diff --git a/studio/src/i18n/ConnectionI18n.test.ts b/studio/src/i18n/ConnectionI18n.test.tsindex 0df98891..8829f32c 100644--- a/studio/src/i18n/ConnectionI18n.test.ts+++ b/studio/src/i18n/ConnectionI18n.test.ts@@ -43,14 +43,14 @@ it('keeps the current video frame visible when an animated gallery preview pauselocalStorage.removeItem('openmotion.template-previews');});-it('recovers a preview whose media buffer was discarded in a background tab', async () => {+it.each([0, 1, 2, 4])('restores a preview after returning from its source with readyState %s', async readyState => {vi.stubGlobal('matchMedia', () => ({ matches: false, addEventListener() {}, removeEventListener() {} }));vi.stubGlobal('IntersectionObserver', class { observe() {} disconnect() {} });const hidden = vi.spyOn(document, 'hidden', 'get').mockReturnValue(false);const load = vi.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(() => {});vi.spyOn(HTMLMediaElement.prototype, 'pause').mockImplementation(() => {});const template = { id: 'prism', title: 'Published template', tags: [], collection: 'example',- kind: 'prism', previewUrl: '/preview.mp4' };+ kind: 'prism', previewUrl: '/preview.mp4', sourceUrl: 'https://x.com/creator/status/123' };vi.stubGlobal('fetch', vi.fn(async (url: string) => url.endsWith('/integration')? new Response(null, { status: 503 }): Response.json({ items: [template], total: 1, entryTotal: 1, catalogTotal: 1, offset: 0, next: null })));@@ -62,26 +62,74 @@ it('recovers a preview whose media buffer was discarded in a background tab', asawait vi.waitFor(() => expect(root.querySelector('.connect-template-cover')).not.toBeNull());root.querySelector<HTMLButtonElement>('.connect-template-cover')!.click();const video = root.querySelector<HTMLVideoElement>('#template-preview-stage video')!;- vi.stubGlobal('HTMLMediaElement', Object.assign(Object.create(HTMLMediaElement), { HAVE_CURRENT_DATA: 2 }));- const ready = vi.spyOn(video, 'readyState', 'get').mockReturnValue(2);+ const ready = vi.spyOn(video, 'readyState', 'get').mockReturnValue(readyState);+ const play = vi.spyOn(video, 'play');const setVisibility = (isHidden: boolean) => {hidden.mockReturnValue(isHidden);document.dispatchEvent(new Event('visibilitychange'));};video.currentTime = 3.5;+ const source = root.querySelector<HTMLAnchorElement>('#preview-source a')!;+ expect(source.href).toBe(template.sourceUrl);+ expect(source.target).toBe('_blank');setVisibility(true);setVisibility(false);- expect(load).not.toHaveBeenCalled();+ expect(load).toHaveBeenCalledTimes(1);+ expect(video.autoplay).toBe(false);+ video.currentTime = 0;+ video.dispatchEvent(new Event('loadedmetadata'));+ expect(video.currentTime).toBe(3.5);+ video.dispatchEvent(new Event('loadeddata'));+ expect(root.querySelector<HTMLElement>('#preview-error')!.hidden).toBe(true);+ expect(play).not.toHaveBeenCalled();+ // A second return during recovery retains the original position and one restore handler.+ video.currentTime = 6;setVisibility(true);+ setVisibility(false);+ video.currentTime = 0;ready.mockReturnValue(0);+ setVisibility(true);setVisibility(false);- expect(load).toHaveBeenCalledTimes(1);- expect(video.autoplay).toBe(false);+ expect(load).toHaveBeenCalledTimes(3);+ video.dispatchEvent(new Event('loadedmetadata'));+ expect(video.currentTime).toBe(6);+ video.currentTime = 8;+ video.dispatchEvent(new Event('loadedmetadata'));+ expect(video.currentTime).toBe(8);++ // Back/forward cache lifecycle events can also restore the same open dialog.+ window.dispatchEvent(new Event('pagehide'));+ window.dispatchEvent(new Event('pageshow'));+ expect(load).toHaveBeenCalledTimes(4);video.currentTime = 0;video.dispatchEvent(new Event('loadedmetadata'));- expect(video.currentTime).toBe(3.5);+ expect(video.currentTime).toBe(8);++ // Closing a recovering preview removes its listeners before reopening it.+ setVisibility(true);+ setVisibility(false);+ const dialog = root.querySelector<HTMLDialogElement>('#template-preview-dialog')!;+ dialog.close();+ dialog.dispatchEvent(new Event('close'));+ const loadsAfterClose = load.mock.calls.length;+ video.currentTime = 0;+ video.dispatchEvent(new Event('loadedmetadata'));+ setVisibility(true);+ setVisibility(false);+ expect(video.currentTime).toBe(0);+ expect(load).toHaveBeenCalledTimes(loadsAfterClose);+ root.querySelector<HTMLButtonElement>('.connect-template-cover')!.click();+ const reopened = root.querySelector<HTMLVideoElement>('#template-preview-stage video')!;+ expect(reopened).not.toBe(video);+ expect(reopened.getAttribute('src')).toBe(template.previewUrl);+ reopened.currentTime = 2;+ setVisibility(true);+ setVisibility(false);+ reopened.currentTime = 0;+ reopened.dispatchEvent(new Event('loadedmetadata'));+ expect(reopened.currentTime).toBe(2);});it('polls cache warnings independently of publication changes and preserves gallery cards', async () => {diff --git a/web/template-gallery.ts b/web/template-gallery.tsindex 209a2a31..11eb52ef 100644--- a/web/template-gallery.ts+++ b/web/template-gallery.ts@@ -217,32 +217,44 @@ export function mountTemplates(root: HTMLElement, options: {if (template.previewUrl) {const video = document.createElement('video'); video.controls = true; video.muted = true; video.playsInline = true; video.autoplay = !reducedMotion.matches; video.loop = true; video.preload = 'metadata'; language.attribute(video, 'aria-label', '{title} reference video', { title: template.title }); if (template.posterUrl) video.poster = template.posterUrl;const mediaEvents = new AbortController();- let hiddenTime: number | undefined;+ let restoreTime: number | undefined;+ let away = false;let timer: ReturnType<typeof setTimeout>;const failed = () => { clearTimeout(timer); language.text(element('preview-error'), "Preview could not load. View the template content and recreation instruction, or reopen the preview to try again."); element('preview-error').hidden = false; };video.onerror = failed;video.onloadeddata = () => { clearTimeout(timer); element('preview-error').hidden = true; };- document.addEventListener('visibilitychange', () => {- if (document.hidden) {- if (video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA) hiddenTime = video.currentTime;- video.pause();- return;- }- const time = hiddenTime;- hiddenTime = undefined;- if (time === undefined || (!video.error && video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA)) return;- // A discarded media buffer needs a fresh decoder. Keep the viewer paused and restore its position.+ video.onloadedmetadata = () => {+ if (away || restoreTime === undefined) return;+ video.currentTime = Number.isFinite(video.duration) ? Math.min(restoreTime, video.duration) : restoreTime;+ restoreTime = undefined;+ };+ const suspendPreview = () => {+ if (away) return;+ away = true;+ restoreTime ??= video.currentTime;+ clearTimeout(timer);+ video.autoplay = false;+ video.pause();+ };+ const restorePreview = () => {+ if (!away || document.hidden) return;+ away = false;+ // A lost decoder frame can still report HAVE_CURRENT_DATA. Reload on return+ // and restore the position while keeping the existing paused-return behavior.video.autoplay = false;- video.addEventListener('loadedmetadata', () => {- video.currentTime = Number.isFinite(video.duration) ? Math.min(time, video.duration) : time;- }, { once: true, signal: mediaEvents.signal });clearTimeout(timer);timer = setTimeout(failed, 15000);video.load();+ };+ document.addEventListener('visibilitychange', () => {+ if (document.hidden) suspendPreview();+ else restorePreview();}, { signal: mediaEvents.signal });+ window.addEventListener('pagehide', suspendPreview, { signal: mediaEvents.signal });+ window.addEventListener('pageshow', restorePreview, { signal: mediaEvents.signal });video.src = template.previewUrl; stage.append(video); timer = setTimeout(failed, 15000);previewCleanup = () => {- clearTimeout(timer); mediaEvents.abort(); video.onerror = null; video.onloadeddata = null;+ clearTimeout(timer); mediaEvents.abort(); video.onerror = null; video.onloadeddata = null; video.onloadedmetadata = null;video.pause(); video.removeAttribute('src'); video.load();};} else if (template.posterUrl) {