mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-27 02:42:30 +00:00
[extractor/wrestleuniverse] Fix extraction, add login (#6982)
Closes #6975 Authored by: bashonly, Grub4K Co-authored-by: Simon Sawicki <contact@grub4k.xyz>
This commit is contained in:
parent
3b52a60688
commit
ef8fb7f029
@ -1835,6 +1835,9 @@ #### rokfinchannel
|
|||||||
#### twitter
|
#### twitter
|
||||||
* `legacy_api`: Force usage of the legacy Twitter API instead of the GraphQL API for tweet extraction. Has no effect if login cookies are passed
|
* `legacy_api`: Force usage of the legacy Twitter API instead of the GraphQL API for tweet extraction. Has no effect if login cookies are passed
|
||||||
|
|
||||||
|
### wrestleuniverse
|
||||||
|
* `device_id`: UUID value assigned by the website and used to enforce device limits for paid livestream content. Can be found in browser local storage
|
||||||
|
|
||||||
**Note**: These options may be changed/removed in the future without concern for backward compatibility
|
**Note**: These options may be changed/removed in the future without concern for backward compatibility
|
||||||
|
|
||||||
<!-- MANPAGE: MOVE "INSTALLATION" SECTION HERE -->
|
<!-- MANPAGE: MOVE "INSTALLATION" SECTION HERE -->
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
import binascii
|
import binascii
|
||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
|
import uuid
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..dependencies import Cryptodome
|
from ..dependencies import Cryptodome
|
||||||
@ -12,30 +13,95 @@
|
|||||||
traverse_obj,
|
traverse_obj,
|
||||||
try_call,
|
try_call,
|
||||||
url_or_none,
|
url_or_none,
|
||||||
|
urlencode_postdata,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class WrestleUniverseBaseIE(InfoExtractor):
|
class WrestleUniverseBaseIE(InfoExtractor):
|
||||||
|
_NETRC_MACHINE = 'wrestleuniverse'
|
||||||
_VALID_URL_TMPL = r'https?://(?:www\.)?wrestle-universe\.com/(?:(?P<lang>\w{2})/)?%s/(?P<id>\w+)'
|
_VALID_URL_TMPL = r'https?://(?:www\.)?wrestle-universe\.com/(?:(?P<lang>\w{2})/)?%s/(?P<id>\w+)'
|
||||||
_API_PATH = None
|
_API_PATH = None
|
||||||
_TOKEN = None
|
_REAL_TOKEN = None
|
||||||
_TOKEN_EXPIRY = None
|
_TOKEN_EXPIRY = None
|
||||||
|
_REFRESH_TOKEN = None
|
||||||
|
_DEVICE_ID = None
|
||||||
|
_LOGIN_QUERY = {'key': 'AIzaSyCaRPBsDQYVDUWWBXjsTrHESi2r_F3RAdA'}
|
||||||
|
_LOGIN_HEADERS = {
|
||||||
|
'Accept': '*/*',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'X-Client-Version': 'Chrome/JsCore/9.9.4/FirebaseCore-web',
|
||||||
|
'X-Firebase-gmpid': '1:307308870738:web:820f38fe5150c8976e338b',
|
||||||
|
'Referer': 'https://www.wrestle-universe.com/',
|
||||||
|
'Origin': 'https://www.wrestle-universe.com',
|
||||||
|
}
|
||||||
|
|
||||||
def _get_token_cookie(self):
|
@property
|
||||||
if not self._TOKEN or not self._TOKEN_EXPIRY:
|
def _TOKEN(self):
|
||||||
self._TOKEN = try_call(lambda: self._get_cookies('https://www.wrestle-universe.com/')['token'].value)
|
if not self._REAL_TOKEN or not self._TOKEN_EXPIRY:
|
||||||
if not self._TOKEN:
|
token = try_call(lambda: self._get_cookies('https://www.wrestle-universe.com/')['token'].value)
|
||||||
|
if not token and not self._REFRESH_TOKEN:
|
||||||
self.raise_login_required()
|
self.raise_login_required()
|
||||||
expiry = traverse_obj(jwt_decode_hs256(self._TOKEN), ('exp', {int_or_none}))
|
self._REAL_TOKEN = token
|
||||||
if not expiry:
|
|
||||||
raise ExtractorError('There was a problem with the token cookie')
|
|
||||||
self._TOKEN_EXPIRY = expiry
|
|
||||||
|
|
||||||
if self._TOKEN_EXPIRY <= int(time.time()):
|
if not self._REAL_TOKEN or self._TOKEN_EXPIRY <= int(time.time()):
|
||||||
raise ExtractorError(
|
if not self._REFRESH_TOKEN:
|
||||||
'Expired token. Refresh your cookies in browser and try again', expected=True)
|
raise ExtractorError(
|
||||||
|
'Expired token. Refresh your cookies in browser and try again', expected=True)
|
||||||
|
self._refresh_token()
|
||||||
|
|
||||||
return self._TOKEN
|
return self._REAL_TOKEN
|
||||||
|
|
||||||
|
@_TOKEN.setter
|
||||||
|
def _TOKEN(self, value):
|
||||||
|
self._REAL_TOKEN = value
|
||||||
|
|
||||||
|
expiry = traverse_obj(value, ({jwt_decode_hs256}, 'exp', {int_or_none}))
|
||||||
|
if not expiry:
|
||||||
|
raise ExtractorError('There was a problem with the auth token')
|
||||||
|
self._TOKEN_EXPIRY = expiry
|
||||||
|
|
||||||
|
def _perform_login(self, username, password):
|
||||||
|
login = self._download_json(
|
||||||
|
'https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword', None,
|
||||||
|
'Logging in', query=self._LOGIN_QUERY, headers=self._LOGIN_HEADERS, data=json.dumps({
|
||||||
|
'returnSecureToken': True,
|
||||||
|
'email': username,
|
||||||
|
'password': password,
|
||||||
|
}, separators=(',', ':')).encode())
|
||||||
|
self._REFRESH_TOKEN = traverse_obj(login, ('refreshToken', {str}))
|
||||||
|
if not self._REFRESH_TOKEN:
|
||||||
|
self.report_warning('No refresh token was granted')
|
||||||
|
self._TOKEN = traverse_obj(login, ('idToken', {str}))
|
||||||
|
|
||||||
|
def _real_initialize(self):
|
||||||
|
if WrestleUniverseBaseIE._DEVICE_ID:
|
||||||
|
return
|
||||||
|
|
||||||
|
WrestleUniverseBaseIE._DEVICE_ID = self._configuration_arg('device_id', [None], ie_key='WrestleUniverse')[0]
|
||||||
|
if not WrestleUniverseBaseIE._DEVICE_ID:
|
||||||
|
WrestleUniverseBaseIE._DEVICE_ID = self.cache.load(self._NETRC_MACHINE, 'device_id')
|
||||||
|
if WrestleUniverseBaseIE._DEVICE_ID:
|
||||||
|
return
|
||||||
|
WrestleUniverseBaseIE._DEVICE_ID = str(uuid.uuid4())
|
||||||
|
|
||||||
|
self.cache.store(self._NETRC_MACHINE, 'device_id', WrestleUniverseBaseIE._DEVICE_ID)
|
||||||
|
|
||||||
|
def _refresh_token(self):
|
||||||
|
refresh = self._download_json(
|
||||||
|
'https://securetoken.googleapis.com/v1/token', None, 'Refreshing token',
|
||||||
|
query=self._LOGIN_QUERY, data=urlencode_postdata({
|
||||||
|
'grant_type': 'refresh_token',
|
||||||
|
'refresh_token': self._REFRESH_TOKEN,
|
||||||
|
}), headers={
|
||||||
|
**self._LOGIN_HEADERS,
|
||||||
|
'Content-Type': 'application/x-www-form-urlencoded',
|
||||||
|
})
|
||||||
|
if traverse_obj(refresh, ('refresh_token', {str})):
|
||||||
|
self._REFRESH_TOKEN = refresh['refresh_token']
|
||||||
|
token = traverse_obj(refresh, 'access_token', 'id_token', expected_type=str)
|
||||||
|
if not token:
|
||||||
|
raise ExtractorError('No auth token returned from refresh request')
|
||||||
|
self._TOKEN = token
|
||||||
|
|
||||||
def _call_api(self, video_id, param='', msg='API', auth=True, data=None, query={}, fatal=True):
|
def _call_api(self, video_id, param='', msg='API', auth=True, data=None, query={}, fatal=True):
|
||||||
headers = {'CA-CID': ''}
|
headers = {'CA-CID': ''}
|
||||||
@ -43,7 +109,7 @@ def _call_api(self, video_id, param='', msg='API', auth=True, data=None, query={
|
|||||||
headers['Content-Type'] = 'application/json;charset=utf-8'
|
headers['Content-Type'] = 'application/json;charset=utf-8'
|
||||||
data = json.dumps(data, separators=(',', ':')).encode()
|
data = json.dumps(data, separators=(',', ':')).encode()
|
||||||
if auth:
|
if auth:
|
||||||
headers['Authorization'] = f'Bearer {self._get_token_cookie()}'
|
headers['Authorization'] = f'Bearer {self._TOKEN}'
|
||||||
return self._download_json(
|
return self._download_json(
|
||||||
f'https://api.wrestle-universe.com/v1/{self._API_PATH}/{video_id}{param}', video_id,
|
f'https://api.wrestle-universe.com/v1/{self._API_PATH}/{video_id}{param}', video_id,
|
||||||
note=f'Downloading {msg} JSON', errnote=f'Failed to download {msg} JSON',
|
note=f'Downloading {msg} JSON', errnote=f'Failed to download {msg} JSON',
|
||||||
@ -65,7 +131,7 @@ def decrypt(data):
|
|||||||
|
|
||||||
token = base64.b64encode(private_key.public_key().export_key('DER')).decode()
|
token = base64.b64encode(private_key.public_key().export_key('DER')).decode()
|
||||||
api_json = self._call_api(video_id, param, msg, data={
|
api_json = self._call_api(video_id, param, msg, data={
|
||||||
# 'deviceId' (random uuid4 generated at login) is not required yet
|
'deviceId': self._DEVICE_ID,
|
||||||
'token': token,
|
'token': token,
|
||||||
**data,
|
**data,
|
||||||
}, query=query, fatal=fatal)
|
}, query=query, fatal=fatal)
|
||||||
@ -105,7 +171,7 @@ class WrestleUniverseVODIE(WrestleUniverseBaseIE):
|
|||||||
'upload_date': '20230129',
|
'upload_date': '20230129',
|
||||||
'thumbnail': 'https://image.asset.wrestle-universe.com/8FjD67P8rZc446RBQs5RBN/8FjD67P8rZc446RBQs5RBN',
|
'thumbnail': 'https://image.asset.wrestle-universe.com/8FjD67P8rZc446RBQs5RBN/8FjD67P8rZc446RBQs5RBN',
|
||||||
'chapters': 'count:7',
|
'chapters': 'count:7',
|
||||||
'cast': 'count:18',
|
'cast': 'count:21',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': 'm3u8',
|
'skip_download': 'm3u8',
|
||||||
@ -169,6 +235,7 @@ class WrestleUniversePPVIE(WrestleUniverseBaseIE):
|
|||||||
'params': {
|
'params': {
|
||||||
'skip_download': 'm3u8',
|
'skip_download': 'm3u8',
|
||||||
},
|
},
|
||||||
|
'skip': 'No longer available',
|
||||||
}, {
|
}, {
|
||||||
'note': 'unencrypted HLS',
|
'note': 'unencrypted HLS',
|
||||||
'url': 'https://www.wrestle-universe.com/en/lives/wUG8hP5iApC63jbtQzhVVx',
|
'url': 'https://www.wrestle-universe.com/en/lives/wUG8hP5iApC63jbtQzhVVx',
|
||||||
@ -196,14 +263,17 @@ def _real_extract(self, url):
|
|||||||
lang, video_id = self._match_valid_url(url).group('lang', 'id')
|
lang, video_id = self._match_valid_url(url).group('lang', 'id')
|
||||||
metadata = self._download_metadata(url, video_id, lang, 'eventFallbackData')
|
metadata = self._download_metadata(url, video_id, lang, 'eventFallbackData')
|
||||||
|
|
||||||
info = traverse_obj(metadata, {
|
info = {
|
||||||
'title': ('displayName', {str}),
|
'id': video_id,
|
||||||
'description': ('description', {str}),
|
**traverse_obj(metadata, {
|
||||||
'channel': ('labels', 'group', {str}),
|
'title': ('displayName', {str}),
|
||||||
'location': ('labels', 'venue', {str}),
|
'description': ('description', {str}),
|
||||||
'timestamp': ('startTime', {int_or_none}),
|
'channel': ('labels', 'group', {str}),
|
||||||
'thumbnails': (('keyVisualUrl', 'alterKeyVisualUrl', 'heroKeyVisualUrl'), {'url': {url_or_none}}),
|
'location': ('labels', 'venue', {str}),
|
||||||
})
|
'timestamp': ('startTime', {int_or_none}),
|
||||||
|
'thumbnails': (('keyVisualUrl', 'alterKeyVisualUrl', 'heroKeyVisualUrl'), {'url': {url_or_none}}),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
|
||||||
ended_time = traverse_obj(metadata, ('endedTime', {int_or_none}))
|
ended_time = traverse_obj(metadata, ('endedTime', {int_or_none}))
|
||||||
if info.get('timestamp') and ended_time:
|
if info.get('timestamp') and ended_time:
|
||||||
@ -211,23 +281,20 @@ def _real_extract(self, url):
|
|||||||
|
|
||||||
video_data, decrypt = self._call_encrypted_api(
|
video_data, decrypt = self._call_encrypted_api(
|
||||||
video_id, ':watchArchive', 'watch archive', data={'method': 1})
|
video_id, ':watchArchive', 'watch archive', data={'method': 1})
|
||||||
formats = self._get_formats(video_data, (
|
info['formats'] = self._get_formats(video_data, (
|
||||||
('hls', None), ('urls', 'chromecastUrls'), ..., {url_or_none}), video_id)
|
('hls', None), ('urls', 'chromecastUrls'), ..., {url_or_none}), video_id)
|
||||||
for f in formats:
|
for f in info['formats']:
|
||||||
# bitrates are exaggerated in PPV playlists, so avoid wrong/huge filesize_approx values
|
# bitrates are exaggerated in PPV playlists, so avoid wrong/huge filesize_approx values
|
||||||
if f.get('tbr'):
|
if f.get('tbr'):
|
||||||
f['tbr'] = int(f['tbr'] / 2.5)
|
f['tbr'] = int(f['tbr'] / 2.5)
|
||||||
|
|
||||||
hls_aes_key = traverse_obj(video_data, ('hls', 'key', {decrypt}))
|
hls_aes_key = traverse_obj(video_data, ('hls', 'key', {decrypt}))
|
||||||
if not hls_aes_key and traverse_obj(video_data, ('hls', 'encryptType', {int}), default=0) > 0:
|
if hls_aes_key:
|
||||||
self.report_warning('HLS AES-128 key was not found in API response')
|
info['hls_aes'] = {
|
||||||
|
|
||||||
return {
|
|
||||||
'id': video_id,
|
|
||||||
'formats': formats,
|
|
||||||
'hls_aes': {
|
|
||||||
'key': hls_aes_key,
|
'key': hls_aes_key,
|
||||||
'iv': traverse_obj(video_data, ('hls', 'iv', {decrypt})),
|
'iv': traverse_obj(video_data, ('hls', 'iv', {decrypt})),
|
||||||
},
|
},
|
||||||
**info,
|
elif traverse_obj(video_data, ('hls', 'encryptType', {int})):
|
||||||
}
|
self.report_warning('HLS AES-128 key was not found in API response')
|
||||||
|
|
||||||
|
return info
|
||||||
|
Loading…
Reference in New Issue
Block a user