mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-03-09 12:50:23 -05:00
patch jsdom for iq
This commit is contained in:
c-basalt
parent
b086b8635d
commit
02001159b8
5 changed files with 54 additions and 24 deletions
|
|
@ -5,7 +5,7 @@
|
|||
import urllib.parse
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..jsinterp import PhantomJSwrapper
|
||||
from ..jsinterp import JSIWrapper
|
||||
from ..utils import (
|
||||
ExtractorError,
|
||||
clean_html,
|
||||
|
|
@ -449,7 +449,6 @@ class IqIE(InfoExtractor):
|
|||
}
|
||||
|
||||
_DASH_JS = '''
|
||||
console.log(page.evaluate(function() {
|
||||
var tvid = "%(tvid)s"; var vid = "%(vid)s"; var src = "%(src)s";
|
||||
var uid = "%(uid)s"; var dfp = "%(dfp)s"; var mode = "%(mode)s"; var lang = "%(lang)s";
|
||||
var bid_list = %(bid_list)s; var ut_list = %(ut_list)s; var tm = new Date().getTime();
|
||||
|
|
@ -515,9 +514,7 @@ class IqIE(InfoExtractor):
|
|||
var dash_path = '/dash?' + enc_params.join('&'); dash_path += '&vf=' + cmd5x(dash_path);
|
||||
dash_paths[bid] = dash_path;
|
||||
});
|
||||
return JSON.stringify(dash_paths);
|
||||
}));
|
||||
saveAndExit();
|
||||
console.log(JSON.stringify(dash_paths));
|
||||
'''
|
||||
|
||||
def _extract_vms_player_js(self, webpage, video_id):
|
||||
|
|
@ -597,10 +594,10 @@ def _real_extract(self, url):
|
|||
else:
|
||||
ut_list = ['0']
|
||||
|
||||
jsi = JSIWrapper(self, url, ['dom'], timeout=120)
|
||||
|
||||
# bid 0 as an initial format checker
|
||||
dash_paths = self._parse_json(PhantomJSwrapper(self, timeout=120_000).get(
|
||||
url, note2='Executing signature code (this may take a couple minutes)',
|
||||
html='<!DOCTYPE html>', video_id=video_id, jscode=self._DASH_JS % {
|
||||
dash_paths = self._parse_json(jsi.execute(self._DASH_JS % {
|
||||
'tvid': video_info['tvId'],
|
||||
'vid': video_info['vid'],
|
||||
'src': traverse_obj(next_props, ('initialProps', 'pageProps', 'ptid'),
|
||||
|
|
@ -612,7 +609,7 @@ def _real_extract(self, url):
|
|||
'bid_list': '[' + ','.join(['0', *self._BID_TAGS.keys()]) + ']',
|
||||
'ut_list': '[' + ','.join(ut_list) + ']',
|
||||
'cmd5x_func': self._extract_cmd5x_function(webpage, video_id),
|
||||
})[1].strip(), video_id)
|
||||
}, video_id, html='<!DOCTYPE html>'), video_id)
|
||||
|
||||
formats, subtitles = [], {}
|
||||
initial_format_data = self._download_json(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# flake8: noqa: F401
|
||||
from .native import JSInterpreter
|
||||
from .common import _JSI_PREFERENCES, _JSI_HANDLERS, JSIWrapper
|
||||
from ._phantomjs import PhantomJSwrapper
|
||||
from . import _deno
|
||||
|
||||
|
||||
__all__ = [
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ def exe_version(cls):
|
|||
return DenoJSI.exe_version
|
||||
|
||||
|
||||
@register_jsi
|
||||
class DenoJSDomJSI(DenoJSI):
|
||||
_SUPPORTED_FEATURES = {'js', 'wasm', 'location', 'dom', 'cookies'}
|
||||
_BASE_PREFERENCE = 4
|
||||
|
|
@ -128,7 +129,7 @@ def _ensure_jsdom(self):
|
|||
self._run_deno(cmd)
|
||||
self._JSDOM_IMPORT_CHECKED = True
|
||||
|
||||
def execute(self, jscode, video_id=None, note='Executing JS in Deno', html='', cookiejar=None):
|
||||
def execute(self, jscode, video_id=None, note='Executing JS in Deno with jsdom', html='', cookiejar=None):
|
||||
self.report_note(video_id, note)
|
||||
self._ensure_jsdom()
|
||||
|
||||
|
|
@ -148,15 +149,35 @@ def execute(self, jscode, video_id=None, note='Executing JS in Deno', html='', c
|
|||
const dom = new jsdom.JSDOM({json.dumps(str(html))}, {{
|
||||
{'url: %s,' % json.dumps(str(self._url)) if self._url else ''}
|
||||
cookieJar: jar,
|
||||
pretendToBeVisual: true,
|
||||
}});
|
||||
Object.keys(dom.window).forEach((key) => {{try {{window[key] = dom.window[key]}} catch (e) {{}}}});
|
||||
Object.keys(dom.window).filter(key => !['atob', 'btoa'].includes(key)).forEach((key) => {{
|
||||
try {{window[key] = dom.window[key]}} catch (e) {{}}
|
||||
}});
|
||||
|
||||
window.screen = {{
|
||||
availWidth: 1920,
|
||||
availHeight: 1040,
|
||||
width: 1920,
|
||||
height: 1080,
|
||||
colorDepth: 24,
|
||||
isExtended: true,
|
||||
onchange: null,
|
||||
orientation: {{angle: 0, type: 'landscape-primary', onchange: null}},
|
||||
pixelDepth: 24,
|
||||
width: 1920,
|
||||
}}
|
||||
Object.defineProperty(document.body, 'clientWidth', {{value: 1903}});
|
||||
Object.defineProperty(document.body, 'clientHeight', {{value: 1035}});
|
||||
document.domain = location.hostname;
|
||||
|
||||
delete window.jsdom;
|
||||
const origLog = console.log;
|
||||
console.log = () => {{}};
|
||||
console.info = () => {{}};
|
||||
return () => {{
|
||||
const stdout = [];
|
||||
console.log = (...msg) => stdout.push(msg.map(m => m.toString()).join(' '));
|
||||
console.log = (...msg) => stdout.push(msg.map(m => '' + m).join(' '));
|
||||
return () => {{ origLog(JSON.stringify({{
|
||||
stdout: stdout.join('\\n'), cookies: jar.serializeSync().cookies}})); }}
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -81,6 +81,16 @@ def override_navigator_js(user_agent: str) -> str:
|
|||
'language': 'en-US',
|
||||
'languages': ['en-US'],
|
||||
'webdriver': False,
|
||||
'cookieEnabled': True,
|
||||
'appCodeName': user_agent.split('/', maxsplit=1)[0],
|
||||
'appName': 'Netscape',
|
||||
'appVersion': user_agent.split('/', maxsplit=1)[-1],
|
||||
'platform': 'Win32',
|
||||
'product': 'Gecko',
|
||||
'productSub': '20030107',
|
||||
'vendor': 'Google Inc.',
|
||||
'vendorSub': '',
|
||||
'onLine': True,
|
||||
}.items()
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ def _version(cls):
|
|||
return PhantomJSJSI.exe_version
|
||||
|
||||
def __init__(self, extractor: InfoExtractor, required_version=None, timeout=10000):
|
||||
self._jsi = PhantomJSJSI(extractor._downloader, timeout=timeout / 1000)
|
||||
self._jsi = PhantomJSJSI(extractor._downloader, '', timeout / 1000, {})
|
||||
|
||||
if not self._jsi.is_available():
|
||||
raise ExtractorError(f'PhantomJS not found, {self.INSTALL_HINT}', expected=True)
|
||||
|
|
|
|||
Loading…
Reference in a new issue