From 0e00579e13f6719245cb7fbbb427194e20813e14 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sun, 22 Nov 2020 14:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=8D=87=E7=BA=A7=EF=BC=888.?= =?UTF-8?q?4.4->9.1.8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WinMain.py | 6 +++++- api.py | 56 +++++++++++++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/WinMain.py b/WinMain.py index ca089d4..06aa169 100644 --- a/WinMain.py +++ b/WinMain.py @@ -190,9 +190,13 @@ def warning(*args): if __name__ == "__main__": name = "97621754276" + if len(sys.argv) > 2: + if sys.argv[-1] == "a": + SHOW_ALL = True + name = sys.argv[1] resetColor() print("西瓜直播礼物助手 by JerryYan") - print("接口版本8.4.4") + print("接口版本9.1.8") print("搜索【", name, "】", end="\t", flush=True) api = WinMain(name) if not api.isValidUser: diff --git a/api.py b/api.py index d1b6f9e..f8c3727 100644 --- a/api.py +++ b/api.py @@ -14,19 +14,23 @@ from XiguaMessage_pb2 import FansClubMessage, SocialMessage DEBUG = False COMMON_GET_PARAM = ( - "&iid=96159232732&device_id=55714661189&channel=xiaomi&aid=32&app_name=video_article&version_code=844" - "&version_name=8.4.4&device_platform=android&ab_version=668855,1640207,1652557,1143698,1043330,1143713," - "1477978,1189797,1635895,1631832,994822,900042,956074,1143356,1046292,1481027,929436,994679,1419059," - "1073579,668854,1143441,668852,668853,941090,668858,668851,668859,668856," - "1639440,1630487&device_type=MI+8+SE&device_brand=Xiaomi&language=zh" - "&os_api=28&os_version=9&openudid=70d6668d41512c39&manifest_version_code=444&update_version_code=84407" - "&_rticket={TIMESTAMP:.0f}&cdid_ts={TIMESTAMP:.0f}&fp=a_fake_fp&tma_jssdk_version=1.53.0.5" + "&iid=844059075938396&device_id=71008241150&channel=xiaomi&aid=32&app_name=video_article&version_code=918" + "&version_name=9.1.8&device_platform=android&ab_version=668852,668853,668858,668851,668859,668856,668855," + "668854,1477978,994679,2186472,1477978,1189797,1635895,1631832,994822,900042,956074,1143356,1046292,1481027," + "929436,994679,1419059,1073579,668854,1143441,668852,668853,941090,668858,668851,668859,668856,1639440,1630487&" + "device_typeMI+9&device_type=MI 9&device_brand=Xiaomi&language=zh" + "&os_api=29&os_version=10&openudid=4aeb1e2b627697be&manifest_version_code=518&update_version_code=91806" + "&_rticket={TIMESTAMP:.0f}&_rticket={TIMESTAMP:.0f}&cdid_ts={TIMESTAMP:.0f}&fp=a_fake_fp&tma_jssdk_version=1790001" + "&rom_version=miui_V12_V12.0.5.0.QFACNXM&oaid=693ea85657ef38ca" "&cdid=ed4295e8-5d9a-4cb9-b2a2-04009a3baa2d&oaid=a625f466e0975d42") SEARCH_USER_API = ( "https://search-hl.ixigua.com/video/app/search/search_content/?format=json" - "&fss=&keyword_type=input&offset=0&count=10&search_sug=0&forum=0&is_native_req=0" + "&fss=search_subtab_switch&target_channel=video_search&keyword_type=search_subtab_switch&offset=0&count=10" + "&search_sug=1&forum=1&is_native_req=0&m_tab=video&pd=user&tab=user&_s_tma=SEARCH_STANDARD.list.fe_get_data" + '&_s_page_sub_route=/&_s_ec={{"filterDataType":[],"reserveFilterBar":true}}&__use_xigua_native_bridge_fetch__=1' + '&ab_param={{"is_show_filter_feature": 1, "is_hit_new_ui": 1}}' "&search_start_time={TIMESTAMP:.0f}&from=live&en_qc=1&pd=xigua_live&ssmix=a{COMMON}&keyword={keyword}") -USER_INFO_API = "https://api3-normal-c-hl.ixigua.com/video/app/user/home/v7/?to_user_id={userId}{COMMON}" +USER_INFO_API = "https://api100-quic-c-hl.ixigua.com/video/app/user/home/v7/?to_user_id={userId}{COMMON}" ROOM_INFO_API = ("https://webcast3.ixigua.com/webcast/room/enter/?room_id={roomId}&webcast_sdk_version=1350" "&webcast_language=zh&webcast_locale=zh_CN&pack_level=4{COMMON}") DANMAKU_GET_API = ("https://webcast3.ixigua.com/webcast/room/{roomId}/_fetch_message_polling/?webcast_sdk_version=1350" @@ -34,8 +38,9 @@ DANMAKU_GET_API = ("https://webcast3.ixigua.com/webcast/room/{roomId}/_fetch_mes GIFT_DATA_API = ("https://webcast.ixigua.com/webcast/gift/list/?room_id={roomId}&fetch_giftlist_from=2" "&webcast_sdk_version=1350&webcast_language=zh&webcast_locale=zh_CN{COMMON}") COMMON_HEADERS = { - "sdk-version": '1', - "User-Agent": "Dalvik/2.1.0 (Linux; U; Android 9) VideoArticle/8.1.6 cronet/TTNetVersion:b97574c0 2019-09-24", + "sdk-version": '2', + "passport-sdk-version": "19", + "User-Agent": "Dalvik/2.1.0 (Linux; U; Android 9) VideoArticle/9.1.8 cronet/TTNetVersion:b97574c0 2020-09-24", "Accept-Encoding": "gzip, deflate" } @@ -244,8 +249,10 @@ class XiGuaLiveApi: 搜索主播名 :return: """ - _formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "keyword": self.name} - _url = SEARCH_USER_API.format_map(_formatData).format_map(_formatData) + _formatData = {"TIMESTAMP": time.time() * 1000, "keyword": self.name} + _COMMON = COMMON_GET_PARAM.format_map(_formatData) + _formatData['COMMON'] = _COMMON + _url = SEARCH_USER_API.format_map(_formatData) d = self.getJson(_url) if d is None: print("搜索接口请求失败") @@ -280,8 +287,10 @@ class XiGuaLiveApi: if self.broadcaster is None: self.isValidUser = False return False - _formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "userId": self.broadcaster.ID} - _url = USER_INFO_API.format_map(_formatData).format_map(_formatData) + _formatData = {"TIMESTAMP": time.time() * 1000, "userId": self.broadcaster.ID} + _COMMON = COMMON_GET_PARAM.format_map(_formatData) + _formatData['COMMON'] = _COMMON + _url = USER_INFO_API.format_map(_formatData) d = self.getJson(_url) if d is None: print("获取用户信息失败") @@ -312,8 +321,10 @@ class XiGuaLiveApi: return False if not force and (self._updRoomAt + timedelta(minutes=10) > datetime.now()): return self.isLive - _formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "roomId": self.roomID} - _url = ROOM_INFO_API.format_map(_formatData).format_map(_formatData) + _formatData = {"TIMESTAMP": time.time() * 1000, "roomId": self.roomID} + _COMMON = COMMON_GET_PARAM.format_map(_formatData) + _formatData['COMMON'] = _COMMON + _url = ROOM_INFO_API.format_map(_formatData) d = self.getJson(_url) if d is None: print("获取房间信息接口请求失败") @@ -344,8 +355,10 @@ class XiGuaLiveApi: def updGiftInfo(self): self.updRoomInfo() - _formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "roomId": self.roomID} - _url = GIFT_DATA_API.format_map(_formatData).format_map(_formatData) + _formatData = {"TIMESTAMP": time.time() * 1000, "roomId": self.roomID} + _COMMON = COMMON_GET_PARAM.format_map(_formatData) + _formatData['COMMON'] = _COMMON + _url = GIFT_DATA_API.format_map(_formatData) d = self.getJson(_url) Gift.roomID = self.roomID if d is None or d["status_code"] != 0: @@ -364,9 +377,12 @@ class XiGuaLiveApi: 获取弹幕 """ self.updRoomInfo() - _formatData = {"COMMON": COMMON_GET_PARAM, "TIMESTAMP": time.time() * 1000, "roomId": self.roomID} + _formatData = {"TIMESTAMP": time.time() * 1000, "roomId": self.roomID} + _COMMON = COMMON_GET_PARAM.format_map(_formatData) + _formatData['COMMON'] = _COMMON _url = DANMAKU_GET_API.format_map(_formatData).format_map(_formatData) p = self.s.post(_url, data="cursor={cursor}&resp_content_type=protobuf&live_id=3&user_id=0&identity=audience" + "last_rtt=85" "&internal_ext={ext}".format_map({"cursor": self._cursor, "ext": self._ext}), headers={"Content-Type": "application/x-www-form-urlencoded"}) if p.status_code != 200: