From 2fbcbc4f83dcdf7c109c6b83c79adb17897a52e6 Mon Sep 17 00:00:00 2001
From: Timo <6156589+Shik3i@users.noreply.github.com>
Date: Thu, 2 Jul 2026 14:38:26 +0200
Subject: [PATCH] Harden Disney+ time fallback against <video> element
 recreation

When the control overlay (and its live time readout) is briefly absent,
the old fallback recomputed the timeline from the raw blob-relative
video.currentTime via a cached scale/start. Disney recreates the <video>
element on some play/pause transitions, which resets currentTime, so that
math produced a wildly wrong time ("loses the time" after a pause).

The native clock advances 1:1 with real playback, so instead anchor the
last live UI position to video.currentTime and extrapolate by the elapsed
native delta. If the delta is negative or implausibly large (element
recreated / seek), freeze at the last known position rather than emitting
a garbage time.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 extension/content.js                  | 37 ++++++++++++++++++---------
 scripts/test-content-video-finder.cjs |  2 ++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/extension/content.js b/extension/content.js
index 115f08f..e8b9c96 100644
--- a/extension/content.js
+++ b/extension/content.js
@@ -62,6 +62,8 @@
     let lastKnownDisneyPlusDuration = 0;
     let lastKnownDisneyPlusScale = 1;
     let lastKnownDisneyPlusStart = 0;
+    let lastDisneyPlusUiCurrent = null;
+    let lastDisneyPlusNativeAtUi = null;
 
     function hostMatchesUrl(host, url) {
         const normalized = String(url || '')
@@ -285,6 +287,8 @@
                 : (range ? range.start : 0);
             lastKnownDisneyPlusScale = nativeScale;
             lastKnownDisneyPlusStart = nativeStart;
+            lastDisneyPlusUiCurrent = ui.current;
+            lastDisneyPlusNativeAtUi = Number.isFinite(current) ? current : null;
             return {
                 ...(range || {}),
                 current: ui.current,
@@ -294,18 +298,27 @@
             };
         }
 
-        if (lastKnownDisneyPlusDuration > 0) {
-            const calculatedCurrent = (Number.isFinite(current) && lastKnownDisneyPlusScale > 0)
-                ? (current - lastKnownDisneyPlusStart) / lastKnownDisneyPlusScale
-                : 0;
-            return {
-                start: 0,
-                end: lastKnownDisneyPlusDuration,
-                duration: lastKnownDisneyPlusDuration,
-                current: Math.max(0, Math.min(lastKnownDisneyPlusDuration, calculatedCurrent)),
-                nativeScale: lastKnownDisneyPlusScale,
-                nativeStart: lastKnownDisneyPlusStart
-            };
+        // No live UI readout (control overlay hidden or mid-rebuild). Extrapolate
+        // from the last live UI position using the native clock, which advances 1:1
+        // with real playback. Disney recreates the <video> on some play/pause
+        // transitions, which resets currentTime; if the native clock jumped back or
+        // leapt implausibly, freeze at the last known position instead of a garbage time.
+        if (lastDisneyPlusUiCurrent !== null && lastKnownDisneyPlusDuration > 0) {
+            let estimated = lastDisneyPlusUiCurrent;
+            if (Number.isFinite(current) && lastDisneyPlusNativeAtUi !== null) {
+                const delta = current - lastDisneyPlusNativeAtUi;
+                if (delta >= 0 && delta < 60) {
+                    estimated = lastDisneyPlusUiCurrent + delta;
+                }
+            }
+            return {
+                start: 0,
+                end: lastKnownDisneyPlusDuration,
+                duration: lastKnownDisneyPlusDuration,
+                current: Math.max(0, Math.min(lastKnownDisneyPlusDuration, estimated)),
+                nativeScale: lastKnownDisneyPlusScale,
+                nativeStart: lastKnownDisneyPlusStart
+            };
         }
 
         if (!range || range.start < 1 || range.duration < 60) return null;
diff --git a/scripts/test-content-video-finder.cjs b/scripts/test-content-video-finder.cjs
index 453995f..804e2f3 100644
--- a/scripts/test-content-video-finder.cjs
+++ b/scripts/test-content-video-finder.cjs
@@ -94,6 +94,8 @@ function loadTimelineFns(hostname, document = makeDocument()) {
     'let lastKnownDisneyPlusDuration = 0;',
     'let lastKnownDisneyPlusScale = 1;',
     'let lastKnownDisneyPlusStart = 0;',
+    'let lastDisneyPlusUiCurrent = null;',
+    'let lastDisneyPlusNativeAtUi = null;',
     extractFunction('scanShadowDom', source),
     extractFunction('querySelectorAllShadow', source),
     extractFunction('hostMatchesUrl', source),