From 076157fef1c3e1a6aa83ac8dae301a9ec219a3c1 Mon Sep 17 00:00:00 2001
From: Timo <6156589+Shik3i@users.noreply.github.com>
Date: Thu, 2 Jul 2026 14:56:02 +0200
Subject: [PATCH] Sync Disney+ via the page media player API (precise time +
 seek)

Disney+'s <video> is blob-relative (unusable as an absolute clock) and its
scrubber aria-value freezes during playback, so DOM scraping lagged and the
+/-10s button seek could neither reach far targets nor land precisely. The
real player hangs off the <disney-web-player> custom element as
`.mediaPlayer`, exposing seek(ms) and timeline.info (playhead/duration ms).

Since the isolated content world can't read that page object, route it
through the existing MAIN-world page-API bridge (as Netflix already does):

- page-api-seek-overrides.js: register a 'disney' provider.
- background.js installPageApiSeekBridge: seek Disney via mediaPlayer.seek(),
  and post the exact playhead/duration (seconds) to the content world every
  250ms. Both are gated on provider === 'disney'; Netflix path unchanged.
- content.js: cache the pushed playhead, prefer it in getDisneyPlusTimeline
  (DOM scraping stays as fallback), and check the page-API seek first in
  seekVideo. Outcome is identical for Netflix and generic sites.

Verified live on Disney+: reported time matches the player exactly and
seek lands within ~1s of the target.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 extension/background.js               | 41 +++++++++++++++-
 extension/content.js                  | 67 ++++++++++++++++++---------
 extension/page-api-seek-overrides.js  |  5 ++
 scripts/test-content-video-finder.cjs |  1 +
 4 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/extension/background.js b/extension/background.js
index 54da4ae..96972a2 100644
--- a/extension/background.js
+++ b/extension/background.js
@@ -1663,10 +1663,22 @@ function installPageApiSeekBridge() {
     if (window.__koalaPageApiSeekBridgeInstalled) return;
     window.__koalaPageApiSeekBridgeInstalled = true;
 
-    function seekWithPageApi(time) {
-        const match = typeof window.koalaFindPageApiSeekProvider === 'function'
+    function currentMatch() {
+        return typeof window.koalaFindPageApiSeekProvider === 'function'
             ? window.koalaFindPageApiSeekProvider(window.location.hostname)
             : null;
+    }
+
+    // Disney+ ("hive"/BAM) player: the real media player hangs off the
+    // <disney-web-player> custom element as `.mediaPlayer`, exposing precise
+    // seek(ms) and timeline.info (playhead/duration in ms).
+    function disneyMediaPlayer() {
+        const el = document.querySelector('disney-web-player');
+        return el && el.mediaPlayer ? el.mediaPlayer : null;
+    }
+
+    function seekWithPageApi(time) {
+        const match = currentMatch();
         if (!match) return;
 
         try {
@@ -1676,6 +1688,9 @@ function installPageApiSeekBridge() {
                 const sessionId = ids ? ids[0] : null;
                 const player = sessionId ? videoPlayer.getVideoPlayerBySessionId(sessionId) : null;
                 player?.seek(Math.round(time * 1000));
+            } else if (match.provider === 'disney') {
+                const mp = disneyMediaPlayer();
+                if (mp && typeof mp.seek === 'function') mp.seek(Math.round(time * 1000));
             }
         } catch (_e) {
             // Player not ready or private API changed; the next sync tick can retry.
@@ -1688,6 +1703,28 @@ function installPageApiSeekBridge() {
         if (!data || data.__koalaPageApiSeek !== 1 || data.kind !== 'seek' || typeof data.time !== 'number') return;
         seekWithPageApi(data.time);
     });
+
+    // Disney+'s <video> currentTime is blob-relative and its scrubber lags, so
+    // the isolated-world content script can't read an accurate position. Push
+    // the real playhead/duration (seconds) from the page's media player.
+    setInterval(() => {
+        try {
+            const match = currentMatch();
+            if (!match || match.provider !== 'disney') return;
+            const mp = disneyMediaPlayer();
+            const info = mp && mp.timeline && mp.timeline.info;
+            if (!info || typeof info.playheadPositionMs !== 'number' || typeof info.programDurationMs !== 'number') return;
+            if (info.programDurationMs <= 0) return;
+            window.postMessage({
+                __koalaPlayerTime: 1,
+                provider: 'disney',
+                position: info.playheadPositionMs / 1000,
+                duration: info.programDurationMs / 1000
+            }, '*');
+        } catch (_e) {
+            // Ignore transient errors (player teardown / element swap).
+        }
+    }, 250);
 }
 
 function setPageApiSeekEnabled(enabled) {
diff --git a/extension/content.js b/extension/content.js
index 02a749c..2128e7a 100644
--- a/extension/content.js
+++ b/extension/content.js
@@ -63,7 +63,21 @@
     let lastKnownDisneyPlusScale = 1;
     let lastKnownDisneyPlusStart = 0;
     let lastDisneyPlusUiCurrent = null;
-    let lastDisneyPlusNativeAtUi = null;
+    let lastDisneyPlusNativeAtUi = null;
+    // Accurate Disney+ playhead pushed by the MAIN-world page-API bridge
+    // (background.js installPageApiSeekBridge). The isolated content world
+    // can't read the page's media player directly.
+    let disneyPageApiTime = null;
+    if (typeof window !== 'undefined' && typeof window.addEventListener === 'function') {
+        window.addEventListener('message', (event) => {
+            if (event.source !== window) return;
+            const data = event.data;
+            if (data && data.__koalaPlayerTime === 1 && data.provider === 'disney'
+                && Number.isFinite(data.position) && Number.isFinite(data.duration) && data.duration > 0) {
+                disneyPageApiTime = { position: data.position, duration: data.duration, at: Date.now() };
+            }
+        });
+    }
 
     function hostMatchesUrl(host, url) {
         const normalized = String(url || '')
@@ -276,7 +290,14 @@
     }
 
     function getDisneyPlusTimeline(video) {
-        if (!isDisneyPlusHost()) return null;
+        if (!isDisneyPlusHost()) return null;
+        // Preferred: exact playhead/duration from the page media player,
+        // relayed by the MAIN-world bridge. Authoritative while fresh.
+        if (disneyPageApiTime && (Date.now() - disneyPageApiTime.at) < 2000 && disneyPageApiTime.duration > 0) {
+            lastKnownDisneyPlusDuration = disneyPageApiTime.duration;
+            const cur = Math.max(0, Math.min(disneyPageApiTime.duration, disneyPageApiTime.position));
+            return { start: 0, end: disneyPageApiTime.duration, duration: disneyPageApiTime.duration, current: cur, nativeScale: 1, nativeStart: 0 };
+        }
         const range = getSeekableRange(video);
         const current = video.currentTime;
         const ui = getDisneyPlusUiTimeline();
@@ -398,26 +419,28 @@
             !!window.koalaFindPageApiSeekProvider(window.location.hostname);
     }
 
-    function seekVideo(video, targetTime, relativeDelta = null) {
-        const siteQuirk = getActiveSiteQuirk();
-        let delta = relativeDelta;
-        if (delta === null && siteQuirk) {
-            const current = getSyncCurrentTime(video);
-            if (current !== null) {
-                delta = targetTime - current;
-            }
-        }
-        if (siteQuirk && siteQuirk.clickRelativeSeek(delta)) {
-            expectedSeekTime = null;
-            return;
-        }
-        const nativeTargetTime = toNativeSeekTime(video, targetTime);
-        expectedSeekTime = targetTime;
-        if (shouldUsePageApiSeek()) {
-            window.postMessage({ __koalaPageApiSeek: PAGE_API_SEEK_BRIDGE, kind: 'seek', time: targetTime }, '*');
-            return;
-        }
-        video.currentTime = nativeTargetTime;
+    function seekVideo(video, targetTime, relativeDelta = null) {
+        // Prefer a precise page-level seek API when available (Netflix, Disney+);
+        // for those players the DOM/button seek path is imprecise or impossible.
+        if (shouldUsePageApiSeek()) {
+            expectedSeekTime = targetTime;
+            window.postMessage({ __koalaPageApiSeek: PAGE_API_SEEK_BRIDGE, kind: 'seek', time: targetTime }, '*');
+            return;
+        }
+        const siteQuirk = getActiveSiteQuirk();
+        let delta = relativeDelta;
+        if (delta === null && siteQuirk) {
+            const current = getSyncCurrentTime(video);
+            if (current !== null) {
+                delta = targetTime - current;
+            }
+        }
+        if (siteQuirk && siteQuirk.clickRelativeSeek(delta)) {
+            expectedSeekTime = null;
+            return;
+        }
+        expectedSeekTime = targetTime;
+        video.currentTime = toNativeSeekTime(video, targetTime);
     }
 

     // --- Play/Pause Coalescing (leading + trailing) ---

diff --git a/extension/page-api-seek-overrides.js b/extension/page-api-seek-overrides.js
index 60c9041..7f0c847 100644
--- a/extension/page-api-seek-overrides.js
+++ b/extension/page-api-seek-overrides.js
@@ -4,6 +4,11 @@
             name: 'netflix-page-api-seek',
             urls: ['netflix.com'],
             provider: 'netflix'
+        },
+        {
+            name: 'disney-page-api-seek',
+            urls: ['disneyplus.com'],
+            provider: 'disney'
         }
     ];
 
diff --git a/scripts/test-content-video-finder.cjs b/scripts/test-content-video-finder.cjs
index 804e2f3..2d9ae7a 100644
--- a/scripts/test-content-video-finder.cjs
+++ b/scripts/test-content-video-finder.cjs
@@ -96,6 +96,7 @@ function loadTimelineFns(hostname, document = makeDocument()) {
     'let lastKnownDisneyPlusStart = 0;',
     'let lastDisneyPlusUiCurrent = null;',
     'let lastDisneyPlusNativeAtUi = null;',
+    'let disneyPageApiTime = null;',
     extractFunction('scanShadowDom', source),
     extractFunction('querySelectorAllShadow', source),
     extractFunction('hostMatchesUrl', source),