diff --git a/packages/core/src/runtime/entry.test.ts b/packages/core/src/runtime/entry.test.ts index 2eb279ed73..fa758a0a05 100644 --- a/packages/core/src/runtime/entry.test.ts +++ b/packages/core/src/runtime/entry.test.ts @@ -4,6 +4,7 @@ import { mediaElementTime } from "./mediaClock"; import { HF_COLOR_GRADING_ATTR, serializeHfColorGrading } from "../colorGrading"; import { PLAYER_FRAME_ATTR, + PLAYER_FRAME_NAME, STUDIO_PREVIEW_LAZY_ATTR, STUDIO_PREVIEW_CAPTURE_MODE, STUDIO_PREVIEW_MARK_META, @@ -76,6 +77,7 @@ function resetRuntimeGlobals(): void { delete win.__hyperframeRuntimeBootstrapped; delete win.__hfFirstPassHidden; delete (document as { readyState?: unknown }).readyState; + window.name = ""; } // The first evaluation transforms the whole runtime graph. Paying it while the file loads keeps @@ -488,9 +490,9 @@ describe("runtime entry", () => { srcWrites.observe(now, { attributeFilter: ["src"] }); window.__player?.seek(7.6); expect(armed(now, soon, later)).toEqual([false, false, true]); - // The two that left are reloaded empty with src dropped for the reload, ending any fetch in flight. + // The two that left are released: now by setting its src again, soon (no src) by reloading empty. expect([now.preload, soon.preload]).toEqual(["none", "none"]); - expect(loadsOf(now, soon, later)).toEqual([2, 2, 1]); + expect(loadsOf(now, soon, later)).toEqual([1, 2, 1]); expect(srcWrites.takeRecords()).toHaveLength(2); expect(now.getAttribute("src")).toBe("now.mp4"); }); @@ -548,39 +550,45 @@ describe("runtime entry", () => { if (userAgent === "safari") asSafari(); }; - it("in the player on Safari a file keeps the take on screen and the next one loading, and frees the rest", async () => { + // Chromium and Firefox keep a paused clip's request open with its unread bytes, and every + // request to one host shares one HTTP/2 or HTTP/3 window: with each take loaded, the window + // fills and the next take's request is never answered. + it.each(["safari", "chrome"] as const)( + "in the player on %s a file keeps the take on screen and the next one loading, and frees the rest", + async (userAgent) => { + spyLoad(); + inPlayerFrame(userAgent); + const [first, second, third] = takesOfOneFile(); + + await evaluateRuntime(); + expect([first, second, third].map((take) => armed(...take))).toEqual([ + [true, true], + [true, true], + [false, false], + ]); + + window.__player?.seek(3.5); + const video = second![0]!; + Object.defineProperty(video, "readyState", { value: 4, configurable: true }); + video.dispatchEvent(new Event("seeked")); + expect([first, second, third].map((take) => armed(...take))).toEqual([ + [false, false], + [true, true], + [true, true], + ]); + }, + ); + + it("holds back the takes after the next in a player frame the composition cannot read, as with an opaque sandbox", async () => { spyLoad(); - inPlayerFrame("safari"); - const [first, second, third] = takesOfOneFile(); - - await evaluateRuntime(); - expect([first, second, third].map((take) => armed(...take))).toEqual([ - [true, true], - [true, true], - [false, false], - ]); - - window.__player?.seek(3.5); - const video = second![0]!; - Object.defineProperty(video, "readyState", { value: 4, configurable: true }); - video.dispatchEvent(new Event("seeked")); - expect([first, second, third].map((take) => armed(...take))).toEqual([ - [false, false], - [true, true], - [true, true], - ]); - }); - - it("in the player on Chromium every take of a file loads at parse", async () => { - spyLoad(); - inPlayerFrame("chrome"); + window.name = PLAYER_FRAME_NAME; const takes = takesOfOneFile(); await evaluateRuntime(); expect(takes.map((take) => armed(...take))).toEqual([ [true, true], [true, true], - [true, true], + [false, false], ]); }); @@ -1115,30 +1123,21 @@ describe("runtime entry", () => { expect([first.preload, later.preload, untrimmed.preload]).toEqual(["", "none", ""]); }); - it("gives each parsed clip preload none in the player's frame, where no clip fetches ahead of the first take", async () => { - const frame = document.createElement("iframe"); - frame.setAttribute(PLAYER_FRAME_ATTR, ""); - vi.spyOn(window, "frameElement", "get").mockReturnValue(frame); - asSafari(); - const root = mountRoot(); - timed(root, "div", "0"); - await evaluateRuntime(); - const [first, later] = videos(root, "0", "5"); - await Promise.resolve(); - expect([first.preload, later.preload]).toEqual(["", "none"]); - }); - - it("leaves Chromium loading every clip at parse in the player's frame", async () => { - const frame = document.createElement("iframe"); - frame.setAttribute(PLAYER_FRAME_ATTR, ""); - vi.spyOn(window, "frameElement", "get").mockReturnValue(frame); - const root = mountRoot(); - timed(root, "div", "0"); - await evaluateRuntime(); - const [first, later] = videos(root, "0", "5"); - await Promise.resolve(); - expect([first.preload, later.preload]).toEqual(["", ""]); - }); + it.each(["safari", "chrome"] as const)( + "gives each parsed clip preload none in the player's frame on %s, where no clip fetches ahead of the first take", + async (userAgent) => { + const frame = document.createElement("iframe"); + frame.setAttribute(PLAYER_FRAME_ATTR, ""); + vi.spyOn(window, "frameElement", "get").mockReturnValue(frame); + if (userAgent === "safari") asSafari(); + const root = mountRoot(); + timed(root, "div", "0"); + await evaluateRuntime(); + const [first, later] = videos(root, "0", "5"); + await Promise.resolve(); + expect([first.preload, later.preload]).toEqual(["", "none"]); + }, + ); it("leaves a frame the player did not mark loading every clip at parse", async () => { vi.spyOn(window, "frameElement", "get").mockReturnValue(document.createElement("iframe")); diff --git a/packages/core/src/runtime/init.previewSeek.test.ts b/packages/core/src/runtime/init.previewSeek.test.ts index f8071342e1..f725df1a5e 100644 --- a/packages/core/src/runtime/init.previewSeek.test.ts +++ b/packages/core/src/runtime/init.previewSeek.test.ts @@ -994,6 +994,27 @@ it("keeps pending-seek Play synchronous in an unmarked Safari player frame", () expect(next.some(({ video }) => vi.mocked(video.play).mock.calls.length > 0)).toBe(true); }); +it.each([ + [ + "Chrome", + "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/157.0.0.0 Safari/537.36", + ], + ["Firefox", "Mozilla/5.0 (X11; Linux x86_64; rv:160.0) Gecko/20100101 Firefox/160.0"], +])( + "moves the playhead at once on a paused seek in a %s player frame, with no picture held", + (_, userAgent) => { + vi.spyOn(navigator, "userAgent", "get").mockReturnValue(userAgent); + const frame = document.createElement("iframe"); + frame.setAttribute(PLAYER_FRAME_ATTR, ""); + vi.spyOn(window, "frameElement", "get").mockReturnValue(frame); + const { main } = film(false, false); + void window.__player!.seek(6); + expect(main.time?.()).toBe(6); + expect(document.querySelectorAll("canvas")).toHaveLength(0); + expect(document.documentElement.hasAttribute(PREVIEW_SEEK_HOLD_ATTR)).toBe(false); + }, +); + it("retains an explicit unmarked provider handoff before its first picture", async () => { const { main, old, next } = safariPlayerFilm(); for (const video of old) video.metadataAt(0); diff --git a/packages/core/src/runtime/init.ts b/packages/core/src/runtime/init.ts index 32fe05fdff..d65417f406 100644 --- a/packages/core/src/runtime/init.ts +++ b/packages/core/src/runtime/init.ts @@ -5173,7 +5173,7 @@ export function initSandboxRuntimeModular(): void { nativePlayTime = undefined; wallClearTimeout(nativeWarmTimer); if ( - !mediaDeferred || + !(studioPreview || (playerFrame && isWebKit())) || state.nativeMediaSyncDisabled || isExportRenderDrivingFrames() || window.__HF_EXPORT_RENDER_SEEK_CONFIG || diff --git a/packages/core/src/runtime/preloadMedia.test.ts b/packages/core/src/runtime/preloadMedia.test.ts index 7511f8894a..54b888be67 100644 --- a/packages/core/src/runtime/preloadMedia.test.ts +++ b/packages/core/src/runtime/preloadMedia.test.ts @@ -108,14 +108,21 @@ describe("initial media preload", () => { }); describe("releasing a clip's download", () => { - it("reloads a src clip with its src dropped, then puts the src back", () => { + const srcWrites = (el: Element) => { + const observer = new MutationObserver(() => {}); + observer.observe(el, { attributeFilter: ["src"] }); + return () => observer.takeRecords().length; + }; + + it("reloads a src clip by setting its src again, not by load(), after which Firefox fetches metadata whatever the preload", () => { const video = document.createElement("video"); video.setAttribute("src", "a.mp4"); - const atLoad: (string | null)[] = []; - video.load = () => atLoad.push(video.getAttribute("src")); + video.load = vi.fn(); + const writes = srcWrites(video); releaseMedia(video); - expect(atLoad).toEqual([null]); + expect(writes()).toBeGreaterThan(0); + expect(video.load).not.toHaveBeenCalled(); expect(video.getAttribute("src")).toBe("a.mp4"); }); @@ -127,9 +134,11 @@ describe("releasing a clip's download", () => { value: { length: 1, start: () => 0, end: () => 6.67 }, }); video.load = vi.fn(); + const writes = srcWrites(video); releaseMedia(video); expect(video.load).not.toHaveBeenCalled(); + expect(writes()).toBe(0); expect(video.getAttribute("src")).toBe("a.mp4"); }); @@ -141,9 +150,10 @@ describe("releasing a clip's download", () => { value: { length: 1, start: () => 0, end: () => 6.67 }, }); video.load = vi.fn(); + const writes = srcWrites(video); releaseMedia(video, true); - expect(video.load).toHaveBeenCalledTimes(1); + expect(writes()).toBeGreaterThan(0); expect(video.getAttribute("src")).toBe("a.mp4"); }); @@ -158,9 +168,10 @@ describe("releasing a clip's download", () => { value: { length: 1, start: () => from, end: () => to }, }); video.load = vi.fn(); + const writes = srcWrites(video); releaseMedia(video); - expect(video.load).toHaveBeenCalledTimes(1); + expect(writes()).toBeGreaterThan(0); }); it("leaves a clip on children, their order and its markup untouched", () => { diff --git a/packages/core/src/runtime/preloadMedia.ts b/packages/core/src/runtime/preloadMedia.ts index f9d2193dfc..761f080b9c 100644 --- a/packages/core/src/runtime/preloadMedia.ts +++ b/packages/core/src/runtime/preloadMedia.ts @@ -99,8 +99,10 @@ export function releaseMedia(media: HTMLMediaElement, whenBuffered = false): voi if (media.querySelector("source") || (!whenBuffered && wholeFileBuffered(media))) return; if (holdsWhenIdle(media)) return holdUntilDue(media); const src = media.getAttribute("src"); - stopMediaDownload(media); - if (src !== null) media.setAttribute("src", src); + if (src === null) return stopMediaDownload(media); + cancelPlaybackStart(media); + media.removeAttribute("src"); + media.setAttribute("src", src); } export function lengthIsAuthored(media: Element): boolean { diff --git a/packages/core/src/studioPreviewMark.ts b/packages/core/src/studioPreviewMark.ts index 418a36b945..4b3e33be01 100644 --- a/packages/core/src/studioPreviewMark.ts +++ b/packages/core/src/studioPreviewMark.ts @@ -1,5 +1,3 @@ -import { isWebKit } from "./runtime/mediaClock.js"; - export const STUDIO_PREVIEW_MARK_META = "hyperframes-studio-preview"; export const PREVIEW_SEEK_HOLD_ATTR = "data-hf-preview-seek-hold"; export const PREVIEW_VIDEO_FRAME_ATTR = "data-hf-preview-video-frame"; @@ -23,9 +21,14 @@ export function getLogicalOpacity(el: Element, computed: CSSStyleDeclaration): s return computed.opacity; } export const PLAYER_FRAME_ATTR = "data-hf-player-frame"; +export const PLAYER_FRAME_NAME = "hyperframes-player"; export function inPlayerFrame(doc: Document): boolean { - return isWebKit() && doc.defaultView?.frameElement?.hasAttribute(PLAYER_FRAME_ATTR) === true; + const frame = doc.defaultView; + return ( + frame?.name === PLAYER_FRAME_NAME || + frame?.frameElement?.hasAttribute(PLAYER_FRAME_ATTR) === true + ); } export function defersMediaIn(doc: Document): boolean { diff --git a/packages/player/src/hyperframes-player.test.ts b/packages/player/src/hyperframes-player.test.ts index 5b5d5703ac..f801edb7e1 100644 --- a/packages/player/src/hyperframes-player.test.ts +++ b/packages/player/src/hyperframes-player.test.ts @@ -1,5 +1,6 @@ import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from "vitest"; import { mediaElementTime } from "@hyperframes/core/runtime/media-clock"; +import { PLAYER_FRAME_NAME } from "@hyperframes/core/studio-preview-mark"; import { formatTime, formatSpeed, SPEED_PRESETS } from "./controls.js"; // Install a stubbed contentDocument getter on the given iframe element. The @@ -3733,6 +3734,11 @@ describe("HyperframesPlayer retained runtime data", () => { expect(player.iframeElement.sandbox.contains("allow-same-origin")).toBe(true); }); + it("names its frame, the one mark a composition in an opaque sandbox can still read", () => { + player.setAttribute("sandbox-origin", "opaque"); + expect(player.iframeElement.name).toBe(PLAYER_FRAME_NAME); + }); + it("treats every non-null sandbox-origin value as restrictive", () => { player.setAttribute("sandbox-origin", "opaqu"); expect(player.iframeElement.sandbox.contains("allow-same-origin")).toBe(false); diff --git a/packages/player/src/iframe-dom.ts b/packages/player/src/iframe-dom.ts index 5709c53660..6a14f5ecb1 100644 --- a/packages/player/src/iframe-dom.ts +++ b/packages/player/src/iframe-dom.ts @@ -4,7 +4,7 @@ * Keeps constructor boilerplate out of the web component class body. */ -import { PLAYER_FRAME_ATTR } from "@hyperframes/core/studio-preview-mark"; +import { PLAYER_FRAME_ATTR, PLAYER_FRAME_NAME } from "@hyperframes/core/studio-preview-mark"; // Cached Constructable Stylesheet shared across all player instances. let _sharedSheet: CSSStyleSheet | null = null; @@ -52,6 +52,7 @@ export function createCompositionIframe(): { iframe.referrerPolicy = "same-origin"; iframe.title = "HyperFrames Composition"; iframe.setAttribute(PLAYER_FRAME_ATTR, ""); + iframe.name = PLAYER_FRAME_NAME; container.appendChild(iframe); return { container, iframe };