Skip to content

fix: update taobao live parse #1403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ihmily wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: update taobao live parse #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None:
url=record_url, proxy_addr=proxy_address, cookies=youtube_cookie))
port_info = asyncio.run(stream.get_stream_url(json_data, record_quality, spec=True))

elif record_url.find("tb.cn") > -1:
elif record_url.find("tb.cn") > -1 or record_url.find("tbzb.taobao.com") > -1:
platform = '淘宝直播'
with semaphore:
json_data = asyncio.run(spider.get_taobao_stream_url(
Expand Down Expand Up @@ -2038,6 +2038,8 @@ def contains_url(string: str) -> bool:
'www.lehaitv.com',
'h.catshow168.com',
'e.tb.cn',
'm.tb.cn',
'tbzb.taobao.com',
'huodong.m.taobao.com',
'3.cn',
'eco.m.jd.com',
Expand Down Expand Up @@ -2152,4 +2154,5 @@ def contains_url(string: str) -> bool:
t2.start()
first_run = False

time.sleep(3)
time.sleep(3)

33 changes: 18 additions & 15 deletions src/spider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3036,10 +3036,8 @@ async def get_taobao_stream_url(url: str, proxy_addr: OptionalStr = None, cookie
if cookies:
headers['Cookie'] = cookies

if '_m_h5_tk' not in headers['Cookie']:
print('Error: Cookies is empty! please input correct cookies')
live_id = get_params(url, 'liveId')

live_id = get_params(url, 'id')
if not live_id:
html_str = await async_req(url, proxy_addr=proxy_addr, headers=headers)
redirect_url = re.findall("var url = '(.*?)';", html_str)[0]
Expand All @@ -3062,16 +3060,23 @@ async def get_taobao_stream_url(url: str, proxy_addr: OptionalStr = None, cookie
}

for i in range(2):
app_key = '12574478'
_m_h5_tk = re.findall('_m_h5_tk=(.*?);', headers['Cookie'])[0]

t13 = int(time.time() * 1000)
pre_sign_str = f'{_m_h5_tk.split("_")[0]}&{t13}&{app_key}&' + params['data']
sign = execjs.compile(open(f'{JS_SCRIPT_PATH}/taobao-sign.js').read()).call('sign', pre_sign_str)
params |= {'sign': sign, 't': t13}
params['t'] = t13

if '_m_h5_tk' in headers['Cookie']:
app_key = '12574478'
_m_h5_tk = re.findall('_m_h5_tk=(.*?);', headers['Cookie'])[0]
pre_sign_str = f'{_m_h5_tk.split("_")[0]}&{t13}&{app_key}&' + params['data']
sign = hashlib.md5(pre_sign_str.encode("utf-8")).hexdigest()
params['sign'] = sign

api = f'https://h5api.m.taobao.com/h5/mtop.mediaplatform.live.livedetail/4.0/?{urllib.parse.urlencode(params)}'
jsonp_str, new_cookie = await async_req(url=api, proxy_addr=proxy_addr, headers=headers, timeout=20,
return_cookies=True, include_cookies=True)
json_data = utils.jsonp_to_json(jsonp_str)
if '哎哟喂,被挤爆啦,请稍后重试' in json_data['ret'][0]:
raise RuntimeError(f"Please change your taobao cookie: {json_data['ret']}")

ret_msg = json_data['ret']
if ret_msg == ['SUCCESS::调用成功']:
Expand All @@ -3092,16 +3097,14 @@ def get_sort_key(item):

play_url_list = sorted(play_url_list, key=get_sort_key, reverse=True)
result |= {"is_live": True, "title": live_title, "play_url_list": play_url_list, 'live_id': live_id}

return result
else:
print(f'Error: Taobao live data fetch failed, {ret_msg[0]}')

if '_m_h5_tk' in new_cookie and '_m_h5_tk_enc' in new_cookie:
headers['Cookie'] = re.sub('_m_h5_tk=(.*?);', new_cookie['_m_h5_tk'], headers['Cookie'])
headers['Cookie'] = re.sub('_m_h5_tk_enc=(.*?);', new_cookie['_m_h5_tk_enc'], headers['Cookie'])
else:
print('Error: Try to update cookie failed, please update the cookies in the configuration file')
if '_m_h5_tk' not in new_cookie or '_m_h5_tk_enc' not in new_cookie:
raise RuntimeError('Try to update cookie failed, please update the cookies in the configuration file')
new_cookie_str = utils.dict_to_cookie_str(new_cookie)
headers['Cookie'] = new_cookie_str
utils.update_config(f'{script_path}/config/config.ini', 'Cookie', 'taobao_cookie', new_cookie_str)


@trace_error_decorator
Expand Down