Remove Disney+ DOM scraping fallback

This commit is contained in:
Timo
2026-07-02 15:08:54 +02:00
parent 076157fef1
commit 9ac8c28442
4 changed files with 47 additions and 432 deletions
+16 -45
View File
@@ -77,38 +77,15 @@ function makeDocument(nodes = []) {
};
}
function makeNode(attrs = {}, textContent = '') {
return {
textContent,
value: attrs.value,
max: attrs.max,
clicked: 0,
click() { this.clicked += 1; },
getAttribute(name) { return attrs[name] ?? null; }
};
}
function loadTimelineFns(hostname, document = makeDocument()) {
function loadTimelineFns(hostname, document = makeDocument(), pageApiTime = null) {
const disneyPageApiTime = pageApiTime
? `let disneyPageApiTime = { position: ${pageApiTime.position}, duration: ${pageApiTime.duration}, at: Date.now() - ${pageApiTime.ageMs || 0} };`
: 'let disneyPageApiTime = null;';
return Function('window', 'document', [
'let lastDisneyPlusTimelineCandidates = [];',
'let lastKnownDisneyPlusDuration = 0;',
'let lastKnownDisneyPlusScale = 1;',
'let lastKnownDisneyPlusStart = 0;',
'let lastDisneyPlusUiCurrent = null;',
'let lastDisneyPlusNativeAtUi = null;',
'let disneyPageApiTime = null;',
extractFunction('scanShadowDom', source),
extractFunction('querySelectorAllShadow', source),
disneyPageApiTime,
extractFunction('hostMatchesUrl', source),
extractFunction('matchesPlayerUrls', source),
extractFunction('isDisneyPlusHost', source),
extractFunction('getSeekableRange', source),
extractFunction('parseClockTime', source),
extractFunction('parseTimelineText', source),
extractFunction('getDisneyPlusUiTimeline', source),
extractFunction('getElementLabel', source),
extractFunction('getDisneyPlusSeekButtonLabels', source),
extractFunction('clickDisneyPlusRelativeSeek', source),
extractFunction('getDisneyPlusTimeline', source),
extractFunction('getSiteQuirkAdapters', source),
extractFunction('getActiveSiteQuirk', source),
@@ -117,7 +94,7 @@ function loadTimelineFns(hostname, document = makeDocument()) {
extractFunction('getSyncCurrentTime', source),
extractFunction('getSyncDuration', source),
extractFunction('toNativeSeekTime', source),
'return { getActiveSiteQuirk, getSyncCurrentTime, getSyncDuration, toNativeSeekTime, clickDisneyPlusRelativeSeek };'
'return { getActiveSiteQuirk, getSyncCurrentTime, getSyncDuration, toNativeSeekTime };'
].join('\n'))({ location: { hostname } }, document);
}
@@ -131,11 +108,11 @@ function loadPlayerFixFns(hostname) {
].join('\n'))({ location: { hostname } });
}
const disneyUiDocument = makeDocument([
makeNode({ 'aria-valuetext': '0:09 / 180:00' })
]);
const disneyFns = loadTimelineFns('www.disneyplus.com', disneyUiDocument);
assert.equal(disneyFns.getActiveSiteQuirk().name, 'disneyplus-timeline-and-buttons');
const disneyFns = loadTimelineFns('www.disneyplus.com', makeDocument(), {
position: 9,
duration: 10800
});
assert.equal(disneyFns.getActiveSiteQuirk().name, 'disneyplus-page-api');
assert.deepEqual(disneyFns.getActiveSiteQuirk().urls, ['disneyplus.com']);
const disneyVideo = makeVideo('disney-offset', 1920, 1080, {
currentTime: 29,
@@ -144,17 +121,17 @@ const disneyVideo = makeVideo('disney-offset', 1920, 1080, {
});
assert.equal(disneyFns.getSyncCurrentTime(disneyVideo), 9);
assert.equal(disneyFns.getSyncDuration(disneyVideo), 10800);
assert.equal(disneyFns.toNativeSeekTime(disneyVideo, 39), 119);
assert.equal(disneyFns.toNativeSeekTime(disneyVideo, 39), 39);
const disneySeekableFallbackFns = loadTimelineFns('www.disneyplus.com');
const disneyNoPageApiFns = loadTimelineFns('www.disneyplus.com');
const disneyOffsetVideo = makeVideo('disney-offset', 1920, 1080, {
currentTime: 29,
duration: 0,
seekable: makeSeekable([[20, 10820]])
});
assert.equal(disneySeekableFallbackFns.getSyncCurrentTime(disneyOffsetVideo), 9);
assert.equal(disneySeekableFallbackFns.getSyncDuration(disneyOffsetVideo), 10800);
assert.equal(disneySeekableFallbackFns.toNativeSeekTime(disneyOffsetVideo, 39), 59);
assert.equal(disneyNoPageApiFns.getSyncCurrentTime(disneyOffsetVideo), 29);
assert.equal(disneyNoPageApiFns.getSyncDuration(disneyOffsetVideo), 0);
assert.equal(disneyNoPageApiFns.toNativeSeekTime(disneyOffsetVideo, 39), 39);
const genericFns = loadTimelineFns('example.com');
assert.equal(genericFns.getActiveSiteQuirk(), null);
@@ -162,12 +139,6 @@ assert.equal(genericFns.getSyncCurrentTime(disneyVideo), 29);
assert.equal(genericFns.getSyncDuration(disneyVideo), 0);
assert.equal(genericFns.toNativeSeekTime(disneyVideo, 39), 39);
const backButton = makeNode({ 'aria-label': '10 Sekunden zurück' });
const forwardButton = makeNode({ 'aria-label': '10 Sekunden vorspulen' });
const disneyButtonFns = loadTimelineFns('www.disneyplus.com', makeDocument([backButton, forwardButton]));
assert.equal(disneyButtonFns.clickDisneyPlusRelativeSeek(-30), true);
assert.equal(disneyButtonFns.clickDisneyPlusRelativeSeek(30), true);
const twitchFixFns = loadPlayerFixFns('player.twitch.tv');
assert.equal(twitchFixFns.getActivePlayerActionFix().name, 'twitch-player-buttons');
assert.deepEqual(twitchFixFns.getActivePlayerActionFix().urls, ['twitch.tv']);